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.

8 files changed, 8 insertions, 8 deletions

diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index 1179e47d8adb..545bea8dd4f3 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -50,7 +50,7 @@ do-build:
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${X11BASE} \
-		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
 do-install:
 	@(cd ${WRKSRC}; \
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index f65e805ec772..95e01644c935 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -30,6 +30,6 @@ post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/*.gz
 
 post-install:
-	@${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+	@${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index 9e6d976e5d42..ab3929c1d21c 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -18,6 +18,6 @@ USE_X_PREFIX=	yes
 
 post-install:
 	${RM} ${PREFIX}/lib/X11/fonts/freefont/fonts.dir.orig
-	@${CAT} ${PKGDIR}/DESCR
+	@${CAT} ${DESCR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 4c010c32d86b..22000cb4581f 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -59,7 +59,7 @@ do-build:
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
+		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
 do-install:
 	(cd ${WRKSRC}; \
diff --git a/x11-fonts/mozilla-fonts/Makefile b/x11-fonts/mozilla-fonts/Makefile
index 29638b76d274..d24c64258907 100644
--- a/x11-fonts/mozilla-fonts/Makefile
+++ b/x11-fonts/mozilla-fonts/Makefile
@@ -22,6 +22,6 @@ post-install:
 	${MKDIR} ${PREFIX}/share/doc/mozilla-fonts
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mozilla-fonts
 .endif
-	@ ${CAT} ${PKGDIR}/DESCR
+	@ ${CAT} ${DESCR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 2f3d21043355..33eb31b6d3a3 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -16,6 +16,6 @@ NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
 post-install:
-	@${CAT} ${PKGDIR}/DESCR
+	@${CAT} ${DESCR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index c6dcb9430e61..58f95b57de88 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -27,6 +27,6 @@ do-install:
 	${CHMOD} 644 ${PREFIX}/lib/X11/fonts/sharefont/*
 
 post-install:
-	@${CAT} ${PKGDIR}/DESCR
+	@${CAT} ${DESCR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/urwfonts/Makefile b/x11-fonts/urwfonts/Makefile
index 34bed863bb69..fc3235efd818 100644
--- a/x11-fonts/urwfonts/Makefile
+++ b/x11-fonts/urwfonts/Makefile
@@ -17,6 +17,6 @@ NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
 post-install:
-	@${CAT} ${PKGDIR}/DESCR
+	@${CAT} ${DESCR}
 
 .include <bsd.port.mk>