Wed Feb 1 08:14:47 2012 UTC ()
Move the options.mk file for net/samba30 and net/samba33 from net/samba to
net/samba33 because of up coming changes to net/samba/options.mk that are
in-compatible with 30 and 33.


(sbd)
diff -r1.2 -r1.3 pkgsrc/net/samba30/Makefile
diff -r1.17 -r1.18 pkgsrc/net/samba33/Makefile
diff -r0 -r1.1 pkgsrc/net/samba33/options.mk

cvs diff -r1.2 -r1.3 pkgsrc/net/samba30/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba30/Attic/Makefile 2011/12/15 22:59:28 1.2
+++ pkgsrc/net/samba30/Attic/Makefile 2012/02/01 08:14:47 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2011/12/15 22:59:28 asau Exp $ 1# $NetBSD: Makefile,v 1.3 2012/02/01 08:14:47 sbd Exp $
2 2
3.include "../../net/samba/Makefile.mirrors" 3.include "../../net/samba/Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
6PKGREVISION= 7 6PKGREVISION= 7
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} 8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
9 9
10.include "Makefile.patches" 10.include "Makefile.patches"
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.samba.org/ 13HOMEPAGE= http://www.samba.org/
14COMMENT= SMB/CIFS protocol server suite 14COMMENT= SMB/CIFS protocol server suite
@@ -60,27 +60,27 @@ CONFIGURE_ARGS+= --with-privatedir=${SAM @@ -60,27 +60,27 @@ CONFIGURE_ARGS+= --with-privatedir=${SAM
60CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR:Q} 60CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR:Q}
61CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q} 61CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q}
62 62
63CONFIGURE_ARGS+= --with-mandir=${PREFIX:Q}/${PKGMANDIR:Q} 63CONFIGURE_ARGS+= --with-mandir=${PREFIX:Q}/${PKGMANDIR:Q}
64CONFIGURE_ARGS+= --with-swatdir=${PREFIX:Q}/share/samba/swat 64CONFIGURE_ARGS+= --with-swatdir=${PREFIX:Q}/share/samba/swat
65 65
66.include "../../converters/libiconv/buildlink3.mk" 66.include "../../converters/libiconv/buildlink3.mk"
67CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} 67CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
68 68
69USE_GNU_READLINE= yes 69USE_GNU_READLINE= yes
70.include "../../devel/readline/buildlink3.mk" 70.include "../../devel/readline/buildlink3.mk"
71CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 71CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
72 72
73.include "../../net/samba/options.mk" 73.include "../../net/samba33/options.mk"
74 74
75# Only Linux supports mount.cifs for mounting a CIFS share into the 75# Only Linux supports mount.cifs for mounting a CIFS share into the
76# filesystem. 76# filesystem.
77# 77#
78PLIST_VARS+= cifsmount 78PLIST_VARS+= cifsmount
79.if ${OPSYS} == "Linux" 79.if ${OPSYS} == "Linux"
80CONFIGURE_ARGS+= --with-cifsmount 80CONFIGURE_ARGS+= --with-cifsmount
81PLIST.cifsmount= yes 81PLIST.cifsmount= yes
82.endif 82.endif
83 83
84# mktemp is useful for the replacement adduser script, but don't require 84# mktemp is useful for the replacement adduser script, but don't require
85# a full dependency since it's not actually needed by samba. 85# a full dependency since it's not actually needed by samba.
86# 86#

