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.

11 files changed, 11 insertions, 12 deletions

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>