aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>1996-12-04 05:55:07 +0000
committerSatoshi Asami <asami@FreeBSD.org>1996-12-04 05:55:07 +0000
commitef7c128a5cfa3f52592a168900fe6387a15efb8c (patch)
treea8137c59e78cb5dc66efb813405eb3a44872adbd
parent519588bfa84e90f2580dd2e16e586972a24d917e (diff)
downloadports-ef7c128a5cfa3f52592a168900fe6387a15efb8c.tar.gz
ports-ef7c128a5cfa3f52592a168900fe6387a15efb8c.zip
Merge 1.233, just in case someone's still listening to this branch.
Notes
Notes: svn path=/branches/RELENG_2_1_0/; revision=4789
-rw-r--r--Mk/bsd.port.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 6fb454c77e2e..95dc7ac3bf75 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.165.2.11 1996/11/13 11:42:57 asami Exp $
+# $Id: bsd.port.mk,v 1.165.2.12 1996/11/14 11:42:14 asami Exp $
#
# Please view me with 4 column tabs!
@@ -383,7 +383,7 @@ INSTALL_MAN= \
PKG_CMD?= /usr/sbin/pkg_create
.if !defined(PKG_ARGS)
-PKG_ARGS= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST -p ${PREFIX} -P "`${MAKE} package-depends|sort|uniq`"
+PKG_ARGS= -v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST -p ${PREFIX} -P "`${MAKE} package-depends|sort -u`"
.if exists(${PKGDIR}/INSTALL)
PKG_ARGS+= -i ${PKGDIR}/INSTALL
.endif
@@ -1374,9 +1374,9 @@ describe:
${ECHO} -n "|/dev/null"; \
fi
@${ECHO} -n "|${MAINTAINER}|${CATEGORIES}|"
- @cd ${.CURDIR} && ${ECHO} -n `make depends-list|sort|uniq`
+ @cd ${.CURDIR} && ${ECHO} -n `make depends-list|sort -u`
@${ECHO} -n "|"
- @cd ${.CURDIR} && ${ECHO} -n `make package-depends|sort|uniq`
+ @cd ${.CURDIR} && ${ECHO} -n `make package-depends|sort -u`
@${ECHO} ""
.endif
@@ -1406,7 +1406,7 @@ print-depends-list:
.if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \
defined(LIB_DEPENDS) || defined(DEPENDS)
@${ECHO} -n 'This port requires package(s) "'
- @${ECHO} -n `make depends-list | sort | uniq`
+ @${ECHO} -n `make depends-list | sort -u`
@${ECHO} '" to build.'
.endif
.endif
@@ -1415,7 +1415,7 @@ print-depends-list:
print-package-depends:
.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS)
@${ECHO} -n 'This port requires package(s) "'
- @${ECHO} -n `make package-depends | sort | uniq`
+ @${ECHO} -n `make package-depends | sort -u`
@${ECHO} '" to run.'
.endif
.endif