cvs diff -r1.17 -r1.18 pkgsrc/net/samba33/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba33/Attic/Makefile 2012/01/31 07:14:58 1.17
+++ pkgsrc/net/samba33/Attic/Makefile 2012/02/01 08:14:47 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2012/01/31 07:14:58 sbd Exp $ 1# $NetBSD: Makefile,v 1.18 2012/02/01 08:14:47 sbd Exp $
2 2
3.include "../../net/samba/Makefile.mirrors" 3.include "../../net/samba/Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/} 8MASTER_SITES= ${SAMBA_MIRRORS:=old-versions/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.samba.org/ 11HOMEPAGE= http://www.samba.org/
12COMMENT= SMB/CIFS protocol server suite 12COMMENT= SMB/CIFS protocol server suite
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
@@ -60,27 +60,27 @@ CONFIGURE_ARGS+= --with-privatedir=${SAM @@ -60,27 +60,27 @@ CONFIGURE_ARGS+= --with-privatedir=${SAM
60CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR:Q} 60CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR:Q}
61CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q} 61CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q}
62 62
63CONFIGURE_ARGS+= --with-mandir=${PREFIX:Q}/${PKGMANDIR:Q} 63CONFIGURE_ARGS+= --with-mandir=${PREFIX:Q}/${PKGMANDIR:Q}
64CONFIGURE_ARGS+= --with-swatdir=${PREFIX:Q}/share/samba/swat 64CONFIGURE_ARGS+= --with-swatdir=${PREFIX:Q}/share/samba/swat
65 65
66.include "../../converters/libiconv/buildlink3.mk" 66.include "../../converters/libiconv/buildlink3.mk"
67CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} 67CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
68 68
69USE_GNU_READLINE= yes 69USE_GNU_READLINE= yes
70.include "../../devel/readline/buildlink3.mk" 70.include "../../devel/readline/buildlink3.mk"
71CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 71CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
72 72
73.include "../../net/samba/options.mk" 73.include "options.mk"
74 74
75# Only Linux supports mount.cifs for mounting a CIFS share into the 75# Only Linux supports mount.cifs for mounting a CIFS share into the
76# filesystem. 76# filesystem.
77# 77#
78PLIST_VARS+= cifsmount 78PLIST_VARS+= cifsmount
79.if ${OPSYS} == "Linux" 79.if ${OPSYS} == "Linux"
80CONFIGURE_ARGS+= --with-cifsmount 80CONFIGURE_ARGS+= --with-cifsmount
81PLIST.cifsmount= yes 81PLIST.cifsmount= yes
82.endif 82.endif
83 83
84# mktemp is useful for the replacement adduser script, but don't require 84# mktemp is useful for the replacement adduser script, but don't require
85# a full dependency since it's not actually needed by samba. 85# a full dependency since it's not actually needed by samba.
86# 86#

File Added: pkgsrc/net/samba33/Attic/options.mk
# $NetBSD: options.mk,v 1.1 2012/02/01 08:14:47 sbd Exp $

# Recommended package options for various setups:
#
#   Standalone Samba server		cups
#   Domain Member server		cups ldap winbind
#   Active Directory Member server	ads cups winbind
#   Domain Controller			ldap winbind
#
PKG_OPTIONS_VAR=	PKG_OPTIONS.samba
PKG_SUPPORTED_OPTIONS=	ads cups fam ldap pam winbind
PKG_SUGGESTED_OPTIONS=	ads ldap pam winbind

.include "../../mk/bsd.fast.prefs.mk"

SAMBA_ACL_OPSYS=	AIX Darwin FreeBSD HPUX IRIX Linux OSF1 SunOS
.if !empty(SAMBA_ACL_OPSYS:M${OPSYS})
PKG_SUPPORTED_OPTIONS+=	acl
.endif

.include "../../mk/bsd.options.mk"

SAMBA_STATIC_MODULES:=	# empty

###
### Allow Samba to join as a member server of an Active Directory domain.
###
.if !empty(PKG_OPTIONS:Mads)
.  include "../../mk/krb5.buildlink3.mk"
.  if empty(PKG_OPTIONS:Mldap)
PKG_OPTIONS+=		ldap
.  endif
CONFIGURE_ARGS+=	--with-ads
CONFIGURE_ARGS+=	--with-krb5=${KRB5BASE}

# Avoid build failures with recent version of Heimdal under NetBSD.
.  if ${OPSYS} == "NetBSD"
CONFIGURE_ENV+=	samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER=no
.  endif

# ignore gssapi.h on Solaris as it conflicts with <gssapi/gssapi.h>
.  if ${OPSYS} == "SunOS"
CONFIGURE_ENV+=		ac_cv_header_gssapi_h=no
.  endif
.else
CONFIGURE_ARGS+=	--without-ads
CONFIGURE_ARGS+=	--without-krb5
.endif

###
### Access Control List support.
###
.if !empty(PKG_OPTIONS:Macl)
CONFIGURE_ARGS+=	--with-acl-support
.endif

###
### Native CUPS support for providing printing services.
###
PLIST_VARS+=		cups
.if !empty(PKG_OPTIONS:Mcups)
.  include "../../print/cups/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-cups
PLIST.cups=		yes
INSTALLATION_DIRS+=	libexec/cups/backend

.PHONY: samba-cups-install
post-install: samba-cups-install
samba-cups-install:
	cd ${DESTDIR}${PREFIX}/libexec/cups/backend && \
		${LN} -fs ../../../bin/smbspool smb
.else
CONFIGURE_ARGS+=	--disable-cups
.endif

###
### Access Control List support.
###
PLIST_VARS+=		fam
.if !empty(PKG_OPTIONS:Mfam)
.  include "../../mk/fam.buildlink3.mk"
CONFIGURE_ARGS+=	--enable-fam
PLIST.fam=		yes
.else
CONFIGURE_ARGS+=	--disable-fam
.endif

