diff options
| author | timur <timur@FreeBSD.org> | 2014-01-17 09:19:58 +0800 |
|---|---|---|
| committer | timur <timur@FreeBSD.org> | 2014-01-17 09:19:58 +0800 |
| commit | d59072f5799a6125b943fad765362ec641fb9e3d (patch) | |
| tree | 0b370ed43a13fcb39f1670ed80ae3bbb63c90899 /net | |
| parent | 289e29ff016b2915aaa95a65bde1a4be3f06f136 (diff) | |
| download | freebsd-ports-gnome-d59072f5799a6125b943fad765362ec641fb9e3d.tar.gz freebsd-ports-gnome-d59072f5799a6125b943fad765362ec641fb9e3d.tar.zst freebsd-ports-gnome-d59072f5799a6125b943fad765362ec641fb9e3d.zip | |
Fixed(?) problem with the late enabling of USES+=fam.
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba41/Makefile | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/net/samba41/Makefile b/net/samba41/Makefile index d8416cc0fb0b..6a95fcc46f06 100644 --- a/net/samba41/Makefile +++ b/net/samba41/Makefile @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}41 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba/stable samba/rc @@ -147,13 +147,6 @@ OPTIONS_DEFAULT+= AVAHI .include <bsd.port.options.mk> -# !SAMBA4_SUBPORT -.endif - -.include <bsd.port.pre.mk> - -.if !defined(SAMBA4_SUBPORT) - CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ @@ -340,6 +333,13 @@ CONFIGURE_ARGS+= --without-ldap PLIST_SUB+= LDAP="@comment " .endif +.if ! ${PORT_OPTIONS:MMANPAGES} +CONFIGURE_ENV+= XSLTPROC="true" +.else +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + xsltproc:${PORTSDIR}/textproc/libxslt +.endif + .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} CONFIGURE_ARGS+= --with-shared-modules="${WANT_EXP_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" @@ -355,13 +355,13 @@ PLIST_REINPLACE+= ${m} PLIST_REINPLACE_${m:U}= s|^@comment ${m} ||g .endfor ############################################################################## -.if ! ${PORT_OPTIONS:MMANPAGES} -CONFIGURE_ENV+= XSLTPROC="true" -.else -BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ - xsltproc:${PORTSDIR}/textproc/libxslt +# !SAMBA4_SUBPORT .endif +.include <bsd.port.pre.mk> + +.if !defined(SAMBA4_SUBPORT) + SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ @@ -533,7 +533,6 @@ post-install: @${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor - .if ${PORT_OPTIONS:MDEVELOPER} test: build @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} $@) |