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.

22 files changed, 29 insertions, 29 deletions

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: