OPTIONS_SET/OPTIONS_UNSET are global variables, they cannot be used in ports Makefiles.
So, replace them with OPTIONS_SLAVE, OPTIONS_EXCLUDE, OPTIONS_DEFAULT, where appropriate. The ghostscript ports are doing something nasty that is certainly wrong, but I don't want to try to understand it. Sponsored by: Absolight
This commit is contained in:
Mathieu Arnold
parent
e3a96b61ab
commit
c6f651390a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=424560
@ -21,7 +21,6 @@ USE_LDCONFIG= yes
|
||||
|
||||
OPTIONS_DEFINE= EXAMPLES TEST
|
||||
OPTIONS_SUB= yes
|
||||
OPTIONS_UNSET= EXAMPLES TEST
|
||||
EXAMPLES_CMAKE_ON= -DINSTALL_EXAMPLES=ON
|
||||
TEST_CMAKE_ON= -DUNITTEST=ON
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ SLAVE_PORT= i386-wine-devel
|
||||
CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-staging-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]*
|
||||
|
||||
OPTIONS_SLAVE= STAGING
|
||||
OPTIONS_SET= LIBXSLT MPG123 HAL V4L X11
|
||||
OPTIONS_DEFAULT= LIBXSLT MPG123 HAL V4L X11
|
||||
|
||||
SLAVEDIR= ${.CURDIR}/../i386-wine-devel
|
||||
PLIST= ${MASTERDIR}/pkg-plist
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../open-vm-tools
|
||||
PKGNAMESUFFIX= -nox11
|
||||
OPTIONS_UNSET= X11 LIBNOTIFY
|
||||
OPTIONS_EXCLUDE= X11 LIBNOTIFY
|
||||
|
||||
BROKEN_powerpc64= Does not build
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ CONFLICTS_INSTALL= wine-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
|
||||
i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
|
||||
|
||||
OPTIONS_SLAVE= STAGING
|
||||
OPTIONS_SET= LIBXSLT MPG123 HAL V4L X11
|
||||
OPTIONS_DEFAULT= LIBXSLT MPG123 HAL V4L X11
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../wine-devel
|
||||
PLIST= ${MASTERDIR}/pkg-plist
|
||||
|
||||
@ -5,7 +5,7 @@ PKGNAMESUFFIX= -qt4
|
||||
|
||||
CONFLICTS= ${PORTNAME}-[0-9]*
|
||||
|
||||
OPTIONS_SET= QT4
|
||||
OPTIONS_SLAVE= QT4
|
||||
OPTIONS_EXCLUDE= QT5
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../djview4
|
||||
|
||||
@ -14,7 +14,7 @@ NO_BUILD= yes
|
||||
NO_WRKSUBDIR= yes
|
||||
PORTDOCS= *
|
||||
|
||||
OPTIONS_SET_FORCE= DOCS
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
do-install:
|
||||
@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
|
||||
|
||||
@ -54,7 +54,7 @@ AUTOMAKE_ARGS= --add-missing --foreign
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
.if defined (MUTT_LITE)
|
||||
OPTIONS_UNSET= NLS DOCS EXAMPLES
|
||||
OPTIONS_EXCLUDE= NLS DOCS EXAMPLES
|
||||
.else
|
||||
OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
|
||||
FORCEBASE64 GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
|
||||
|
||||
@ -76,12 +76,6 @@ OS_DEFS+= -DAPOP_ONLY
|
||||
.endif
|
||||
.endif
|
||||
|
||||
# Do not install documentation since it is in pdf format and normally
|
||||
# not used unless user wants it.
|
||||
.if empty(PORT_OPTIONS:MDOCUMENTATION)
|
||||
OPTIONS_UNSET+= DOCS
|
||||
.endif
|
||||
|
||||
# If WITH_DRAC variable present in the environment, qpopper builds
|
||||
# with Dynamic Relay Authorization Control support.
|
||||
.if ${PORT_OPTIONS:MDRAC}
|
||||
@ -161,7 +155,7 @@ do-install:
|
||||
.if ${PORT_OPTIONS:MPOPPASSD}
|
||||
@${INSTALL_PROGRAM} ${WRKSRC}/password/poppassd ${STAGEDIR}${PREFIX}/libexec/qpoppassd
|
||||
.endif
|
||||
.if ${PORT_OPTIONS:MDOCS}
|
||||
.if ${PORT_OPTIONS:MDOCUMENTATION}
|
||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
@${INSTALL_DATA} ${WRKSRC}/GUIDE.pdf ${STAGEDIR}${DOCSDIR}
|
||||
.endif
|
||||
|
||||
@ -5,5 +5,5 @@ libexec/qpopper
|
||||
man/man8/qpopper.8.gz
|
||||
%%QPOPAUTH%%man/man8/qpopauth.8.gz
|
||||
%%EPOPPASSD%%libexec/qpoppassd
|
||||
%%PORTDOCS%%%%DOCSDIR%%/GUIDE.pdf
|
||||
%%DOCUMENTATION%%%%DOCSDIR%%/GUIDE.pdf
|
||||
@dir(%%USERS%%,%%GROUPS%%,) %%ETCDIR%%
|
||||
|
||||
@ -101,7 +101,7 @@ SYBASE_DESC= Sybase database
|
||||
DB_TYPE:= ${DB_TYPE:tu}
|
||||
. for option in ${OPTIONS_RADIO_DATABASE}
|
||||
. if ${DB_TYPE} == ${option:S,PGSQL,PG,}
|
||||
OPTIONS_SET+= ${option}
|
||||
OPTIONS_DEFAULT+= ${option}
|
||||
.warning You need to replace your DB_TYPE variable in make.conf with mail_sympa_SET+=${option}
|
||||
. endif
|
||||
. endfor
|
||||
|
||||
@ -49,7 +49,7 @@ TXT_DESC= Plain text
|
||||
|
||||
# if PACKAGE_BUILDING=yes, enable all of $AVAILABLEFORMATS.
|
||||
.if defined(PACKAGE_BUILDING)
|
||||
OPTIONS_SET+= ${AVAILABLEFORMATS}
|
||||
OPTIONS_DEFAULT+= ${AVAILABLEFORMATS}
|
||||
.endif
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
@ -7,7 +7,7 @@ COMMENT= Nagios Remote Plugin Executor (SSL version)
|
||||
|
||||
CONFLICTS= nrpe-2.*
|
||||
|
||||
OPTIONS_SET= SSL
|
||||
OPTIONS_SLAVE= SSL
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../nrpe
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ COMMENT= Advanced fork of nss_ldap with sasl support
|
||||
|
||||
LICENSE= # pet portlint
|
||||
|
||||
OPTIONS_SET+= SASL
|
||||
OPTIONS_SLAVE+= SASL
|
||||
|
||||
SLAVE_PORT= sasl # In case we come up with more
|
||||
MASTERDIR= ${.CURDIR}/../nss-pam-ldapd
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
PKGNAMESUFFIX= -milter
|
||||
|
||||
OPTIONS_SET+= MILTER
|
||||
OPTIONS_SLAVE+= MILTER
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../clamav
|
||||
PKGNAMESUFFIX= -milter
|
||||
|
||||
@ -10,6 +10,5 @@ DESCR= ${.CURDIR}/pkg-descr
|
||||
|
||||
PORT_OPTIONS+= CGID
|
||||
OPTIONS_EXCLUDE= CGI
|
||||
OPTIONS_UNSET+= CGI
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
|
||||
@ -10,6 +10,5 @@ DESCR= ${.CURDIR}/pkg-descr
|
||||
|
||||
PORT_OPTIONS+= CGID
|
||||
OPTIONS_EXCLUDE= CGI
|
||||
OPTIONS_UNSET+= CGI
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
|
||||
@ -31,7 +31,7 @@ PYDISTUTILS_BUILDARGS= --inplace
|
||||
PYDISTUTILS_EGGINFO= Kivy-${PORTVERSION}-py${PYTHON_VER}.egg-info
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
OPTIONS_SET= ENCHANT OPENCV PYGAME
|
||||
OPTIONS_DEFAULT= ENCHANT OPENCV PYGAME
|
||||
OPTIONS_SUB= yes
|
||||
OPTIONS_GROUP= VIDEO AUDIO IMAGE CAMERA SPELLING CLIPBOARD
|
||||
OPTIONS_MULTI= WINDOW TEXT
|
||||
|
||||
Loading…
Reference in New Issue
Block a user