Fri Sep 30 13:41:33 2011 UTC ()
Explicitly depend on gettext-lib; use BROKEN_GETTEXT_DETECTION=yes, because configure does not check for -lintl


(adam)
diff -r1.9 -r1.10 pkgsrc/net/samba35/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/net/samba35/Attic/Makefile (switch to unified diff)

--- pkgsrc/net/samba35/Attic/Makefile 2011/08/05 09:51:45 1.9
+++ pkgsrc/net/samba35/Attic/Makefile 2011/09/30 13:41:33 1.10
@@ -1,161 +1,163 @@ @@ -1,161 +1,163 @@
1# $NetBSD: Makefile,v 1.9 2011/08/05 09:51:45 adam Exp $ 1# $NetBSD: Makefile,v 1.10 2011/09/30 13:41:33 adam Exp $
2 2
3.include "../../net/samba/Makefile.mirrors" 3.include "../../net/samba/Makefile.mirrors"
4 4
5DISTNAME= samba-${VERSION} 5DISTNAME= samba-${VERSION}
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${SAMBA_MIRRORS:=stable/} 7MASTER_SITES= ${SAMBA_MIRRORS:=stable/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.samba.org/ 10HOMEPAGE= http://www.samba.org/
11COMMENT= SMB/CIFS protocol server suite 11COMMENT= SMB/CIFS protocol server suite
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14VERSION= 3.5.11 14VERSION= 3.5.11
15CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* 15CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19FILESDIR= ${PKGDIR}/../../net/samba/files 19FILESDIR= ${PKGDIR}/../../net/samba/files
20DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR 20DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR
21MESSAGE_SRC= ${PKGDIR}/../../net/samba/MESSAGE 21MESSAGE_SRC= ${PKGDIR}/../../net/samba/MESSAGE
22WRKSRC= ${WRKDIR}/${DISTNAME}/source3 22WRKSRC= ${WRKDIR}/${DISTNAME}/source3
23BUILD_DEFS+= VARBASE 23BUILD_DEFS+= VARBASE
24 24
25.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
26 26
27PKG_SYSCONFSUBDIR= samba 27PKG_SYSCONFSUBDIR= samba
28SAMBA_ETCDIR?= ${PKG_SYSCONFDIR} 28SAMBA_ETCDIR?= ${PKG_SYSCONFDIR}
29SAMBA_LIBDIR?= ${PREFIX}/lib 29SAMBA_LIBDIR?= ${PREFIX}/lib
30SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/run/samba 30SAMBA_LOCKDIR?= ${SAMBA_VARDIR}/run/samba
31SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log 31SAMBA_LOGDIR?= ${SAMBA_VARDIR}/log
32SAMBA_MODULESDIR?= ${SAMBA_LIBDIR}/samba 32SAMBA_MODULESDIR?= ${SAMBA_LIBDIR}/samba
33SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run 33SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run
34SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private 34SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private
35SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba 35SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba
36SAMBA_VARDIR?= ${VARBASE} 36SAMBA_VARDIR?= ${VARBASE}
37WINBINDD_RCD_SCRIPT= # empty 37WINBINDD_RCD_SCRIPT= # empty
38 38
39FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR} 39FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR}
40FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} 40FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR}
41FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} 41FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR}
42FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR} 42FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR}
43FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q} 43FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q}
44FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR} 44FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR}
45FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} 45FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR}
46FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} 46FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q}
47 47
48# mktemp is useful for the replacement adduser script, but don't require 48# mktemp is useful for the replacement adduser script, but don't require
49# a full dependency since it's not actually needed by samba. 49# a full dependency since it's not actually needed by samba.
50USE_TOOLS+= gmake mktemp perl:run 50USE_TOOLS+= gmake mktemp perl:run
51REPLACE_PERL= script/findsmb.in 51REPLACE_PERL= script/findsmb.in
52 52
 53BROKEN_GETTEXT_DETECTION=yes
