diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-06-23 13:44:03 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2000-06-23 13:44:03 +0000 |
commit | 40a33a607008465f53d5a6195b52da563743c5c1 (patch) | |
tree | 6746aa60a42ef4999ee47c9081c98f357098f148 | |
parent | 08436d780099b5b9549d412fe146fb0733c19412 (diff) | |
download | ports-40a33a607008465f53d5a6195b52da563743c5c1.tar.gz ports-40a33a607008465f53d5a6195b52da563743c5c1.zip |
- Support LOCALBASE properly (in setting path to custom wish script)
PR: 19470
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=29809
-rw-r--r-- | audio/snowstar/Makefile | 8 | ||||
-rw-r--r-- | audio/snowstar/files/patch-aa | 2 | ||||
-rw-r--r-- | deskutils/cbb/files/patch-01 | 2 | ||||
-rw-r--r-- | deskutils/zorro/Makefile | 3 | ||||
-rw-r--r-- | deskutils/zorro/files/patch-aa | 2 | ||||
-rw-r--r-- | devel/spin/Makefile | 3 | ||||
-rw-r--r-- | devel/spin/files/patch-aa | 2 | ||||
-rw-r--r-- | devel/vtcl/Makefile | 23 | ||||
-rw-r--r-- | devel/vtcl/files/patch-aa | 2 | ||||
-rw-r--r-- | emulators/frodo/Makefile | 9 | ||||
-rw-r--r-- | emulators/frodo/files/patch-TkGui.tcl | 2 | ||||
-rw-r--r-- | finance/cbb/files/patch-01 | 2 | ||||
-rw-r--r-- | japanese/xshodou/Makefile | 3 | ||||
-rw-r--r-- | japanese/xshodou/files/patch-ab | 2 | ||||
-rw-r--r-- | math/spin/Makefile | 3 | ||||
-rw-r--r-- | math/spin/files/patch-aa | 2 | ||||
-rw-r--r-- | misc/dotfile/Makefile | 5 | ||||
-rw-r--r-- | misc/dotfile/files/patch-af | 2 | ||||
-rw-r--r-- | misc/tkman/Makefile | 2 | ||||
-rw-r--r-- | misc/tkman/files/patch-aa | 2 |
20 files changed, 52 insertions, 29 deletions
diff --git a/audio/snowstar/Makefile b/audio/snowstar/Makefile index 1cfcb06725d6..864dafdcd425 100644 --- a/audio/snowstar/Makefile +++ b/audio/snowstar/Makefile @@ -18,12 +18,14 @@ RUN_DEPENDS= rio:${PORTSDIR}/audio/rio \ NO_BUILD= true NO_WRKSUBDIR= true +DOC_FILES= CHANGES TODO README_Snowstar LICENSE + # somehow snowstar.tcl managed to get loaded with ^M's. post-extract: - @${MV} ${WRKSRC}/snowstar.tcl ${WRKSRC}/snowstar.tcl.dist - @${SED} -e 's/
$$//' ${WRKSRC}/snowstar.tcl.dist > ${WRKSRC}/snowstar.tcl + @${PERL} -pi -e "s|\r\n|\n|g" ${WRKSRC}/snowstar.tcl -DOC_FILES= CHANGES TODO README_Snowstar LICENSE +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/snowstar.tcl do-install: ${INSTALL_SCRIPT} ${WRKSRC}/snowstar.tcl ${PREFIX}/bin/snowstar diff --git a/audio/snowstar/files/patch-aa b/audio/snowstar/files/patch-aa index f7971a8c1974..a56df5f0fbac 100644 --- a/audio/snowstar/files/patch-aa +++ b/audio/snowstar/files/patch-aa @@ -2,7 +2,7 @@ +++ snowstar.tcl Thu Nov 4 12:24:19 1999 @@ -1,4 +1,4 @@ -#!/usr/bin/wish -+#!/usr/local/bin/wish8.2 ++#!%%LOCALBASE%%/bin/wish8.2 wm title . "Snowstar 0.75.5" wm minsize . 320 240 wm resizable . 1 1 diff --git a/deskutils/cbb/files/patch-01 b/deskutils/cbb/files/patch-01 index 96ce834a7341..924d43de64b2 100644 --- a/deskutils/cbb/files/patch-01 +++ b/deskutils/cbb/files/patch-01 @@ -8,7 +8,7 @@ +PERL = ${PERL5} VERSION = 0.8.1 -WISH = /usr/bin/wish -+WISH = /usr/bin/wish8.2 ++WISH = ${LOCALBASE}/bin/wish8.2 language = english SUBDIRS = contrib demo docs graphs images languages reports diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile index 85fec116913d..366ab92461b0 100644 --- a/deskutils/zorro/Makefile +++ b/deskutils/zorro/Makefile @@ -17,6 +17,9 @@ LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 NO_BUILD= yes +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/zorro + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/zorro ${PREFIX}/bin/zorro ${MKDIR} ${PREFIX}/share/zorro diff --git a/deskutils/zorro/files/patch-aa b/deskutils/zorro/files/patch-aa index 4874763fbe63..a62e966242bd 100644 --- a/deskutils/zorro/files/patch-aa +++ b/deskutils/zorro/files/patch-aa @@ -9,7 +9,7 @@ # ---------------------------------------------------------------------- # AUTHOR: Lindsay Marshall <lindsay.marshall@newcastle.ac.uk> --- 1,6 ---- -! #!/usr/local/bin/wish8.2 +! #!%%LOCALBASE%%/bin/wish8.2 # ! # Version 1.1 Patch 8 # diff --git a/devel/spin/Makefile b/devel/spin/Makefile index 184c53739e51..9323a74dbf5a 100644 --- a/devel/spin/Makefile +++ b/devel/spin/Makefile @@ -23,6 +23,9 @@ ALL_TARGET= spin post-extract: @cd ${WRKDIR}/Test && ${SH} ${WRKDIR}/Test/examples +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKDIR}/Xspin3.3/xspin3310.tcl + pre-build: cd ${WRKSRC} && ${MAKE} clean diff --git a/devel/spin/files/patch-aa b/devel/spin/files/patch-aa index 8b8a59c6f671..6eb41e379951 100644 --- a/devel/spin/files/patch-aa +++ b/devel/spin/files/patch-aa @@ -2,7 +2,7 @@ +++ ../Xspin3.3/xspin3310.tcl Wed Jun 23 18:30:51 1999 @@ -1,4 +1,4 @@ -#!/usr/local/bin/wish -f -+#!/usr/local/bin/wish8.0 -f ++#!%%LOCALBASE%%/bin/wish8.0 -f #======================================================================# # Tcl/Tk Spin Controller, Gerard J. Holzmann, Bell Laboratories, USA. # diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile index 0a3be2e0960d..8348152d4751 100644 --- a/devel/vtcl/Makefile +++ b/devel/vtcl/Makefile @@ -16,22 +16,25 @@ RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 NO_BUILD= yes +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/vt.tcl + do-install: - @ ${MKDIR} ${PREFIX}/lib/vtcl/images - @ ${MKDIR} ${PREFIX}/lib/vtcl/images/edit - @ ${MKDIR} ${PREFIX}/lib/vtcl/lib - @ ${MKDIR} ${PREFIX}/share/doc/vtcl - @ ${INSTALL_SCRIPT} ${WRKSRC}/vtcl ${PREFIX}/bin - @ ${INSTALL_DATA} ${WRKSRC}/doc/tutorial.txt ${PREFIX}/share/doc/vtcl + @${MKDIR} ${PREFIX}/lib/vtcl/images + @${MKDIR} ${PREFIX}/lib/vtcl/images/edit + @${MKDIR} ${PREFIX}/lib/vtcl/lib + @${MKDIR} ${PREFIX}/share/doc/vtcl + ${INSTALL_SCRIPT} ${WRKSRC}/vtcl ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/doc/tutorial.txt ${PREFIX}/share/doc/vtcl .for data in Announce ChangeLog README vt.tcl - @ ${INSTALL_DATA} ${WRKSRC}/${data} ${PREFIX}/lib/vtcl + ${INSTALL_DATA} ${WRKSRC}/${data} ${PREFIX}/lib/vtcl .endfor .for sufx in gif ppm xbm xpm - @ ${INSTALL_DATA} ${WRKSRC}/images/*.${sufx} ${PREFIX}/lib/vtcl/images + ${INSTALL_DATA} ${WRKSRC}/images/*.${sufx} ${PREFIX}/lib/vtcl/images .endfor - @ ${INSTALL_DATA} ${WRKSRC}/images/edit/*.gif ${PREFIX}/lib/vtcl/images/edit + ${INSTALL_DATA} ${WRKSRC}/images/edit/*.gif ${PREFIX}/lib/vtcl/images/edit .for sufx in sh tcl - @ ${INSTALL_DATA} ${WRKSRC}/lib/*.${sufx} ${PREFIX}/lib/vtcl/lib + ${INSTALL_DATA} ${WRKSRC}/lib/*.${sufx} ${PREFIX}/lib/vtcl/lib .endfor .include <bsd.port.mk> diff --git a/devel/vtcl/files/patch-aa b/devel/vtcl/files/patch-aa index f9195dad9133..84a4b480cb2f 100644 --- a/devel/vtcl/files/patch-aa +++ b/devel/vtcl/files/patch-aa @@ -2,7 +2,7 @@ +++ vt.tcl Thu Oct 8 01:31:27 1998 @@ -1,4 +1,4 @@ -#!/usr/bin/wish -f -+#!/usr/local/bin/wish8.2 -f ++#!%%LOCALBASE%%/bin/wish8.2 -f # $Id: vt.tcl,v 1.20 1998/02/02 05:11:27 stewart Exp $ ############################################################################## diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile index 411e5b7ab65e..576c93e7d6c3 100644 --- a/emulators/frodo/Makefile +++ b/emulators/frodo/Makefile @@ -8,7 +8,7 @@ PORTNAME= frodo PORTVERSION= 4.1a CATEGORIES= emulators tk82 -MASTER_SITES= ftp://sunsite.unc.edu/pub/micro/commodore/crossplatform/emulators/unix/ +MASTER_SITES= ftp://metalab.unc.edu/pub/micro/commodore/crossplatform/emulators/unix/ DISTNAME= FrodoV4_1a.Src MAINTAINER= dirk.meyer@dinoex.sub.org @@ -21,6 +21,9 @@ WRKSRC= ${WRKDIR}/Frodo/Src ROM= 1541 Basic Char Kernal +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKDIR}/Frodo/TkGui.tcl + do-configure: @(cd ${WRKSRC}; ${SH} ./configure) @@ -36,7 +39,7 @@ do-install: ${INSTALL_DATA} "${WRKDIR}/Frodo/Frodo Logo" ${PREFIX}/libexec/frodo ${CP} "${WRKDIR}/Frodo/TkGui.tcl" ${PREFIX}/libexec/frodo ${MKDIR} ${PREFIX}/libexec/frodo/64prgs - @cd ${WRKDIR}/Frodo/64prgs; tar cf - . | (cd ${PREFIX}/libexec/frodo/64prgs; tar xf -) + @(${TAR} -C ${WRKDIR}/Frodo/64prgs -cf - . | ${TAR} -C ${PREFIX}/libexec/frodo/64prgs -xf - post-install: .if !defined(NOPORTDOCS) @@ -44,7 +47,7 @@ post-install: .for i in CHANGES ${INSTALL_DATA} ${WRKDIR}/Frodo/${i} ${PREFIX}/share/doc/frodo .endfor - @cd ${WRKDIR}/Frodo/Docs; tar cf - . | (cd ${PREFIX}/share/doc/frodo; tar xf -) + @(${TAR} -C ${WRKDIR}/Frodo/Docs -cf - . | ${TAR} -C ${PREFIX}/share/doc/frodo -xf -) .endif .include <bsd.port.mk> diff --git a/emulators/frodo/files/patch-TkGui.tcl b/emulators/frodo/files/patch-TkGui.tcl index 6a94e3408dbc..5aae3b731caf 100644 --- a/emulators/frodo/files/patch-TkGui.tcl +++ b/emulators/frodo/files/patch-TkGui.tcl @@ -2,7 +2,7 @@ +++ ../TkGui.tcl Mon Apr 26 21:49:18 1999 @@ -1,9 +1,9 @@ -#!/usr/local/bin/X11/wish -+#!/usr/local/bin/wish8.2 -f ++#!%%LOCALBASE%%/bin/wish8.2 -f # Frodo Tk GUI by Lutz Vieweg <lkv@mania.robin.de> # requires Tk >= 4.1 diff --git a/finance/cbb/files/patch-01 b/finance/cbb/files/patch-01 index 96ce834a7341..924d43de64b2 100644 --- a/finance/cbb/files/patch-01 +++ b/finance/cbb/files/patch-01 @@ -8,7 +8,7 @@ +PERL = ${PERL5} VERSION = 0.8.1 -WISH = /usr/bin/wish -+WISH = /usr/bin/wish8.2 ++WISH = ${LOCALBASE}/bin/wish8.2 language = english SUBDIRS = contrib demo docs graphs images languages reports diff --git a/japanese/xshodou/Makefile b/japanese/xshodou/Makefile index da1b7ce8e2b1..7e8a626965f2 100644 --- a/japanese/xshodou/Makefile +++ b/japanese/xshodou/Makefile @@ -18,4 +18,7 @@ USE_X_PREFIX= yes MAN1= xshodou.1 MANCOMPRESSED= yes +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/xshodou + .include <bsd.port.mk> diff --git a/japanese/xshodou/files/patch-ab b/japanese/xshodou/files/patch-ab index a527a6dc19af..46036e6bd264 100644 --- a/japanese/xshodou/files/patch-ab +++ b/japanese/xshodou/files/patch-ab @@ -2,7 +2,7 @@ +++ xshodou Mon Jan 11 15:08:33 1999 @@ -1,4 +1,4 @@ -#!/usr/local/bin/wish -+#!/usr/local/bin/wish8.0 ++#!%%LOCALBASE%%/bin/wish8.0 # # XShodou version 1.11 for X based on Tcl/Tk. # Programed by Sakai Hiroaki. (E-Mail:sakai@miya.ee.kagu.sut.ac.jp) diff --git a/math/spin/Makefile b/math/spin/Makefile index 184c53739e51..9323a74dbf5a 100644 --- a/math/spin/Makefile +++ b/math/spin/Makefile @@ -23,6 +23,9 @@ ALL_TARGET= spin post-extract: @cd ${WRKDIR}/Test && ${SH} ${WRKDIR}/Test/examples +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKDIR}/Xspin3.3/xspin3310.tcl + pre-build: cd ${WRKSRC} && ${MAKE} clean diff --git a/math/spin/files/patch-aa b/math/spin/files/patch-aa index 8b8a59c6f671..6eb41e379951 100644 --- a/math/spin/files/patch-aa +++ b/math/spin/files/patch-aa @@ -2,7 +2,7 @@ +++ ../Xspin3.3/xspin3310.tcl Wed Jun 23 18:30:51 1999 @@ -1,4 +1,4 @@ -#!/usr/local/bin/wish -f -+#!/usr/local/bin/wish8.0 -f ++#!%%LOCALBASE%%/bin/wish8.0 -f #======================================================================# # Tcl/Tk Spin Controller, Gerard J. Holzmann, Bell Laboratories, USA. # diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index 2063f5c8b4ae..f648a218497c 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -20,6 +20,9 @@ MAN1= dotfile.1 NO_BUILD= yes +post-patch: + @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dotfile + post-configure: @(cd ${WRKSRC}/Modules/procmail && CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \ INSTALL="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}" \ @@ -41,6 +44,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Doc/dotfile/* ${PREFIX}/share/doc/${DISTNAME}/dotfile ${INSTALL_DATA} ${WRKSRC}/Doc/tcsh/* ${PREFIX}/share/doc/${DISTNAME}/tcsh ${INSTALL_DATA} ${WRKSRC}/Doc/procmail/* ${PREFIX}/share/doc/${DISTNAME}/procmail - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/misc/dotfile/files/patch-af b/misc/dotfile/files/patch-af index 4d47e3855499..655899763097 100644 --- a/misc/dotfile/files/patch-af +++ b/misc/dotfile/files/patch-af @@ -5,6 +5,6 @@ echo "" else - exec /usr/local/bin/wish -f Generator/dotfile.tcl Generator Modules/$1 $2 -+ exec /usr/local/bin/wish8.2 -f Generator/dotfile.tcl Generator Modules/$1 $2 ++ exec %%LOCALBASE%%/bin/wish8.2 -f Generator/dotfile.tcl Generator Modules/$1 $2 fi diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile index 2066b3bdcb73..31428d7c4a3a 100644 --- a/misc/tkman/Makefile +++ b/misc/tkman/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= rman:${PORTSDIR}/textproc/rman \ NO_CDROM= "License required" post-patch: - perl -pi -e "s;/usr/local/bin/wish;${LOCALBASE}/bin/wish8.3;" \ + ${PERL} -pi -e "s;/usr/local/bin/wish;${LOCALBASE}/bin/wish8.3;" \ ${WRKSRC}/contrib/tkmanclient post-install: diff --git a/misc/tkman/files/patch-aa b/misc/tkman/files/patch-aa index ce3f54572412..14f0295d627a 100644 --- a/misc/tkman/files/patch-aa +++ b/misc/tkman/files/patch-aa @@ -8,7 +8,7 @@ +#WISH = /private/share/bin/wish #WISH = /private/share/bin/wish8.3 -#WISH = /usr/local/bin/wish8.3 -+WISH = /usr/local/bin/wish8.3 ++WISH = ${LOCALBASE}/bin/wish8.3 # the executable `tkman' is placed in BINDIR # this should be a directory that's in your bin PATH |