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.

16 files changed, 25 insertions, 25 deletions

diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile
index a70480585119..714f871c1782 100644
--- a/print/acroread-commfont/Makefile
+++ b/print/acroread-commfont/Makefile
@@ -42,9 +42,9 @@ RUN_DEPENDS=	acroread4:${PORTSDIR}/print/acroread4
 .else
 ###### For slave ports ##############################
 ## Use a local directory of the slave port!!
-COMMENT=	${.CURDIR}/pkg/COMMENT
-DESCR=		${.CURDIR}/pkg/DESCR
-PLIST=		${.CURDIR}/pkg/PLIST
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
 FILESDIR=	${.CURDIR}/files
 ##
 RUN_DEPENDS=	${PREFIX}/Acrobat4/Resource/CMap/H:${PORTSDIR}/print/acroread-commfont
@@ -74,6 +74,6 @@ do-install:
 	@${TAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat4/Resource
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/print/acroread4/Makefile b/print/acroread4/Makefile
index 3c6aa0aecbdf..ec63cb3b676b 100644
--- a/print/acroread4/Makefile
+++ b/print/acroread4/Makefile
@@ -44,7 +44,7 @@ pre-configure:
 	@${PERL} -pi.fbsd -e 's:Linux\):FreeBSD|Linux):g' ${WRKSRC}/INSTALL
 .elif ${ARCH} == "alpha"
 	@${PERL} -pi.fbsd -e 's:OSF1\):FreeBSD|OSF1):g' ${WRKSRC}/INSTALL
-	${SED} -e 's/@comment ALPHA-ONLY://g' ${PKGDIR}/PLIST > ${PLIST}
+	${SED} -e 's/@comment ALPHA-ONLY://g' ${PKGDIR}/pkg-plist > ${PLIST}
 .endif
 
 do-build:
diff --git a/print/acroread5-commfont/Makefile b/print/acroread5-commfont/Makefile
index a70480585119..714f871c1782 100644
--- a/print/acroread5-commfont/Makefile
+++ b/print/acroread5-commfont/Makefile
@@ -42,9 +42,9 @@ RUN_DEPENDS=	acroread4:${PORTSDIR}/print/acroread4
 .else
 ###### For slave ports ##############################
 ## Use a local directory of the slave port!!
-COMMENT=	${.CURDIR}/pkg/COMMENT
-DESCR=		${.CURDIR}/pkg/DESCR
-PLIST=		${.CURDIR}/pkg/PLIST
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
 FILESDIR=	${.CURDIR}/files
 ##
 RUN_DEPENDS=	${PREFIX}/Acrobat4/Resource/CMap/H:${PORTSDIR}/print/acroread-commfont
@@ -74,6 +74,6 @@ do-install:
 	@${TAR} xf ${TAR_FILE} -C ${PREFIX}/Acrobat4/Resource
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index 3c6aa0aecbdf..ec63cb3b676b 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -44,7 +44,7 @@ pre-configure:
 	@${PERL} -pi.fbsd -e 's:Linux\):FreeBSD|Linux):g' ${WRKSRC}/INSTALL
 .elif ${ARCH} == "alpha"
 	@${PERL} -pi.fbsd -e 's:OSF1\):FreeBSD|OSF1):g' ${WRKSRC}/INSTALL
-	${SED} -e 's/@comment ALPHA-ONLY://g' ${PKGDIR}/PLIST > ${PLIST}
+	${SED} -e 's/@comment ALPHA-ONLY://g' ${PKGDIR}/pkg-plist > ${PLIST}
 .endif
 
 do-build:
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index a8ffd341680a..ddc31e56acc7 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -50,6 +50,6 @@ post-install:
 	cd ${WRKSRC} &&  ${SETENV} ${MAKE_ENV} ${MAKE} install-info >/dev/null
 	install-info --entry='* AUC-Tex mode: (auctex).	Emacs mode for editing TeX and LaTeX files.' --section='TeX' ${PREFIX}/info/auctex ${PREFIX}/info/dir
 .endif
-	@${CAT} ${PKGDIR}/MESSAGE | ${SED} 's¦/usr/local¦${PREFIX}¦g'
+	@${CAT} ${PKGMESSAGE} | ${SED} 's¦/usr/local¦${PREFIX}¦g'
 
 .include <bsd.port.post.mk>
diff --git a/print/enscriptfonts/Makefile b/print/enscriptfonts/Makefile
index 7c3d67f8d520..283d47399c02 100644
--- a/print/enscriptfonts/Makefile
+++ b/print/enscriptfonts/Makefile
@@ -26,7 +26,7 @@ do-install:
 	@${CP} -p ${WRKDIR}/* ${PREFIX}/share/enscript/xenscript
 
 post-install:
-	@${CAT} ${PKGDIR}/DESCR
+	@${CAT} ${DESCR}
 	@sleep 2;
 	@${ECHO_MSG} "";
 	@${ECHO_MSG} "";
diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile
index f297c30a420b..5379462f54d3 100644
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@@ -17,6 +17,6 @@ USE_IMAKE=	yes
 MAN1=		ghostview.1
 
 post-install:
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/gv/Makefile b/print/gv/Makefile
index a8556a7006bf..79eb73931cde 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -24,6 +24,6 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}; ${MAKE} install.doc)
 .endif
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index e42a37320258..102db0f94c5c 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -31,6 +31,6 @@ do-install:
 
 post-install:
 	${PREFIX}/bin/mktexlsr
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index eedeb15c9167..4b41a18faa4b 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -24,6 +24,6 @@ PLIST_SUB=	MGV_VERSION=3.1.5
 MAN1=		mgv.1
 
 post-install:
-		@ ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+		@ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/pips760/Makefile b/print/pips760/Makefile
index 3738377333c9..ea5d531be6f8 100644
--- a/print/pips760/Makefile
+++ b/print/pips760/Makefile
@@ -7,8 +7,8 @@
 
 MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg/COMMENT
-DESCR=		${.CURDIR}/pkg/DESCR
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		760
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips770/Makefile b/print/pips770/Makefile
index 05eb5a2c8fe1..5163e8b6c443 100644
--- a/print/pips770/Makefile
+++ b/print/pips770/Makefile
@@ -8,8 +8,8 @@
 
 MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg/COMMENT
-DESCR=		${.CURDIR}/pkg/DESCR
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		770
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips820_3300/Makefile b/print/pips820_3300/Makefile
index a0d52e649976..7c9bb90cf87f 100644
--- a/print/pips820_3300/Makefile
+++ b/print/pips820_3300/Makefile
@@ -8,8 +8,8 @@
 MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE:S,_3300,,}/
 
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg/COMMENT
-DESCR=		${.CURDIR}/pkg/DESCR
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		820_3300
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile
index 04be33a5be9d..fe934dfb9e5c 100644
--- a/print/yatex-mule/Makefile
+++ b/print/yatex-mule/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-mule
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENT=	${.CURDIR}/pkg/COMMENT
+COMMENT=	${.CURDIR}/pkg-comment
 EMACS_PORT_NAME=mule
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index d46594d109ab..5b518d945a69 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-xemacs-mule
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENT=	${.CURDIR}/pkg/COMMENT
+COMMENT=	${.CURDIR}/pkg-comment
 EMACS_PORT_NAME=xemacs21-mule
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index 0d6e9c346456..9275ed9d0de1 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-xemacs
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENT=	${.CURDIR}/pkg/COMMENT
+COMMENT=	${.CURDIR}/pkg-comment
 EMACS_PORT_NAME=xemacs21
 
 .include	"${MASTERDIR}/Makefile"