diff options
| author | asami <asami@FreeBSD.org> | 2000-10-08 18:23:48 +0800 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 2000-10-08 18:23:48 +0800 |
| commit | 380a7ab9be4a5e0b282aadcbabd4a0fcb60d22e6 (patch) | |
| tree | d8d06834191fc67caaf8749fb3c9963013b7d611 | |
| parent | d742677c18dda5fd6194bb940adb18babef26617 (diff) | |
| download | freebsd-ports-gnome-380a7ab9be4a5e0b282aadcbabd4a0fcb60d22e6.tar.gz freebsd-ports-gnome-380a7ab9be4a5e0b282aadcbabd4a0fcb60d22e6.tar.zst freebsd-ports-gnome-380a7ab9be4a5e0b282aadcbabd4a0fcb60d22e6.zip | |
Change PKGDIR from pkg/ to . Also fix places where ${PKGDIR} is
spelled out (many of which are ${PKGDIR}/MESSAGE -> ${PKGMESSAGE} type
fixes that shouldn't have been necessary) and the string "/pkg/"
appear.
523 files changed, 651 insertions, 653 deletions
diff --git a/archivers/linux_rar/Makefile b/archivers/linux_rar/Makefile index 88a61e7a00f3..53a2bcae785a 100644 --- a/archivers/linux_rar/Makefile +++ b/archivers/linux_rar/Makefile @@ -49,7 +49,7 @@ do-install: .if defined(WITH_UNRAR) @${INSTALL_PROGRAM} ${WRKSRC}/unrar ${PREFIX}/bin brandelf -t Linux ${PREFIX}/bin/unrar - @${ECHO} bin/unrar >> ${WRKSRC}/PLIST + @${ECHO} bin/unrar >> ${PLIST} .endif .for i in ${RARDOCS} @${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/rar @@ -59,12 +59,12 @@ do-install: .endfor @${INSTALL_MAN} ${WRKSRC}/rar.txt ${PREFIX}/man/cat1/rar.1 - @${CP} ${PKGDIR}/PLIST ${WRKSRC} + @${CP} ${PKGDIR}/pkg-plist ${PLIST} .if !defined(NOMANCOMPRESS) @${GZIP_CMD} ${PREFIX}/man/cat1/rar.1 - @${ECHO} man/cat1/rar.1.gz >> ${WRKSRC}/PLIST + @${ECHO} man/cat1/rar.1.gz >> ${PLIST} .else - @${ECHO} man/cat1/rar.1 >> ${WRKSRC}/PLIST + @${ECHO} man/cat1/rar.1 >> ${PLIST} .endif post-install: diff --git a/astro/setiathome/Makefile b/astro/setiathome/Makefile index 728c04e3be58..0ef4ff6cf14f 100644 --- a/astro/setiathome/Makefile +++ b/astro/setiathome/Makefile @@ -63,6 +63,6 @@ do-install: post-install: @PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile index 100a8b158521..0570907065a2 100644 --- a/audio/icecast/Makefile +++ b/audio/icecast/Makefile @@ -30,6 +30,6 @@ do-install: .endfor ${MKDIR} ${PREFIX}/share/doc/icecast/ ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${PREFIX}/share/doc/icecast/ - @${CAT} ${PKGDIR}/MESSAGE | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' + @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' .include <bsd.port.mk> diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile index 100a8b158521..0570907065a2 100644 --- a/audio/icecast2/Makefile +++ b/audio/icecast2/Makefile @@ -30,6 +30,6 @@ do-install: .endfor ${MKDIR} ${PREFIX}/share/doc/icecast/ ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${PREFIX}/share/doc/icecast/ - @${CAT} ${PKGDIR}/MESSAGE | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' + @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' .include <bsd.port.mk> diff --git a/audio/juke/Makefile b/audio/juke/Makefile index a9b61e5dda80..df2ae6c5b9e6 100644 --- a/audio/juke/Makefile +++ b/audio/juke/Makefile @@ -17,7 +17,7 @@ PKGMESSAGE= ${WRKSRC}/MESSAGE post-install: ${INSTALL_DATA} ${WRKSRC}/juke.conf ${PREFIX}/etc/juke.conf.sample - @${SED} 's,PREFIX,${PREFIX},' ${PKGDIR}/MESSAGE > ${WRKSRC}/MESSAGE + @${SED} 's,PREFIX,${PREFIX},' ${PKGDIR}/pkg-message > ${WRKSRC}/MESSAGE @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/audio/napster/Makefile b/audio/napster/Makefile index a2f99058e114..69f4451213df 100644 --- a/audio/napster/Makefile +++ b/audio/napster/Makefile @@ -35,6 +35,6 @@ do-install: .endif post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/audio/opennap/Makefile b/audio/opennap/Makefile index d1b1235c0bbd..c8dcb0c16d97 100644 --- a/audio/opennap/Makefile +++ b/audio/opennap/Makefile @@ -34,6 +34,6 @@ post-install: cd ${WRKSRC} ; for FILE in sample.*; do ${INSTALL_DATA} $${FILE} ${PREFIX}/share/opennap/examples ; done @echo "===> Installing startup script into ${PREFIX}/etc/rc.d." ${INSTALL_SCRIPT} ${FILESDIR}/opennap.sh ${PREFIX}/etc/rc.d - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/audio/raproxy/Makefile b/audio/raproxy/Makefile index b8c27aaaca6a..22b665b4397d 100644 --- a/audio/raproxy/Makefile +++ b/audio/raproxy/Makefile @@ -33,6 +33,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.html ${WRKSRC}/*.pdf \ ${PREFIX}/share/doc/raproxy .endif - -cat ${PKGDIR}/MESSAGE + -cat ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/audio/teknap/Makefile b/audio/teknap/Makefile index 54476d48a136..afc0e6635f80 100644 --- a/audio/teknap/Makefile +++ b/audio/teknap/Makefile @@ -63,7 +63,7 @@ post-install: ${TAR} --directory ${PREFIX}/share/TekNap/help -xf - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/TekNap @${ECHO} - @${CAT} ${PKGDIR}/MESSAGE | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g" + @${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g" @${ECHO} .endif diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile index adf7019eec55..378718d9cd23 100644 --- a/biology/seaview/Makefile +++ b/biology/seaview/Makefile @@ -28,6 +28,6 @@ do-install: @ ${INSTALL_DATA} ${WRKSRC}/seaview.help ${PREFIX}/lib/X11/seaview post-install: - @ ${CAT} ${PKGDIR}/DESCR + @ ${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/chinese/FreeWnn-lib/Makefile b/chinese/FreeWnn-lib/Makefile index 4ff48ce7d363..f74cfcff324d 100644 --- a/chinese/FreeWnn-lib/Makefile +++ b/chinese/FreeWnn-lib/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -lib CATEGORIES= chinese MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} WNN= cWnn .include "${MASTERDIR}/Makefile" diff --git a/chinese/FreeWnn-server/Makefile b/chinese/FreeWnn-server/Makefile index 538297254026..0cb2f7d2b7ea 100644 --- a/chinese/FreeWnn-server/Makefile +++ b/chinese/FreeWnn-server/Makefile @@ -8,8 +8,8 @@ PKGNAMESUFFIX= -server CATEGORIES= chinese MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib -PKGDIR= ${.CURDIR}/pkg -PKGINSTALL= ${.CURDIR}/../../japanese/FreeWnn-server/pkg/INSTALL +PKGDIR= ${.CURDIR} +PKGINSTALL= ${.CURDIR}/../../japanese/FreeWnn-server/pkg-install WNN= cWnn .include "${MASTERDIR}/Makefile" diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile index 757085bb3e09..2fb8a3ec4925 100644 --- a/chinese/arphicttf/Makefile +++ b/chinese/arphicttf/Makefile @@ -40,6 +40,6 @@ do-install: @${MKDIR} ${FONTDIR}/arphic @${CP} -fr ${WRKSRC}/license ${FONTDIR}/arphic @${CP} -f ${WRKSRC}/logo.gif ${WRKSRC}/release.txt ${FONTDIR}/arphic - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/chinese/moefonts-cid/Makefile b/chinese/moefonts-cid/Makefile index ae7847c14b1e..8bb0e4297d46 100644 --- a/chinese/moefonts-cid/Makefile +++ b/chinese/moefonts-cid/Makefile @@ -38,6 +38,6 @@ do-install: ${PREFIX}/share/ghostscript/fonts/CMap @${INSTALL_DATA} ${WRKDIR}/ag13/CMap/* \ ${PREFIX}/share/ghostscript/fonts/CMap - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile index 28423a6de795..922f5ddf4f2b 100644 --- a/chinese/moettf/Makefile +++ b/chinese/moettf/Makefile @@ -46,6 +46,6 @@ do-install: @${INSTALL_DATA} ${WRKDIR}/moe_lishu.ttf ${FONTDIR} @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/moe_kai.ttf ${FONTDIR} @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/moe_sung.ttf ${FONTDIR} - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/chinese/mule-freewnn/Makefile b/chinese/mule-freewnn/Makefile index 9bec815a8882..d4f2025a6085 100644 --- a/chinese/mule-freewnn/Makefile +++ b/chinese/mule-freewnn/Makefile @@ -9,7 +9,7 @@ CATEGORIES= chinese PKGNAMESUFFIX= -freewnn MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} CFREEWNN= yes diff --git a/chinese/nvi-big5/Makefile b/chinese/nvi-big5/Makefile index 6301b73504ef..9163b3b50e34 100644 --- a/chinese/nvi-big5/Makefile +++ b/chinese/nvi-big5/Makefile @@ -12,7 +12,7 @@ MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n MAINTAINER= itojun@itojun.org -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment CONFIGURE_ARGS+= --enable-multibyte=big5 --program-prefix=n .include "${MASTERDIR}/Makefile" diff --git a/chinese/nvi-euc-cn/Makefile b/chinese/nvi-euc-cn/Makefile index d94d42445122..59737eb370f5 100644 --- a/chinese/nvi-euc-cn/Makefile +++ b/chinese/nvi-euc-cn/Makefile @@ -13,6 +13,6 @@ MAINTAINER= itojun@itojun.org CONFIGURE_ARGS+= --enable-multibyte=euc-cn --program-prefix=n MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment .include "${MASTERDIR}/Makefile" diff --git a/chinese/nvi-euc-tw/Makefile b/chinese/nvi-euc-tw/Makefile index 1f277c50ef76..0679bffe08a6 100644 --- a/chinese/nvi-euc-tw/Makefile +++ b/chinese/nvi-euc-tw/Makefile @@ -13,6 +13,6 @@ MAINTAINER= itojun@itojun.org CONFIGURE_ARGS+= --enable-multibyte=euc-tw --program-prefix=n MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment .include "${MASTERDIR}/Makefile" diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index b98b54b06551..d47e65761514 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -38,7 +38,7 @@ pre-install: .if !defined(BATCH) post-install: - @(cd ${PKGDIR}; export PKG_PREFIX=${PREFIX}; ${PERL5} INSTALL _ POST-INSTALL) + @(cd ${PKGDIR}; export PKG_PREFIX=${PREFIX}; ${PERL5} ${PKGINSTALL} _ POST-INSTALL) .endif .include <bsd.port.mk> diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index 2ff7e2658752..2d68323af6c9 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -44,7 +44,7 @@ post-build: (cd ${WRKSRC}/send-pr; ${MAKE} info) pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: (cd ${WRKSRC}/gnats; ${MAKE} install-info) diff --git a/devel/SN/Makefile b/devel/SN/Makefile index 98d1479da5ab..2d2176bef924 100644 --- a/devel/SN/Makefile +++ b/devel/SN/Makefile @@ -24,6 +24,6 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/SN451 post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/devel/crossgo32-djgpp2-pdcurses/Makefile b/devel/crossgo32-djgpp2-pdcurses/Makefile index 99cce1a1b903..08112e8915a9 100644 --- a/devel/crossgo32-djgpp2-pdcurses/Makefile +++ b/devel/crossgo32-djgpp2-pdcurses/Makefile @@ -52,7 +52,7 @@ do-install: ${INSTALL_DATA} ${PDDOC}/basics/intro.man ${DOCDIR}/intro.txt ${INSTALL_DATA} ${PDDOC}/basics/overview.man ${DOCDIR}/overview.txt ${INSTALL_DATA} ${PDDOC}/basics/xwindows.man ${DOCDIR}/xwindows.txt - ${INSTALL_DATA} ${PKGDIR}/DESCR ${DOCDIR}/README.FreeBSD + ${INSTALL_DATA} ${DESCR} ${DOCDIR}/README.FreeBSD .endif .include <bsd.port.mk> diff --git a/devel/crossgo32-djgpp2/Makefile b/devel/crossgo32-djgpp2/Makefile index c2227de337e6..50c73551fb3f 100644 --- a/devel/crossgo32-djgpp2/Makefile +++ b/devel/crossgo32-djgpp2/Makefile @@ -78,7 +78,7 @@ do-install: ${MKDIR} ${DOCDIR} ${INSTALL_DATA} ${DJGPPDOC}/install ${DOCDIR}/ ${INSTALL_DATA} ${DJGPPDOC}/readme ${DOCDIR}/ - ${INSTALL_DATA} ${PKGDIR}/DESCR ${DOCDIR}/README.FreeBSD + ${INSTALL_DATA} ${DESCR} ${DOCDIR}/README.FreeBSD .endif .include <bsd.port.mk> diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile index 1a66e52ce269..2c8ec32a6f91 100644 --- a/devel/cweb/Makefile +++ b/devel/cweb/Makefile @@ -26,6 +26,6 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/cweb @${INSTALL_DATA} ${WRKDIR}/cwebman.tex ${PREFIX}/share/doc/cweb .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/devel/linuxthreads/Makefile b/devel/linuxthreads/Makefile index f068e16947d5..e2f0d6bbe351 100644 --- a/devel/linuxthreads/Makefile +++ b/devel/linuxthreads/Makefile @@ -54,8 +54,8 @@ pre-install: post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m /usr/lib - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} -# @sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL +# @sh ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/devel/ruby-racc-runtime/Makefile b/devel/ruby-racc-runtime/Makefile index f43cec23dbc0..cbcac621a922 100644 --- a/devel/ruby-racc-runtime/Makefile +++ b/devel/ruby-racc-runtime/Makefile @@ -9,7 +9,7 @@ MASTERDIR= ${.CURDIR}/../ruby-racc PKGNAMESUFFIX= -runtime -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} RUNTIME= yes diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile index 98d1479da5ab..2d2176bef924 100644 --- a/devel/sourcenav/Makefile +++ b/devel/sourcenav/Makefile @@ -24,6 +24,6 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/SN451 post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/dns/ddup/Makefile b/dns/ddup/Makefile index c7f82db72767..146548df9caa 100644 --- a/dns/ddup/Makefile +++ b/dns/ddup/Makefile @@ -45,6 +45,6 @@ do-install: post-install: strip ${PREFIX}/sbin/ddup - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> 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} diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index 299133e7b1fc..2644ff9e2d15 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -74,7 +74,7 @@ post-install: for file in ${DOC_FILES} ; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${ATARI_DOC}/ ;\ done - ${INSTALL_DATA} ${PKGDIR}/DESCR ${ATARI_DOC}/README.FreeBSD + ${INSTALL_DATA} ${DESCR} ${ATARI_DOC}/README.FreeBSD .endif .include <bsd.port.mk> diff --git a/emulators/vMac/Makefile b/emulators/vMac/Makefile index c1bde3422830..6949e7b1790e 100644 --- a/emulators/vMac/Makefile +++ b/emulators/vMac/Makefile @@ -38,6 +38,6 @@ post-install: ${PREFIX}/share/doc/vMac ${INSTALL_DATA} ${WRKSRC}/README.rom \ ${PREFIX}/share/doc/vMac - @${CAT} ${PKGDIR}/MESSAGE | ${SED} -e s:/usr/local:${PREFIX}: + @${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}: .include <bsd.port.mk> diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile index e1cb56e2c2af..eb4fcd4c5183 100644 --- a/emulators/xsystem35/Makefile +++ b/emulators/xsystem35/Makefile @@ -52,7 +52,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/xsys35rc.sample ${PREFIX}/share/examples/xsystem35 @(cd ${WRKSRC}/../contrib; \ ${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/xsystem35) - @${SED} -e s,PREFIX,${PREFIX}, ${PKGDIR}/MESSAGE > ${WRKSRC}/MESSAGE + @${SED} -e s,PREFIX,${PREFIX}, ${PKGDIR}/pkg-message > ${WRKSRC}/MESSAGE @${CAT} ${WRKSRC}/MESSAGE .include <bsd.port.post.mk> diff --git a/french/staroffice52/Makefile b/french/staroffice52/Makefile index 734bae3940e7..6f31b1a33e41 100644 --- a/french/staroffice52/Makefile +++ b/french/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/games/actx/Makefile b/games/actx/Makefile index bade5b45b7e4..2ef0838eaa7f 100644 --- a/games/actx/Makefile +++ b/games/actx/Makefile @@ -38,6 +38,6 @@ post-install: @ ${INSTALL_MAN} ${WRKSRC}/$i ${PREFIX}/share/doc/ja/actx .endfor .endif - @ ${CAT} ${PKGDIR}/MESSAGE + @ ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/angband/Makefile b/games/angband/Makefile index 1c62efae3f11..ffa8481be7c9 100644 --- a/games/angband/Makefile +++ b/games/angband/Makefile @@ -48,6 +48,6 @@ do-install: ${CHMOD} 1777 save user \ ) ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 /dev/null ${PREFIX}/lib/X11/angband/apex/scores.raw - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/netrek-BRMH-bin/Makefile b/games/netrek-BRMH-bin/Makefile index 43b179b723cb..dde585c489f3 100644 --- a/games/netrek-BRMH-bin/Makefile +++ b/games/netrek-BRMH-bin/Makefile @@ -24,6 +24,6 @@ do-extract: do-install: ${INSTALL} -c -o root -g wheel -m 555 ${WRKDIR}/netrek ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/netrek-COW3-bin/Makefile b/games/netrek-COW3-bin/Makefile index 43dcc1bd8d93..15f4c569d022 100644 --- a/games/netrek-COW3-bin/Makefile +++ b/games/netrek-COW3-bin/Makefile @@ -23,6 +23,6 @@ do-extract: do-install: ${INSTALL} -c -o root -g wheel -m 555 ${WRKDIR}/netrek ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 6213d6d94440..a15a0c24f582 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -56,7 +56,7 @@ pre-configure: .endif do-install: - @${CP} ${PKGDIR}/PLIST ${PLIST} + @${CP} ${PKGDIR}/pkg-plist ${PLIST} .if defined(WITH_GLX) @${CAT} ${PKGDIR}/pkg-plist.glx >>${PLIST} diff --git a/games/uox3/Makefile b/games/uox3/Makefile index 1ca93cf1e4e4..d85f1d2243f5 100644 --- a/games/uox3/Makefile +++ b/games/uox3/Makefile @@ -45,6 +45,6 @@ do-install: ${INSTALL_DATA} $${FILE} ${PREFIX}/uox3/docs ;\ done .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile index 1d9d74e52886..fec63077d9db 100644 --- a/games/xjewel/Makefile +++ b/games/xjewel/Makefile @@ -31,7 +31,7 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: ${INSTALL_DATA} ${WRKSRC}/bitmaps/seven_seg.pcf.gz ${PREFIX}/${FONTSDIR} diff --git a/games/xracer/Makefile b/games/xracer/Makefile index acfe719e228c..3168bf785cf9 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -50,6 +50,6 @@ post-install: @ strip ${PREFIX}/bin/perlin @ strip ${PREFIX}/bin/test-poly-opts - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/xshipwars-client/Makefile b/games/xshipwars-client/Makefile index 74a0b0539e99..48edb8a89a92 100644 --- a/games/xshipwars-client/Makefile +++ b/games/xshipwars-client/Makefile @@ -45,6 +45,6 @@ post-install: @ ${ECHO} "===> Stripping Binary " @ strip ${PREFIX}/bin/xsw - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/zangband/Makefile b/games/zangband/Makefile index df9f756102b5..e1b52f5d84f8 100644 --- a/games/zangband/Makefile +++ b/games/zangband/Makefile @@ -25,7 +25,7 @@ USE_XLIB= yes NO_CDROM= Possible copyright infringement -PKGDIR?= ${.CURDIR}/pkg +PKGDIR?= ${.CURDIR} WRKSRC= ${WRKDIR}/ZAngband PKGMESSAGE= ${WRKDIR}/MESSAGE PLIST= ${WRKDIR}/PLIST diff --git a/german/staroffice5/Makefile b/german/staroffice5/Makefile index e8803cfa666c..adffbbe82ed8 100644 --- a/german/staroffice5/Makefile +++ b/german/staroffice5/Makefile @@ -75,7 +75,7 @@ do-install: @PATH=${PATH}:${WRKDIR}/tmp @LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${WRKDIR}/tmp:/usr/lib:/lib:/compat/linux/lib @/compat/linux/sbin/ldconfig -f ${WRKDIR}/tmp/ld.so.conf.temp - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @-TEMP=${WRKDIR}/tmp ${WRKDIR}/so51inst/office51/setup /net @ ${ECHO} @ ${ECHO} Ignorieren Sie die Fehlermeldung. StarOffice5.1a wurde erfolgreich diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile index b651d4d69cda..3a55017ffbe3 100644 --- a/german/staroffice52/Makefile +++ b/german/staroffice52/Makefile @@ -96,7 +96,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/german/staroffice70/Makefile b/german/staroffice70/Makefile index 64a1fc650011..d510844e3a06 100644 --- a/german/staroffice70/Makefile +++ b/german/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/graphics/camediaplay/Makefile b/graphics/camediaplay/Makefile index 238e0f432c36..e2bb217a29d7 100644 --- a/graphics/camediaplay/Makefile +++ b/graphics/camediaplay/Makefile @@ -25,6 +25,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/../$$i \ ${PREFIX}/share/doc/camediaplay; \ done - ${SED} -e 's@\/usr\/local@${PREFIX}@' < ${PKGDIR}/MESSAGE + ${SED} -e 's@\/usr\/local@${PREFIX}@' < ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/graphics/dc3play/Makefile b/graphics/dc3play/Makefile index c4adb78c4d3a..5c07b6bede36 100644 --- a/graphics/dc3play/Makefile +++ b/graphics/dc3play/Makefile @@ -26,6 +26,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/../$$i \ ${PREFIX}/share/doc/dc3play; \ done - ${SED} -e 's@\/usr\/local@${PREFIX}@' < ${PKGDIR}/MESSAGE + ${SED} -e 's@\/usr\/local@${PREFIX}@' < ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index 1272d291e5ec..a8a18597242c 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -63,6 +63,6 @@ USE_GNOME= yes post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 1272d291e5ec..a8a18597242c 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -63,6 +63,6 @@ USE_GNOME= yes post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile index 1272d291e5ec..a8a18597242c 100644 --- a/graphics/gimp-devel/Makefile +++ b/graphics/gimp-devel/Makefile @@ -63,6 +63,6 @@ USE_GNOME= yes post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 1272d291e5ec..a8a18597242c 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -63,6 +63,6 @@ USE_GNOME= yes post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index 1272d291e5ec..a8a18597242c 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -63,6 +63,6 @@ USE_GNOME= yes post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index 1272d291e5ec..a8a18597242c 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -63,6 +63,6 @@ USE_GNOME= yes post-install: ${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/graphics/gridpix/Makefile b/graphics/gridpix/Makefile index ae631ebd2694..efeca74e247c 100644 --- a/graphics/gridpix/Makefile +++ b/graphics/gridpix/Makefile @@ -27,7 +27,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/gridpix ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gridpix @${ECHO} "================================" - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} @${ECHO} "================================" .include <bsd.port.mk> diff --git a/graphics/netshow/Makefile b/graphics/netshow/Makefile index a24ae779b818..f363019013ca 100644 --- a/graphics/netshow/Makefile +++ b/graphics/netshow/Makefile @@ -38,6 +38,6 @@ do-install: ${INSTALL} -c -o bin -g bin -m 555 ${WRKDIR}/netshow ${PREFIX}/bin/netshow post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile index 46ea6cb1d25c..bdcc5fe2f69e 100644 --- a/graphics/qvplay/Makefile +++ b/graphics/qvplay/Makefile @@ -35,6 +35,6 @@ post-install: ${PREFIX}/share/doc/qvplay; \ done @${ECHO} && ${ECHO} - @${SED} -e 's#/usr/local#${PREFIX}#' ${PKGDIR}/MESSAGE + @${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/graphics/xv-m17n/Makefile b/graphics/xv-m17n/Makefile index dd7865d0d90b..b48f33cafe93 100644 --- a/graphics/xv-m17n/Makefile +++ b/graphics/xv-m17n/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= -m17n MAINTAINER= shige@FreeBSD.org MASTERDIR= ${.CURDIR}/../../graphics/xv -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} MAKE_ENV= LOCALE_EXTENSION=-DTV_MULTILINGUAL diff --git a/hebrew/elmar-fonts/Makefile b/hebrew/elmar-fonts/Makefile index 1f38ad8f50ce..faa6d47d533b 100644 --- a/hebrew/elmar-fonts/Makefile +++ b/hebrew/elmar-fonts/Makefile @@ -23,6 +23,6 @@ do-install: ${TAR} -C ${PREFIX}/lib/X11/fonts/hebrew -xZpf \ ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile index 59fbdd4475ac..6806dbf87d61 100644 --- a/irc/ircd-hybrid/Makefile +++ b/irc/ircd-hybrid/Makefile @@ -18,7 +18,7 @@ IS_INTERACTIVE= yes MAN8= ircd.8 pre-install: - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: ${INSTALL_SCRIPT} ${WRKSRC}/tools/buildm4 ${PREFIX}/bin diff --git a/irc/trickyirc/Makefile b/irc/trickyirc/Makefile index 0a9c561dafd3..7903022b3d2e 100644 --- a/irc/trickyirc/Makefile +++ b/irc/trickyirc/Makefile @@ -25,6 +25,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README \ ${PREFIX}/share/doc/TrickyIRC @strip ${PREFIX}/bin/trickyirc - @${CAT} ${PKGDIR}/MESSAGE | ${SED} -e s:/usr/local:${PREFIX}: + @${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}: .include <bsd.port.mk> diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index 16ef7810a4dd..7c3b8dbfef2e 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -60,6 +60,6 @@ post-install: ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ fi - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile index 91b3e8dede4e..14fea615a163 100644 --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -8,6 +8,6 @@ PKGNAMESUFFIX= -server MASTERDIR= ${.CURDIR}/../FreeWnn-lib -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile index 145fa8ff10c4..40756bebf125 100644 --- a/japanese/Wnn6/Makefile +++ b/japanese/Wnn6/Makefile @@ -82,12 +82,12 @@ post-extract: @/sbin/umount ${MOUNT_PT} pre-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: @cd ${WRKSRC}/usr; tar cf - OMRONWnn6 | (cd ${PREFIX}; tar xvpf -) post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile index fb55eeb366c3..de63d5d68f2a 100644 --- a/japanese/alias-fonts/Makefile +++ b/japanese/alias-fonts/Makefile @@ -30,6 +30,6 @@ NO_BUILD= yes do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - /usr/bin/perl ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + /usr/bin/perl ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/another-htmllint/Makefile b/japanese/another-htmllint/Makefile index 5aa141aab734..9d080c6c8a1e 100644 --- a/japanese/another-htmllint/Makefile +++ b/japanese/another-htmllint/Makefile @@ -38,6 +38,6 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${RULE} ${DIR}/rule post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index 16ef7810a4dd..7c3b8dbfef2e 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -60,6 +60,6 @@ post-install: ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ fi - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 16ef7810a4dd..7c3b8dbfef2e 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -60,6 +60,6 @@ post-install: ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${WRKDIR}/canna.sh ${STARTUP_SCRIPT}; \ fi - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile index 1fc0d3769ec5..a4c092e93422 100644 --- a/japanese/cdrom2/Makefile +++ b/japanese/cdrom2/Makefile @@ -29,7 +29,7 @@ post-install: .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/cdrom2 .endfor - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .endif .include <bsd.port.mk> diff --git a/japanese/dserver/Makefile b/japanese/dserver/Makefile index 8b31ad3e56d6..ee22adefa328 100644 --- a/japanese/dserver/Makefile +++ b/japanese/dserver/Makefile @@ -35,6 +35,6 @@ post-install: @${SED} s!PREFIX_DIR!${PREFIX}!g ${WRKSRC}/deinstall.sh.template \ > ${PREFIX}/lib/dserver/deinstall.sh @${INSTALL_DATA} ${FILESDIR}/README.FreeBSD-setup.euc ${PREFIX}/lib/dserver/doc/ - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL .include <bsd.port.mk> diff --git a/japanese/dvi2ps/Makefile b/japanese/dvi2ps/Makefile index 178988328285..d02177c719a3 100644 --- a/japanese/dvi2ps/Makefile +++ b/japanese/dvi2ps/Makefile @@ -40,6 +40,6 @@ post-install: ${INSTALL_SCRIPT} tools/psstrip ${PREFIX}/bin ;\ ${INSTALL_SCRIPT} tools/MakePK ${PREFIX}/bin ;\ ) - @${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SH} ${PKGREQ} ${PKGNAME} INSTALL .include <bsd.port.mk> diff --git a/japanese/dvipsk-vflib/Makefile b/japanese/dvipsk-vflib/Makefile index 7bd3df296b2e..00901af44627 100644 --- a/japanese/dvipsk-vflib/Makefile +++ b/japanese/dvipsk-vflib/Makefile @@ -88,6 +88,6 @@ post-install: done @${LN} -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile index 99a390d35b22..c04be457984a 100644 --- a/japanese/dvipsk/Makefile +++ b/japanese/dvipsk/Makefile @@ -82,6 +82,6 @@ post-install: done @${LN} -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile index f48f153fe5b6..2e9316a470fe 100644 --- a/japanese/elisa10x8/Makefile +++ b/japanese/elisa10x8/Makefile @@ -34,7 +34,7 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile index 4ea6289f350b..01e0f5040f7b 100644 --- a/japanese/elisa8x8/Makefile +++ b/japanese/elisa8x8/Makefile @@ -40,7 +40,7 @@ do-build: pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: @${MKDIR} ${INSTALLDIR} ${DOCDIR} diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile index 92111fa0d9b1..c0f6d837dc2d 100644 --- a/japanese/elvis/Makefile +++ b/japanese/elvis/Makefile @@ -31,7 +31,7 @@ do-configure: post-install: @${MKDIR} ${PREFIX}/share/doc/ja-elvis ${INSTALL_DATA} ${WRKSRC}/README.j18 ${PREFIX}/share/doc/ja-elvis - @${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SH} ${PKGREQ} ${PKGNAME} INSTALL @if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ ${INSTALL_SCRIPT} ${FILESDIR}/ja-elvis.sh ${STARTUP_SCRIPT};\ diff --git a/japanese/exmh2/Makefile b/japanese/exmh2/Makefile index 3752468008d9..a6bb4c16e601 100644 --- a/japanese/exmh2/Makefile +++ b/japanese/exmh2/Makefile @@ -12,8 +12,8 @@ MAINTAINER= ports@FreeBSD.org JAPANESE_EXMH= yes MASTERDIR= ${.CURDIR}/../../mail/exmh2 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work .include "${MASTERDIR}/Makefile" diff --git a/japanese/gn-gnspool/Makefile b/japanese/gn-gnspool/Makefile index 02d4855d0ca6..ed10047c4d8b 100644 --- a/japanese/gn-gnspool/Makefile +++ b/japanese/gn-gnspool/Makefile @@ -43,6 +43,6 @@ post-install: .endif @${MKDIR} ${PREFIX}/share/examples/gn-gnspool @${CP} ${FILESDIR}/_gnrc ${PREFIX}/share/examples/gn-gnspool - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/gp/Makefile b/japanese/gp/Makefile index dc2a514ee6ea..a4a36befb96c 100644 --- a/japanese/gp/Makefile +++ b/japanese/gp/Makefile @@ -10,6 +10,6 @@ CATEGORIES= japanese LANGUAGE= Japanese MASTERDIR= ${.CURDIR}/../../print/gp -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile index a3882a5845a4..d38f1da16f3c 100644 --- a/japanese/jed/Makefile +++ b/japanese/jed/Makefile @@ -106,6 +106,6 @@ do-install: .endif post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/jpilot/Makefile b/japanese/jpilot/Makefile index 02fe066c05a9..6c8d279695b4 100644 --- a/japanese/jpilot/Makefile +++ b/japanese/jpilot/Makefile @@ -6,7 +6,7 @@ # MASTERDIR= ${.CURDIR}/../../palm/jpilot -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment CATEGORIES= japanese diff --git a/japanese/jtex209-ascii/Makefile b/japanese/jtex209-ascii/Makefile index b5332e8cc96e..b4a6440c9a6e 100644 --- a/japanese/jtex209-ascii/Makefile +++ b/japanese/jtex209-ascii/Makefile @@ -10,6 +10,6 @@ BATCH_TEX= ASCII MANUAL_PACKAGE_BUILD= incompatible with other versions of jtex-* MASTERDIR= ${.CURDIR}/../jtex209-both/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jtex209-ntt/Makefile b/japanese/jtex209-ntt/Makefile index adf2569a0d64..a6569a38ce76 100644 --- a/japanese/jtex209-ntt/Makefile +++ b/japanese/jtex209-ntt/Makefile @@ -10,6 +10,6 @@ BATCH_TEX= NTT MANUAL_PACKAGE_BUILD= incompatible with other versions of jtex-* MASTERDIR= ${.CURDIR}/../jtex209-both/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+freewnn/Makefile b/japanese/jvim-canna+freewnn/Makefile index 5f57766b1026..a4d4a5dab751 100644 --- a/japanese/jvim-canna+freewnn/Makefile +++ b/japanese/jvim-canna+freewnn/Makefile @@ -10,6 +10,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+wnn6/Makefile b/japanese/jvim-canna+wnn6/Makefile index 165c7e5e4912..310b3a8cb447 100644 --- a/japanese/jvim-canna+wnn6/Makefile +++ b/japanese/jvim-canna+wnn6/Makefile @@ -10,6 +10,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+wnn7/Makefile b/japanese/jvim-canna+wnn7/Makefile index 165c7e5e4912..310b3a8cb447 100644 --- a/japanese/jvim-canna+wnn7/Makefile +++ b/japanese/jvim-canna+wnn7/Makefile @@ -10,6 +10,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna/Makefile b/japanese/jvim-canna/Makefile index 1fb81f682902..c14537105db1 100644 --- a/japanese/jvim-canna/Makefile +++ b/japanese/jvim-canna/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -canna CANNA= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-freewnn/Makefile b/japanese/jvim-freewnn/Makefile index a799e2d48eb4..5b6def445750 100644 --- a/japanese/jvim-freewnn/Makefile +++ b/japanese/jvim-freewnn/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -freewnn FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-wnn6/Makefile b/japanese/jvim-wnn6/Makefile index b61c433057be..c351b2e8d27b 100644 --- a/japanese/jvim-wnn6/Makefile +++ b/japanese/jvim-wnn6/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -wnn6 WNN6= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-wnn7/Makefile b/japanese/jvim-wnn7/Makefile index b61c433057be..c351b2e8d27b 100644 --- a/japanese/jvim-wnn7/Makefile +++ b/japanese/jvim-wnn7/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -wnn6 WNN6= yes MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-canna+freewnn/Makefile b/japanese/jvim3-canna+freewnn/Makefile index 7318a13f4e54..639aeb32c223 100644 --- a/japanese/jvim3-canna+freewnn/Makefile +++ b/japanese/jvim3-canna+freewnn/Makefile @@ -9,6 +9,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-canna+wnn6/Makefile b/japanese/jvim3-canna+wnn6/Makefile index 41ee6eaad019..3088260ab82f 100644 --- a/japanese/jvim3-canna+wnn6/Makefile +++ b/japanese/jvim3-canna+wnn6/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-canna+wnn7/Makefile b/japanese/jvim3-canna+wnn7/Makefile index 41ee6eaad019..3088260ab82f 100644 --- a/japanese/jvim3-canna+wnn7/Makefile +++ b/japanese/jvim3-canna+wnn7/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-canna/Makefile b/japanese/jvim3-canna/Makefile index 9f3ec47dc983..84678da9f79c 100644 --- a/japanese/jvim3-canna/Makefile +++ b/japanese/jvim3-canna/Makefile @@ -8,6 +8,6 @@ CANNA= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-direct_canna/Makefile b/japanese/jvim3-direct_canna/Makefile index 4d1a73ef6beb..4dc35cf67046 100644 --- a/japanese/jvim3-direct_canna/Makefile +++ b/japanese/jvim3-direct_canna/Makefile @@ -8,6 +8,6 @@ DIRECT_CANNA= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-freewnn/Makefile b/japanese/jvim3-freewnn/Makefile index fbe0bec7b257..9d29c12073cc 100644 --- a/japanese/jvim3-freewnn/Makefile +++ b/japanese/jvim3-freewnn/Makefile @@ -8,6 +8,6 @@ FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-wnn6/Makefile b/japanese/jvim3-wnn6/Makefile index 4347bf16810e..cbacb366dff3 100644 --- a/japanese/jvim3-wnn6/Makefile +++ b/japanese/jvim3-wnn6/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim3-wnn7/Makefile b/japanese/jvim3-wnn7/Makefile index 4347bf16810e..cbacb366dff3 100644 --- a/japanese/jvim3-wnn7/Makefile +++ b/japanese/jvim3-wnn7/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../jvim3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile index d5d9892146ae..417dc4808927 100644 --- a/japanese/k10/Makefile +++ b/japanese/k10/Makefile @@ -28,7 +28,7 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile index e11d2d0b2ba4..eaa426bb1d80 100644 --- a/japanese/k12/Makefile +++ b/japanese/k12/Makefile @@ -37,7 +37,7 @@ post-extract: pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile index b9d88626ea39..a6be93e74e1a 100644 --- a/japanese/kanji18/Makefile +++ b/japanese/kanji18/Makefile @@ -58,7 +58,7 @@ do-build: pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: @${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.pcf.gz ${PREFIX}/lib/X11/fonts/local/ diff --git a/japanese/kanji26/Makefile b/japanese/kanji26/Makefile index 665dc62c6208..49da61a57a9a 100644 --- a/japanese/kanji26/Makefile +++ b/japanese/kanji26/Makefile @@ -10,7 +10,7 @@ DISTFILES?= 793.gz 794.gz 795.gz 796.gz 797.gz 798.gz 799.gz \ 800.gz 802.gz 816.gz 817.gz 818.gz 819.gz 820.gz 821.gz FILESDIR= ${.CURDIR}/files -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} MASTERDIR= ${.CURDIR}/../kanji18 README_FILE?= 793.gz RESIZESED_FILE?= 26to24.sed diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile index 3ff2c6292739..7a46e8a1f8cb 100644 --- a/japanese/kappa20/Makefile +++ b/japanese/kappa20/Makefile @@ -29,7 +29,7 @@ PLIST_SUB= FONTSDIR=${FONTSDIR} pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) diff --git a/japanese/kinput2-canna+freewnn+sj3/Makefile b/japanese/kinput2-canna+freewnn+sj3/Makefile index 6586f84ecae0..478d39e4a97a 100644 --- a/japanese/kinput2-canna+freewnn+sj3/Makefile +++ b/japanese/kinput2-canna+freewnn+sj3/Makefile @@ -10,6 +10,6 @@ SJ3= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+freewnn/Makefile b/japanese/kinput2-canna+freewnn/Makefile index f4d91b9944cb..112596697d74 100644 --- a/japanese/kinput2-canna+freewnn/Makefile +++ b/japanese/kinput2-canna+freewnn/Makefile @@ -9,6 +9,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3+wnn6/Makefile b/japanese/kinput2-canna+sj3+wnn6/Makefile index 97f33a72ec20..b0cedcde9944 100644 --- a/japanese/kinput2-canna+sj3+wnn6/Makefile +++ b/japanese/kinput2-canna+sj3+wnn6/Makefile @@ -10,6 +10,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile index 97f33a72ec20..b0cedcde9944 100644 --- a/japanese/kinput2-canna+sj3+wnn7/Makefile +++ b/japanese/kinput2-canna+sj3+wnn7/Makefile @@ -10,6 +10,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3/Makefile b/japanese/kinput2-canna+sj3/Makefile index 2d39683aa9dc..64b6c2308b00 100644 --- a/japanese/kinput2-canna+sj3/Makefile +++ b/japanese/kinput2-canna+sj3/Makefile @@ -9,6 +9,6 @@ CANNA= yes SJ3= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile index 9409f5ece462..83fa48e6d38f 100644 --- a/japanese/kinput2-canna+wnn6/Makefile +++ b/japanese/kinput2-canna+wnn6/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile index 9409f5ece462..83fa48e6d38f 100644 --- a/japanese/kinput2-canna+wnn7/Makefile +++ b/japanese/kinput2-canna+wnn7/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna/Makefile b/japanese/kinput2-canna/Makefile index 47eec3219abb..df1f90f9899d 100644 --- a/japanese/kinput2-canna/Makefile +++ b/japanese/kinput2-canna/Makefile @@ -8,6 +8,6 @@ CANNA= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-freewnn+sj3/Makefile b/japanese/kinput2-freewnn+sj3/Makefile index 69c608505f69..fa81460d69dc 100644 --- a/japanese/kinput2-freewnn+sj3/Makefile +++ b/japanese/kinput2-freewnn+sj3/Makefile @@ -9,6 +9,6 @@ SJ3= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile index a9fdd38ab4df..e06705e38597 100644 --- a/japanese/kinput2-freewnn/Makefile +++ b/japanese/kinput2-freewnn/Makefile @@ -72,8 +72,8 @@ do-configure: post-install: # For FreeWnn or Wnn6 - @if [ -e ${PKGDIR}/MESSAGE ]; then \ - ${CAT} ${PKGDIR}/MESSAGE; \ + @if [ -e ${PKGMESSAGE} ]; then \ + ${CAT} ${PKGMESSAGE}; \ fi .include <bsd.port.mk> diff --git a/japanese/kinput2-sj3+wnn6/Makefile b/japanese/kinput2-sj3+wnn6/Makefile index 0619283a3650..beef5feb502c 100644 --- a/japanese/kinput2-sj3+wnn6/Makefile +++ b/japanese/kinput2-sj3+wnn6/Makefile @@ -9,6 +9,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile index 0619283a3650..beef5feb502c 100644 --- a/japanese/kinput2-sj3+wnn7/Makefile +++ b/japanese/kinput2-sj3+wnn7/Makefile @@ -9,6 +9,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3/Makefile b/japanese/kinput2-sj3/Makefile index e0c7d9df5e5d..a995c1d51643 100644 --- a/japanese/kinput2-sj3/Makefile +++ b/japanese/kinput2-sj3/Makefile @@ -8,6 +8,6 @@ SJ3= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-wnn6/Makefile b/japanese/kinput2-wnn6/Makefile index 1b83328003bf..e6c8263d21b7 100644 --- a/japanese/kinput2-wnn6/Makefile +++ b/japanese/kinput2-wnn6/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile index 1b83328003bf..e6c8263d21b7 100644 --- a/japanese/kinput2-wnn7/Makefile +++ b/japanese/kinput2-wnn7/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index a9fdd38ab4df..e06705e38597 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -72,8 +72,8 @@ do-configure: post-install: # For FreeWnn or Wnn6 - @if [ -e ${PKGDIR}/MESSAGE ]; then \ - ${CAT} ${PKGDIR}/MESSAGE; \ + @if [ -e ${PKGMESSAGE} ]; then \ + ${CAT} ${PKGMESSAGE}; \ fi .include <bsd.port.mk> diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile index 02163b34643b..dfebfaca9748 100644 --- a/japanese/kterm16c/Makefile +++ b/japanese/kterm16c/Makefile @@ -81,6 +81,6 @@ post-install: @${INSTALL_DATA} ${FILESDIR}/dot.termcap ${DOCDIR} @${INSTALL_DATA} ${FILESDIR}/kterm16c.doc ${DOCDIR} .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile index 5901dbf9d1b3..72ac343f9781 100644 --- a/japanese/lookup-emacs21/Makefile +++ b/japanese/lookup-emacs21/Makefile @@ -16,8 +16,8 @@ MAINTAINER= taoka@FreeBSD.org RUN_DEPENDS+= eblook:${PORTSDIR}/japanese/eblook FILESDIR= ${.CURDIR}/../lookup-mule/files -PKGDIR= ${.CURDIR}/../lookup-mule/pkg -PLIST= ${.CURDIR}/pkg/PLIST +PKGDIR= ${.CURDIR}/../lookup-mule +PLIST= ${.CURDIR}/pkg-plist EMACS_PORT_NAME?= mule .if (${EMACS_PORT_NAME} == "xemacs21-mule") diff --git a/japanese/lookup-mule/Makefile b/japanese/lookup-mule/Makefile index 5901dbf9d1b3..72ac343f9781 100644 --- a/japanese/lookup-mule/Makefile +++ b/japanese/lookup-mule/Makefile @@ -16,8 +16,8 @@ MAINTAINER= taoka@FreeBSD.org RUN_DEPENDS+= eblook:${PORTSDIR}/japanese/eblook FILESDIR= ${.CURDIR}/../lookup-mule/files -PKGDIR= ${.CURDIR}/../lookup-mule/pkg -PLIST= ${.CURDIR}/pkg/PLIST +PKGDIR= ${.CURDIR}/../lookup-mule +PLIST= ${.CURDIR}/pkg-plist EMACS_PORT_NAME?= mule .if (${EMACS_PORT_NAME} == "xemacs21-mule") diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile index 5901dbf9d1b3..72ac343f9781 100644 --- a/japanese/lookup/Makefile +++ b/japanese/lookup/Makefile @@ -16,8 +16,8 @@ MAINTAINER= taoka@FreeBSD.org RUN_DEPENDS+= eblook:${PORTSDIR}/japanese/eblook FILESDIR= ${.CURDIR}/../lookup-mule/files -PKGDIR= ${.CURDIR}/../lookup-mule/pkg -PLIST= ${.CURDIR}/pkg/PLIST +PKGDIR= ${.CURDIR}/../lookup-mule +PLIST= ${.CURDIR}/pkg-plist EMACS_PORT_NAME?= mule .if (${EMACS_PORT_NAME} == "xemacs21-mule") diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile index 2983fb5bbb60..762b793cb968 100644 --- a/japanese/magicpoint/Makefile +++ b/japanese/magicpoint/Makefile @@ -6,7 +6,7 @@ # MASTERDIR= ${.CURDIR}/../../misc/magicpoint -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile index 5a6d55d09062..a2675b8de025 100644 --- a/japanese/man-doc/Makefile +++ b/japanese/man-doc/Makefile @@ -64,6 +64,6 @@ pre-install: .endfor post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/man/Makefile b/japanese/man/Makefile index 17717432f732..78d84160cd9d 100644 --- a/japanese/man/Makefile +++ b/japanese/man/Makefile @@ -27,6 +27,6 @@ MANCOMPRESSED= yes pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .include <bsd.port.mk> diff --git a/japanese/mhonarc/Makefile b/japanese/mhonarc/Makefile index b0c367cc0d2c..7209cf60da28 100644 --- a/japanese/mhonarc/Makefile +++ b/japanese/mhonarc/Makefile @@ -39,6 +39,6 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/mhonarc.rc.sample ${PREFIX}/share/examples/MHonArc/ post-install: - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/mnews-gnspool/Makefile b/japanese/mnews-gnspool/Makefile index 9aeea4c0a0e7..222f9a651060 100644 --- a/japanese/mnews-gnspool/Makefile +++ b/japanese/mnews-gnspool/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= -gnspool RUN_DEPENDS= gnspool:${PORTSDIR}/japanese/gn-gnspool MASTERDIR= ${.CURDIR}/../mnews -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment GNSPOOL= 1 diff --git a/japanese/mnews-im/Makefile b/japanese/mnews-im/Makefile index ab2aba0be6ab..55b60f251e32 100644 --- a/japanese/mnews-im/Makefile +++ b/japanese/mnews-im/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= -im RUN_DEPENDS= imput:${PORTSDIR}/mail/im MASTERDIR= ${.CURDIR}/../mnews -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment GNSPOOL= 0 IMPUT= 1 diff --git a/japanese/mule-canna+freewnn+sj3/Makefile b/japanese/mule-canna+freewnn+sj3/Makefile index 84f3d9cae21b..100ee184a5f8 100644 --- a/japanese/mule-canna+freewnn+sj3/Makefile +++ b/japanese/mule-canna+freewnn+sj3/Makefile @@ -13,6 +13,6 @@ SJ3= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile index 9c5a74502eb8..d371cf24ceb9 100644 --- a/japanese/mule-canna+freewnn/Makefile +++ b/japanese/mule-canna+freewnn/Makefile @@ -12,6 +12,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile index 9a584c65c4c4..8620e654f287 100644 --- a/japanese/mule-canna+sj3+wnn6/Makefile +++ b/japanese/mule-canna+sj3+wnn6/Makefile @@ -13,6 +13,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile index 9a584c65c4c4..8620e654f287 100644 --- a/japanese/mule-canna+sj3+wnn7/Makefile +++ b/japanese/mule-canna+sj3+wnn7/Makefile @@ -13,6 +13,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile index 7f72d3fd501e..0a21dae9ce4a 100644 --- a/japanese/mule-canna+sj3/Makefile +++ b/japanese/mule-canna+sj3/Makefile @@ -12,6 +12,6 @@ CANNA= yes SJ3= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile index f78195fde45d..225171354406 100644 --- a/japanese/mule-canna+wnn6/Makefile +++ b/japanese/mule-canna+wnn6/Makefile @@ -12,6 +12,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile index f78195fde45d..225171354406 100644 --- a/japanese/mule-canna+wnn7/Makefile +++ b/japanese/mule-canna+wnn7/Makefile @@ -12,6 +12,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile index a5edfd61b0cb..bb2bd1a26b43 100644 --- a/japanese/mule-canna/Makefile +++ b/japanese/mule-canna/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese CANNA= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile index 0fa3618a444a..3f5a75f0bf72 100644 --- a/japanese/mule-freewnn+sj3/Makefile +++ b/japanese/mule-freewnn+sj3/Makefile @@ -12,6 +12,6 @@ SJ3= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile index 97d2cf26a060..1b84f2697442 100644 --- a/japanese/mule-freewnn/Makefile +++ b/japanese/mule-freewnn/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile index 0233ed71d206..95fa0a2d81c3 100644 --- a/japanese/mule-sj3+wnn6/Makefile +++ b/japanese/mule-sj3+wnn6/Makefile @@ -12,6 +12,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile index 0233ed71d206..95fa0a2d81c3 100644 --- a/japanese/mule-sj3+wnn7/Makefile +++ b/japanese/mule-sj3+wnn7/Makefile @@ -12,6 +12,6 @@ SJ3= yes WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile index 5be8f36cda5c..04988366f0e1 100644 --- a/japanese/mule-sj3/Makefile +++ b/japanese/mule-sj3/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese SJ3= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile index bba36ac6392c..98c1d7c63b16 100644 --- a/japanese/mule-wnn6/Makefile +++ b/japanese/mule-wnn6/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile index bba36ac6392c..98c1d7c63b16 100644 --- a/japanese/mule-wnn7/Makefile +++ b/japanese/mule-wnn7/Makefile @@ -11,6 +11,6 @@ CATEGORIES= japanese WNN6= yes MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile index ae4480016fe5..cf65002302a8 100644 --- a/japanese/nethack/Makefile +++ b/japanese/nethack/Makefile @@ -55,6 +55,6 @@ post-install: ${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf ${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf .endfor - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile index ae4480016fe5..cf65002302a8 100644 --- a/japanese/nethack32/Makefile +++ b/japanese/nethack32/Makefile @@ -55,6 +55,6 @@ post-install: ${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf ${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf .endfor - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile index ae4480016fe5..cf65002302a8 100644 --- a/japanese/nethack34/Makefile +++ b/japanese/nethack34/Makefile @@ -55,6 +55,6 @@ post-install: ${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf ${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf .endfor - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/netscape-fonts/Makefile b/japanese/netscape-fonts/Makefile index fb55eeb366c3..de63d5d68f2a 100644 --- a/japanese/netscape-fonts/Makefile +++ b/japanese/netscape-fonts/Makefile @@ -30,6 +30,6 @@ NO_BUILD= yes do-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - /usr/bin/perl ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + /usr/bin/perl ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/netscape3.language/Makefile b/japanese/netscape3.language/Makefile index 19bdf08f6182..6927af642283 100644 --- a/japanese/netscape3.language/Makefile +++ b/japanese/netscape3.language/Makefile @@ -67,7 +67,7 @@ post-install: ${MKDIR} ${DOCDIR} ${INSTALL_DATA} ${FILESDIR}/setup.doc ${DOCDIR} .endif - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile index 4482ec09df5e..a64f29e1d40d 100644 --- a/japanese/nvi-euc-jp/Makefile +++ b/japanese/nvi-euc-jp/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -eucjp MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile index 3dc83934dac5..44d8efd86cd2 100644 --- a/japanese/nvi-iso-2022-jp/Makefile +++ b/japanese/nvi-iso-2022-jp/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -iso2022jp MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile index a24c2011903e..8fad785c7705 100644 --- a/japanese/nvi-sjis/Makefile +++ b/japanese/nvi-sjis/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -sjis MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna diff --git a/japanese/okphone/Makefile b/japanese/okphone/Makefile index 91bb4c259794..20d3ceb54785 100644 --- a/japanese/okphone/Makefile +++ b/japanese/okphone/Makefile @@ -26,6 +26,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/okphone .endfor .endif - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/onew-canna+freewnn/Makefile b/japanese/onew-canna+freewnn/Makefile index 9ae32ac0fdd4..15322c59ca46 100644 --- a/japanese/onew-canna+freewnn/Makefile +++ b/japanese/onew-canna+freewnn/Makefile @@ -9,6 +9,6 @@ CANNA= yes FREEWNN= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+wnn6/Makefile b/japanese/onew-canna+wnn6/Makefile index 9b1afeaed3f9..a27515142150 100644 --- a/japanese/onew-canna+wnn6/Makefile +++ b/japanese/onew-canna+wnn6/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+wnn7/Makefile b/japanese/onew-canna+wnn7/Makefile index 9b1afeaed3f9..a27515142150 100644 --- a/japanese/onew-canna+wnn7/Makefile +++ b/japanese/onew-canna+wnn7/Makefile @@ -9,6 +9,6 @@ CANNA= yes WNN6= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna/Makefile b/japanese/onew-canna/Makefile index 74ac138eff77..68f0d027e909 100644 --- a/japanese/onew-canna/Makefile +++ b/japanese/onew-canna/Makefile @@ -8,6 +8,6 @@ CANNA= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-wnn6/Makefile b/japanese/onew-wnn6/Makefile index b97f6a9bc6e1..1e07108d66c8 100644 --- a/japanese/onew-wnn6/Makefile +++ b/japanese/onew-wnn6/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-wnn7/Makefile b/japanese/onew-wnn7/Makefile index b97f6a9bc6e1..1e07108d66c8 100644 --- a/japanese/onew-wnn7/Makefile +++ b/japanese/onew-wnn7/Makefile @@ -8,6 +8,6 @@ WNN6= yes MASTERDIR= ${.CURDIR}/../onew-freewnn -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile index a1b1d95f02b4..bcf2a353d391 100644 --- a/japanese/perl5/Makefile +++ b/japanese/perl5/Makefile @@ -129,6 +129,6 @@ post-install: @${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/suidperl @${LN} -fs ${PREFIX}/bin/sperl${JPERL_VERSION} ${PREFIX}/bin/jsuidperl @${LN} -fs ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so.${PERL_SHLIBVER} ${PREFIX}/lib/perl5/${JPERL_VERSION}/i386-freebsd/CORE/libperl.so - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/pgp.language/Makefile b/japanese/pgp.language/Makefile index c3d5fbf7e022..4fa6b36422cf 100644 --- a/japanese/pgp.language/Makefile +++ b/japanese/pgp.language/Makefile @@ -44,6 +44,6 @@ do-install: ${SH} ${SCRIPTDIR}/pgp.config.l10n.sh \ ${PGPLIB} ${PGP_LANG} ${PGP_CHARSET} -pgp > /dev/null 2>&1 # update .idx file - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/pips760/Makefile b/japanese/pips760/Makefile index 51d9fbb06f5e..f51cb61eac7b 100644 --- a/japanese/pips760/Makefile +++ b/japanese/pips760/Makefile @@ -2,13 +2,13 @@ # Date created: 2000.08.04 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips760/Attic/Makefile,v 1.1.1.1 2000-09-01 16:31:58 taoka Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips760/Attic/Makefile,v 1.2 2000-10-08 10:21:15 asami Exp $ # CATEGORIES?= japanese print linux MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 760 do-install: # empty diff --git a/japanese/pips770/Makefile b/japanese/pips770/Makefile index d03e7550e35f..d8072e876200 100644 --- a/japanese/pips770/Makefile +++ b/japanese/pips770/Makefile @@ -2,13 +2,13 @@ # Date created: 00/04/21 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips770/Attic/Makefile,v 1.1.1.1 2000-09-01 16:30:47 taoka Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips770/Attic/Makefile,v 1.2 2000-10-08 10:21:16 asami Exp $ # CATEGORIES?= japanese print linux MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 770 do-install: # empty diff --git a/japanese/pips820_3300/Makefile b/japanese/pips820_3300/Makefile index 7553bc22e1e2..5e054c29a26f 100644 --- a/japanese/pips820_3300/Makefile +++ b/japanese/pips820_3300/Makefile @@ -2,13 +2,13 @@ # Date created: 00/04/21 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # -# $FreeBSD: /tmp/pcvs/ports/japanese/pips820_3300/Attic/Makefile,v 1.1.1.1 2000-09-01 16:29:44 taoka Exp $ +# $FreeBSD: /tmp/pcvs/ports/japanese/pips820_3300/Attic/Makefile,v 1.2 2000-10-08 10:21:17 asami Exp $ # CATEGORIES?= japanese print linux MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 820_3300 do-install: # empty diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile index 00155653cb76..d74516835f7e 100644 --- a/japanese/plan/Makefile +++ b/japanese/plan/Makefile @@ -22,4 +22,4 @@ PLIST= ${WRKDIR}/PLIST pre-install: ${ECHO} "share/doc/plan/plan_calSJ.ps" > ${PLIST} - ${CAT} ${PKGDIR}/PLIST >> ${PLIST} + ${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile index 12cbb98193c1..e6f4c60fabc4 100644 --- a/japanese/postgresql/Makefile +++ b/japanese/postgresql/Makefile @@ -129,7 +129,7 @@ pre-install: @ ${SETENV} INSTALL_DIR=${INSTALL_DIR} \ PGSQL_UID=${PGSQL_UID} PGSQL_GID=${PGSQL_GID} \ PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @ if [ ! -f ${PREFIX}/${INSTALL_DIR}/.profile ]; then \ ${ECHO} "PATH=${PATH}:${PREFIX}/${INSTALL_DIR}/bin" \ diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile index 1ea53fb4b93c..1f172a9321cb 100644 --- a/japanese/ptex-base/Makefile +++ b/japanese/ptex-base/Makefile @@ -44,9 +44,9 @@ do-configure: pre-install: .if defined(BATCH) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL BATCH + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL BATCH .else - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL .endif @${TAR} --exclude 'texmf/tex/latex/base/*' --exclude 'texmf/dvips/*' \ -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/texmflib-7.3.tar.gz diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile index 1ea53fb4b93c..1f172a9321cb 100644 --- a/japanese/ptex-common/Makefile +++ b/japanese/ptex-common/Makefile @@ -44,9 +44,9 @@ do-configure: pre-install: .if defined(BATCH) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL BATCH + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL BATCH .else - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL .endif @${TAR} --exclude 'texmf/tex/latex/base/*' --exclude 'texmf/dvips/*' \ -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/texmflib-7.3.tar.gz diff --git a/japanese/ruby-man/Makefile b/japanese/ruby-man/Makefile index feec4735a782..056b9c14f71e 100644 --- a/japanese/ruby-man/Makefile +++ b/japanese/ruby-man/Makefile @@ -12,7 +12,7 @@ CATEGORIES= japanese MAINTAINER= knu@FreeBSD.org FILESDIR= ${.CURDIR}/files -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} LANGSUFFIX= -jp diff --git a/japanese/ruby-slang/Makefile b/japanese/ruby-slang/Makefile index 83d7c18c1ac9..e08a39073b37 100644 --- a/japanese/ruby-slang/Makefile +++ b/japanese/ruby-slang/Makefile @@ -11,7 +11,7 @@ CATEGORIES= japanese MAINTAINER= knu@FreeBSD.org -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment WITH_JAPANESE= yes diff --git a/japanese/ruby-usersguide/Makefile b/japanese/ruby-usersguide/Makefile index 0cf41e2b5f8b..e1ea9d1b3be9 100644 --- a/japanese/ruby-usersguide/Makefile +++ b/japanese/ruby-usersguide/Makefile @@ -18,7 +18,7 @@ MAINTAINER= knu@FreeBSD.org VERSION= 980206 FILESDIR= ${.CURDIR}/files -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} LANGSUFFIX= -jp diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile index a15b4f975ed9..c8917609e086 100644 --- a/japanese/sj3-lib/Makefile +++ b/japanese/sj3-lib/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT}; \ fi ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile index a15b4f975ed9..c8917609e086 100644 --- a/japanese/sj3-server/Makefile +++ b/japanese/sj3-server/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT}; \ fi ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/sj3/Makefile b/japanese/sj3/Makefile index a15b4f975ed9..c8917609e086 100644 --- a/japanese/sj3/Makefile +++ b/japanese/sj3/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/sj3.sh.in ${STARTUP_SCRIPT}; \ fi ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/japanese/tcsh-nls-asuka/Makefile b/japanese/tcsh-nls-asuka/Makefile index ceb4ad99c76f..c9577f2eee0a 100644 --- a/japanese/tcsh-nls-asuka/Makefile +++ b/japanese/tcsh-nls-asuka/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= asuka MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-ayanami/Makefile b/japanese/tcsh-nls-ayanami/Makefile index b00cbb4224a2..d719c33cacdc 100644 --- a/japanese/tcsh-nls-ayanami/Makefile +++ b/japanese/tcsh-nls-ayanami/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= ayanami MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-koshiki/Makefile b/japanese/tcsh-nls-koshiki/Makefile index 345423b09894..c2e95baa3418 100644 --- a/japanese/tcsh-nls-koshiki/Makefile +++ b/japanese/tcsh-nls-koshiki/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= koshiki MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-merril/Makefile b/japanese/tcsh-nls-merril/Makefile index 8c99e6f3ab08..35f6720d81a7 100644 --- a/japanese/tcsh-nls-merril/Makefile +++ b/japanese/tcsh-nls-merril/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= merril MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-miyakonjo/Makefile b/japanese/tcsh-nls-miyakonjo/Makefile index ecef524b18e8..558cb3306a40 100644 --- a/japanese/tcsh-nls-miyakonjo/Makefile +++ b/japanese/tcsh-nls-miyakonjo/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= miyakonjo MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-multi/Makefile b/japanese/tcsh-nls-multi/Makefile index 6d1de93b4144..7b94979d42cc 100644 --- a/japanese/tcsh-nls-multi/Makefile +++ b/japanese/tcsh-nls-multi/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= multi MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-rishu/Makefile b/japanese/tcsh-nls-rishu/Makefile index d78ed2a3eb6c..152ddd68a561 100644 --- a/japanese/tcsh-nls-rishu/Makefile +++ b/japanese/tcsh-nls-rishu/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= rishu MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-roomi/Makefile b/japanese/tcsh-nls-roomi/Makefile index 02ee70db83cc..a271f96c5996 100644 --- a/japanese/tcsh-nls-roomi/Makefile +++ b/japanese/tcsh-nls-roomi/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= roomi MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh-nls-ruri2/Makefile b/japanese/tcsh-nls-ruri2/Makefile index 7f7751221190..e315b5df554d 100644 --- a/japanese/tcsh-nls-ruri2/Makefile +++ b/japanese/tcsh-nls-ruri2/Makefile @@ -10,7 +10,7 @@ CATALOGNAME= ruri2 MAINTAINER= issei@jp.FreeBSD.org MASTERDIR= ${.CURDIR}/../tcsh-nls-generic -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/japanese/tcsh/Makefile b/japanese/tcsh/Makefile index 69dd1c793951..5f29c780aa46 100644 --- a/japanese/tcsh/Makefile +++ b/japanese/tcsh/Makefile @@ -37,6 +37,6 @@ post-install: @${ECHO} "updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/tcsh) >/etc/shells - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/tgif2tex/Makefile b/japanese/tgif2tex/Makefile index 202d78bfe245..bcdc12831148 100644 --- a/japanese/tgif2tex/Makefile +++ b/japanese/tgif2tex/Makefile @@ -10,7 +10,7 @@ CATEGORIES= japanese RUN_DEPENDS= nkf:${PORTSDIR}/japanese/nkf MASTERDIR= ${.CURDIR}/../../print/tgif2tex -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} PORTSDOCDIR= ${PREFIX}/share/doc/ja-tgif2tex DOCSRC= Makefile \ example.obj \ diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile index d30b39e7d26f..d3f0a07761aa 100644 --- a/japanese/tk80/Makefile +++ b/japanese/tk80/Makefile @@ -57,7 +57,7 @@ post-install: ${LN} -sf libtk80jp.so.1.5 ${PREFIX}/lib/libtk80jp.so ${RANLIB} ${PREFIX}/lib/libtk80jp.so .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} test: cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test diff --git a/japanese/truetypefonts/Makefile b/japanese/truetypefonts/Makefile index 4f84efab9aef..1532e3ee2eac 100644 --- a/japanese/truetypefonts/Makefile +++ b/japanese/truetypefonts/Makefile @@ -37,6 +37,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/watanabe-mincho.ttf ${FONTDIR} ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${FONTDIR}/fonts.dir.truetype ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias.truetype - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/japanese/vje30-trial/Makefile b/japanese/vje30-trial/Makefile index ee46b866e00f..8ab44c1bb98e 100644 --- a/japanese/vje30-trial/Makefile +++ b/japanese/vje30-trial/Makefile @@ -64,6 +64,6 @@ do-install: @${GREP} -qw '^vjed' /etc/services || ${ECHO} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile index 06a62fd39fde..c22076de92e6 100644 --- a/japanese/vje30/Makefile +++ b/japanese/vje30/Makefile @@ -104,6 +104,6 @@ do-install: @${GREP} -qw '^vjed' /etc/services || ${ECHO} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/japanese/w3/Makefile b/japanese/w3/Makefile index 400514332df0..b1f6e18a605a 100644 --- a/japanese/w3/Makefile +++ b/japanese/w3/Makefile @@ -17,6 +17,6 @@ EMACSCMD= mule ELISPDIR= ${PREFIX}/lib/mule/site-lisp MASTERDIR= ${.CURDIR}/../../www/w3 -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/japanese/w3m-ssl/Makefile b/japanese/w3m-ssl/Makefile index 2a1f310c6d51..40ad6087b42c 100644 --- a/japanese/w3m-ssl/Makefile +++ b/japanese/w3m-ssl/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= -ssl CATEGORIES= japanese MASTERDIR= ${.CURDIR}/../../www/w3m -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist.ja JAPANESE= Yes diff --git a/japanese/w3m/Makefile b/japanese/w3m/Makefile index be9f844e87b2..63340f26d84d 100644 --- a/japanese/w3m/Makefile +++ b/japanese/w3m/Makefile @@ -8,7 +8,7 @@ CATEGORIES= japanese MASTERDIR= ${.CURDIR}/../../www/w3m -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} PLIST= ${MASTERDIR}/pkg-plist.ja JAPANESE= Yes diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile index 825c6860ab16..bea2f942ea81 100644 --- a/japanese/xemacs21-canna+freewnn/Makefile +++ b/japanese/xemacs21-canna+freewnn/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment XEMACS_MAJOR_VER= 21 CANNA= yes diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile index d5a3ae72375c..5fd7df668062 100644 --- a/japanese/xemacs21-canna+wnn6/Makefile +++ b/japanese/xemacs21-canna+wnn6/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment XEMACS_MAJOR_VER= 21 CANNA= yes diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile index 07e8740f5ff3..5a2a91aaa6de 100644 --- a/japanese/xemacs21-canna/Makefile +++ b/japanese/xemacs21-canna/Makefile @@ -24,8 +24,8 @@ CATEGORIES= japanese MANLANG= ja MAN1= xemacs-ja.1 -COMMENT?= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/COMMENT -DESCR= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/DESCR +COMMENT?= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-comment +DESCR= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-descr XEMACS_MAJOR_VER?= 21 DESCR_TMPL= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/files/DESCR.tmpl diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile index 20d0221ed99d..1356f7612552 100644 --- a/japanese/xemacs21-freewnn/Makefile +++ b/japanese/xemacs21-freewnn/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment XEMACS_MAJOR_VER= 21 FREEWNN= yes diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile index 821a7368040d..a6b804a7a6df 100644 --- a/japanese/xemacs21-wnn6/Makefile +++ b/japanese/xemacs21-wnn6/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment XEMACS_MAJOR_VER= 21 WNN6= yes diff --git a/japanese/xjman-3/Makefile b/japanese/xjman-3/Makefile index f066addcd347..0bdeee0e8c71 100644 --- a/japanese/xjman-3/Makefile +++ b/japanese/xjman-3/Makefile @@ -60,6 +60,6 @@ post-install: .for i in COPYRIGHT COPYRIGHT.XJDP @${INSTALL_DATA} ${FILESDIR}/$i ${PREFIX}/share/doc/xjman/ .endfor - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/xjman/Makefile b/japanese/xjman/Makefile index f066addcd347..0bdeee0e8c71 100644 --- a/japanese/xjman/Makefile +++ b/japanese/xjman/Makefile @@ -60,6 +60,6 @@ post-install: .for i in COPYRIGHT COPYRIGHT.XJDP @${INSTALL_DATA} ${FILESDIR}/$i ${PREFIX}/share/doc/xjman/ .endfor - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/japanese/xv/Makefile b/japanese/xv/Makefile index d14e357b7cb6..d861ee659d55 100644 --- a/japanese/xv/Makefile +++ b/japanese/xv/Makefile @@ -10,7 +10,7 @@ CATEGORIES= japanese MAINTAINER= shige@FreeBSD.org MASTERDIR= ${.CURDIR}/../../graphics/xv -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} MAKE_ENV= LOCALE_EXTENSION=-DTV_L10N diff --git a/java/java-tutorial/Makefile b/java/java-tutorial/Makefile index 20ac9d267ce5..598c9988df2e 100644 --- a/java/java-tutorial/Makefile +++ b/java/java-tutorial/Makefile @@ -26,7 +26,7 @@ do-install: (cd ${WRKSRC} && ${TAR} -cf - * ) \ | (cd ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial \ && ${TAR} -xf -) - @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE} + @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/pkg-message > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} @${RM} ${PKGMESSAGE} diff --git a/java/jdk-tutorial/Makefile b/java/jdk-tutorial/Makefile index 20ac9d267ce5..598c9988df2e 100644 --- a/java/jdk-tutorial/Makefile +++ b/java/jdk-tutorial/Makefile @@ -26,7 +26,7 @@ do-install: (cd ${WRKSRC} && ${TAR} -cf - * ) \ | (cd ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial \ && ${TAR} -xf -) - @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE} + @${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/pkg-message > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} @${RM} ${PKGMESSAGE} diff --git a/korean/FreeWnn-lib/Makefile b/korean/FreeWnn-lib/Makefile index f842be88047c..aa219c5b72b4 100644 --- a/korean/FreeWnn-lib/Makefile +++ b/korean/FreeWnn-lib/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -lib CATEGORIES= korean MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} WNN= kWnn .include "${MASTERDIR}/Makefile" diff --git a/korean/FreeWnn-server/Makefile b/korean/FreeWnn-server/Makefile index 342f72070045..3fa336e49f70 100644 --- a/korean/FreeWnn-server/Makefile +++ b/korean/FreeWnn-server/Makefile @@ -8,8 +8,8 @@ PKGNAMESUFFIX= -server CATEGORIES= korean MASTERDIR= ${.CURDIR}/../../japanese/FreeWnn-lib -PKGDIR= ${.CURDIR}/pkg -PKGINSTALL= ${.CURDIR}/../../japanese/FreeWnn-server/pkg/INSTALL +PKGDIR= ${.CURDIR} +PKGINSTALL= ${.CURDIR}/../../japanese/FreeWnn-server/pkg-install WNN= kWnn .include "${MASTERDIR}/Makefile" diff --git a/korean/baekmukfonts-ttf/Makefile b/korean/baekmukfonts-ttf/Makefile index ad8fd0fa77e0..fd58524548d3 100644 --- a/korean/baekmukfonts-ttf/Makefile +++ b/korean/baekmukfonts-ttf/Makefile @@ -41,6 +41,6 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTDIR}/fonts.dir.baekmuk ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${FONTDIR}/fonts.alias.baekmuk ${INSTALL_DATA} ${FILESDIR}/hconfig.ps ${FONTDIR}/hconfig.ps.baekmuk - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/korean/hlatexp-pkfonts1200/Makefile b/korean/hlatexp-pkfonts1200/Makefile index d356933833d5..daa617650d7f 100644 --- a/korean/hlatexp-pkfonts1200/Makefile +++ b/korean/hlatexp-pkfonts1200/Makefile @@ -7,7 +7,7 @@ MASTERDIR= ${.CURDIR}/../hlatexp-pkfonts300 FILESDIR= ${.CURDIR}/files -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} # pkfonts dpi RESOLUTION= 1200 diff --git a/korean/hlatexp-pkfonts600/Makefile b/korean/hlatexp-pkfonts600/Makefile index bfa9ac6e5066..fa4393eebc09 100644 --- a/korean/hlatexp-pkfonts600/Makefile +++ b/korean/hlatexp-pkfonts600/Makefile @@ -7,7 +7,7 @@ MASTERDIR= ${.CURDIR}/../hlatexp-pkfonts300 FILESDIR= ${.CURDIR}/files -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} # pkfonts dpi RESOLUTION= 600 diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile index cee9f23fdb40..475737886c6a 100644 --- a/korean/kaistfonts/Makefile +++ b/korean/kaistfonts/Makefile @@ -37,6 +37,6 @@ do-extract: done post-install: - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile index 58f9c3f1931b..7f5c28d3abe6 100644 --- a/korean/mizifont/Makefile +++ b/korean/mizifont/Makefile @@ -54,6 +54,6 @@ do-install: cd ${PREFIX}/lib/X11/fonts/local/ ; mkfontdir post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/korean/mule-freewnn/Makefile b/korean/mule-freewnn/Makefile index 3a050746d13e..c6ff8c7e2e5f 100644 --- a/korean/mule-freewnn/Makefile +++ b/korean/mule-freewnn/Makefile @@ -9,7 +9,7 @@ CATEGORIES= korean PKGNAMESUFFIX= -freewnn MASTERDIR= ${.CURDIR}/../../editors/mule -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} KFREEWNN= yes diff --git a/korean/netscape3/Makefile b/korean/netscape3/Makefile index df999546160e..88f6b66e7d20 100644 --- a/korean/netscape3/Makefile +++ b/korean/netscape3/Makefile @@ -57,6 +57,6 @@ do-install: # by sada@e-mail.ne.jp post-install: - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/korean/nvi-euc-kr/Makefile b/korean/nvi-euc-kr/Makefile index a3e473340488..b65208cbc9ad 100644 --- a/korean/nvi-euc-kr/Makefile +++ b/korean/nvi-euc-kr/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -euckr MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment .include "${MASTERDIR}/Makefile" diff --git a/korean/nvi-iso-2022-kr/Makefile b/korean/nvi-iso-2022-kr/Makefile index 0062f3eb057e..6e8063ee9129 100644 --- a/korean/nvi-iso-2022-kr/Makefile +++ b/korean/nvi-iso-2022-kr/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -iso2022kr MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment .include "${MASTERDIR}/Makefile" diff --git a/korean/pgp.language/Makefile b/korean/pgp.language/Makefile index b4c4318f05ea..57e968e0ccee 100644 --- a/korean/pgp.language/Makefile +++ b/korean/pgp.language/Makefile @@ -47,6 +47,6 @@ do-install: ${SH} ${SCRIPTDIR}/pgp.config.l10n.sh \ ${PGPLIB} ${PGP_LANG} ${PGP_CHARSET} -pgp > /dev/null 2>&1 # update .idx file - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile index 813e1915b447..59cced9ef9e8 100644 --- a/lang/egcs/Makefile +++ b/lang/egcs/Makefile @@ -64,7 +64,7 @@ pre-configure: >${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" - @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} + @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST} .endif @# Keep from running `autoconf' and `autoheader' since we modified @# configure.in by patching it. diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile index 813e1915b447..59cced9ef9e8 100644 --- a/lang/gcc295/Makefile +++ b/lang/gcc295/Makefile @@ -64,7 +64,7 @@ pre-configure: >${WRKSRC}/gcc/config/freebsd.h ) @${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" - @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} + @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST} .endif @# Keep from running `autoconf' and `autoheader' since we modified @# configure.in by patching it. diff --git a/lang/lcc/Makefile b/lang/lcc/Makefile index e16b7359c9bf..3e1008c99119 100644 --- a/lang/lcc/Makefile +++ b/lang/lcc/Makefile @@ -33,7 +33,7 @@ pre-configure: ${FILESDIR}/${OPSYS}.c.in > ${WRKSRC}/etc/${OPSYS}.c @# below can be used to patchup PLIST file for diff os/arch @#${SED} -e "s:%%LCCDESTDIR%%:${LCCDESTDIR}:g" \ - #${PKGDIR}/PLIST.in > ${PKGDIR}/PLIST + #${PKGDIR}/pkg-plist.in > ${PKGDIR}/pkg-plist @${SED} -e "s:%%OPSYS%%:${OPSYS}:g" \ ${WRKSRC}/makefile > ${WRKSRC}/makefile.configured @${MV} -f ${WRKSRC}/makefile.configured ${WRKSRC}/makefile diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile index 1fac6a600773..58d0f840e96b 100644 --- a/lang/modula-3-lib/Makefile +++ b/lang/modula-3-lib/Makefile @@ -131,7 +131,7 @@ do-build: pre-install: @${ECHO_MSG} "Checking for conflicting shared libraries" - @PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: @${ECHO_MSG} "Installing shared libraries" diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile index 19da1086fc54..fe8308bf0eb5 100644 --- a/lang/mozart/Makefile +++ b/lang/mozart/Makefile @@ -46,6 +46,6 @@ pre-extract: @${ECHO} post-install: - @cat ${PKGDIR}/MESSAGE + @cat ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/lang/o2c/Makefile b/lang/o2c/Makefile index 0924f1dc38f4..35b585ca7b14 100644 --- a/lang/o2c/Makefile +++ b/lang/o2c/Makefile @@ -24,6 +24,6 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/system/o2c.red.template ${PREFIX}/lib/o2c-1.16 - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile index 031f93411382..48e5d0856d9d 100644 --- a/lang/pgcc/Makefile +++ b/lang/pgcc/Makefile @@ -74,7 +74,7 @@ pre-configure: ${SED} -e "s:__FreeBSD__[0-9=]*:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \ >${WRKSRC}/gcc/config/freebsd.h ) .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386" - @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST} + @${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST} .endif pre-install: diff --git a/lang/smalleiffel-devel/Makefile b/lang/smalleiffel-devel/Makefile index 0694217121b4..84db665cc5e1 100644 --- a/lang/smalleiffel-devel/Makefile +++ b/lang/smalleiffel-devel/Makefile @@ -52,9 +52,9 @@ do-install: ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \ ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \ ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX) - @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/MESSAGE \ + @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \ > ${PKGMESSAGE} - @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/INSTALL \ + @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} @${CAT} ${PKGMESSAGE} diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile index 56ebcb124ecf..5478fe868499 100644 --- a/lang/smalleiffel/Makefile +++ b/lang/smalleiffel/Makefile @@ -53,9 +53,9 @@ do-install: ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \ ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \ ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX) - @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/MESSAGE \ + @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \ > ${PKGMESSAGE} - @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/INSTALL \ + @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} @${CAT} ${PKGMESSAGE} diff --git a/lang/smarteiffel/Makefile b/lang/smarteiffel/Makefile index 56ebcb124ecf..5478fe868499 100644 --- a/lang/smarteiffel/Makefile +++ b/lang/smarteiffel/Makefile @@ -53,9 +53,9 @@ do-install: ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \ ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \ ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX) - @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/MESSAGE \ + @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \ > ${PKGMESSAGE} - @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/INSTALL \ + @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} @${CAT} ${PKGMESSAGE} diff --git a/mail/biffer/Makefile b/mail/biffer/Makefile index c2b33a73f09a..25f635fe367f 100644 --- a/mail/biffer/Makefile +++ b/mail/biffer/Makefile @@ -29,7 +29,7 @@ do-install: cd ${WRKDIR}/${DISTNAME}/biffer_comsat && ${MAKE} ${MFLAGS} install post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} \ + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ POST-INSTALL .include <bsd.port.mk> diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 60aaef03cb3b..0e3be212312c 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -41,7 +41,7 @@ post-configure: pre-install: @ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 - @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${PKGINSTALL} ${PKGNAME} PRE-INSTALL DOCS= README acl-extension anoncvs bugs changes copyrights install \ mailing-list overview quota-extension server-design @@ -101,6 +101,6 @@ post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \ >${PREFIX}/etc/rc.d/cyrus.sh @${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh - @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile index 60aaef03cb3b..0e3be212312c 100644 --- a/mail/cyrus-imapd2/Makefile +++ b/mail/cyrus-imapd2/Makefile @@ -41,7 +41,7 @@ post-configure: pre-install: @ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 - @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${PKGINSTALL} ${PKGNAME} PRE-INSTALL DOCS= README acl-extension anoncvs bugs changes copyrights install \ mailing-list overview quota-extension server-design @@ -101,6 +101,6 @@ post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \ >${PREFIX}/etc/rc.d/cyrus.sh @${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh - @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index 60aaef03cb3b..0e3be212312c 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -41,7 +41,7 @@ post-configure: pre-install: @ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 - @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${PKGINSTALL} ${PKGNAME} PRE-INSTALL DOCS= README acl-extension anoncvs bugs changes copyrights install \ mailing-list overview quota-extension server-design @@ -101,6 +101,6 @@ post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \ >${PREFIX}/etc/rc.d/cyrus.sh @${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh - @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 60aaef03cb3b..0e3be212312c 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -41,7 +41,7 @@ post-configure: pre-install: @ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 - @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${PKGINSTALL} ${PKGNAME} PRE-INSTALL DOCS= README acl-extension anoncvs bugs changes copyrights install \ mailing-list overview quota-extension server-design @@ -101,6 +101,6 @@ post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \ >${PREFIX}/etc/rc.d/cyrus.sh @${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh - @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 60aaef03cb3b..0e3be212312c 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -41,7 +41,7 @@ post-configure: pre-install: @ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 - @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${PKGINSTALL} ${PKGNAME} PRE-INSTALL DOCS= README acl-extension anoncvs bugs changes copyrights install \ mailing-list overview quota-extension server-design @@ -101,6 +101,6 @@ post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \ >${PREFIX}/etc/rc.d/cyrus.sh @${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh - @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile index 60aaef03cb3b..0e3be212312c 100644 --- a/mail/cyrus/Makefile +++ b/mail/cyrus/Makefile @@ -41,7 +41,7 @@ post-configure: pre-install: @ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8 - @${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${PKGINSTALL} ${PKGNAME} PRE-INSTALL DOCS= README acl-extension anoncvs bugs changes copyrights install \ mailing-list overview quota-extension server-design @@ -101,6 +101,6 @@ post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/cyrus.sh \ >${PREFIX}/etc/rc.d/cyrus.sh @${CHMOD} 0755 ${PREFIX}/etc/rc.d/cyrus.sh - @PKG_PREFIX=${PREFIX} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index 357a75c5b6c3..0a5dec5d95ba 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -120,6 +120,6 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ezmlm-idx .endfor .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/mail/ezmlm-web/Makefile b/mail/ezmlm-web/Makefile index f1e4c9fd32a1..7ec12bb05622 100644 --- a/mail/ezmlm-web/Makefile +++ b/mail/ezmlm-web/Makefile @@ -37,7 +37,7 @@ do-install: .endfor post-install: - @${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGDIR}/MESSAGE + @${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE} @${ECHO} .include <bsd.port.mk> diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index a8b2b5c4d500..8dc910382bbc 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -36,7 +36,7 @@ MAN8= ipopd.8 imapd.8 pre-extract: .if !defined(BATCH) && !defined(PACKAGE_BUILDING) - @${SH} ${PKGDIR}/INSTALL foo PRE-INSTALL || ${FALSE} + @${SH} ${PKGINSTALL} foo PRE-INSTALL || ${FALSE} .endif post-build: diff --git a/mail/listar/Makefile b/mail/listar/Makefile index 346c400fa62a..d236aa147763 100644 --- a/mail/listar/Makefile +++ b/mail/listar/Makefile @@ -23,7 +23,7 @@ pre-patch: pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @ ${MKDIR} ${PREFIX}/listar @ ${CP} -R ${WRKDIR}/${DISTNAME}/* ${PREFIX}/listar @ ${RM} -R ${PREFIX}/listar/src/ diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index 75c4957945ff..0e2a4135ac5d 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -28,9 +28,9 @@ do-install: .endif pre-install: - @ ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @ ${CAT} ${PKGDIR}/MESSAGE + @ ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 5ed4b8ba53a8..1dca2be8dd36 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -76,7 +76,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @/bin/sh ${PKGDIR}/INSTALL Postfix PRE-INSTALL + @/bin/sh ${PKGINSTALL} Postfix PRE-INSTALL do-install: @${MKDIR} -m 755 ${PREFIX}/etc/postfix diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix1/Makefile +++ b/mail/postfix1/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix20/Makefile +++ b/mail/postfix20/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix21/Makefile +++ b/mail/postfix21/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix23/Makefile +++ b/mail/postfix23/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix25/Makefile +++ b/mail/postfix25/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix26/Makefile +++ b/mail/postfix26/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index 2cef938289a9..9c96356d0ccd 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -105,10 +105,10 @@ do-install: @${ECHO_MSG} "--------------------------------------------------" pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.pre.mk> diff --git a/mail/rlytest/Makefile b/mail/rlytest/Makefile index f53f1cb805ca..2085f81e4e12 100644 --- a/mail/rlytest/Makefile +++ b/mail/rlytest/Makefile @@ -25,6 +25,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/rlytest ${PREFIX}/bin/rlytest post-install: - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/mail/smtpd/Makefile b/mail/smtpd/Makefile index 615087c7a0c8..dd850790edb2 100644 --- a/mail/smtpd/Makefile +++ b/mail/smtpd/Makefile @@ -65,6 +65,6 @@ post-install: @${ECHO} "Done!" - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile index f3099db47491..65f94c6561c3 100644 --- a/mail/smtpfeed/Makefile +++ b/mail/smtpfeed/Makefile @@ -54,7 +54,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}; \ done .endif - @${SED} -e 's#/usr/local#${PREFIX}#' ${PKGDIR}/MESSAGE + @${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE} install-sendmail: (cd ${WRKSRC_SENDMAIL}; sh makesendmail install) diff --git a/mail/xpbiff-youbin/Makefile b/mail/xpbiff-youbin/Makefile index fa698e567cda..72ee2f78f67f 100644 --- a/mail/xpbiff-youbin/Makefile +++ b/mail/xpbiff-youbin/Makefile @@ -14,8 +14,8 @@ MAINTAINER= sanpei@FreeBSD.org YOUBIN= yes MASTERDIR= ${.CURDIR}/../xpbiff -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist RUN_DEPENDS= youbin:${PORTSDIR}/mail/youbin diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile index 29cdf4a20e81..c51727fc3d20 100644 --- a/mail/youbin/Makefile +++ b/mail/youbin/Makefile @@ -25,10 +25,10 @@ MAN8= youbind.8 STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/youbind.sh.sample pre-build: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGDIR}/REQ ${PKGNAME} BUILD + @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGREQ} ${PKGNAME} BUILD pre-install: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGREQ} ${PKGNAME} INSTALL post-install: @if [ ! -f ${STARTUP_SCRIPT} ]; then \ @@ -37,6 +37,6 @@ post-install: > ${STARTUP_SCRIPT} ; \ ${CHMOD} 755 ${STARTUP_SCRIPT} ; \ fi - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile index ce6c73aad666..abf8816fac36 100644 --- a/mail/zmailer/Makefile +++ b/mail/zmailer/Makefile @@ -60,7 +60,7 @@ PKGMESSAGE= ${WRKDIR}/MESSAGE post-configure: ${SED} -e s:@PREFIX@:${PREFIX}:g -e s:@PORTSDIR@:${PORTSDIR}:g \ - ${PKGDIR}/MESSAGE > ${PKGMESSAGE} + ${PKGDIR}/pkg-message > ${PKGMESSAGE} post-install: @${INSTALL_SCRIPT} ${FILESDIR}/zmailer.sh.sample \ diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile index 25d3fe932be9..c5fe4b90517c 100644 --- a/math/gnuplot+/Makefile +++ b/math/gnuplot+/Makefile @@ -86,6 +86,6 @@ post-install: ${INSTALL_DATA} ${GP_DOCS} ${PREFIX}/share/doc/gnuplot+ ${INSTALL_DATA} ${WRKSRC}/docs/gnuplot.info ${PREFIX}/info install-info ${PREFIX}/info/gnuplot.info ${PREFIX}/info/dir - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/math/lapack/Makefile b/math/lapack/Makefile index 4dbf79f3660a..fab1a1a9ee02 100644 --- a/math/lapack/Makefile +++ b/math/lapack/Makefile @@ -215,9 +215,9 @@ pre-fetch: .endif pre-install: .if !defined(NOPROFILE) - @${CAT} ${PKGDIR}/PLIST > ${PLIST} + @${CAT} ${PKGDIR}/pkg-plist > ${PLIST} .else - @${SED} -e /_p.a/d ${PKGDIR}/PLIST > ${PLIST} + @${SED} -e /_p.a/d ${PKGDIR}/pkg-plist > ${PLIST} .endif do-install: diff --git a/math/snns/Makefile b/math/snns/Makefile index 104a52542b76..8795087efebf 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -29,6 +29,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/default.cfg ${PREFIX}/snns ${INSTALL_DATA} ${WRKSRC}/help.hdoc ${PREFIX}/snns ${INSTALL_SCRIPT} ${WRKSRC}/snns ${PREFIX}/bin - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/math/wingz/Makefile b/math/wingz/Makefile index eaca756d05f8..4f1bc25b5c1a 100644 --- a/math/wingz/Makefile +++ b/math/wingz/Makefile @@ -23,6 +23,6 @@ NO_WRKSUBDIR= yes USE_X_PREFIX= yes post-install: - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/misc/221upgrade/Makefile b/misc/221upgrade/Makefile index c6642f6a179c..02adcf790467 100644 --- a/misc/221upgrade/Makefile +++ b/misc/221upgrade/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes PKGINSTALL= ${WRKDIR}/INSTALL do-install: - ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/222upgrade/Makefile b/misc/222upgrade/Makefile index 4f4c47fbac33..28bc541a97c1 100644 --- a/misc/222upgrade/Makefile +++ b/misc/222upgrade/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes PKGINSTALL= ${WRKDIR}/INSTALL do-install: - ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/225upgrade/Makefile b/misc/225upgrade/Makefile index 75459d788938..c613bbd65ae7 100644 --- a/misc/225upgrade/Makefile +++ b/misc/225upgrade/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes PKGINSTALL= ${WRKDIR}/INSTALL do-install: - ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/227upgrade/Makefile b/misc/227upgrade/Makefile index 15711ab37e49..600a055a64ab 100644 --- a/misc/227upgrade/Makefile +++ b/misc/227upgrade/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes PKGINSTALL= ${WRKDIR}/INSTALL do-install: - ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/30upgrade/Makefile b/misc/30upgrade/Makefile index 40908dcbe368..f0324ead53ec 100644 --- a/misc/30upgrade/Makefile +++ b/misc/30upgrade/Makefile @@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/31upgrade/Makefile b/misc/31upgrade/Makefile index 725322b0245e..fa83ff6f90e8 100644 --- a/misc/31upgrade/Makefile +++ b/misc/31upgrade/Makefile @@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/32upgrade/Makefile b/misc/32upgrade/Makefile index eab547d5a082..686ebeec0342 100644 --- a/misc/32upgrade/Makefile +++ b/misc/32upgrade/Makefile @@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/34upgrade/Makefile b/misc/34upgrade/Makefile index 0279c6612e5d..e6088f1141d5 100644 --- a/misc/34upgrade/Makefile +++ b/misc/34upgrade/Makefile @@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/40upgrade/Makefile b/misc/40upgrade/Makefile index 6181c47e0df6..bee8a161cbb1 100644 --- a/misc/40upgrade/Makefile +++ b/misc/40upgrade/Makefile @@ -26,7 +26,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/41upgrade/Makefile b/misc/41upgrade/Makefile index 0d0c6030cce9..6047673436ff 100644 --- a/misc/41upgrade/Makefile +++ b/misc/41upgrade/Makefile @@ -26,7 +26,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile index 4a59ef274d91..30286958d052 100644 --- a/misc/amanda/Makefile +++ b/misc/amanda/Makefile @@ -45,6 +45,6 @@ post-install: .endfor @${MKDIR} ${PREFIX}/share/examples/amanda ${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/misc/bbjd/Makefile b/misc/bbjd/Makefile index 8c65925b5766..afd9b37cd3c0 100644 --- a/misc/bbjd/Makefile +++ b/misc/bbjd/Makefile @@ -25,6 +25,6 @@ do-install: @ ${INSTALL_DATA} ${WRKSRC}/Theory ${PREFIX}/share/bbjd/ post-install: - @ ${CAT} ${PKGDIR}/MESSAGE + @ ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index f648a218497c..d7e51b79d3de 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -32,7 +32,7 @@ post-configure: .if !defined(DISPLAY) PLIST= ${WRKDIR}/PLIST pre-install: - @${CAT} ${PKGDIR}/PLIST | ${SED} -e '/fvwm.\/bytecompile/d' > ${PLIST} + @${CAT} ${PKGDIR}/pkg-plist | ${SED} -e '/fvwm.\/bytecompile/d' > ${PLIST} .endif post-install: diff --git a/misc/fd/Makefile b/misc/fd/Makefile index ef2b6ddabbd1..ac8395627b75 100644 --- a/misc/fd/Makefile +++ b/misc/fd/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \ done .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 82cd81d00ed6..2c98379eaf70 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -39,7 +39,7 @@ MAN8= mcserv.8 .if defined(WITH_SLANG) PLIST= ${WRKDIR}/PLIST pre-install: - @${CAT} ${PKGDIR}/PLIST > ${PLIST} + @${CAT} ${PKGDIR}/pkg-plist > ${PLIST} @${ECHO} bin/mcedit >> ${PLIST} .endif diff --git a/misc/sma/Makefile b/misc/sma/Makefile index d53c27867190..62d008160e41 100644 --- a/misc/sma/Makefile +++ b/misc/sma/Makefile @@ -32,6 +32,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/sma ${PREFIX}/bin post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile index a24ae779b818..f363019013ca 100644 --- a/multimedia/netshow/Makefile +++ b/multimedia/netshow/Makefile @@ -38,6 +38,6 @@ do-install: ${INSTALL} -c -o bin -g bin -m 555 ${WRKDIR}/netshow ${PREFIX}/bin/netshow post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile index 091a68e92bad..5d47b75584cb 100644 --- a/net-im/gale/Makefile +++ b/net-im/gale/Makefile @@ -25,6 +25,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALL="" post-install: - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index 10e7421cd731..337e90fbfeda 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -19,7 +19,7 @@ USE_LIBTOOL= yes rc=${PREFIX}/etc/rc.d post-install: - @PREFIX=${PREFIX} ${PERL5} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${INSTALL_SCRIPT} ${FILESDIR}/jserver.sh ${rc} .include <bsd.port.mk> diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile index 29bb0c31ff10..59946d692f1c 100644 --- a/net-im/naim/Makefile +++ b/net-im/naim/Makefile @@ -28,7 +28,7 @@ post-install: @ ${INSTALL_DATA} ${WRKSRC}/doc/naim.hlp ${PREFIX}/share/doc/naim/ .endif @ ${ECHO} "************************************************************" - @ ${CAT} ${PKGDIR}/MESSAGE + @ ${CAT} ${PKGMESSAGE} @ ${ECHO} "************************************************************" .include <bsd.port.mk> diff --git a/net-im/tik/Makefile b/net-im/tik/Makefile index acdd09970b4a..893bd3540d52 100644 --- a/net-im/tik/Makefile +++ b/net-im/tik/Makefile @@ -66,7 +66,7 @@ DOCFILES= CHANGES CONTRIBUTORS COPYING LICENSE README-LANG \ # The packing list starts with just bin/tik. As we install things, # build onto the list. do-install: - @${CP} ${PKGDIR}/PLIST ${PLIST} + @${CP} ${PKGDIR}/pkg-plist ${PLIST} .for d in ${SRCDIRS} @${MKDIR} ${PREFIX}/${d} @${ECHO} @dirrm ${d} >> ${PLIST}.dirrm diff --git a/net-p2p/opennap/Makefile b/net-p2p/opennap/Makefile index d1b1235c0bbd..c8dcb0c16d97 100644 --- a/net-p2p/opennap/Makefile +++ b/net-p2p/opennap/Makefile @@ -34,6 +34,6 @@ post-install: cd ${WRKSRC} ; for FILE in sample.*; do ${INSTALL_DATA} $${FILE} ${PREFIX}/share/opennap/examples ; done @echo "===> Installing startup script into ${PREFIX}/etc/rc.d." ${INSTALL_SCRIPT} ${FILESDIR}/opennap.sh ${PREFIX}/etc/rc.d - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile index 54476d48a136..afc0e6635f80 100644 --- a/net-p2p/teknap/Makefile +++ b/net-p2p/teknap/Makefile @@ -63,7 +63,7 @@ post-install: ${TAR} --directory ${PREFIX}/share/TekNap/help -xf - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/TekNap @${ECHO} - @${CAT} ${PKGDIR}/MESSAGE | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g" + @${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g" @${ECHO} .endif diff --git a/net/cap/Makefile b/net/cap/Makefile index 5c61144dabde..4c00081b6656 100644 --- a/net/cap/Makefile +++ b/net/cap/Makefile @@ -100,6 +100,6 @@ post-install: @${LN} -fs ${PREFIX}/man/man3/CAP.3${GZ} ${PREFIX}/man/man3/${f}.3${GZ} .endfor @${LN} -fs ${PREFIX}/man/man8/papif.8${GZ} ${PREFIX}/man/man8/papof.8${GZ} - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include "bsd.port.mk" diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile index 1727d0698032..0b789657ac4f 100644 --- a/net/coda5_client/Makefile +++ b/net/coda5_client/Makefile @@ -11,7 +11,7 @@ PORTVERSION= ${CODA_VERSION} CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc MASTERDIR= ${.CURDIR}/../coda5_server -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} CODA_SUITE= client diff --git a/net/cvsup-mirror/Makefile b/net/cvsup-mirror/Makefile index 77b427903aed..c0bd9299add9 100644 --- a/net/cvsup-mirror/Makefile +++ b/net/cvsup-mirror/Makefile @@ -41,6 +41,6 @@ do-install: @${CP} /dev/null ${base}/.start_server post-install: - @PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/net/cvsupit/Makefile b/net/cvsupit/Makefile index 61e6f33fd8fc..93777043d5ea 100644 --- a/net/cvsupit/Makefile +++ b/net/cvsupit/Makefile @@ -21,7 +21,7 @@ NO_BUILD= yes do-install: .if !make(package) - @${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .include <bsd.port.mk> diff --git a/net/ddup/Makefile b/net/ddup/Makefile index c7f82db72767..146548df9caa 100644 --- a/net/ddup/Makefile +++ b/net/ddup/Makefile @@ -45,6 +45,6 @@ do-install: post-install: strip ${PREFIX}/sbin/ddup - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net/delegate/Makefile b/net/delegate/Makefile index f4b70ffb7b61..3d6fd45d6f8f 100644 --- a/net/delegate/Makefile +++ b/net/delegate/Makefile @@ -51,6 +51,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/Manual.htm \ ${PREFIX}/share/doc/delegate .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile index d79f6e964387..009da8c5dd5e 100644 --- a/net/dgd-lpmud/Makefile +++ b/net/dgd-lpmud/Makefile @@ -22,15 +22,15 @@ RUN_DEPENDS= ${PREFIX}/dgd/bin/driver:${PORTSDIR}/net/dgd DIST_SUBDIR= dgd WRKSRC= ${WRKDIR}/mud -PKG_ARGS= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \ +PKG_ARGS= -v -c ${COMMENT} -d ${DESCR} -f ${PLIST} \ -p ${PREFIX}/dgd -# -r ${PKGDIR}/REQ +# -r ${PKGREQ} do-build: @cd ${WRKDIR}/mud/bin; make do-install: - @tar -C ${WRKSRC} -cf - `${GREP} '^[a-z]' ${PKGDIR}/PLIST` \ + @tar -C ${WRKSRC} -cf - `${GREP} '^[a-z]' ${PLIST}` \ | tar -C ${PREFIX}/dgd -xpf - .include <bsd.port.mk> diff --git a/net/dgd-net/Makefile b/net/dgd-net/Makefile index e5dbe0fcf095..0e51be00a1ef 100644 --- a/net/dgd-net/Makefile +++ b/net/dgd-net/Makefile @@ -53,7 +53,7 @@ post-build: do-install: @-${MV} ${PREFIX}/dgd/bin/driver.net ${PREFIX}/dgd/bin/driver.net.old - @tar -C ${WRKDIR} -cf - `${GREP} '^dgd/' ${PKGDIR}/PLIST` \ + @tar -C ${WRKDIR} -cf - `${GREP} '^dgd/' ${PLIST}` \ | tar -C ${PREFIX} -xpf - .include <bsd.port.mk> diff --git a/net/dgd/Makefile b/net/dgd/Makefile index 23dce5d10650..186576c6ea00 100644 --- a/net/dgd/Makefile +++ b/net/dgd/Makefile @@ -44,7 +44,7 @@ post-build: do-install: @-${MV} ${PREFIX}/dgd/bin/driver ${PREFIX}/dgd/bin/driver.old - @tar -C ${WRKDIR} -cf - `${GREP} '^dgd/' ${PKGDIR}/PLIST` \ + @tar -C ${WRKDIR} -cf - `${GREP} '^dgd/' ${PLIST}` \ | tar -C ${PREFIX} -xpf - .include <bsd.port.mk> diff --git a/net/etherboot/Makefile b/net/etherboot/Makefile index af687f992a48..3d3991994538 100644 --- a/net/etherboot/Makefile +++ b/net/etherboot/Makefile @@ -32,7 +32,7 @@ pre-build: make do-install: - @${ECHO} Refer ${PKGDIR}/DESCR and ${WRKDIR}/${PKGNAME}/doc for how to + @${ECHO} Refer ${DESCR} and ${WRKDIR}/${PKGNAME}/doc for how to @${ECHO} build and install the rom/floppy image. @exit 1 diff --git a/net/gale/Makefile b/net/gale/Makefile index 091a68e92bad..5d47b75584cb 100644 --- a/net/gale/Makefile +++ b/net/gale/Makefile @@ -25,6 +25,6 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALL="" post-install: - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net/jabber-transport/Makefile b/net/jabber-transport/Makefile index 10e7421cd731..337e90fbfeda 100644 --- a/net/jabber-transport/Makefile +++ b/net/jabber-transport/Makefile @@ -19,7 +19,7 @@ USE_LIBTOOL= yes rc=${PREFIX}/etc/rc.d post-install: - @PREFIX=${PREFIX} ${PERL5} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${INSTALL_SCRIPT} ${FILESDIR}/jserver.sh ${rc} .include <bsd.port.mk> diff --git a/net/jabber/Makefile b/net/jabber/Makefile index 10e7421cd731..337e90fbfeda 100644 --- a/net/jabber/Makefile +++ b/net/jabber/Makefile @@ -19,7 +19,7 @@ USE_LIBTOOL= yes rc=${PREFIX}/etc/rc.d post-install: - @PREFIX=${PREFIX} ${PERL5} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${INSTALL_SCRIPT} ${FILESDIR}/jserver.sh ${rc} .include <bsd.port.mk> diff --git a/net/kxicq-devel/Makefile b/net/kxicq-devel/Makefile index 19cd34686b8c..a4b23ac103a8 100644 --- a/net/kxicq-devel/Makefile +++ b/net/kxicq-devel/Makefile @@ -55,7 +55,7 @@ pre-install: @${ECHO} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm .endfor @${CAT} ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm - @${CAT} ${PKGDIR}/PLIST >> ${PLIST} + @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} .endif post-install: diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile index 19cd34686b8c..a4b23ac103a8 100644 --- a/net/kxicq/Makefile +++ b/net/kxicq/Makefile @@ -55,7 +55,7 @@ pre-install: @${ECHO} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm .endfor @${CAT} ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm - @${CAT} ${PKGDIR}/PLIST >> ${PLIST} + @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} .endif post-install: diff --git a/net/naim/Makefile b/net/naim/Makefile index 29bb0c31ff10..59946d692f1c 100644 --- a/net/naim/Makefile +++ b/net/naim/Makefile @@ -28,7 +28,7 @@ post-install: @ ${INSTALL_DATA} ${WRKSRC}/doc/naim.hlp ${PREFIX}/share/doc/naim/ .endif @ ${ECHO} "************************************************************" - @ ${CAT} ${PKGDIR}/MESSAGE + @ ${CAT} ${PKGMESSAGE} @ ${ECHO} "************************************************************" .include <bsd.port.mk> diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile index 68f502e60b51..009d64c7c22d 100644 --- a/net/netatalk-asun/Makefile +++ b/net/netatalk-asun/Makefile @@ -58,6 +58,6 @@ MAN4= atalk.4 MAN8= afpd.8 atalkd.8 papd.8 psf.8 post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile index 437aa3604d00..a03d45e6f9a2 100644 --- a/net/netatalk-devel/Makefile +++ b/net/netatalk-devel/Makefile @@ -31,6 +31,6 @@ MAN4= atalk.4 MAN8= afpd.8 atalkd.8 papd.8 psf.8 post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 437aa3604d00..a03d45e6f9a2 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -31,6 +31,6 @@ MAN4= atalk.4 MAN8= afpd.8 atalkd.8 papd.8 psf.8 post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/net/ppxp/Makefile b/net/ppxp/Makefile index c0c6abddbff8..9767a4d4ebaf 100644 --- a/net/ppxp/Makefile +++ b/net/ppxp/Makefile @@ -78,6 +78,6 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/console/tcltk/README ${PREFIX}/share/doc/tkppxp @${MKDIR} ${PREFIX}/share/doc/xppxp @${INSTALL_DATA} ${WRKSRC}/console/xppxp/README ${PREFIX}/share/doc/xppxp - csh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + csh ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/net/sntop/Makefile b/net/sntop/Makefile index 1fe387b84305..a84e2d019c40 100644 --- a/net/sntop/Makefile +++ b/net/sntop/Makefile @@ -21,6 +21,6 @@ MANCOMPRESSED= yes post-install: @strip ${PREFIX}/bin/sntop - @cat ${PKGDIR}/MESSAGE + @cat ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net/tik/Makefile b/net/tik/Makefile index acdd09970b4a..893bd3540d52 100644 --- a/net/tik/Makefile +++ b/net/tik/Makefile @@ -66,7 +66,7 @@ DOCFILES= CHANGES CONTRIBUTORS COPYING LICENSE README-LANG \ # The packing list starts with just bin/tik. As we install things, # build onto the list. do-install: - @${CP} ${PKGDIR}/PLIST ${PLIST} + @${CP} ${PKGDIR}/pkg-plist ${PLIST} .for d in ${SRCDIRS} @${MKDIR} ${PREFIX}/${d} @${ECHO} @dirrm ${d} >> ${PLIST}.dirrm diff --git a/news/atp/Makefile b/news/atp/Makefile index 53e62285e2e8..82c08197f854 100644 --- a/news/atp/Makefile +++ b/news/atp/Makefile @@ -26,6 +26,6 @@ MAN1= atp.1 \ MAN3= editline.3 post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/news/nn/Makefile b/news/nn/Makefile index b3ff7c800fd8..97bb05076b15 100644 --- a/news/nn/Makefile +++ b/news/nn/Makefile @@ -25,6 +25,6 @@ pre-build: | ${SED} -e "s#SUB_MANPREFIX#${MANPREFIX}#" > ${WRKSRC}/config.h post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${DISTNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile index 2aac03ccc827..7c265d9006b9 100644 --- a/news/nntpcache/Makefile +++ b/news/nntpcache/Makefile @@ -38,7 +38,7 @@ post-install: .endif ${INSTALL_SCRIPT} ${WRKSRC}/nntpcached.sh \ ${PREFIX}/etc/rc.d/nntpcached.sh.sample - @${SED} -e 's#/usr/local#${PREFIX}#' ${PKGDIR}/MESSAGE + @${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE} hardlink-pgp-files: for i in ${PREFIX}/etc/nntpcache/*asc-dist ${PREFIX}/etc/nntpcache/*pgp-dist ; do \ diff --git a/news/xmitbin/Makefile b/news/xmitbin/Makefile index 25f057f1bdc4..b2934f93d21f 100644 --- a/news/xmitbin/Makefile +++ b/news/xmitbin/Makefile @@ -18,6 +18,6 @@ MAN1= xmitBin.1 NO_WRKSUBDIR= YES post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile index a70480585119..714f871c1782 100644 --- a/print/acroread-commfont/Makefile +++ b/print/acroread-commfont/Makefile @@ -42,9 +42,9 @@ RUN_DEPENDS= acroread4:${PORTSDIR}/print/acroread4 .else ###### For slave ports ############################## ## Use a local directory of the slave port!! -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR -PLIST= ${.CURDIR}/pkg/PLIST +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist FILESDIR= ${.CURDIR}/files ## RUN_DEPENDS= ${PREFIX}/Acrobat4/Resource/CMap/H:${PORTSDIR}/print/acroread-commfont @@ -74,6 +74,6 @@ do-install: @${TAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat4/Resource post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/print/acroread4/Makefile b/print/acroread4/Makefile index 3c6aa0aecbdf..ec63cb3b676b 100644 --- a/print/acroread4/Makefile +++ b/print/acroread4/Makefile @@ -44,7 +44,7 @@ pre-configure: @${PERL} -pi.fbsd -e 's:Linux\):FreeBSD|Linux):g' ${WRKSRC}/INSTALL .elif ${ARCH} == "alpha" @${PERL} -pi.fbsd -e 's:OSF1\):FreeBSD|OSF1):g' ${WRKSRC}/INSTALL - ${SED} -e 's/@comment ALPHA-ONLY://g' ${PKGDIR}/PLIST > ${PLIST} + ${SED} -e 's/@comment ALPHA-ONLY://g' ${PKGDIR}/pkg-plist > ${PLIST} .endif do-build: diff --git a/print/acroread5-commfont/Makefile b/print/acroread5-commfont/Makefile index a70480585119..714f871c1782 100644 --- a/print/acroread5-commfont/Makefile +++ b/print/acroread5-commfont/Makefile @@ -42,9 +42,9 @@ RUN_DEPENDS= acroread4:${PORTSDIR}/print/acroread4 .else ###### For slave ports ############################## ## Use a local directory of the slave port!! -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR -PLIST= ${.CURDIR}/pkg/PLIST +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist FILESDIR= ${.CURDIR}/files ## RUN_DEPENDS= ${PREFIX}/Acrobat4/Resource/CMap/H:${PORTSDIR}/print/acroread-commfont @@ -74,6 +74,6 @@ do-install: @${TAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat4/Resource post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile index 3c6aa0aecbdf..ec63cb3b676b 100644 --- a/print/acroread5/Makefile +++ b/print/acroread5/Makefile @@ -44,7 +44,7 @@ pre-configure: @${PERL} -pi.fbsd -e 's:Linux\):FreeBSD|Linux):g' ${WRKSRC}/INSTALL .elif ${ARCH} == "alpha" @${PERL} -pi.fbsd -e 's:OSF1\):FreeBSD|OSF1):g' ${WRKSRC}/INSTALL - ${SED} -e 's/@comment ALPHA-ONLY://g' ${PKGDIR}/PLIST > ${PLIST} + ${SED} -e 's/@comment ALPHA-ONLY://g' ${PKGDIR}/pkg-plist > ${PLIST} .endif do-build: diff --git a/print/auctex/Makefile b/print/auctex/Makefile index a8ffd341680a..ddc31e56acc7 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -50,6 +50,6 @@ post-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} install-info >/dev/null install-info --entry='* AUC-Tex mode: (auctex). Emacs mode for editing TeX and LaTeX files.' --section='TeX' ${PREFIX}/info/auctex ${PREFIX}/info/dir .endif - @${CAT} ${PKGDIR}/MESSAGE | ${SED} 's¦/usr/local¦${PREFIX}¦g' + @${CAT} ${PKGMESSAGE} | ${SED} 's¦/usr/local¦${PREFIX}¦g' .include <bsd.port.post.mk> diff --git a/print/enscriptfonts/Makefile b/print/enscriptfonts/Makefile index 7c3d67f8d520..283d47399c02 100644 --- a/print/enscriptfonts/Makefile +++ b/print/enscriptfonts/Makefile @@ -26,7 +26,7 @@ do-install: @${CP} -p ${WRKDIR}/* ${PREFIX}/share/enscript/xenscript post-install: - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} @sleep 2; @${ECHO_MSG} ""; @${ECHO_MSG} ""; diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile index f297c30a420b..5379462f54d3 100644 --- a/print/ghostview/Makefile +++ b/print/ghostview/Makefile @@ -17,6 +17,6 @@ USE_IMAKE= yes MAN1= ghostview.1 post-install: - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/print/gv/Makefile b/print/gv/Makefile index a8556a7006bf..79eb73931cde 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -24,6 +24,6 @@ post-install: .if !defined(NOPORTDOCS) @(cd ${WRKSRC}; ${MAKE} install.doc) .endif - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile index e42a37320258..102db0f94c5c 100644 --- a/print/jadetex/Makefile +++ b/print/jadetex/Makefile @@ -31,6 +31,6 @@ do-install: post-install: ${PREFIX}/bin/mktexlsr - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/print/mgv/Makefile b/print/mgv/Makefile index eedeb15c9167..4b41a18faa4b 100644 --- a/print/mgv/Makefile +++ b/print/mgv/Makefile @@ -24,6 +24,6 @@ PLIST_SUB= MGV_VERSION=3.1.5 MAN1= mgv.1 post-install: - @ ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/print/pips760/Makefile b/print/pips760/Makefile index 3738377333c9..ea5d531be6f8 100644 --- a/print/pips760/Makefile +++ b/print/pips760/Makefile @@ -7,8 +7,8 @@ MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 760 .include "${MASTERDIR}/Makefile" diff --git a/print/pips770/Makefile b/print/pips770/Makefile index 05eb5a2c8fe1..5163e8b6c443 100644 --- a/print/pips770/Makefile +++ b/print/pips770/Makefile @@ -8,8 +8,8 @@ MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 770 .include "${MASTERDIR}/Makefile" diff --git a/print/pips820_3300/Makefile b/print/pips820_3300/Makefile index a0d52e649976..7c9bb90cf87f 100644 --- a/print/pips820_3300/Makefile +++ b/print/pips820_3300/Makefile @@ -8,8 +8,8 @@ MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE:S,_3300,,}/ MASTERDIR= ${.CURDIR}/../pips800 -COMMENT= ${.CURDIR}/pkg/COMMENT -DESCR= ${.CURDIR}/pkg/DESCR +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr PRTYPE= 820_3300 .include "${MASTERDIR}/Makefile" diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile index 04be33a5be9d..fe934dfb9e5c 100644 --- a/print/yatex-mule/Makefile +++ b/print/yatex-mule/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -mule MASTERDIR= ${.CURDIR}/../yatex -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment EMACS_PORT_NAME=mule .include "${MASTERDIR}/Makefile" diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile index d46594d109ab..5b518d945a69 100644 --- a/print/yatex-xemacs-mule/Makefile +++ b/print/yatex-xemacs-mule/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -xemacs-mule MASTERDIR= ${.CURDIR}/../yatex -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment EMACS_PORT_NAME=xemacs21-mule .include "${MASTERDIR}/Makefile" diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile index 0d6e9c346456..9275ed9d0de1 100644 --- a/print/yatex-xemacs/Makefile +++ b/print/yatex-xemacs/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -xemacs MASTERDIR= ${.CURDIR}/../yatex -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment EMACS_PORT_NAME=xemacs21 .include "${MASTERDIR}/Makefile" diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile index 2fe2b6bf00b9..6e4535d05dce 100644 --- a/russian/X.language/Makefile +++ b/russian/X.language/Makefile @@ -56,7 +56,7 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/nls_C ${XLIB}/nls/C; \ fi ${MAKE} pre-package - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${MAKE} post-package pre-package: diff --git a/russian/koi8r-ps/Makefile b/russian/koi8r-ps/Makefile index 89285fd01423..8fa537998fb9 100644 --- a/russian/koi8r-ps/Makefile +++ b/russian/koi8r-ps/Makefile @@ -86,6 +86,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/Fontmap.diff ${CPS_DIR} ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${CPS_DIR} ${LN} -s fonts.dir ${CPS_DIR}/fonts.scale - ${CAT} ${PKGDIR}/MESSAGE + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index ca02d8727d80..47a6cedd6e43 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -108,7 +108,7 @@ pre-configure: # Create Cyrus user and group pre-install: - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/pwcheck.sh \ @@ -128,7 +128,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html .endfor .endif - @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} post-clean: diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index ca02d8727d80..47a6cedd6e43 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -108,7 +108,7 @@ pre-configure: # Create Cyrus user and group pre-install: - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" ${FILESDIR}/pwcheck.sh \ @@ -128,7 +128,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${PREFIX}/share/doc/SASL/html .endfor .endif - @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} post-clean: diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile index d012523bc3d6..0a172704913f 100644 --- a/security/logcheck/Makefile +++ b/security/logcheck/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@freebsddiary.org PKGMESSAGE= ${WRKDIR}/MESSAGE post-build: - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGDIR}/MESSAGE > ${PKGMESSAGE} + @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} post-install: @${CAT} ${PKGMESSAGE} diff --git a/security/openssh/Makefile b/security/openssh/Makefile index c0aec37774de..0e77130e5ad7 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -70,7 +70,7 @@ post-patch: PLIST= ${WRKDIR}/PLIST do-configure: - @${CP} ${PKGDIR}/PLIST ${PLIST} + @${CP} ${PKGDIR}/pkg-plist ${PLIST} @${ECHO} "@cwd /usr" >> ${PLIST} @${ECHO} "lib/pam_ssh.so" >> ${PLIST} .endif diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile index 31d03c97d6c7..483fa23bc12b 100644 --- a/security/openssl-beta/Makefile +++ b/security/openssl-beta/Makefile @@ -86,6 +86,6 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/openssl @${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${PREFIX}/share/doc/openssl .endif - @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGDIR}/MESSAGE + @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 31d03c97d6c7..483fa23bc12b 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -86,6 +86,6 @@ post-install: @${MKDIR} ${PREFIX}/share/doc/openssl @${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${PREFIX}/share/doc/openssl .endif - @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGDIR}/MESSAGE + @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile index 58d00ef5ad91..fa7180ad69c9 100644 --- a/security/portsentry/Makefile +++ b/security/portsentry/Makefile @@ -30,6 +30,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.install ${WRKSRC}/README.methods ${WRKSRC}/README.stealth \ ${PREFIX}/share/doc/portsentry .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/shells/fd/Makefile b/shells/fd/Makefile index ef2b6ddabbd1..ac8395627b75 100644 --- a/shells/fd/Makefile +++ b/shells/fd/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \ done .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile index c8fb1b8c1783..acc6e3668fb4 100644 --- a/sysutils/LPRng/Makefile +++ b/sysutils/LPRng/Makefile @@ -36,7 +36,6 @@ MANCOMPRESSED= yes post-install: ${INSTALL} -d -g bin -o bin -m 0555 ${PREFIX}/share/doc/LPRng ${INSTALL} -c -g bin -o bin -m 0444 ${WRKSRC}/HOWTO/* ${PREFIX}/share/doc/LPRng - @${CAT} ${PKGDIR}/MESSAGE | \ - ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" + @${CAT} ${PKGMESSAGE} | ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" .include <bsd.port.mk> diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile index 9067598122fc..c3daa917b887 100644 --- a/sysutils/cd-write/Makefile +++ b/sysutils/cd-write/Makefile @@ -31,6 +31,6 @@ pre-build: ${SED} -e s:/usr/local:${PREFIX}:g <Makefile~ >Makefile post-install: - @PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff --git a/sysutils/comconsole/Makefile b/sysutils/comconsole/Makefile index 57fbce7ad8be..e90a4f4b3b44 100644 --- a/sysutils/comconsole/Makefile +++ b/sysutils/comconsole/Makefile @@ -17,6 +17,6 @@ NO_BUILD= yes NO_WRKSUBDIR= yes do-install: - @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile index de894c5b4442..1b6b40438ac0 100644 --- a/sysutils/contool/Makefile +++ b/sysutils/contool/Makefile @@ -25,6 +25,6 @@ pre-install: @${MKDIR} ${PREFIX}/lib/help post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile index 296a215cc034..595e83e7efcf 100644 --- a/sysutils/flexbackup/Makefile +++ b/sysutils/flexbackup/Makefile @@ -32,6 +32,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/flexbackup.README ${PREFIX}/share/doc/flexbackup post-install: - @${CAT} ${PKGDIR}/MESSAGE | ${SED} -e 's:%%PREFIX%%:${PREFIX}:g' + @${CAT} ${PKGMESSAGE} | ${SED} -e 's:%%PREFIX%%:${PREFIX}:g' .include <bsd.port.mk> diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 24784e81f2cc..5bbbea741236 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -63,7 +63,7 @@ do-install: .endfor .endif .if !defined(WITHOUT_SENSOR) - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .endif .include <bsd.port.post.mk> diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 24784e81f2cc..5bbbea741236 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -63,7 +63,7 @@ do-install: .endfor .endif .if !defined(WITHOUT_SENSOR) - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .endif .include <bsd.port.post.mk> diff --git a/sysutils/nwclient/Makefile b/sysutils/nwclient/Makefile index 971dfeea9f36..cf139b58c7e5 100644 --- a/sysutils/nwclient/Makefile +++ b/sysutils/nwclient/Makefile @@ -41,7 +41,7 @@ do-install: (cd /usr/local/man/cat8 && tar --unlink -xpf -) post-install: - @sed -e "s,ROOTDIR,${PREFIX}," < ${PKGDIR}/MESSAGE + @sed -e "s,ROOTDIR,${PREFIX}," < ${PKGMESSAGE} @cd / && rm -f nsr && ln -s ${PREFIX}/nsr pre-deinstall: diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index ca1576a596f1..2fd21ff1e018 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -25,7 +25,7 @@ post-patch: @${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h post-build: - @${SED} -e 's,__PREFIX__,${PREFIX},g' ${PKGDIR}/MESSAGE > ${PKGMESSAGE} + @${SED} -e 's,__PREFIX__,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} post-install: .if !defined(NOPORTDOCS) diff --git a/sysutils/syslog-ng1/Makefile b/sysutils/syslog-ng1/Makefile index ca1576a596f1..2fd21ff1e018 100644 --- a/sysutils/syslog-ng1/Makefile +++ b/sysutils/syslog-ng1/Makefile @@ -25,7 +25,7 @@ post-patch: @${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h post-build: - @${SED} -e 's,__PREFIX__,${PREFIX},g' ${PKGDIR}/MESSAGE > ${PKGMESSAGE} + @${SED} -e 's,__PREFIX__,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} post-install: .if !defined(NOPORTDOCS) diff --git a/sysutils/upsmon/Makefile b/sysutils/upsmon/Makefile index 4e29692597b3..59e19a186230 100644 --- a/sysutils/upsmon/Makefile +++ b/sysutils/upsmon/Makefile @@ -29,6 +29,6 @@ do-install: .endif post-install: - ${SED} -e 's#/usr/local#${PREFIX}#' ${PKGDIR}/MESSAGE + ${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile index 021cb9875d30..02b1b1583db1 100644 --- a/textproc/coco/Makefile +++ b/textproc/coco/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/textproc/cocoon/Makefile b/textproc/cocoon/Makefile index 4e631a6235a8..01739a0029f0 100644 --- a/textproc/cocoon/Makefile +++ b/textproc/cocoon/Makefile @@ -64,6 +64,6 @@ do-install: .endif post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile index 000b0fcd19d4..22e195c346ae 100644 --- a/textproc/mgdiff/Makefile +++ b/textproc/mgdiff/Makefile @@ -21,6 +21,6 @@ MAN1= mgdiff.1 post-install: @${MKDIR} ${PREFIX}/lib/X11/mgdiff @${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${PREFIX}/lib/X11/mgdiff - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile index bf1019d1cf18..c2eb52c32a03 100644 --- a/textproc/sgmlformat/Makefile +++ b/textproc/sgmlformat/Makefile @@ -34,6 +34,6 @@ MAN5= transpec.5 MANCOMPRESSED= yes post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile index e4f60ca05563..f7690986b996 100644 --- a/textproc/tth/Makefile +++ b/textproc/tth/Makefile @@ -38,6 +38,6 @@ do-install: .if !defined(NOPORTDOCS) ${INSTALL_SCRIPT} ${WRKSRC}/tth_manual.html ${PREFIX}/share/doc/tth .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/vietnamese/vnterm/Makefile b/vietnamese/vnterm/Makefile index 571dc46cbb14..4eed66a06984 100644 --- a/vietnamese/vnterm/Makefile +++ b/vietnamese/vnterm/Makefile @@ -40,7 +40,7 @@ post-install: ${PREFIX}/lib/X11/fonts/vietnamese ; \ ) @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/vnterm \ && ${CHMOD} a+rx ${PREFIX}/share/doc/vnterm diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile index 0cf006043bef..a7c6da4daa84 100644 --- a/www/aolserver/Makefile +++ b/www/aolserver/Makefile @@ -43,6 +43,6 @@ post-install: >${PREFIX}/etc/rc.d/aolserver.sh ; \ ${CHMOD} 755 ${PREFIX}/etc/rc.d/aolserver.sh; \ fi - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile index daa9316dfb21..a1495a020f6b 100644 --- a/www/apache-jserv/Makefile +++ b/www/apache-jserv/Makefile @@ -46,6 +46,6 @@ pre-install: ${MKDIR} ${PREFIX}/share/java/classes post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile index 4c102203af50..37db44526097 100644 --- a/www/apache13-fp/Makefile +++ b/www/apache13-fp/Makefile @@ -146,9 +146,9 @@ post-patch: post-configure: .if defined(SUEXEC) - ${CP} ${PKGDIR}/PLIST ${PLIST} + ${CP} ${PKGDIR}/pkg-plist ${PLIST} .else - ${CAT} ${PKGDIR}/PLIST | ${GREP} -v sbin/suexec > ${PLIST} + ${CAT} ${PKGDIR}/pkg-plist | ${GREP} -v sbin/suexec > ${PLIST} .endif IMAGES= apache_pb.gif fplogo.gif powerlogo.gif @@ -174,6 +174,6 @@ post-install: @${INSTALL_FILE} ${WRKSRC}/${FPINSTALL} ${PREFIX}/${FPINSTALL}-dist @${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist @${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM} - @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/www/bacon/Makefile b/www/bacon/Makefile index 070f9e1cc5c9..8d083df376ad 100644 --- a/www/bacon/Makefile +++ b/www/bacon/Makefile @@ -28,6 +28,6 @@ do-install: post-install: ${MKDIR} ${PREFIX}/share/doc/bacon/ ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/bacon/INSTALL - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 4e631a6235a8..01739a0029f0 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -64,6 +64,6 @@ do-install: .endif post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/gnujsp/Makefile b/www/gnujsp/Makefile index b26516690181..46a11924a165 100644 --- a/www/gnujsp/Makefile +++ b/www/gnujsp/Makefile @@ -36,7 +36,7 @@ do-install: .endif post-install: - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGDIR}/MESSAGE > ${PKGMESSAGE} + @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/linux-netscape4/Makefile b/www/linux-netscape4/Makefile index 690720928edb..ac72c47ff15a 100644 --- a/www/linux-netscape4/Makefile +++ b/www/linux-netscape4/Makefile @@ -39,6 +39,6 @@ do-install: ${CHOWN} -R ${BINOWN}.${BINGRP} ${NDIR} post-install: - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/www/netscape3-gold/Makefile b/www/netscape3-gold/Makefile index 1d44880311d7..7937246b0504 100644 --- a/www/netscape3-gold/Makefile +++ b/www/netscape3-gold/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 3.04 MASTER_SITES= ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_gold_complete/ DIST_SUBDIR= gold -COMMENT= ${.CURDIR}/pkg/COMMENT +COMMENT= ${.CURDIR}/pkg-comment MASTERDIR= ${.CURDIR}/../netscape3 NO_LATEST_LINK= yes diff --git a/www/netscape3/Makefile b/www/netscape3/Makefile index 0f36d87c16af..fcd2d755fc46 100644 --- a/www/netscape3/Makefile +++ b/www/netscape3/Makefile @@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386 USE_XLIB= yes NO_LATEST_LINK= yes NO_WRKSUBDIR= yes -PKGREQ= ${PORTSDIR}/www/netscape4-communicator/pkg/REQ.aout +PKGREQ= ${PORTSDIR}/www/netscape4-communicator/pkg-req.aout .if defined(WITH_128BIT) MASTER_SITES+= ftp://ftp.fortify.net/pub/Fortify/ \ @@ -48,6 +48,6 @@ post-install: && (${ECHO}; ${ECHO} yes; ${ECHO} no; ${ECHO} no) \ | ./Fortify.sh ${PREFIX}/lib/netscape/netscape.bin .endif - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/www/netscape4-communicator.us/Makefile b/www/netscape4-communicator.us/Makefile index 0964202afa36..2fc89878e89f 100644 --- a/www/netscape4-communicator.us/Makefile +++ b/www/netscape4-communicator.us/Makefile @@ -72,6 +72,6 @@ do-install: ${CHOWN} -R ${BINOWN}.${BINGRP} ${NDIR} post-install: - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.post.mk> diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile index d963a0b5b3f9..ebd561ea5287 100644 --- a/www/netscape4-communicator/Makefile +++ b/www/netscape4-communicator/Makefile @@ -27,7 +27,7 @@ NO_BUILD= yes NO_FILTER_SHLIBS= yes STRIP= WRKSRC?= ${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} AUTOADMIN?= autoadmin-v408.x86-unknown-freebsd.tar.gz BROWSER?= communicator @@ -113,7 +113,7 @@ do-install: ${CHOWN} -R root:wheel ${NDIR} post-install: - ${CAT} ${PKGDIR}/DESCR + ${CAT} ${DESCR} # hack to allow slave ports to include bsd.port.pre.mk and then this file .if defined(_PREMKINCLUDED) diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile index d963a0b5b3f9..ebd561ea5287 100644 --- a/www/netscape48-communicator/Makefile +++ b/www/netscape48-communicator/Makefile @@ -27,7 +27,7 @@ NO_BUILD= yes NO_FILTER_SHLIBS= yes STRIP= WRKSRC?= ${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} AUTOADMIN?= autoadmin-v408.x86-unknown-freebsd.tar.gz BROWSER?= communicator @@ -113,7 +113,7 @@ do-install: ${CHOWN} -R root:wheel ${NDIR} post-install: - ${CAT} ${PKGDIR}/DESCR + ${CAT} ${DESCR} # hack to allow slave ports to include bsd.port.pre.mk and then this file .if defined(_PREMKINCLUDED) diff --git a/www/npc/Makefile b/www/npc/Makefile index 4118a433b7e8..e74d76408789 100644 --- a/www/npc/Makefile +++ b/www/npc/Makefile @@ -27,6 +27,6 @@ do-install: ${MKDIR} ${INDEX_DIR} post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/oops/Makefile b/www/oops/Makefile index 9112af75ddb8..2ec4763f7f2b 100644 --- a/www/oops/Makefile +++ b/www/oops/Makefile @@ -22,12 +22,12 @@ CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \ --enable-oops-user=oops pre-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .include <bsd.port.pre.mk> post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @ ${ECHO} "------------------------------------------------------------" @ ${ECHO} "Sample of configuration file placed at ${PREFIX}/etc/oops !" @ ${ECHO} "Copy oops.cfg.sample to oops.cfg, then run server..." diff --git a/www/squidclients/Makefile b/www/squidclients/Makefile index 429642dfc49c..99e4f37c0f64 100644 --- a/www/squidclients/Makefile +++ b/www/squidclients/Makefile @@ -25,6 +25,6 @@ do-install: @ ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} ${PREFIX}/bin/squidclients post-install: - @ ${CAT} ${PKGDIR}/MESSAGE + @ ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/squidtimes/Makefile b/www/squidtimes/Makefile index bc5e8a9cdbbf..02c49fb03ad8 100644 --- a/www/squidtimes/Makefile +++ b/www/squidtimes/Makefile @@ -27,6 +27,6 @@ do-install: @ ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} ${PREFIX}/bin/squidtimes post-install: - @ ${CAT} ${PKGDIR}/MESSAGE + @ ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/ssserver/Makefile b/www/ssserver/Makefile index 6da2caadb92b..49cb86e59d33 100644 --- a/www/ssserver/Makefile +++ b/www/ssserver/Makefile @@ -80,6 +80,6 @@ do-install: @${CHMOD} -f 777 ${PREFIX}/www/cgi-bin/ssserverdata post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/w3m-ssl/Makefile b/www/w3m-ssl/Makefile index 4e18014227cb..0f9bef1b6881 100644 --- a/www/w3m-ssl/Makefile +++ b/www/w3m-ssl/Makefile @@ -8,8 +8,8 @@ PKGNAMESUFFIX= -ssl MASTERDIR= ${.CURDIR}/../../www/w3m -PKGDIR= ${.CURDIR}/pkg -PLIST= ${MASTERDIR}/pkg/PLIST +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist USE_OPENSSL= YES diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile index 24ca79e95a21..a81525df8e28 100644 --- a/www/web2ldap/Makefile +++ b/www/web2ldap/Makefile @@ -30,6 +30,6 @@ do-install: @if [ -w /var/log ]; then ${MKDIR} /var/log/web2ldap; fi post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/web500gw/Makefile b/www/web500gw/Makefile index 28458488b971..ec3d3ded6a21 100644 --- a/www/web500gw/Makefile +++ b/www/web500gw/Makefile @@ -36,6 +36,6 @@ WEB500GWDIR= ${PREFIX}/etc/web500gw post-install: strip ${INSTDIR}/web500gw - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/webstone/Makefile b/www/webstone/Makefile index 3dfe37db8b4e..63bc30a89397 100644 --- a/www/webstone/Makefile +++ b/www/webstone/Makefile @@ -39,6 +39,6 @@ do-install: .endfor post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index 4cd248fd7d4d..8030fc058b2e 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -45,7 +45,7 @@ do-configure: @find ${WRKSRC} -type f | \ xargs perl -pi -e 's@/var/spool/wwwoffle@${SPOOL}/wwwoffle@g' @${SED} 's@/var/spool/wwwoffle@${SPOOL}/wwwoffle@g' \ - ${PKGDIR}/MESSAGE > ${PKGMESSAGE} + ${PKGDIR}/pkg-message > ${PKGMESSAGE} .endif post-install: diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile index 1179e47d8adb..545bea8dd4f3 100644 --- a/x11-fonts/bitmap-fonts/Makefile +++ b/x11-fonts/bitmap-fonts/Makefile @@ -50,7 +50,7 @@ do-build: pre-install: @${SETENV} PKG_PREFIX=${X11BASE} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: @(cd ${WRKSRC}; \ diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile index f65e805ec772..95e01644c935 100644 --- a/x11-fonts/etlfonts/Makefile +++ b/x11-fonts/etlfonts/Makefile @@ -30,6 +30,6 @@ post-extract: @${GUNZIP_CMD} ${WRKSRC}/*.gz post-install: - @${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SH} ${PKGREQ} ${PKGNAME} INSTALL .include <bsd.port.post.mk> diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile index 9e6d976e5d42..ab3929c1d21c 100644 --- a/x11-fonts/freefonts/Makefile +++ b/x11-fonts/freefonts/Makefile @@ -18,6 +18,6 @@ USE_X_PREFIX= yes post-install: ${RM} ${PREFIX}/lib/X11/fonts/freefont/fonts.dir.orig - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile index 4c010c32d86b..22000cb4581f 100644 --- a/x11-fonts/intlfonts/Makefile +++ b/x11-fonts/intlfonts/Makefile @@ -59,7 +59,7 @@ do-build: pre-install: @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: (cd ${WRKSRC}; \ diff --git a/x11-fonts/mozilla-fonts/Makefile b/x11-fonts/mozilla-fonts/Makefile index 29638b76d274..d24c64258907 100644 --- a/x11-fonts/mozilla-fonts/Makefile +++ b/x11-fonts/mozilla-fonts/Makefile @@ -22,6 +22,6 @@ post-install: ${MKDIR} ${PREFIX}/share/doc/mozilla-fonts ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mozilla-fonts .endif - @ ${CAT} ${PKGDIR}/DESCR + @ ${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile index 2f3d21043355..33eb31b6d3a3 100644 --- a/x11-fonts/nucleus/Makefile +++ b/x11-fonts/nucleus/Makefile @@ -16,6 +16,6 @@ NO_WRKSUBDIR= yes USE_X_PREFIX= yes post-install: - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile index c6dcb9430e61..58f95b57de88 100644 --- a/x11-fonts/sharefonts/Makefile +++ b/x11-fonts/sharefonts/Makefile @@ -27,6 +27,6 @@ do-install: ${CHMOD} 644 ${PREFIX}/lib/X11/fonts/sharefont/* post-install: - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/x11-fonts/urwfonts/Makefile b/x11-fonts/urwfonts/Makefile index 34bed863bb69..fc3235efd818 100644 --- a/x11-fonts/urwfonts/Makefile +++ b/x11-fonts/urwfonts/Makefile @@ -17,6 +17,6 @@ NO_WRKSUBDIR= yes USE_X_PREFIX= yes post-install: - @${CAT} ${PKGDIR}/DESCR + @${CAT} ${DESCR} .include <bsd.port.mk> diff --git a/x11-servers/XttXF86srv-3DLabs/Makefile b/x11-servers/XttXF86srv-3DLabs/Makefile index 2672bc45345d..ceeb2e27bf10 100644 --- a/x11-servers/XttXF86srv-3DLabs/Makefile +++ b/x11-servers/XttXF86srv-3DLabs/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_3DLabs MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile index 49e7a9fcac9e..7f10e2dd0ad8 100644 --- a/x11-servers/XttXF86srv-8514/Makefile +++ b/x11-servers/XttXF86srv-8514/Makefile @@ -18,6 +18,6 @@ ONLY_FOR_ARCHS= i386 SERVER= XF86_8514 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile index 1d194656cc66..ebcd4cb00ed0 100644 --- a/x11-servers/XttXF86srv-AGX/Makefile +++ b/x11-servers/XttXF86srv-AGX/Makefile @@ -18,6 +18,6 @@ ONLY_FOR_ARCHS= i386 SERVER= XF86_AGX MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile index 5053db964bd6..54bc5aba2bd4 100644 --- a/x11-servers/XttXF86srv-I128/Makefile +++ b/x11-servers/XttXF86srv-I128/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_I128 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile index 9aaa7d8559b3..4fdc4e27543e 100644 --- a/x11-servers/XttXF86srv-Mach32/Makefile +++ b/x11-servers/XttXF86srv-Mach32/Makefile @@ -18,6 +18,6 @@ ONLY_FOR_ARCHS= i386 SERVER= XF86_Mach32 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile index 091af00266e5..c9612169d007 100644 --- a/x11-servers/XttXF86srv-Mach64/Makefile +++ b/x11-servers/XttXF86srv-Mach64/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_Mach64 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile index ff9f71971b93..759d9d14575f 100644 --- a/x11-servers/XttXF86srv-Mach8/Makefile +++ b/x11-servers/XttXF86srv-Mach8/Makefile @@ -18,6 +18,6 @@ ONLY_FOR_ARCHS= i386 SERVER= XF86_Mach8 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile index 9744771fade0..84ff53e9a059 100644 --- a/x11-servers/XttXF86srv-Mono/Makefile +++ b/x11-servers/XttXF86srv-Mono/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_Mono MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile index 7e9f62e55eb9..fde989073719 100644 --- a/x11-servers/XttXF86srv-P9000/Makefile +++ b/x11-servers/XttXF86srv-P9000/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_P9000 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile index c4e371fe21c7..2331fb6a781a 100644 --- a/x11-servers/XttXF86srv-S3/Makefile +++ b/x11-servers/XttXF86srv-S3/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_S3 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile index 35eecc308d7b..61182bc83389 100644 --- a/x11-servers/XttXF86srv-S3V/Makefile +++ b/x11-servers/XttXF86srv-S3V/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_S3V MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile index 89a473ac7ec5..6e0a12f2643f 100644 --- a/x11-servers/XttXF86srv-SVGA/Makefile +++ b/x11-servers/XttXF86srv-SVGA/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= XF86_SVGA MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile index 9f93541acffe..04f7e217dade 100644 --- a/x11-servers/XttXF86srv-VGA16/Makefile +++ b/x11-servers/XttXF86srv-VGA16/Makefile @@ -18,6 +18,6 @@ ONLY_FOR_ARCHS= i386 SERVER= XF86_VGA16 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile index ef504914a07f..3850593034e3 100644 --- a/x11-servers/XttXF86srv-W32/Makefile +++ b/x11-servers/XttXF86srv-W32/Makefile @@ -18,6 +18,6 @@ ONLY_FOR_ARCHS= i386 SERVER= XF86_W32 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile index bca9f0e991c4..eeb975d6d13d 100644 --- a/x11-servers/XttXF86srv-xfs/Makefile +++ b/x11-servers/XttXF86srv-xfs/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= mkfontdir.pl:${.CURDIR}/../XttXF86srv-common SERVER= xfs MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/XttXF98srv-EGC/Makefile b/x11-servers/XttXF98srv-EGC/Makefile index a02f64311eda..8686c88c85b3 100644 --- a/x11-servers/XttXF98srv-EGC/Makefile +++ b/x11-servers/XttXF98srv-EGC/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_EGC MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-GA968/Makefile b/x11-servers/XttXF98srv-GA968/Makefile index 3ff22a32b411..c6eb4b1f8332 100644 --- a/x11-servers/XttXF98srv-GA968/Makefile +++ b/x11-servers/XttXF98srv-GA968/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_GA968 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-GANBWAP/Makefile b/x11-servers/XttXF98srv-GANBWAP/Makefile index 0e861c77cfad..5df0bd3b109f 100644 --- a/x11-servers/XttXF98srv-GANBWAP/Makefile +++ b/x11-servers/XttXF98srv-GANBWAP/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_GANBWAP MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-MGA/Makefile b/x11-servers/XttXF98srv-MGA/Makefile index 734736a8a52b..9fe4a872f288 100644 --- a/x11-servers/XttXF98srv-MGA/Makefile +++ b/x11-servers/XttXF98srv-MGA/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_MGA MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-NEC480/Makefile b/x11-servers/XttXF98srv-NEC480/Makefile index e2f326658aee..c3777b58ee0f 100644 --- a/x11-servers/XttXF98srv-NEC480/Makefile +++ b/x11-servers/XttXF98srv-NEC480/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_NEC480 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-NECS3/Makefile b/x11-servers/XttXF98srv-NECS3/Makefile index be5ad73c9bf3..a29174f1dad0 100644 --- a/x11-servers/XttXF98srv-NECS3/Makefile +++ b/x11-servers/XttXF98srv-NECS3/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_NECS3 MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-NKVNEC/Makefile b/x11-servers/XttXF98srv-NKVNEC/Makefile index b7807b1069b9..1c0f2cd2512e 100644 --- a/x11-servers/XttXF98srv-NKVNEC/Makefile +++ b/x11-servers/XttXF98srv-NKVNEC/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_NKVNEC MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-PWLB/Makefile b/x11-servers/XttXF98srv-PWLB/Makefile index 19e1376cc2a4..e4421addcfa1 100644 --- a/x11-servers/XttXF98srv-PWLB/Makefile +++ b/x11-servers/XttXF98srv-PWLB/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_PWLB MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-PWSKB/Makefile b/x11-servers/XttXF98srv-PWSKB/Makefile index 74ba0a9ea083..7a89ee05ac44 100644 --- a/x11-servers/XttXF98srv-PWSKB/Makefile +++ b/x11-servers/XttXF98srv-PWSKB/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_PWSKB MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-SVGA/Makefile b/x11-servers/XttXF98srv-SVGA/Makefile index 17d0bbbb6b1d..74a0d635ccc6 100644 --- a/x11-servers/XttXF98srv-SVGA/Makefile +++ b/x11-servers/XttXF98srv-SVGA/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_SVGA MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-TGUI/Makefile b/x11-servers/XttXF98srv-TGUI/Makefile index 88dc2254c430..eccd8efd0310 100644 --- a/x11-servers/XttXF98srv-TGUI/Makefile +++ b/x11-servers/XttXF98srv-TGUI/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_TGUI MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-WABEP/Makefile b/x11-servers/XttXF98srv-WABEP/Makefile index b4a5355c5fe5..f8e95dc99467 100644 --- a/x11-servers/XttXF98srv-WABEP/Makefile +++ b/x11-servers/XttXF98srv-WABEP/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_WABEP MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-WABS/Makefile b/x11-servers/XttXF98srv-WABS/Makefile index 549840c25380..cb9855c70dfe 100644 --- a/x11-servers/XttXF98srv-WABS/Makefile +++ b/x11-servers/XttXF98srv-WABS/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_WABS MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-servers/XttXF98srv-WSNA/Makefile b/x11-servers/XttXF98srv-WSNA/Makefile index d3871d11a4b5..e08bda096e68 100644 --- a/x11-servers/XttXF98srv-WSNA/Makefile +++ b/x11-servers/XttXF98srv-WSNA/Makefile @@ -18,7 +18,7 @@ ONLY_FOR_ARCHS= i386 SERVER= XF98_WSNA MASTERDIR= ${.CURDIR}/../XttXF86srv-common -PKGDIR= ${.CURDIR}/pkg +PKGDIR= ${.CURDIR} X98SERVER= yes diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile index 7230913030ea..8132ecd3e296 100644 --- a/x11-toolkits/Xaw3d/Makefile +++ b/x11-toolkits/Xaw3d/Makefile @@ -26,7 +26,7 @@ post-extract: .if exists(${X11BASE}/bin/XFree86) post-build: - ${CP} ${PKGDIR}/PLIST ${WRKDIR}/PLIST + ${CP} ${PKGDIR}/pkg-plist ${PLIST} ${ECHO} "lib/libXaw3d.so.7" >> ${PLIST} .endif diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile index 4b0271f29a18..96df7a9ef4e8 100644 --- a/x11-toolkits/gtk--/Makefile +++ b/x11-toolkits/gtk--/Makefile @@ -27,6 +27,6 @@ CONFIGURE_ARGS= --enable-static=yes \ --without-gnome post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile index 4b0271f29a18..96df7a9ef4e8 100644 --- a/x11-toolkits/gtk--2/Makefile +++ b/x11-toolkits/gtk--2/Makefile @@ -27,6 +27,6 @@ CONFIGURE_ARGS= --enable-static=yes \ --without-gnome post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile index 4b0271f29a18..96df7a9ef4e8 100644 --- a/x11-toolkits/gtkmm12/Makefile +++ b/x11-toolkits/gtkmm12/Makefile @@ -27,6 +27,6 @@ CONFIGURE_ARGS= --enable-static=yes \ --without-gnome post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile index 4b0271f29a18..96df7a9ef4e8 100644 --- a/x11-toolkits/gtkmm20/Makefile +++ b/x11-toolkits/gtkmm20/Makefile @@ -27,6 +27,6 @@ CONFIGURE_ARGS= --enable-static=yes \ --without-gnome post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index 4b0271f29a18..96df7a9ef4e8 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -27,6 +27,6 @@ CONFIGURE_ARGS= --enable-static=yes \ --without-gnome post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 4b0271f29a18..96df7a9ef4e8 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -27,6 +27,6 @@ CONFIGURE_ARGS= --enable-static=yes \ --without-gnome post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile index 4828e386d5ed..7a3968f5617d 100644 --- a/x11-toolkits/py-gnome/Makefile +++ b/x11-toolkits/py-gnome/Makefile @@ -42,7 +42,7 @@ PLIST= ${WRKDIR}/PLIST.nodocs pre-install: ${RM} -f ${PLIST} ${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)' \ - ${PKGDIR}/PLIST > ${PLIST} + ${PKGDIR}/pkg-plist > ${PLIST} .endif .include <bsd.port.mk> diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 4828e386d5ed..7a3968f5617d 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -42,7 +42,7 @@ PLIST= ${WRKDIR}/PLIST.nodocs pre-install: ${RM} -f ${PLIST} ${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)' \ - ${PKGDIR}/PLIST > ${PLIST} + ${PKGDIR}/pkg-plist > ${PLIST} .endif .include <bsd.port.mk> diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile index 82b31e8aaba7..bfd04a556f91 100644 --- a/x11-toolkits/py-gtk/Makefile +++ b/x11-toolkits/py-gtk/Makefile @@ -41,7 +41,7 @@ PLIST= ${WRKDIR}/PLIST.nodocs pre-install: ${RM} -f ${PLIST} ${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)' \ - ${PKGDIR}/PLIST > ${PLIST} + ${PKGDIR}/pkg-plist > ${PLIST} .endif .include <bsd.port.mk> diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index 82b31e8aaba7..bfd04a556f91 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -41,7 +41,7 @@ PLIST= ${WRKDIR}/PLIST.nodocs pre-install: ${RM} -f ${PLIST} ${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)' \ - ${PKGDIR}/PLIST > ${PLIST} + ${PKGDIR}/pkg-plist > ${PLIST} .endif .include <bsd.port.mk> diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile index 5a21425408b5..2770845e6ae8 100644 --- a/x11-toolkits/ruby-gtk/Makefile +++ b/x11-toolkits/ruby-gtk/Makefile @@ -32,7 +32,7 @@ USE_IMLIB= yes .else PLIST= ${WRKDIR}/PLIST pre-install: - @${SED} -e '/gdkimlib/d' ${PKGDIR}/PLIST > ${PLIST} + @${SED} -e '/gdkimlib/d' ${PKGDIR}/pkg-plist > ${PLIST} .endif post-configure: diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile index 5a21425408b5..2770845e6ae8 100644 --- a/x11-toolkits/ruby-gtk2/Makefile +++ b/x11-toolkits/ruby-gtk2/Makefile @@ -32,7 +32,7 @@ USE_IMLIB= yes .else PLIST= ${WRKDIR}/PLIST pre-install: - @${SED} -e '/gdkimlib/d' ${PKGDIR}/PLIST > ${PLIST} + @${SED} -e '/gdkimlib/d' ${PKGDIR}/pkg-plist > ${PLIST} .endif post-configure: diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile index 08e11af75371..9f566ad7398d 100644 --- a/x11-toolkits/v/Makefile +++ b/x11-toolkits/v/Makefile @@ -41,6 +41,6 @@ post-install: find ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \; @${ECHO_MSG} "==> Extra docs installed. Note, you will need *tex to read 'em." .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile index 347cc5a9ddcd..fb26f75d2a2b 100644 --- a/x11-wm/fvwm2-beta/Makefile +++ b/x11-wm/fvwm2-beta/Makefile @@ -39,6 +39,6 @@ post-install: @${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \ ${PREFIX}/lib/X11/fvwm2/pixmaps - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index 347cc5a9ddcd..fb26f75d2a2b 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -39,6 +39,6 @@ post-install: @${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \ ${PREFIX}/lib/X11/fvwm2/pixmaps - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 62b0733cda37..e90d4a25a51f 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -31,6 +31,6 @@ MAN1= FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ post-install: @${MKDIR} ${PREFIX}/icons ${INSTALL_DATA} ${WRKDIR}/*.xpm ${PREFIX}/icons - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile index 62b0733cda37..e90d4a25a51f 100644 --- a/x11-wm/fvwm24/Makefile +++ b/x11-wm/fvwm24/Makefile @@ -31,6 +31,6 @@ MAN1= FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \ post-install: @${MKDIR} ${PREFIX}/icons ${INSTALL_DATA} ${WRKDIR}/*.xpm ${PREFIX}/icons - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile index 98f69e91d914..290608966e5f 100644 --- a/x11/XFree86-aoutlibs/Makefile +++ b/x11/XFree86-aoutlibs/Makefile @@ -23,8 +23,7 @@ PORTOBJFORMAT= aout USE_X_PREFIX= yes pre-configure: - @${SETENV} ${SCRIPTS_ENV} ${SH} \ - ${PKGDIR}/REQ ${PKGNAME} INSTALL + @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: @${MKDIR} ${PREFIX}/lib/aout |