diff options
author | Satoshi Asami <asami@FreeBSD.org> | 2000-10-08 10:23:48 +0000 |
---|---|---|
committer | Satoshi Asami <asami@FreeBSD.org> | 2000-10-08 10:23:48 +0000 |
commit | 7acef1cd7a4173168980125b140340c62b38c8d6 (patch) | |
tree | 8e913f3c1574a206914a5852d584d77c40e8b447 /misc | |
parent | Remove extra "pkg/". (diff) |
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.
Notes
Notes:
svn path=/head/; revision=33576
Diffstat (limited to 'misc')
-rw-r--r-- | misc/221upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/222upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/225upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/227upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/30upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/31upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/32upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/34upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/40upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/41upgrade/Makefile | 2 | ||||
-rw-r--r-- | misc/amanda/Makefile | 2 | ||||
-rw-r--r-- | misc/bbjd/Makefile | 2 | ||||
-rw-r--r-- | misc/dotfile/Makefile | 2 | ||||
-rw-r--r-- | misc/fd/Makefile | 2 | ||||
-rw-r--r-- | misc/mc/Makefile | 2 | ||||
-rw-r--r-- | misc/sma/Makefile | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/misc/221upgrade/Makefile b/misc/221upgrade/Makefile index c6642f6a179c..02adcf790467 100644 --- a/misc/221upgrade/Makefile +++ b/misc/221upgrade/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes PKGINSTALL= ${WRKDIR}/INSTALL do-install: - ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/222upgrade/Makefile b/misc/222upgrade/Makefile index 4f4c47fbac33..28bc541a97c1 100644 --- a/misc/222upgrade/Makefile +++ b/misc/222upgrade/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes PKGINSTALL= ${WRKDIR}/INSTALL do-install: - ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/225upgrade/Makefile b/misc/225upgrade/Makefile index 75459d788938..c613bbd65ae7 100644 --- a/misc/225upgrade/Makefile +++ b/misc/225upgrade/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes PKGINSTALL= ${WRKDIR}/INSTALL do-install: - ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/227upgrade/Makefile b/misc/227upgrade/Makefile index 15711ab37e49..600a055a64ab 100644 --- a/misc/227upgrade/Makefile +++ b/misc/227upgrade/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes PKGINSTALL= ${WRKDIR}/INSTALL do-install: - ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${BSDPORTMKVERSION}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/30upgrade/Makefile b/misc/30upgrade/Makefile index 40908dcbe368..f0324ead53ec 100644 --- a/misc/30upgrade/Makefile +++ b/misc/30upgrade/Makefile @@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/31upgrade/Makefile b/misc/31upgrade/Makefile index 725322b0245e..fa83ff6f90e8 100644 --- a/misc/31upgrade/Makefile +++ b/misc/31upgrade/Makefile @@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/32upgrade/Makefile b/misc/32upgrade/Makefile index eab547d5a082..686ebeec0342 100644 --- a/misc/32upgrade/Makefile +++ b/misc/32upgrade/Makefile @@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/34upgrade/Makefile b/misc/34upgrade/Makefile index 0279c6612e5d..e6088f1141d5 100644 --- a/misc/34upgrade/Makefile +++ b/misc/34upgrade/Makefile @@ -27,7 +27,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/40upgrade/Makefile b/misc/40upgrade/Makefile index 6181c47e0df6..bee8a161cbb1 100644 --- a/misc/40upgrade/Makefile +++ b/misc/40upgrade/Makefile @@ -26,7 +26,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/41upgrade/Makefile b/misc/41upgrade/Makefile index 0d0c6030cce9..6047673436ff 100644 --- a/misc/41upgrade/Makefile +++ b/misc/41upgrade/Makefile @@ -26,7 +26,7 @@ PKGINSTALL= ${WRKDIR}/INSTALL DATE!= cat /var/db/port.mkversion do-install: - ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/INSTALL \ + ${SED} -e "s/%%VERSION%%/${DATE}/" ${PKGDIR}/pkg-install \ > ${PKGINSTALL} deinstall: diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile index 4a59ef274d91..30286958d052 100644 --- a/misc/amanda/Makefile +++ b/misc/amanda/Makefile @@ -45,6 +45,6 @@ post-install: .endfor @${MKDIR} ${PREFIX}/share/examples/amanda ${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/misc/bbjd/Makefile b/misc/bbjd/Makefile index 8c65925b5766..afd9b37cd3c0 100644 --- a/misc/bbjd/Makefile +++ b/misc/bbjd/Makefile @@ -25,6 +25,6 @@ do-install: @ ${INSTALL_DATA} ${WRKSRC}/Theory ${PREFIX}/share/bbjd/ post-install: - @ ${CAT} ${PKGDIR}/MESSAGE + @ ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index f648a218497c..d7e51b79d3de 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -32,7 +32,7 @@ post-configure: .if !defined(DISPLAY) PLIST= ${WRKDIR}/PLIST pre-install: - @${CAT} ${PKGDIR}/PLIST | ${SED} -e '/fvwm.\/bytecompile/d' > ${PLIST} + @${CAT} ${PKGDIR}/pkg-plist | ${SED} -e '/fvwm.\/bytecompile/d' > ${PLIST} .endif post-install: diff --git a/misc/fd/Makefile b/misc/fd/Makefile index ef2b6ddabbd1..ac8395627b75 100644 --- a/misc/fd/Makefile +++ b/misc/fd/Makefile @@ -33,6 +33,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \ done .endif - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 82cd81d00ed6..2c98379eaf70 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -39,7 +39,7 @@ MAN8= mcserv.8 .if defined(WITH_SLANG) PLIST= ${WRKDIR}/PLIST pre-install: - @${CAT} ${PKGDIR}/PLIST > ${PLIST} + @${CAT} ${PKGDIR}/pkg-plist > ${PLIST} @${ECHO} bin/mcedit >> ${PLIST} .endif diff --git a/misc/sma/Makefile b/misc/sma/Makefile index d53c27867190..62d008160e41 100644 --- a/misc/sma/Makefile +++ b/misc/sma/Makefile @@ -32,6 +32,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/sma ${PREFIX}/bin post-install: - @${CAT} ${PKGDIR}/MESSAGE + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> |