svn commit: r349166 - in head: Mk lang/pure net-im/ejabberd net-im/ejabberd/files
Mathieu Arnold
mat at FreeBSD.org
Tue Mar 25 18:19:46 UTC 2014
Author: mat
Date: Tue Mar 25 18:19:44 2014
New Revision: 349166
URL: http://svnweb.freebsd.org/changeset/ports/349166
QAT: https://qat.redports.org/buildarchive/r349166/
Log:
Have OPTIONS_SUB also fill in SUB_LIST.
Fix two ports that would have been broken with this change.
With hat: portmgr
Modified:
head/Mk/bsd.options.mk
head/lang/pure/Makefile
head/net-im/ejabberd/Makefile
head/net-im/ejabberd/files/pkg-install.in
Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk Tue Mar 25 18:15:14 2014 (r349165)
+++ head/Mk/bsd.options.mk Tue Mar 25 18:19:44 2014 (r349166)
@@ -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_${
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}}
Modified: head/lang/pure/Makefile
==============================================================================
--- head/lang/pure/Makefile Tue Mar 25 18:15:14 2014 (r349165)
+++ head/lang/pure/Makefile Tue Mar 25 18:19:44 2014 (r349166)
@@ -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
Modified: head/net-im/ejabberd/Makefile
==============================================================================
--- head/net-im/ejabberd/Makefile Tue Mar 25 18:15:14 2014 (r349165)
+++ head/net-im/ejabberd/Makefile Tue Mar 25 18:19:44 2014 (r349166)
@@ -38,7 +38,7 @@ SUB_LIST= PORTNAME=${PORTNAME} PORTVERSI
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
Modified: head/net-im/ejabberd/files/pkg-install.in
==============================================================================
--- head/net-im/ejabberd/files/pkg-install.in Tue Mar 25 18:15:14 2014 (r349165)
+++ head/net-im/ejabberd/files/pkg-install.in Tue Mar 25 18:19:44 2014 (r349166)
@@ -14,9 +14,7 @@ chown -R %%USERS%%:%%GROUPS%% %%PREFIX%
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
More information about the svn-ports-head
mailing list