53USE_GNU_READLINE= yes 54USE_GNU_READLINE= yes
54GNU_CONFIGURE= yes 55GNU_CONFIGURE= yes
55CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} 56CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
56CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 57CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
57CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} 58CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR}
58CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR} 59CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR}
59CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} 60CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR}
60CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} 61CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR}
61CONFIGURE_ARGS+= --with-modulesdir=${SAMBA_MODULESDIR} 62CONFIGURE_ARGS+= --with-modulesdir=${SAMBA_MODULESDIR}
62CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} 63CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR}
63CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} 64CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q}
64CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} 65CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR}
65CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} 66CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR}
66CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} 67CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR}
67CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat 68CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat
68# 69#
69# Explicitly disable samba4 merged-build option which is broken. 70# Explicitly disable samba4 merged-build option which is broken.
70# 71#
71CONFIGURE_ARGS+= --enable-merged-build=no 72CONFIGURE_ARGS+= --enable-merged-build=no
72 73
73.include "../../net/samba/options.mk" 74.include "../../net/samba/options.mk"
74 75
75PLIST_VARS+= cifsmount macosx 76PLIST_VARS+= cifsmount macosx
76 77
77# Only Linux supports mount.cifs for mounting a CIFS share into the filesystem. 78# Only Linux supports mount.cifs for mounting a CIFS share into the filesystem.
78.if ${OPSYS} == "Linux" 79.if ${OPSYS} == "Linux"
79CONFIGURE_ARGS+= --with-cifsmount --with-cifsumount 80CONFIGURE_ARGS+= --with-cifsmount --with-cifsumount
80PLIST.cifsmount= yes 81PLIST.cifsmount= yes
81.endif 82.endif
82 83
83.if ${OPSYS} == "Darwin" 84.if ${OPSYS} == "Darwin"
84PLIST.macosx= yes 85PLIST.macosx= yes
85.endif 86.endif
86 87
87.if ${_OPSYS_SHLIB_TYPE} == "dylib" 88.if ${_OPSYS_SHLIB_TYPE} == "dylib"
88PLIST_SUBST+= LIBEXT=dylib 89PLIST_SUBST+= LIBEXT=dylib
89.else 90.else
90PLIST_SUBST+= LIBEXT=so 91PLIST_SUBST+= LIBEXT=so
91.endif 92.endif
92 93
93.if !defined(PWD_MKDB) 94.if !defined(PWD_MKDB)
94PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \ 95PWD_MKDB!= ${TYPE} pwd_mkdb 2>&1 | \
95 ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }' 96 ${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
96MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q} 97MAKEFLAGS+= PWD_MKDB=${PWD_MKDB:Q}
97.endif 98.endif
98FILES_SUBST+= MKTEMP=${MKTEMP:Q} 99FILES_SUBST+= MKTEMP=${MKTEMP:Q}
99FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q} 100FILES_SUBST+= PWD_MKDB=${PWD_MKDB:Q}
100 101
101INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 102INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
102 103
103DOCDIR= share/doc/${PKGBASE} 104DOCDIR= share/doc/${PKGBASE}
104EGDIR= share/examples/${PKGBASE} 105EGDIR= share/examples/${PKGBASE}
105CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf 106CONF_FILES= ${PREFIX}/${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
106MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR} 107MAKE_DIRS= ${SAMBA_VARDIR} ${SAMBA_LOGDIR} ${SAMBA_PIDDIR}
107OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR} 108OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_LOCKDIR} ${SAMBA_STATEDIR}
108OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 109OWN_DIRS_PERMS= ${SAMBA_PRIVATE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
109RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT} 110RCD_SCRIPTS+= samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
110 111
111SUBST_CLASSES+= paths 112SUBST_CLASSES+= paths
112SUBST_MESSAGE.paths= Fixing paths. 113SUBST_MESSAGE.paths= Fixing paths.
113SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh 114SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
114SUBST_STAGE.paths= post-patch 115SUBST_STAGE.paths= post-patch
115SUBST_SED.paths+= -e 's,@AWK@,${AWK},g' 116SUBST_SED.paths+= -e 's,@AWK@,${AWK},g'
116SUBST_SED.paths+= -e 's,@CAT@,${CAT},g' 117SUBST_SED.paths+= -e 's,@CAT@,${CAT},g'
117SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g' 118SUBST_SED.paths+= -e 's,@MKTEMP@,${MKTEMP},g'
118SUBST_SED.paths+= -e 's,@RM@,${RM},g' 119SUBST_SED.paths+= -e 's,@RM@,${RM},g'
119SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g' 120SUBST_SED.paths+= -e 's,@PWD_MKDB@,${PWD_MKDB},g'
120SUBST_SED.paths+= -e 's,@SH@,${SH},g' 121SUBST_SED.paths+= -e 's,@SH@,${SH},g'
121 122
122post-extract: 123post-extract:
123 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} 124 ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
124 125
125post-install: 126post-install:
126 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js 127 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js
127 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/include 128 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/include
128 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/images 129 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/images
129 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/js 130 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/ja/js
130 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include 131 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/include
131 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/js 132 ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/lang/tr/js
132 ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/gpext 133 ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/gpext
133 ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/idmap 134 ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/idmap
134 ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/pdb 135 ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/pdb
135 ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/rpc 136 ${RMDIR} ${DESTDIR}${SAMBA_MODULESDIR}/rpc
136 set -e ; cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do \ 137 set -e ; cd ${WRKDIR}/${DISTNAME}/docs/registry; for f in *.reg; do \
137 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \ 138 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/${DOCDIR}/$${f}; \
138 done 139 done
139 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \ 140 ${INSTALL_SCRIPT} ${WRKDIR}/adduser.sh \
140 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh 141 ${DESTDIR}${PREFIX}/${EGDIR}/adduser.sh
141 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \ 142 ${INSTALL_SCRIPT} ${WRKDIR}/deluser.sh \
142 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh 143 ${DESTDIR}${PREFIX}/${EGDIR}/deluser.sh
143 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/LDAP/samba.schema \ 144 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/LDAP/samba.schema \
144 ${DESTDIR}${PREFIX}/${EGDIR} 145 ${DESTDIR}${PREFIX}/${EGDIR}
145 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/smb.conf.default \ 146 ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/examples/smb.conf.default \
146 ${DESTDIR}${PREFIX}/${EGDIR} 147 ${DESTDIR}${PREFIX}/${EGDIR}
147 ${INSTALL_SCRIPT} ${WRKSRC}/script/mknissmbpasswd.sh \ 148 ${INSTALL_SCRIPT} ${WRKSRC}/script/mknissmbpasswd.sh \
148 ${DESTDIR}${PREFIX}/${EGDIR} 149 ${DESTDIR}${PREFIX}/${EGDIR}
149 ${INSTALL_SCRIPT} ${WRKSRC}/script/mknissmbpwdtbl.sh \ 150 ${INSTALL_SCRIPT} ${WRKSRC}/script/mknissmbpwdtbl.sh \
150 ${DESTDIR}${PREFIX}/${EGDIR} 151 ${DESTDIR}${PREFIX}/${EGDIR}
151 ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ 152 ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \
152 ${DESTDIR}${PREFIX}/${EGDIR} 153 ${DESTDIR}${PREFIX}/${EGDIR}
153 ${INSTALL_SCRIPT} ${WRKSRC}/script/updatesmbpasswd.sh \ 154 ${INSTALL_SCRIPT} ${WRKSRC}/script/updatesmbpasswd.sh \
154 ${DESTDIR}${PREFIX}/${EGDIR} 155 ${DESTDIR}${PREFIX}/${EGDIR}
155 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h 156 ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/include/*.h
156 157
157.include "../../converters/libiconv/buildlink3.mk" 158.include "../../converters/libiconv/buildlink3.mk"
 159.include "../../devel/gettext-lib/buildlink3.mk"
158.include "../../devel/popt/buildlink3.mk" 160.include "../../devel/popt/buildlink3.mk"
159.include "../../devel/readline/buildlink3.mk" 161.include "../../devel/readline/buildlink3.mk"
160.include "../../security/openssl/buildlink3.mk" 162.include "../../security/openssl/buildlink3.mk"
161.include "../../mk/bsd.pkg.mk" 163.include "../../mk/bsd.pkg.mk"