diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1997-03-06 08:33:34 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1997-03-06 08:33:34 +0000 |
| commit | f2fd027c63c72f5a086ef3f742b97f9656619e8a (patch) | |
| tree | c99b1d4db380aff4964f54ed0b7d22acd739bd0c | |
| parent | Merge 1.251, 1.252 and 1.253. (diff) | |
Merge 1.254.release/2.2.1release/2.2.0
Notes
Notes:
svn path=/branches/RELENG_2_2/; revision=5880
svn path=/tags/RELENG_2_2_1_RELEASE/; revision=5882; tag=release/2.2.1
| -rw-r--r-- | Mk/bsd.port.mk | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 303e7e9fcb3d..93cb566a7723 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6,7 +6,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.227.2.14 1997/01/25 02:51:14 asami Exp $ +# $Id: bsd.port.mk,v 1.227.2.15 1997/02/23 13:27:21 asami Exp $ # # Please view me with 4 column tabs! @@ -416,11 +416,13 @@ SCRIPTS_ENV+= ${INSTALL_MACROS} .undef NO_PACKAGE .endif +COMMENT?= ${PKGDIR}/COMMENT +DESCR?= ${PKGDIR}/DESCR PLIST?= ${PKGDIR}/PLIST PKG_CMD?= /usr/sbin/pkg_create .if !defined(PKG_ARGS) -PKG_ARGS= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PLIST} -p ${PREFIX} -P "`${MAKE} package-depends|sort -u`" +PKG_ARGS= -v -c ${COMMENT} -d ${DESCR} -f ${PLIST} -p ${PREFIX} -P "`${MAKE} package-depends|sort -u`" .if exists(${PKGDIR}/INSTALL) PKG_ARGS+= -i ${PKGDIR}/INSTALL .endif @@ -1539,13 +1541,13 @@ depends-list: describe: @${ECHO} -n "${PKGNAME}|${.CURDIR}|" @${ECHO} -n "${PREFIX}|" - @if [ -f ${PKGDIR}/COMMENT ]; then \ - ${ECHO} -n "`${CAT} ${PKGDIR}/COMMENT`"; \ + @if [ -f ${COMMENT} ]; then \ + ${ECHO} -n "`${CAT} ${COMMENT}`"; \ else \ ${ECHO} -n "** No Description"; \ fi - @if [ -f ${PKGDIR}/DESCR ]; then \ - ${ECHO} -n "|${PKGDIR}/DESCR"; \ + @if [ -f ${DESCR} ]; then \ + ${ECHO} -n "|${DESCR}"; \ else \ ${ECHO} -n "|/dev/null"; \ fi @@ -1602,7 +1604,7 @@ print-package-depends: .if !target(fake-pkg) fake-pkg: - @if [ ! -f ${PLIST} -o ! -f ${PKGDIR}/COMMENT -o ! -f ${PKGDIR}/DESCR ]; then ${ECHO} "** Missing package files for ${PKGNAME} - installation not recorded."; exit 1; fi + @if [ ! -f ${PLIST} -o ! -f ${COMMENT} -o ! -f ${DESCR} ]; then ${ECHO} "** Missing package files for ${PKGNAME} - installation not recorded."; exit 1; fi @if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi .if defined(FORCE_PKG_REGISTER) @${RM} -rf ${PKG_DBDIR}/${PKGNAME} @@ -1611,8 +1613,8 @@ fake-pkg: ${ECHO_MSG} "===> Registering installation for ${PKGNAME}"; \ ${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \ ${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \ - ${CP} ${PKGDIR}/DESCR ${PKG_DBDIR}/${PKGNAME}/+DESC; \ - ${CP} ${PKGDIR}/COMMENT ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \ + ${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \ + ${CP} ${COMMENT} ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \ if [ -f ${PKGDIR}/INSTALL ]; then \ ${CP} ${PKGDIR}/INSTALL ${PKG_DBDIR}/${PKGNAME}/+INSTALL; \ fi; \ |