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

duplicate the print-plist targets, add a version -with-depends, which is

Browse Source 
slower, but shows dependency lines as well...

Also fix target evaluation to work like it does elsewhere
This commit is contained in:
espie 2006-12-18 12:52:34 +00:00
parent 7e2fd65f75
commit 5efd6b68e4
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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.874 2006/12/16 11:53:46 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.875 2006/12/18 12:52:34 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 $
#
@ -2161,12 +2161,21 @@ _register_plist = perl ${PORTSDIR}/infrastructure/package/register-plist ${PLIST
print-plist:
@${PKG_CMD} -n -q ${PKG_ARGS${SUBPACKAGE}} ${_PACKAGE_COOKIE${SUBPACKAGE}}
print-plist-with-depends:
@${PKG_CMD} -n -q `SUBPACKAGE=${SUBPACKAGE} ${MAKE} _print-package-args|sort -u` ${PKG_ARGS${SUBPACKAGE}} ${_PACKAGE_COOKIE${SUBPACKAGE}}
print-plist-all:
.for _S in ${MULTI_PACKAGES}
@${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
@${PKG_CMD} -n -q ${PKG_ARGS${_S}} ${_PACKAGE_COOKIE${_S}}
.endfor
print-plist-all-with-depends:
.for _S in ${MULTI_PACKAGES}
@${ECHO_MSG} "===> ${FULLPKGNAME${_S}}"
@${PKG_CMD} -n -q `SUBPACKAGE=${_S} ${MAKE} _print-package-args|sort -u `${PKG_ARGS${_S}} ${_PACKAGE_COOKIE${_S}}
.endfor
print-plist-contents:
@${PKG_CMD} -n -Q ${PKG_ARGS${SUBPACKAGE}} ${_PACKAGE_COOKIE${SUBPACKAGE}}
@ -2923,4 +2932,5 @@ dump-vars:
_internal-install-all install-all \
subpackage _internal-subupdate _internal-update \
regress-dir-depends _recurse-regress-dir-depends \
full-regress-depends print-plist-all
full-regress-depends print-plist-all \
print-plist-with-depends print-plist-all-with-depends

9
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.80 2006/12/02 11:27:46 espie Exp $
# $OpenBSD: bsd.port.subdir.mk,v 1.81 2006/12/18 12:52:34 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
@ -92,11 +92,10 @@ _subdir_fragment = \
for subdir in ${_FULLSUBDIR}; do \
${_flavor_fragment}; \
eval $${echo_msg} "===\> $$subdir"; \
set +e; \
if ! eval $$toset ${MAKE} $$target; then \
if ! (eval $$toset exec ${MAKE} $$target); then \
${REPORT_PROBLEM}; \
fi; \
done; set -e
done
.for __target in all fetch package fake extract patch configure \
build distclean deinstall install update \
@ -111,7 +110,7 @@ ${__target}:
.for __target in describe show verbose-show dump-vars \
homepage-links print-plist print-plist-contents \
print-plist-all
print-plist-all print-plist-with-depends print-plist-all-with-depends
${__target}:
@DESCRIBE_TARGET=Yes; export DESCRIBE_TARGET; ${_subdir_fragment}
.endfor