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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -40,26 +40,27 @@ FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCD @@ -40,26 +40,27 @@ FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCD
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}
@@ -145,17 +146,18 @@ post-install: @@ -145,17 +146,18 @@ post-install:
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"