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, 13 insertions, 13 deletions

diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 813e1915b447..59cced9ef9e8 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -64,7 +64,7 @@ pre-configure:
 		>${WRKSRC}/gcc/config/freebsd.h )
 	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
 .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
-	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST}
+	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST}
 .endif
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 813e1915b447..59cced9ef9e8 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -64,7 +64,7 @@ pre-configure:
 		>${WRKSRC}/gcc/config/freebsd.h )
 	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
 .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
-	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST}
+	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST}
 .endif
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
diff --git a/lang/lcc/Makefile b/lang/lcc/Makefile
index e16b7359c9bf..3e1008c99119 100644
--- a/lang/lcc/Makefile
+++ b/lang/lcc/Makefile
@@ -33,7 +33,7 @@ pre-configure:
 		${FILESDIR}/${OPSYS}.c.in > ${WRKSRC}/etc/${OPSYS}.c
 	@#	below can be used to patchup PLIST file for diff os/arch
 	@#${SED} -e "s:%%LCCDESTDIR%%:${LCCDESTDIR}:g"  \
-		#${PKGDIR}/PLIST.in > ${PKGDIR}/PLIST
+		#${PKGDIR}/pkg-plist.in > ${PKGDIR}/pkg-plist
 	@${SED} -e "s:%%OPSYS%%:${OPSYS}:g"  \
 		${WRKSRC}/makefile > ${WRKSRC}/makefile.configured
 	@${MV} -f ${WRKSRC}/makefile.configured ${WRKSRC}/makefile
diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile
index 1fac6a600773..58d0f840e96b 100644
--- a/lang/modula-3-lib/Makefile
+++ b/lang/modula-3-lib/Makefile
@@ -131,7 +131,7 @@ do-build:
 
 pre-install:
 	@${ECHO_MSG} "Checking for conflicting shared libraries"
-	@PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${ECHO_MSG} "Installing shared libraries"
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index 19da1086fc54..fe8308bf0eb5 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -46,6 +46,6 @@ pre-extract:
 	@${ECHO}
 
 post-install:
-	@cat ${PKGDIR}/MESSAGE
+	@cat ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/lang/o2c/Makefile b/lang/o2c/Makefile
index 0924f1dc38f4..35b585ca7b14 100644
--- a/lang/o2c/Makefile
+++ b/lang/o2c/Makefile
@@ -24,6 +24,6 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/system/o2c.red.template ${PREFIX}/lib/o2c-1.16
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 031f93411382..48e5d0856d9d 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -74,7 +74,7 @@ pre-configure:
 	${SED} -e "s:__FreeBSD__[0-9=]*:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \
 		>${WRKSRC}/gcc/config/freebsd.h )
 .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
-	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST}
+	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/pkg-plist >${PLIST}
 .endif
 
 pre-install:
diff --git a/lang/smalleiffel-devel/Makefile b/lang/smalleiffel-devel/Makefile
index 0694217121b4..84db665cc5e1 100644
--- a/lang/smalleiffel-devel/Makefile
+++ b/lang/smalleiffel-devel/Makefile
@@ -52,9 +52,9 @@ do-install:
 	    ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
 	    ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
 	    ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
-	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/MESSAGE \
+	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
-	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/INSTALL \
+	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \
 		> ${PKGINSTALL}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile
index 56ebcb124ecf..5478fe868499 100644
--- a/lang/smalleiffel/Makefile
+++ b/lang/smalleiffel/Makefile
@@ -53,9 +53,9 @@ do-install:
 	    ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
 	    ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
 	    ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
-	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/MESSAGE \
+	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
-	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/INSTALL \
+	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \
 		> ${PKGINSTALL}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/lang/smarteiffel/Makefile b/lang/smarteiffel/Makefile
index 56ebcb124ecf..5478fe868499 100644
--- a/lang/smarteiffel/Makefile
+++ b/lang/smarteiffel/Makefile
@@ -53,9 +53,9 @@ do-install:
 	    ${ECHO} ${SEDIR}/lib_number/ >> ${SEDIR}/sys/loadpath.UNIX; \
 	    ${ECHO} ${SEDIR}/lib_show/ >> ${SEDIR}/sys/loadpath.UNIX; \
 	    ${ECHO} ${SEDIR}/lib_se/ >> ${SEDIR}/sys/loadpath.UNIX)
-	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/MESSAGE \
+	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
-	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/INSTALL \
+	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGDIR}/pkg-install \
 		> ${PKGINSTALL}
 	@${CAT} ${PKGMESSAGE}