summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1995-04-10 08:09:21 +0000
committerjkh <jkh@FreeBSD.org>1995-04-10 08:09:21 +0000
commit22728a4eac36b0827a82cb67e0fbb652c00ae0e5 (patch)
tree43d2eda8944885afab7cb028e0e12573073b0e3a /share/mk
parent3e496240b4efc0f4e8498ffe6ad9f4cce26624ac (diff)
downloadFreeBSD-src-22728a4eac36b0827a82cb67e0fbb652c00ae0e5.zip
FreeBSD-src-22728a4eac36b0827a82cb67e0fbb652c00ae0e5.tar.gz
Don't pass duplicate pkgdeps to pkg_create
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.port.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index f1413be..742fa3f 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -3,7 +3,7 @@
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
#
-# $Id: bsd.port.mk,v 1.135 1995/04/09 12:27:58 jkh Exp $
+# $Id: bsd.port.mk,v 1.136 1995/04/09 15:00:56 jkh Exp $
#
# Please view me with 4 column tabs!
@@ -226,7 +226,7 @@ EXTRACT_BEFORE_ARGS?= -xzf
PKG_CMD?= pkg_create
.if !defined(PKG_ARGS)
-PKG_ARGS= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST -p ${PREFIX} -P "`${MAKE} package-depends`"
+PKG_ARGS= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST -p ${PREFIX} -P "`${MAKE} package-depends|sort|uniq`"
.if exists(${PKGDIR}/INSTALL)
PKG_ARGS+= -i ${PKGDIR}/INSTALL
.endif
@@ -430,7 +430,7 @@ package-name:
# Show (recursively) all the packages this package depends on.
.if !target(package-depends)
package-depends:
- @for i in ${EXEC_DEPENDS} ${LIB_DEPENDS}; do \
+ @for i in ${EXEC_DEPENDS} ${LIB_DEPENDS} ${DEPENDS}; do \
dir=`echo $$i | sed -e 's/.*://'`; \
(cd $$dir ; ${MAKE} package-name package-depends); \
done
OpenPOWER on IntegriCloud