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.

4 files changed, 4 insertions, 4 deletions

diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 091a68e92bad..5d47b75584cb 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -25,6 +25,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALL=""
 
 post-install:
-	${CAT} ${PKGDIR}/MESSAGE
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 10e7421cd731..337e90fbfeda 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -19,7 +19,7 @@ USE_LIBTOOL=	yes
 rc=${PREFIX}/etc/rc.d
 
 post-install:
-	@PREFIX=${PREFIX} ${PERL5} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${INSTALL_SCRIPT} ${FILESDIR}/jserver.sh ${rc}
 
 .include <bsd.port.mk>
diff --git a/net-im/naim/Makefile b/net-im/naim/Makefile
index 29bb0c31ff10..59946d692f1c 100644
--- a/net-im/naim/Makefile
+++ b/net-im/naim/Makefile
@@ -28,7 +28,7 @@ post-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/doc/naim.hlp ${PREFIX}/share/doc/naim/
 .endif
 	@ ${ECHO} "************************************************************"
-	@ ${CAT} ${PKGDIR}/MESSAGE
+	@ ${CAT} ${PKGMESSAGE}
 	@ ${ECHO} "************************************************************"
 
 .include <bsd.port.mk>
diff --git a/net-im/tik/Makefile b/net-im/tik/Makefile
index acdd09970b4a..893bd3540d52 100644
--- a/net-im/tik/Makefile
+++ b/net-im/tik/Makefile
@@ -66,7 +66,7 @@ DOCFILES=	CHANGES CONTRIBUTORS COPYING LICENSE README-LANG	   \
 # The packing list starts with just bin/tik.  As we install things,
 # build onto the list.
 do-install:
-	@${CP} ${PKGDIR}/PLIST ${PLIST}
+	@${CP} ${PKGDIR}/pkg-plist ${PLIST}
 .for d in ${SRCDIRS}
 	@${MKDIR} ${PREFIX}/${d}
 	@${ECHO} @dirrm ${d} >> ${PLIST}.dirrm