diff options
| author | mat <mat@FreeBSD.org> | 2014-03-26 02:19:44 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2014-03-26 02:19:44 +0800 |
| commit | f779a172ab0e0615159c086f120bb6a9ffac2115 (patch) | |
| tree | de3407a75e0507021973e1fc6ff428fee456700a /net-im | |
| parent | d61a812c7ec5e6763b8e4a7aa01f06fd25ab4171 (diff) | |
| download | freebsd-ports-gnome-f779a172ab0e0615159c086f120bb6a9ffac2115.tar.gz freebsd-ports-gnome-f779a172ab0e0615159c086f120bb6a9ffac2115.tar.zst freebsd-ports-gnome-f779a172ab0e0615159c086f120bb6a9ffac2115.zip | |
Have OPTIONS_SUB also fill in SUB_LIST.
Fix two ports that would have been broken with this change.
With hat: portmgr
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/ejabberd/Makefile | 8 | ||||
| -rw-r--r-- | net-im/ejabberd/files/pkg-install.in | 6 |
2 files changed, 3 insertions, 11 deletions
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 |