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

handle the very special case of ports-readmes, after discussion with

Browse Source 
landry, sthen
This commit is contained in:
espie 2012-06-18 12:15:52 +00:00
parent 1258d46300
commit 5a916fc963
1 changed files with 12 additions and 4 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; -*- #-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make: # ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1177 2012/06/15 10:31:52 espie Exp $ # $OpenBSD: bsd.port.mk,v 1.1178 2012/06/18 12:15:52 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp 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 $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
# #
@ -122,7 +122,7 @@ _ALL_VARIABLES_PER_ARCH += BROKEN
_ALL_VARIABLES_INDEXED += COMMENT PKGNAME \ _ALL_VARIABLES_INDEXED += COMMENT PKGNAME \
ONLY_FOR_ARCHS NOT_FOR_ARCHS PKGSPEC \ ONLY_FOR_ARCHS NOT_FOR_ARCHS PKGSPEC \
PERMIT_PACKAGE_FTP PERMIT_PACKAGE_CDROM WANTLIB CATEGORIES DESCR \ PERMIT_PACKAGE_FTP PERMIT_PACKAGE_CDROM WANTLIB CATEGORIES DESCR \
EPOCH REVISION EPOCH REVISION STATIC_PLIST
.endif .endif
# special purpose user settings # special purpose user settings
PATCH_CHECK_ONLY ?= No PATCH_CHECK_ONLY ?= No
@ -725,9 +725,10 @@ PKGNAMES += ${FULLPKGNAME${_s}}
PKGFILES += ${PKGFILE${_s}} PKGFILES += ${PKGFILE${_s}}
.endfor .endfor
STATIC_PLIST ?= Yes
.for _s in ${MULTI_PACKAGES} .for _s in ${MULTI_PACKAGES}
. for _v in PKG_ARCH PERMIT_PACKAGE_FTP PERMIT_PACKAGE_CDROM \ . for _v in PKG_ARCH PERMIT_PACKAGE_FTP PERMIT_PACKAGE_CDROM \
RUN_DEPENDS WANTLIB LIB_DEPENDS PREFIX CATEGORIES RUN_DEPENDS WANTLIB LIB_DEPENDS PREFIX CATEGORIES STATIC_PLIST
${_v}${_s} ?= ${${_v}} ${_v}${_s} ?= ${${_v}}
. endfor . endfor
.endfor .endfor
@ -1676,6 +1677,13 @@ _CHECK_LIB_DEPENDS += -d ${_PKG_REPO} -B ${WRKINST}
_CHECK_LIB_DEPENDS += -o _CHECK_LIB_DEPENDS += -o
. endif . endif
.for _s in ${MULTI_PACKAGES}
. if ${STATIC_PLIST${_s}:L} == "no"
_register_plist${_s} = :
. else
_register_plist${_s} = ${_register_plist}
. endif
.endfor
### ###
### end of variable setup. Only targets now ### end of variable setup. Only targets now
@ -1731,7 +1739,7 @@ ${_PACKAGE_COOKIE${_S}}:
${SUDO} ${_PKG_CREATE} -DPORTSDIR="${PORTSDIR}" \ ${SUDO} ${_PKG_CREATE} -DPORTSDIR="${PORTSDIR}" \
$$deps ${PKG_ARGS${_S}} $$tmp && \ $$deps ${PKG_ARGS${_S}} $$tmp && \
${_check_lib_depends} $$tmp && \ ${_check_lib_depends} $$tmp && \
${_register_plist} $$tmp && \ ${_register_plist${_S}} $$tmp && \
${_checksum_package} && \ ${_checksum_package} && \
mv $$tmp ${_PACKAGE_COOKIE${_S}} && \ mv $$tmp ${_PACKAGE_COOKIE${_S}} && \
mode=`id -u`:`id -g` && \ mode=`id -u`:`id -g` && \