svn commit: r340005 - head/net/samba41
Timur I. Bakeyev
timur at FreeBSD.org
Fri Jan 17 01:19:59 UTC 2014
Author: timur
Date: Fri Jan 17 01:19:58 2014
New Revision: 340005
URL: http://svnweb.freebsd.org/changeset/ports/340005
QAT: https://qat.redports.org/buildarchive/r340005/
Log:
Fixed(?) problem with the late enabling of USES+=fam.
Modified:
head/net/samba41/Makefile
Modified: head/net/samba41/Makefile
==============================================================================
--- head/net/samba41/Makefile Fri Jan 17 01:17:19 2014 (r340004)
+++ head/net/samba41/Makefile Fri Jan 17 01:19:58 2014 (r340005)
@@ -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} $@)
More information about the svn-ports-all
mailing list