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

Add an option helper for PLIST_SUB

Browse Source 
Rename a few variables to avoid confusion with this new helper

Requested by:	koobs
Reviewed by:	mat
With hat:	portmgr
Differential revision: https://reviews.freebsd.org/D665
This commit is contained in:
Antoine Brodin 2014-08-21 18:06:58 +00:00
parent b79b3f1ca2
commit b154a5521f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=365573
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mk/bsd.apache.mk
View File

@ -143,7 +143,7 @@ IGNORE= lowercase WITH_STATIC_MODULES="${WITH_STATIC_MODULES}"\
# Setting "@comment " as default.
.for module in ${AVAILABLE_MODULES:O}
${module}_PLIST_SUB= "@comment "
${module}PLIST_SUB= "@comment "
_DISABLE_MODULES+= --disable-${module:tl}
.endfor
@ -244,11 +244,11 @@ SHARED_MODULES= ${APACHE_MODULES}
.endif
.for module in ${SHARED_MODULES}
${module}_PLIST_SUB= ""
${module}PLIST_SUB= ""
.endfor
.for module in ${AVAILABLE_MODULES:O:u}
PLIST_SUB+= MOD_${module}=${${module}_PLIST_SUB}
PLIST_SUB+= MOD_${module}=${${module}PLIST_SUB}
.endfor
# pkg-plist workaround STATIC support

4
Mk/bsd.options.mk
View File

@ -104,7 +104,7 @@
# ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD
# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES
# INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES
# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES INFO USES, defining ${opt}_${variable} will
# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES PLIST_SUB INFO USES, defining ${opt}_${variable} will
# add its content to the actual variable when the option is enabled. Defining
# ${opt}_${variable}_OFF will add its content to the actual variable when the
# option is disabled.
@ -130,7 +130,7 @@ _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \
CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES \
EXTRA_PATCHES INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \
PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY PLIST_FILES \
USES INFO
PLIST_SUB USES INFO
_OPTIONS_DEPENDS= PKG FETCH EXTRACT PATCH BUILD LIB RUN
# Set the default values for the global options, as defined by portmgr

8
x11-themes/slim-themes/Makefile
View File

@ -84,11 +84,11 @@ PORT_OPTIONS+= ${n}
NEWDISTFILES:= ${DISTFILES} ${${n}_DIST}
DISTFILES:= ${NEWDISTFILES}
SEEN_THEMES= yes
NEW_PLIST_SUB:= ${PLIST_SUB} ${n}=""
PLIST_SUB:= ${NEW_PLIST_SUB}
NEWPLIST_SUB:= ${PLIST_SUB} ${n}=""
PLIST_SUB:= ${NEWPLIST_SUB}
.else
NEW_PLIST_SUB:= ${PLIST_SUB} ${n}="@comment "
PLIST_SUB:= ${NEW_PLIST_SUB}
NEWPLIST_SUB:= ${PLIST_SUB} ${n}="@comment "
PLIST_SUB:= ${NEWPLIST_SUB}
.endif # ${PORT_OPTIONS:MALL_THEMES} || ${PORT_OPTIONS:M${n}}
.endfor # n in ${THEMELIST}