Date: Sat, 3 Jan 2015 10:33:04 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376112 - in head/net: samba36 samba4 samba41 Message-ID: <201501031033.t03AX47W068156@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Jan 3 10:33:03 2015 New Revision: 376112 URL: https://svnweb.freebsd.org/changeset/ports/376112 QAT: https://qat.redports.org/buildarchive/r376112/ Log: Minor net/samba* ports cleanups: - Drop leading article from COMMENT and use neutral spelling of Unix - Sort USES alphabetically and wrap it if necessary - Rename FAM_SUPPORT to standard option FAM, drop FAM_SUPPORT_DESC - Fix a typo in AIO_SUPPORT_DESC (Asyncronous -> Asynchronous) - Consistently reword PAM_SMBPASS option description - Kill one case of EOL whitespace and bogus uses of := operator Approved by: maintainer (timur; timeout since 2014.12.16) Modified: head/net/samba36/Makefile head/net/samba4/Makefile head/net/samba41/Makefile Modified: head/net/samba36/Makefile ============================================================================== --- head/net/samba36/Makefile Sat Jan 3 09:14:10 2015 (r376111) +++ head/net/samba36/Makefile Sat Jan 3 10:33:03 2015 (r376112) @@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= samba samba/stable s DISTNAME= ${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB and CIFS client and server for UNIX +COMMENT?= Free SMB and CIFS client and server for Unix LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING @@ -32,7 +32,7 @@ AUTOHEADER_ARGS= ${IPATHS} AUTOCONF_ARGS= ${IPATHS} GNU_CONFIGURE= yes -USES= gmake pkgconfig iconv execinfo cpe +USES= cpe execinfo gmake iconv pkgconfig USE_AUTOTOOLS= autoconf autoheader USE_LDCONFIG= ${SAMBA_LIBDIR} # pkg-config is used to find talloc @@ -99,7 +99,7 @@ CONFIGURE_ARGS+= ${ICONV_CONFIGURE_BASE} .if !defined(SAMBA_SUBPORT) OPTIONS_DEFINE= ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DNSUPDATE \ - DOCS EXAMPLES EXP_MODULES FAM_SUPPORT IPV6 LDAP \ + DOCS EXAMPLES EXP_MODULES FAM IPV6 LDAP \ MAX_DEBUG PAM_SMBPASS POPT PTHREADPOOL QUOTAS \ SMBTORTURE SWAT SYSLOG UTMP WINBIND @@ -108,12 +108,11 @@ OPTIONS_DEFAULT= ACL_SUPPORT AIO_SUPPORT ACL_SUPPORT_DESC= ACL support ADS_DESC= Active Directory support -AIO_SUPPORT_DESC= Asyncronous IO support -DNSUPDATE_DESC= Dynamic DNS update(require ADS) +AIO_SUPPORT_DESC= Asynchronous IO support +DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor MAX_DEBUG_DESC= Maximum debugging -PAM_SMBPASS_DESC= PAM authentication vs passdb backends +PAM_SMBPASS_DESC= PAM authentication via passdb backends POPT_DESC= System-wide POPT library PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support @@ -237,7 +236,7 @@ WANT_EXP_MODULES+= vfs_cacheprime vfs_ca . endif .endif -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam WANT_EXP_MODULES+= vfs_notify_fam CONFIGURE_ARGS+= --enable-fam @@ -392,7 +391,7 @@ SAMBA_MAN8+= pam_winbind.8 winbindd.8 SAMBA_MAN8+= swat.8 .endif -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} SAMBA_MAN8+= vfs_notify_fam.8 .endif Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Sat Jan 3 09:14:10 2015 (r376111) +++ head/net/samba4/Makefile Sat Jan 3 10:33:03 2015 (r376112) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= samba/stable samba/r DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB/CIFS and AD/DC server and client for UNIX +COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 @@ -64,7 +64,8 @@ DESTDIRNAME= --destdir CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -USES= shebangfix compiler perl5 python:2 pkgconfig iconv readline execinfo cpe +USES= compiler cpe execinfo fam iconv perl5 pkgconfig \ + python:2 readline shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf @@ -72,7 +73,8 @@ CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -# XXX: Unconditional dependencies which can't be switched off(if present in the system) +# XXX: Unconditional dependencies which can't be switched off (if present +# in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify @@ -108,20 +110,19 @@ SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP -OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ +OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support -AIO_SUPPORT_DESC= Asyncronous IO support -DNSUPDATE_DESC= Dynamic DNS update(require ADS) +AIO_SUPPORT_DESC= Asynchronous IO support +DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends @@ -138,7 +139,7 @@ MANPAGES_DESC= Build manpages from DOCB OPTIONS_RADIO= DNS ZEROCONF OPTIONS_RADIO_DNS= NSUPDATE BIND99 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER - + BIND99_DESC= Use bind99 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC @@ -273,7 +274,7 @@ CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam Modified: head/net/samba41/Makefile ============================================================================== --- head/net/samba41/Makefile Sat Jan 3 09:14:10 2015 (r376111) +++ head/net/samba41/Makefile Sat Jan 3 10:33:03 2015 (r376112) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= samba/stable samba/r DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB/CIFS and AD/DC server and client for UNIX +COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 @@ -64,7 +64,8 @@ DESTDIRNAME= --destdir CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -USES= shebangfix compiler perl5 python:2 pkgconfig iconv readline execinfo cpe +USES= compiler cpe execinfo fam iconv perl5 pkgconfig \ + python:2 readline shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf @@ -72,7 +73,8 @@ CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -# XXX: Unconditional dependencies which can't be switched off(if present in the system) +# XXX: Unconditional dependencies which can't be switched off (if present +# in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify @@ -112,20 +114,19 @@ SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SYSLOG UTMP -OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP \ +OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ + DNSUPDATE DOCS FAM LDAP \ PTHREADPOOL QUOTAS SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support -AIO_SUPPORT_DESC= Asyncronous IO support -DNSUPDATE_DESC= Dynamic DNS update(require ADS) +AIO_SUPPORT_DESC= Asynchronous IO support +DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends @@ -276,7 +277,7 @@ CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501031033.t03AX47W068156>