summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>1999-04-20 18:06:41 +0000
committerMarc Espie <espie@cvs.openbsd.org>1999-04-20 18:06:41 +0000
commitdb0ca0cf8fd9afa4d20becf0af9f3b0a65fbb894 (patch)
treea5f0a9dc3349edfb19953fad19f752eaa069af2f
parent2acd9f50d3132c0a05230eff41e837e52276cce1 (diff)
remove weird restriction on package repository name, and make delete-links
safer.
-rw-r--r--share/mk/bsd.port.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 16277d1723d..f6450ec8a19 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
-# $OpenBSD: bsd.port.mk,v 1.85 1999/04/20 18:04:27 espie Exp $
+# $OpenBSD: bsd.port.mk,v 1.86 1999/04/20 18:06:40 espie Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@@ -28,7 +28,7 @@ OpenBSD_MAINTAINER= marc@OpenBSD.ORG
# NEED_VERSION: we need at least this version of bsd.port.mk for this
# port to build
-FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.85 1999/04/20 18:04:27 espie Exp $$
+FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.86 1999/04/20 18:06:40 espie Exp $$
.if defined(NEED_VERSION)
_VERSION_REVISION=${FULL_REVISION:M[0-9]*.*}
@@ -949,8 +949,6 @@ MAINTAINER?= ports@OpenBSD.ORG
@${FALSE}
.endif
-# Note this has to start with a capital letter (or more accurately, it
-# shouldn't match "[a-z]*"), see the target "delete-package-links" below.
PKGREPOSITORYSUBDIR?= All
PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR}
.if exists(${PACKAGES})
@@ -1493,7 +1491,7 @@ package-links:
.if !target(delete-package-links)
delete-package-links:
- @${RM} -f ${PACKAGES}/[a-z]*/${PKGNAME}${PKG_SUFX};
+ @find ${PACKAGES} -type l -name ${PKGNAME}${PKG_SUFX}|xargs ${RM} -f
.endif
.if !target(delete-package)