22 files changed, 24 insertions, 24 deletions

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