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

avoid ignoring ports while running a `describe' target.

Browse Source 
triggered by setting DESCRIBE_TARGET=Yes in bsd.port.subdir.mk
This commit is contained in:
espie 2006-11-13 13:55:10 +00:00
parent a04f27b662
commit 1ef50b337c
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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.800 2006/11/12 10:52:59 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.801 2006/11/13 13:55:10 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 $
#
@ -971,7 +971,7 @@ IS_INTERACTIVE=Yes
# Don't build a port if it comes with the base system.
################################################################
.if !defined(NO_IGNORE)
.if !defined(NO_IGNORE) && !defined(DESCRIBE_TARGET)
. if (defined(REGRESS_IS_INTERACTIVE) && defined(BATCH))
_IGNORE_REGRESS= "has interactive tests"
. elif (!defined(REGRESS_IS_INTERACTIVE) && defined(INTERACTIVE))
@ -983,8 +983,6 @@ IGNORE= "is an interactive port"
IGNORE= "is not an interactive port"
. elif ${USE_X11:L} == "yes" && !exists(${X11BASE})
IGNORE= "uses X11, but ${X11BASE} not found"
. elif defined(BROKEN)
IGNORE= "is marked as broken: ${BROKEN}"
. elif defined(ONLY_FOR_ARCHS)
. for __ARCH in ${MACHINE_ARCH} ${ARCH}
. if !empty(ONLY_FOR_ARCHS:M${__ARCH})
@ -1007,14 +1005,16 @@ IGNORE= "is not for ${NOT_FOR_ARCHS}"
. elif ${SHARED_ONLY:L} == "yes" && ${NO_SHARED_LIBS:L} == "yes"
IGNORE="requires shared libraries"
. endif
. if !defined(IGNORE) && defined(COMES_WITH)
. if ( ${OPSYS_VER} >= ${COMES_WITH} )
.endif # NO_IGNORE
.if !defined(NO_IGNORE)
. if defined(BROKEN)
IGNORE= "is marked as broken: ${BROKEN}"
. elif defined(COMES_WITH)
IGNORE= "-- ${FULLPKGNAME${SUBPACKAGE}:C/-[0-9].*//g} comes with ${OPSYS} as of release ${COMES_WITH}"
. endif
.endif
.endif # NO_IGNORE
.if !defined(DEPENDS_TARGET)
. if make(reinstall)
DEPENDS_TARGET= reinstall

23
infrastructure/mk/bsd.port.subdir.mk
View File

@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
# $OpenBSD: bsd.port.subdir.mk,v 1.77 2006/11/11 16:10:36 espie Exp $
# $OpenBSD: bsd.port.subdir.mk,v 1.78 2006/11/13 13:55:10 espie Exp $
# FreeBSD Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp
#
# The include file <bsd.port.subdir.mk> contains the default targets
@ -93,17 +93,23 @@ _subdir_fragment= \
done; set -e
.for __target in all fetch package fake extract patch configure \
build describe distclean deinstall install update \
reinstall checksum show verbose-show dump-vars fetch-makefile \
build distclean deinstall install update \
reinstall checksum fetch-makefile \
link-categories unlink-categories regress lib-depends-check \
newlib-depends-check homepage-links manpages-check license-check \
print-package-signature print-plist print-plist-contents \
print-plist-all
newlib-depends-check manpages-check license-check \
print-package-signature
${__target}:
@${_subdir_fragment}
.endfor
.for __target in describe show verbose-show dump-vars \
homepage-links print-plist print-plist-contents \
print-plist-all
${__target}:
@DESCRIBE_TARGET=Yes; export DESCRIBE_TARGET; ${_subdir_fragment}
.endfor
.for __target in all-dir-depends build-dir-depends run-dir-depends regress-dir-depends
${__target}:
@ -125,7 +131,7 @@ clean:
.endif
readmes:
@${_subdir_fragment}
@DESCRIBE_TARGET=Yes; export DESCRIBE_TARGET; ${_subdir_fragment}
@rm -f ${.CURDIR}/README.html
@cd ${.CURDIR} && exec ${MAKE} README.html
@ -139,7 +145,8 @@ README= ${TEMPLATES}/README.category
README.html:
@>$@.tmp
.for d in ${_FULLSUBDIR}
@subdir=$d; ${_flavor_fragment}; \
@subdir=$d; DESCRIBE_TARGET=yes; export DESCRIBE_TARGET; \
${_flavor_fragment}; \
name=`eval $$toset ${MAKE} _print-packagename`; \
case $$name in \
README) comment='';; \