cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

most abreviated format for depends. there's a consensus that it's good,

Browse Source 
and it works.
This commit is contained in:
espie 2010-11-16 09:16:26 +00:00
parent 2c6819b17b
commit 86a41b10d0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1058 2010/11/14 11:17:36 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1059 2010/11/16 09:16:26 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -563,7 +563,7 @@ ERRORS += "Fatal: no flavors for this port."
USE_GROFF ?= No
.if ${USE_GROFF:L} == "yes"
BUILD_DEPENDS += groff->=1.15.4.7p2:textproc/groff
BUILD_DEPENDS += textproc/groff>=1.15.4.7p2
_PKG_ARGS += -DUSE_GROFF=1
.endif
@ -1423,14 +1423,19 @@ _FULL_PACKAGE_NAME ?= No
_CHECK_DEPENDS =
# normalization of depends to remove extra :
# also, the C,...., part basically does this:
# if the depends contains only pkgpath>=something
# then we rebuild it as STEM->=something:pkgpath
.for _v in BUILD LIB RUN REGRESS
_CHECK_DEPENDS +:= ${${_v}_DEPENDS}
${_v}_DEPENDS := ${${_v}_DEPENDS:S/^://:S/^://}
${_v}_DEPENDS := ${${_v}_DEPENDS:S/^://:S/^://:C,^([^:]+/[^:<=>]+)([<=>][^:]+)$,STEM-\2:\1,}
.endfor
.for _s in ${MULTI_PACKAGES}
. for _v in RUN LIB
_CHECK_DEPENDS +:= ${${_v}_DEPENDS${_s}}
${_v}_DEPENDS${_s} := ${${_v}_DEPENDS${_s}:S/^://:S/^://}
${_v}_DEPENDS${_s} := ${${_v}_DEPENDS${_s}:S/^://:S/^://:C,^([^:]+/[^:<=>]+)([<=>][^:]+)$,STEM-\2:\1,}
. endfor
.endfor