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.

10 files changed, 10 insertions, 10 deletions

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