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

- tweak CONFIG_SITE_LIST to run under infra/db.

Browse Source 
- recognize absence of dependencies on gsed, gtar, ggrep,
and prevent more tests from seeing these.
This commit is contained in:
espie 2011-12-10 11:15:16 +00:00
parent b053169cc3
commit 0603716dc7
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infrastructure/db/config.no-ggrep Normal file
View File

@ -0,0 +1,5 @@
# $OpenBSD: config.no-ggrep,v 1.1 2011/12/10 11:15:16 espie Exp $
# included unless sysutils/ggrep
ac_cv_path_GREP=${ac_cv_path_GREP=/usr/bin/grep}
ac_cv_path_EGREP=${ac_cv_path_EGREP=/usr/bin/egrep}
ac_cv_path_FGREP=${ac_cv_path_EGREP=/usr/bin/fgrep}

4
infrastructure/db/config.no-gsed Normal file
View File

@ -0,0 +1,4 @@
# $OpenBSD: config.no-gsed,v 1.1 2011/12/10 11:15:16 espie Exp $
# included unless textproc/gsed
ac_cv_path_SED=${ac_cv_path_SED=/usr/bin/sed}
ac_cv_prog_SED=${ac_cv_prog_SED=/usr/bin/sed}

4
infrastructure/db/config.no-gtar Normal file
View File

@ -0,0 +1,4 @@
# $OpenBSD: config.no-gtar,v 1.1 2011/12/10 11:15:16 espie Exp $
# included unless archivers/gtar*
am_cv_prog_tar_ustar=${am_cv_prog_tar_ustar=/usr/bin/tar}
AMTAR=${AMTAR=/usr/bin/tar}

4
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.1151 2011/12/09 09:42:44 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1152 2011/12/10 11:15:16 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 $
#
@ -2400,7 +2400,7 @@ ${_PATCH_COOKIE}: ${_EXTRACT_COOKIE}
${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
@${ECHO_MSG} "===> Configuring for ${FULLPKGNAME}${_MASTER}"
.if defined(_CONFIG_SITE)
@cat ${CONFIG_SITE_LIST} >${_CONFIG_SITE}
@cd ${PORTSDIR}/infrastructure/db && cat ${CONFIG_SITE_LIST} >${_CONFIG_SITE}
@echo "Using ${_CONFIG_SITE} (generated)"
.endif
@mkdir -p ${WRKBUILD}

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

@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: gnu.port.mk,v 1.46 2011/12/09 09:42:44 espie Exp $
# $OpenBSD: gnu.port.mk,v 1.47 2011/12/10 11:15:16 espie Exp $
# Based on bsd.port.mk, originally by Jordan K. Hubbard.
# This file is in the public domain.
@ -34,7 +34,16 @@ CONFIGURE_STYLE += autoheader
. endif
.endif
CONFIG_SITE_LIST += ${PORTSDIR}/infrastructure/db/config.site
CONFIG_SITE_LIST += config.site
.for d name in \
sysutils/ggrep ggrep \
textproc/gsed gsed \
archivers/gtar* gtar
. if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:M$d}
CONFIG_SITE_LIST += config.no-${name}
. endif
.endfor
_CONFIG_SITE = ${WRKDIR}/config.site
CONFIGURE_ENV += CONFIG_SITE='${_CONFIG_SITE}'
.if !defined(MODGNU_EMACS_YOURE_WEIRD)