diff options
| -rw-r--r-- | Mk/bsd.options.mk | 8 | ||||
| -rw-r--r-- | lang/pure/Makefile | 6 | ||||
| -rw-r--r-- | net-im/ejabberd/Makefile | 8 | ||||
| -rw-r--r-- | net-im/ejabberd/files/pkg-install.in | 6 |
4 files changed, 11 insertions, 17 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 27beb351440b..df0b04e38b85 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -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}} diff --git a/lang/pure/Makefile b/lang/pure/Makefile index 1315a11231ae..72dfb24f3090 100644 --- a/lang/pure/Makefile +++ b/lang/pure/Makefile @@ -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 diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index 8f50552e90ba..44338fc35ed7 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -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 diff --git a/net-im/ejabberd/files/pkg-install.in b/net-im/ejabberd/files/pkg-install.in index e4cb90168261..0b8e818927f3 100644 --- a/net-im/ejabberd/files/pkg-install.in +++ b/net-im/ejabberd/files/pkg-install.in @@ -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 |