###
### Support LDAP authentication and storage of Samba account information.
###
.if !empty(PKG_OPTIONS:Mldap)
.  include "../../databases/openldap-client/buildlink3.mk"
CONFIGURE_ARGS+=	--with-ldap
.else
CONFIGURE_ARGS+=	--without-ldap
.endif

###
### Support PAM authentication and build smbpass and winbind PAM modules.
###
PLIST_VARS+=		pam
.if !empty(PKG_OPTIONS:Mpam)
.  include "../../security/PAM/module.mk"
CONFIGURE_ARGS+=	--with-pam
CONFIGURE_ARGS+=	--with-pam_smbpass
CONFIGURE_ARGS+=	--with-pammodulesdir=${PAM_INSTMODULEDIR}
PLIST.pam=		yes
INSTALLATION_DIRS+=	${EGDIR}/pam_smbpass

.PHONY: samba-pam-smbpass-install
post-install: samba-pam-smbpass-install
samba-pam-smbpass-install:
	${INSTALL_DATA} ${WRKSRC}/pam_smbpass/README			\
		${DESTDIR}${PREFIX}/${DOCDIR}/README.pam_smbpass
	cd ${WRKSRC}/pam_smbpass/samples; for f in [a-z]*; do		\
		${INSTALL_DATA} $${f} \
			${DESTDIR}${PREFIX}/${EGDIR}/pam_smbpass/$${f};	\
	done
.endif

###
### Support querying a PDC for domain user and group information, e.g.,
### through NSS or PAM.
###
PLIST_VARS+=		winbind
.if !empty(PKG_OPTIONS:Mwinbind)
CONFIGURE_ARGS+=	--with-winbind

SAMBA_STATIC_MODULES:=	${SAMBA_STATIC_MODULES},idmap_rid
.  if !empty(PKG_OPTIONS:Mads)
SAMBA_STATIC_MODULES:=	${SAMBA_STATIC_MODULES},idmap_ad
.  endif

WINBINDD_RCD_SCRIPT=	winbindd
PLIST.winbind=		yes

# Install the NSS winbind module if it exists.
PLIST_SUBST+=		NSS_WINBIND=${NSS_WINBIND:Q}
NSS_WINBIND=		${NSS_WINBIND_cmd:sh}
NSS_WINBIND_cmd=	\
	${TEST} -x ${WRKSRC}/config.status ||				\
		{ ${ECHO} "@comment no NSS winbind module" ; exit 0; };	\
	cd ${WRKDIR} && ${ECHO} @WINBIND_NSS@ |				\
	${WRKSRC}/config.status --file=-:- | 				\
	${AWK} '/^$$/ { print "@comment no NSS winbind module"; exit 0; } \
		{ sub(".*/", "lib/"); print; }' &&			\
	${RM} -f config.log

.PHONY: samba-nss-winbind-install
post-install: samba-nss-winbind-install
samba-nss-winbind-install:
	lib=${WRKSRC}/nsswitch/${NSS_WINBIND:T:Q};			\
	${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX}/lib

# Install the NSS WINS module if it exists.
PLIST_SUBST+=	NSS_WINS=${NSS_WINS:Q}
NSS_WINS=	${NSS_WINS_cmd:sh}
NSS_WINS_cmd=	\
	${TEST} -x ${WRKSRC}/config.status ||				\
		{ ${ECHO} "@comment no NSS WINS module" ; exit 0; };	\
	cd ${WRKDIR} && ${ECHO} @WINBIND_WINS_NSS@ |			\
	${WRKSRC}/config.status --file=-:- |				\
	${AWK} '/^$$/ { print "@comment no NSS WINS module"; exit 0; }	\
		{ sub(".*/", "lib/"); print; }' &&			\
	${RM} -f config.log

.PHONY: samba-nss-wins-install
post-install: samba-nss-wins-install
samba-nss-wins-install:
	lib=${WRKSRC}/nsswitch/${NSS_WINS:T:Q};				\
	${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX}/lib
.else
CONFIGURE_ARGS+=	--without-winbind
PLIST_SUBST+=		NSS_WINBIND="no NSS winbind module"
PLIST_SUBST+=		NSS_WINS="no NSS WINS module"
.endif

###
### Add the optional static modules to the configuration.
###
.if !empty(SAMBA_STATIC_MODULES)
CONFIGURE_ARGS+=	--with-static-modules=${SAMBA_STATIC_MODULES:S/^,//}
.endif