Mon Mar 3 08:15:10 2014 UTC ()
Replace log dir in the default sample config file correctly.
Bump PKGREVISION.
(obache)
diff -r1.244 -r1.245 pkgsrc/net/samba/Makefile
diff -r1.96 -r1.97 pkgsrc/net/samba/distinfo
diff -r1.28 -r1.29 pkgsrc/net/samba/patches/patch-ab
--- pkgsrc/net/samba/Makefile 2014/03/03 08:05:07 1.244
+++ pkgsrc/net/samba/Makefile 2014/03/03 08:15:10 1.245
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.244 2014/03/03 08:05:07 obache Exp $
+# $NetBSD: Makefile,v 1.245 2014/03/03 08:15:10 obache Exp $
DISTNAME= samba-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${SAMBA_MIRRORS:=stable/}
@@ -107,6 +107,12 @@
SUBST_FILES.paths= ${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
SUBST_STAGE.paths= post-patch
SUBST_VARS.paths+= AWK CAT MKTEMP RM PWD_MKDB SH
+
+SUBST_CLASSES+= def-cfg
+SUBST_MESSAGE.def-cfg= Fixing default config files
+SUBST_FILES.def-cfg= ${WRKDIR}/${DISTNAME}/examples/smb.conf.default
+SUBST_STAGE.def-cfg= post-configure
+SUBST_VARS.def-cfg= SAMBA_LOGDIR
post-extract:
${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR}
--- pkgsrc/net/samba/distinfo 2013/12/09 10:44:22 1.96
+++ pkgsrc/net/samba/distinfo 2014/03/03 08:15:10 1.97
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.96 2013/12/09 10:44:22 taca Exp $
+$NetBSD: distinfo,v 1.97 2014/03/03 08:15:10 obache Exp $
SHA1 (samba-3.6.22.tar.gz) = e4ce4a273cc264b01d928f1bb59f0dc38dd65f9b
RMD160 (samba-3.6.22.tar.gz) = 66063045f4c3232764528ce7571dd336591001e4
Size (samba-3.6.22.tar.gz) = 34122131 bytes
SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
-SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
+SHA1 (patch-ab) = eb680f72ab0118e57d1b322aba869ac798b27e17
SHA1 (patch-ac) = 25edbd616199b7dcb41f87aa1374d0bdf19cafec
SHA1 (patch-ad) = 750b0c08d9975a257bec09088cb38414a1299070
SHA1 (patch-ae) = de70580b293f4b964bc39b95c6a27511faaf088a
--- pkgsrc/net/samba/patches/patch-ab 2011/12/16 11:05:24 1.28
+++ pkgsrc/net/samba/patches/patch-ab 2014/03/03 08:15:10 1.29
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.28 2011/12/16 11:05:24 asau Exp $
+$NetBSD: patch-ab,v 1.29 2014/03/03 08:15:10 obache Exp $
--- ../examples/smb.conf.default.orig 2010-01-14 10:12:10.000000000 +0000
+++ ../examples/smb.conf.default
@@ -16,7 +16,7 @@
# this tells Samba to use a separate log file for each machine
# that connects
- log file = /usr/local/samba/var/log.%m
-+; log file = @VARBASE@/log/log.%m
++; log file = @SAMBA_LOGDIR@/log.%m
# Put a capping on the size of the log files (in Kb).
- max log size = 50