diff options
| author | sobomax <sobomax@FreeBSD.org> | 2000-06-23 21:44:03 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2000-06-23 21:44:03 +0800 |
| commit | 75802943a41a8d04904b4f8f73577c1e1f41bd19 (patch) | |
| tree | cdb15359f6b17edd36ab0ef3a40572e8e1afb2d9 /misc | |
| parent | 8ec81ff63c63edeff820bab082cf56a6e9155929 (diff) | |
| download | freebsd-ports-gnome-75802943a41a8d04904b4f8f73577c1e1f41bd19.tar.gz freebsd-ports-gnome-75802943a41a8d04904b4f8f73577c1e1f41bd19.tar.zst freebsd-ports-gnome-75802943a41a8d04904b4f8f73577c1e1f41bd19.zip | |
- Support LOCALBASE properly (in setting path to custom wish script)
PR: 19470
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'misc')
| -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 |
4 files changed, 7 insertions, 4 deletions
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 |