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.
svn path=/head/; revision=33576
2000-10-08 10:23:48 +00:00 · 2000-10-08 10:23:48 +00:00 · 7acef1cd7a · 2021-03-31 03:12:20 +00:00
commit 7acef1cd7a
parent 99ebbc27f8
523 changed files with 651 additions and 653 deletions
--- 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:
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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

--- 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>
--- 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"
--- 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"
--- 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>
--- 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>
--- 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>
--- 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

--- 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"
--- 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"
--- 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"
--- 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>
--- 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)
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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	

--- 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>
--- 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>
--- 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/
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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/
--- 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/
--- 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/
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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/
--- 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/
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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/
--- 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/
--- 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."; \
--- 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)
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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} ; \
--- 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>
--- 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>
--- 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>
--- 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/
--- 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/
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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
--- 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/
--- 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/
--- 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>
--- 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>
--- 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>
--- 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>
--- a/Show More
+++ b/Show More