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.

14 files changed, 14 insertions, 14 deletions

diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 7230913030ea..8132ecd3e296 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -26,7 +26,7 @@ post-extract:
 
 .if exists(${X11BASE}/bin/XFree86)
 post-build:
-	${CP} ${PKGDIR}/PLIST ${WRKDIR}/PLIST
+	${CP} ${PKGDIR}/pkg-plist ${PLIST}
 	${ECHO} "lib/libXaw3d.so.7" >> ${PLIST}
 .endif
 
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 4b0271f29a18..96df7a9ef4e8 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -27,6 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 4b0271f29a18..96df7a9ef4e8 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -27,6 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 4b0271f29a18..96df7a9ef4e8 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -27,6 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 4b0271f29a18..96df7a9ef4e8 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -27,6 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 4b0271f29a18..96df7a9ef4e8 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -27,6 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 4b0271f29a18..96df7a9ef4e8 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -27,6 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 4828e386d5ed..7a3968f5617d 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -42,7 +42,7 @@ PLIST=		${WRKDIR}/PLIST.nodocs
 pre-install:
 	${RM} -f ${PLIST}
 	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)'       \
-		${PKGDIR}/PLIST > ${PLIST}
+		${PKGDIR}/pkg-plist > ${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 4828e386d5ed..7a3968f5617d 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -42,7 +42,7 @@ PLIST=		${WRKDIR}/PLIST.nodocs
 pre-install:
 	${RM} -f ${PLIST}
 	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)'       \
-		${PKGDIR}/PLIST > ${PLIST}
+		${PKGDIR}/pkg-plist > ${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 82b31e8aaba7..bfd04a556f91 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -41,7 +41,7 @@ PLIST=		${WRKDIR}/PLIST.nodocs
 pre-install:
 	${RM} -f ${PLIST}
 	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)'       \
-		${PKGDIR}/PLIST > ${PLIST}
+		${PKGDIR}/pkg-plist > ${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 82b31e8aaba7..bfd04a556f91 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -41,7 +41,7 @@ PLIST=		${WRKDIR}/PLIST.nodocs
 pre-install:
 	${RM} -f ${PLIST}
 	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)'       \
-		${PKGDIR}/PLIST > ${PLIST}
+		${PKGDIR}/pkg-plist > ${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 5a21425408b5..2770845e6ae8 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -32,7 +32,7 @@ USE_IMLIB=	yes
 .else
 PLIST=		${WRKDIR}/PLIST
 pre-install:
-	@${SED} -e '/gdkimlib/d' ${PKGDIR}/PLIST > ${PLIST}
+	@${SED} -e '/gdkimlib/d' ${PKGDIR}/pkg-plist > ${PLIST}
 .endif
 
 post-configure:
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 5a21425408b5..2770845e6ae8 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -32,7 +32,7 @@ USE_IMLIB=	yes
 .else
 PLIST=		${WRKDIR}/PLIST
 pre-install:
-	@${SED} -e '/gdkimlib/d' ${PKGDIR}/PLIST > ${PLIST}
+	@${SED} -e '/gdkimlib/d' ${PKGDIR}/pkg-plist > ${PLIST}
 .endif
 
 post-configure:
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 08e11af75371..9f566ad7398d 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -41,6 +41,6 @@ post-install:
 	find ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \;
 	@${ECHO_MSG} "==> Extra docs installed.  Note, you will need *tex to read 'em."
 .endif
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>