mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Have OPTIONS_SUB also fill in SUB_LIST.

Browse Source 
Fix two ports that would have been broken with this change.

With hat:	portmgr
This commit is contained in:
Mathieu Arnold 2014-03-25 18:19:44 +00:00
parent eb4b752da5
commit 0cfd925acd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=349166
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mk/bsd.options.mk
View File

@ -398,6 +398,7 @@ ALL_OPTIONS= ${OPTIONS_DEFINE}
.for opt in ${COMPLETE_OPTIONS_LIST} ${OPTIONS_SLAVE} ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE}
# PLIST_SUB
PLIST_SUB?=
SUB_LIST?=
. if defined(OPTIONS_SUB)
. if ! ${PLIST_SUB:M${opt}=*}
. if ${PORT_OPTIONS:M${opt}}
@ -406,6 +407,13 @@ PLIST_SUB:= ${PLIST_SUB} ${opt}="" NO_${opt}="@comment "
PLIST_SUB:= ${PLIST_SUB} ${opt}="@comment " NO_${opt}=""
. endif
. endif
. if ! ${SUB_LIST:M${opt}=*}
. if ${PORT_OPTIONS:M${opt}}
SUB_LIST:= ${SUB_LIST} ${opt}="" NO_${opt}="@comment "
. else
SUB_LIST:= ${SUB_LIST} ${opt}="@comment " NO_${opt}=""
. endif
. endif
. endif
. if ${PORT_OPTIONS:M${opt}}

6
lang/pure/Makefile
View File

@ -64,12 +64,6 @@ SUB_LIST+= NOCLANG=""
SUB_LIST+= NOCLANG="@comment "
.endif
.if ${PORT_OPTIONS:METC}
SUB_LIST+= ETC=""
.else
SUB_LIST+= ETC="@comment "
.endif
# automatically disable readline support if editline support is available
.if exists(/usr/include/edit/readline/readline.h)
CONFIGURE_ARGS+= --without-readline

8
net-im/ejabberd/Makefile
View File

@ -38,7 +38,7 @@ SUB_LIST= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
OPTIONS_SUB= PAM ODBC
OPTIONS_SUB= yes
PAM_CONFIGURE_ENABLE= pam
ODBC_CONFIGURE_ENABLE= odbc
DOCS_MAKE_ARGS_OFF= NOPORTDOCS=yes
@ -47,12 +47,6 @@ USE_OPENSSL= yes
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MPAM}
SUB_LIST+= PAM="1"
.else
SUB_LIST+= PAM="0"
.endif
post-patch:
@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure

6
net-im/ejabberd/files/pkg-install.in
View File

@ -14,9 +14,7 @@ chown -R %%USERS%%:%%GROUPS%% %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERS
find %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 | xargs -0 chmod %%SHAREMODE%%
find %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 | xargs -0 chown %%SHAREOWN%%:%%SHAREGRP%%
if [ "%%PAM%%" = 1 ]; then
chmod 4750 %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
chown root:%%GROUPS%% %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
fi
%%PAM%%chmod 4750 %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
%%PAM%%chown root:%%GROUPS%% %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
exit 0