diff options
Diffstat (limited to 'editors')
95 files changed, 147 insertions, 147 deletions
diff --git a/editors/apel-emacs/Makefile b/editors/apel-emacs/Makefile index d9bca31dbbd5..ca7559a709e5 100644 --- a/editors/apel-emacs/Makefile +++ b/editors/apel-emacs/Makefile @@ -110,7 +110,7 @@ setupel-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile index 4062df0cbbb8..e32856b17fca 100644 --- a/editors/apel-emacs20/Makefile +++ b/editors/apel-emacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/apel-emacs # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile index 1353f8dc98b1..01aeb2d0314d 100644 --- a/editors/apel-mule/Makefile +++ b/editors/apel-mule/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/apel-xemacs/Makefile b/editors/apel-xemacs/Makefile index 2c1dc16aec9d..425b6afb2bdf 100644 --- a/editors/apel-xemacs/Makefile +++ b/editors/apel-xemacs/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/apel-emacs # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/apel-xemacs20/Makefile b/editors/apel-xemacs20/Makefile index 78d6d5753618..0e9e1aeb83ed 100644 --- a/editors/apel-xemacs20/Makefile +++ b/editors/apel-xemacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/apel-emacs # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile index e1983ee3e7ee..64aeefb72d6e 100644 --- a/editors/apel-xemacs21-mule/Makefile +++ b/editors/apel-xemacs21-mule/Makefile @@ -25,8 +25,8 @@ PLIST_SUB= EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} ALL_TARGET= package INSTALL_TARGET= install-package -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.apel diff --git a/editors/apel/Makefile b/editors/apel/Makefile index d9bca31dbbd5..ca7559a709e5 100644 --- a/editors/apel/Makefile +++ b/editors/apel/Makefile @@ -110,7 +110,7 @@ setupel-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/flim-emacs-current/Makefile b/editors/flim-emacs-current/Makefile index 61cc10fc34d6..26e5b8c0ff42 100644 --- a/editors/flim-emacs-current/Makefile +++ b/editors/flim-emacs-current/Makefile @@ -204,7 +204,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/flim-emacs/Makefile b/editors/flim-emacs/Makefile index 32679dff8e44..18fca3034a80 100644 --- a/editors/flim-emacs/Makefile +++ b/editors/flim-emacs/Makefile @@ -204,7 +204,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/flim-emacs20-current/Makefile b/editors/flim-emacs20-current/Makefile index 739eff5d587c..ce2452d6506c 100644 --- a/editors/flim-emacs20-current/Makefile +++ b/editors/flim-emacs20-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile index 7b94a5b58503..f7e7f52ddebb 100644 --- a/editors/flim-emacs20/Makefile +++ b/editors/flim-emacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-mule-current/Makefile b/editors/flim-mule-current/Makefile index 9d859d76107b..d8503931a49e 100644 --- a/editors/flim-mule-current/Makefile +++ b/editors/flim-mule-current/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-mule/Makefile b/editors/flim-mule/Makefile index b3a0c5190500..e10dc46e9648 100644 --- a/editors/flim-mule/Makefile +++ b/editors/flim-mule/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-xemacs-current/Makefile b/editors/flim-xemacs-current/Makefile index 36d4f50cbfff..90627c10cb52 100644 --- a/editors/flim-xemacs-current/Makefile +++ b/editors/flim-xemacs-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-xemacs/Makefile b/editors/flim-xemacs/Makefile index 664c972d6510..29e13cadd778 100644 --- a/editors/flim-xemacs/Makefile +++ b/editors/flim-xemacs/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-xemacs20-current/Makefile b/editors/flim-xemacs20-current/Makefile index f3270189c694..c601400031b6 100644 --- a/editors/flim-xemacs20-current/Makefile +++ b/editors/flim-xemacs20-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-xemacs20/Makefile b/editors/flim-xemacs20/Makefile index b1fbc2fa00a5..8dfb28ab21b9 100644 --- a/editors/flim-xemacs20/Makefile +++ b/editors/flim-xemacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim-xemacs21-mule-current/Makefile b/editors/flim-xemacs21-mule-current/Makefile index e1b97eb53e10..648353d5799a 100644 --- a/editors/flim-xemacs21-mule-current/Makefile +++ b/editors/flim-xemacs21-mule-current/Makefile @@ -30,8 +30,8 @@ BUILD_INFO_BY_EMACS= YES # texinfo packages BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.flim diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile index 44394ba2a953..575ac67e503f 100644 --- a/editors/flim-xemacs21-mule/Makefile +++ b/editors/flim-xemacs21-mule/Makefile @@ -30,8 +30,8 @@ BUILD_INFO_BY_EMACS= YES # texinfo packages BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.flim diff --git a/editors/flim/Makefile b/editors/flim/Makefile index 61cc10fc34d6..26e5b8c0ff42 100644 --- a/editors/flim/Makefile +++ b/editors/flim/Makefile @@ -204,7 +204,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile index 61cc10fc34d6..26e5b8c0ff42 100644 --- a/editors/flim113-emacs/Makefile +++ b/editors/flim113-emacs/Makefile @@ -204,7 +204,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile index 739eff5d587c..ce2452d6506c 100644 --- a/editors/flim113-emacs20/Makefile +++ b/editors/flim113-emacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim113-mule/Makefile b/editors/flim113-mule/Makefile index 9d859d76107b..d8503931a49e 100644 --- a/editors/flim113-mule/Makefile +++ b/editors/flim113-mule/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim113-xemacs/Makefile b/editors/flim113-xemacs/Makefile index 36d4f50cbfff..90627c10cb52 100644 --- a/editors/flim113-xemacs/Makefile +++ b/editors/flim113-xemacs/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim113-xemacs20/Makefile b/editors/flim113-xemacs20/Makefile index f3270189c694..c601400031b6 100644 --- a/editors/flim113-xemacs20/Makefile +++ b/editors/flim113-xemacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/flim-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/flim113-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile index e1b97eb53e10..648353d5799a 100644 --- a/editors/flim113-xemacs21-mule/Makefile +++ b/editors/flim113-xemacs21-mule/Makefile @@ -30,8 +30,8 @@ BUILD_INFO_BY_EMACS= YES # texinfo packages BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.flim diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile index 61cc10fc34d6..26e5b8c0ff42 100644 --- a/editors/flim113/Makefile +++ b/editors/flim113/Makefile @@ -204,7 +204,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/flim114-emacs20/Makefile b/editors/flim114-emacs20/Makefile index 61cc10fc34d6..26e5b8c0ff42 100644 --- a/editors/flim114-emacs20/Makefile +++ b/editors/flim114-emacs20/Makefile @@ -204,7 +204,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile index 021cb9875d30..02b1b1583db1 100644 --- a/editors/mule-common/Makefile +++ b/editors/mule-common/Makefile @@ -148,7 +148,7 @@ post-install: install-info --section="The Emacs editor and associated tools" --entry="* Mule-jp: (mule-jp). Multilingual Enhancement to GNU Emacs. (Japanese)" ${PREFIX}/info/mule-jp ${PREFIX}/info/dir install-info --section="The Emacs editor and associated tools" --entry="* Egg-jp: (egg-jp). Japanese/Chinese Inputting Method. (Japanese)" ${PREFIX}/info/egg-jp ${PREFIX}/info/dir install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp). Another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/canna-jp ${PREFIX}/info/dir - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 5b110c8998ee..8f670741b747 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -144,8 +144,8 @@ pre-install: post-install: strip ${PREFIX}/bin/${EMACS_EXECUTABLE}-${EMACS_VERSION} # for freewnn+sj3 or wnn6+sj3 - @if [ -e ${PKGDIR}/INSTALL ]; then \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \ + @if [ -e ${PKGINSTALL} ]; then \ + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; \ fi # Installing site-start.el # (we redefun set-korean-environment etc) diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile index 5de6e48cd0ae..edd0fcf02353 100644 --- a/editors/psgml-emacs20/Makefile +++ b/editors/psgml-emacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../psgml-emacs # emacs port setup EMACS_PORT_NAME= emacs20 -# pkg/* files are used in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# pkg-* files in ${.CURDIR} are used +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/psgml-mule/Makefile b/editors/psgml-mule/Makefile index df3e378cee83..702c7ab84428 100644 --- a/editors/psgml-mule/Makefile +++ b/editors/psgml-mule/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/psgml-emacs # emacs port setup EMACS_PORT_NAME= mule -# pkg/* files are used in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# pkg-* files in ${.CURDIR} are used +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/psgml-xemacs21-mule/Makefile b/editors/psgml-xemacs21-mule/Makefile index 61ae85600bd5..29187bf21753 100644 --- a/editors/psgml-xemacs21-mule/Makefile +++ b/editors/psgml-xemacs21-mule/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../psgml-emacs # emacs port setup EMACS_PORT_NAME= xemacs21-mule -# pkg/* files are used in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# pkg-* files in ${.CURDIR} are used +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile index 0331c6187f95..64e742c6ccc8 100644 --- a/editors/semi-emacs-current/Makefile +++ b/editors/semi-emacs-current/Makefile @@ -194,7 +194,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/semi-emacs/Makefile b/editors/semi-emacs/Makefile index 52c98a71a411..c4d7b016856e 100644 --- a/editors/semi-emacs/Makefile +++ b/editors/semi-emacs/Makefile @@ -195,7 +195,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/semi-emacs20-current/Makefile b/editors/semi-emacs20-current/Makefile index bd53da93b24f..3662fd6baaa2 100644 --- a/editors/semi-emacs20-current/Makefile +++ b/editors/semi-emacs20-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile index e26999119704..9ff5e65d92ec 100644 --- a/editors/semi-emacs20/Makefile +++ b/editors/semi-emacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-mule-current/Makefile b/editors/semi-mule-current/Makefile index 95e2b3adee21..8c35a505d77a 100644 --- a/editors/semi-mule-current/Makefile +++ b/editors/semi-mule-current/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-mule/Makefile b/editors/semi-mule/Makefile index 333c8e22aa61..4ec6db2f46c5 100644 --- a/editors/semi-mule/Makefile +++ b/editors/semi-mule/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-xemacs-current/Makefile b/editors/semi-xemacs-current/Makefile index b4a59b4848b1..a7a0c5949cf9 100644 --- a/editors/semi-xemacs-current/Makefile +++ b/editors/semi-xemacs-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-xemacs/Makefile b/editors/semi-xemacs/Makefile index 93c0c2727753..434d2d351f28 100644 --- a/editors/semi-xemacs/Makefile +++ b/editors/semi-xemacs/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-xemacs20-current/Makefile b/editors/semi-xemacs20-current/Makefile index b19b50cc24da..f379278721d0 100644 --- a/editors/semi-xemacs20-current/Makefile +++ b/editors/semi-xemacs20-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-xemacs20/Makefile b/editors/semi-xemacs20/Makefile index b9780761cafb..bb4b92ace18e 100644 --- a/editors/semi-xemacs20/Makefile +++ b/editors/semi-xemacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi-xemacs21-mule-current/Makefile b/editors/semi-xemacs21-mule-current/Makefile index e9295a909714..fc0949f75dc8 100644 --- a/editors/semi-xemacs21-mule-current/Makefile +++ b/editors/semi-xemacs21-mule-current/Makefile @@ -30,8 +30,8 @@ BUILD_INFO_BY_EMACS= YES # texinfo packages BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.semi diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile index 3a5a57928103..2b9d06894324 100644 --- a/editors/semi-xemacs21-mule/Makefile +++ b/editors/semi-xemacs21-mule/Makefile @@ -36,8 +36,8 @@ BUILD_INFO_BY_EMACS= YES # texinfo packages BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.semi diff --git a/editors/semi/Makefile b/editors/semi/Makefile index 0331c6187f95..64e742c6ccc8 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -194,7 +194,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile index 0331c6187f95..64e742c6ccc8 100644 --- a/editors/semi113-emacs/Makefile +++ b/editors/semi113-emacs/Makefile @@ -194,7 +194,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile index bd53da93b24f..3662fd6baaa2 100644 --- a/editors/semi113-emacs20/Makefile +++ b/editors/semi113-emacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile index 95e2b3adee21..8c35a505d77a 100644 --- a/editors/semi113-mule/Makefile +++ b/editors/semi113-mule/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi113-xemacs/Makefile b/editors/semi113-xemacs/Makefile index b4a59b4848b1..a7a0c5949cf9 100644 --- a/editors/semi113-xemacs/Makefile +++ b/editors/semi113-xemacs/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi113-xemacs20/Makefile b/editors/semi113-xemacs20/Makefile index b19b50cc24da..f379278721d0 100644 --- a/editors/semi113-xemacs20/Makefile +++ b/editors/semi113-xemacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/semi-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile index e9295a909714..fc0949f75dc8 100644 --- a/editors/semi113-xemacs21-mule/Makefile +++ b/editors/semi113-xemacs21-mule/Makefile @@ -30,8 +30,8 @@ BUILD_INFO_BY_EMACS= YES # texinfo packages BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.semi diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile index 0331c6187f95..64e742c6ccc8 100644 --- a/editors/semi113/Makefile +++ b/editors/semi113/Makefile @@ -194,7 +194,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile index 0331c6187f95..64e742c6ccc8 100644 --- a/editors/semi114-emacs20/Makefile +++ b/editors/semi114-emacs20/Makefile @@ -194,7 +194,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile index 2714cfc1bfab..f5886d726a6a 100644 --- a/editors/staroffice5/Makefile +++ b/editors/staroffice5/Makefile @@ -67,7 +67,7 @@ do-install: @PATH=${PATH}:${TMPDIR}/sv001.tmp:/compat/linux/tmp/sv001.tmp:/compat/linux/tmp:/tmp @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${TMPDIR}:${WRKDIR}/tmp:/usr/lib:/lib:/tmp:/compat/linux/lib @/compat/linux/sbin/ldconfig -f ${TMPDIR}/ld.so.conf.tmp - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-TEMP=${TMPDIR} ${WRKDIR}/so51inst/office51/setup /net @${INSTALL_DATA} ${WRKDIR}/applicat.rdb ${PREFIX}/Office51/bin diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/staroffice52/Makefile +++ b/editors/staroffice52/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/staroffice60/Makefile +++ b/editors/staroffice60/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/editors/staroffice70/Makefile +++ b/editors/staroffice70/Makefile @@ -101,7 +101,7 @@ do-install: .if exists(${LINUXBASE}/${PREFIX}) @${LN} -fs ${LINUXBASE}/${PREFIX}/office52 ${PREFIX}/office52 .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-SAL_IGNOREXERRORS=1 TEMP=${TMPDIR} LD_LIBRARY_PATH=${LD_PATH} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net' @if [ -f ${PREFIX}/office52/program/setup ]; then \ ${ECHO} ; \ diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 95199b42cff7..4e31f23dd759 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -74,7 +74,7 @@ MAKE_ARGS+= CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable pre-build: @(cd ${WRKSRC}; ${MAKE} distclean) - @${SED} -e '/gvi/d' ${PKGDIR}/PLIST > ${WRKDIR}/PLIST.nogui + @${SED} -e '/gvi/d' ${PKGDIR}/pkg-plist > ${WRKDIR}/PLIST.nogui post-install: .if !defined(LITE) diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile index 251ce75996ab..6b53b45dedbc 100644 --- a/editors/vim5/Makefile +++ b/editors/vim5/Makefile @@ -73,7 +73,7 @@ MAKE_ARGS+= CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable pre-build: @(cd ${WRKSRC}; ${MAKE} distclean) - @${SED} -e '/gvi/d' ${PKGDIR}/PLIST > ${WRKDIR}/PLIST.nogui + @${SED} -e '/gvi/d' ${PKGDIR}/pkg-plist > ${WRKDIR}/PLIST.nogui post-install: .if !defined(LITE) diff --git a/editors/vim6+ruby/Makefile b/editors/vim6+ruby/Makefile index 089f735d8e42..c8b97824f0b1 100644 --- a/editors/vim6+ruby/Makefile +++ b/editors/vim6+ruby/Makefile @@ -16,7 +16,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org FILESDIR= ${.CURDIR}/files -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment USE_RUBY= yes diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile index 95199b42cff7..4e31f23dd759 100644 --- a/editors/vim6/Makefile +++ b/editors/vim6/Makefile @@ -74,7 +74,7 @@ MAKE_ARGS+= CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable pre-build: @(cd ${WRKSRC}; ${MAKE} distclean) - @${SED} -e '/gvi/d' ${PKGDIR}/PLIST > ${WRKDIR}/PLIST.nogui + @${SED} -e '/gvi/d' ${PKGDIR}/pkg-plist > ${WRKDIR}/PLIST.nogui post-install: .if !defined(LITE) diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile index 2ed83bd513bc..6e6d48ee62d2 100644 --- a/editors/wemi-emacs-current/Makefile +++ b/editors/wemi-emacs-current/Makefile @@ -193,7 +193,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile index e00d625696e0..050d93501cef 100644 --- a/editors/wemi-emacs/Makefile +++ b/editors/wemi-emacs/Makefile @@ -196,7 +196,7 @@ info-package-install: manifest-install: @${RM} -f ${WRKDIR}/${MANIFEST} - @${CAT} ${PKGDIR}/PLIST | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ + @${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ ${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST} @${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \ ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/ diff --git a/editors/wemi-emacs20-current/Makefile b/editors/wemi-emacs20-current/Makefile index b78a95a2a5a2..ac7b4df9d484 100644 --- a/editors/wemi-emacs20-current/Makefile +++ b/editors/wemi-emacs20-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs-current # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/wemi-emacs20/Makefile b/editors/wemi-emacs20/Makefile index bb23057dfe35..994563008850 100644 --- a/editors/wemi-emacs20/Makefile +++ b/editors/wemi-emacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs # emacs port setup EMACS_PORT_NAME= emacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/wemi-mule-current/Makefile b/editors/wemi-mule-current/Makefile index a50a9303607e..ea3ae70b92b3 100644 --- a/editors/wemi-mule-current/Makefile +++ b/editors/wemi-mule-current/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/wemi-mule/Makefile b/editors/wemi-mule/Makefile index 8b5aea344fe9..47d4ca2ec954 100644 --- a/editors/wemi-mule/Makefile +++ b/editors/wemi-mule/Makefile @@ -18,7 +18,7 @@ EMACS_PORT_NAME= mule # whether emacs requires *-setupel.el REQUIRE_SETUPEL= YES -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/wemi-xemacs-current/Makefile b/editors/wemi-xemacs-current/Makefile index 9c36953794dc..d893130b39e5 100644 --- a/editors/wemi-xemacs-current/Makefile +++ b/editors/wemi-xemacs-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/wemi-xemacs/Makefile b/editors/wemi-xemacs/Makefile index 79d86432727a..3bc348b85f5c 100644 --- a/editors/wemi-xemacs/Makefile +++ b/editors/wemi-xemacs/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs # emacs port setup EMACS_PORT_NAME= xemacs -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/wemi-xemacs20-current/Makefile b/editors/wemi-xemacs20-current/Makefile index 9cda9dfe5042..7966e903567d 100644 --- a/editors/wemi-xemacs20-current/Makefile +++ b/editors/wemi-xemacs20-current/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs-current # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/wemi-xemacs20/Makefile b/editors/wemi-xemacs20/Makefile index 8b4d5fe59722..1c58064f95d5 100644 --- a/editors/wemi-xemacs20/Makefile +++ b/editors/wemi-xemacs20/Makefile @@ -15,7 +15,7 @@ MASTERDIR= ${.CURDIR}/../../editors/wemi-emacs # emacs port setup EMACS_PORT_NAME= xemacs20 -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} .include <${MASTERDIR}/Makefile> diff --git a/editors/wemi-xemacs21-mule-current/Makefile b/editors/wemi-xemacs21-mule-current/Makefile index 759f245f54d1..726bc5932ed5 100644 --- a/editors/wemi-xemacs21-mule-current/Makefile +++ b/editors/wemi-xemacs21-mule-current/Makefile @@ -30,8 +30,8 @@ BUILD_INFO_BY_EMACS= YES # texinfo packages BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.semi diff --git a/editors/wemi-xemacs21-mule/Makefile b/editors/wemi-xemacs21-mule/Makefile index 0a7e0a67c9ef..a3c3ce599c1f 100644 --- a/editors/wemi-xemacs21-mule/Makefile +++ b/editors/wemi-xemacs21-mule/Makefile @@ -36,8 +36,8 @@ BUILD_INFO_BY_EMACS= YES # texinfo packages BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_PACKAGESDIR}/../xemacs-packages/lisp/texinfo/texinfmt.el:${PORTSDIR}/editors/xemacs-packages -# use pkg/* files in ${.CURDIR} -PKGDIR= ${.CURDIR}/pkg +# use pkg-* files in ${.CURDIR} +PKGDIR= ${.CURDIR} # package info manifest MANIFEST= MANIFEST.semi diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile index 46e035401371..ec122dcdc6e4 100644 --- a/editors/xemacs21-mule-common/Makefile +++ b/editors/xemacs21-mule-common/Makefile @@ -51,10 +51,10 @@ CONFIGURE_ARGS= --with-x11 \ MAN1= ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \ gnuserv.1 xemacs.1 -PKGDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-common/pkg +PKGDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-common INSTALL_TARGET= install-arch-indep -PLIST= ${PKGDIR}/PLIST +PLIST= ${PKGDIR}/pkg-plist TMPPLIST= ${WRKDIR}/.PLIST.mktmp-${PKGNAME} MULE_COMMON= yes @@ -75,9 +75,9 @@ pre-install: (cd ${PREFIX}/lib/xemacs; ${MKDIR} info etc site-lisp) post-install:: - @if [ -f ${PKGDIR}/INSTALL ]; then \ + @if [ -f ${PKGINSTALL} ]; then \ ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL; \ + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; \ fi @${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE} |