From 9f2628b281f09a964a6482206506317fdc23db17 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Mon, 3 Mar 2014 08:46:45 +0000
Subject: Replace log dir in the default sampel config file correctly.

Bump PKGREVISION.
---
 net/samba35/Makefile         | 10 ++++++++--
 net/samba35/distinfo         |  4 ++--
 net/samba35/patches/patch-ab |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'net')

diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 781a2a959d2..ab4e346eb16 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2014/03/03 08:31:02 obache Exp $
+# $NetBSD: Makefile,v 1.35 2014/03/03 08:46:45 obache Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=	samba-${VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${SAMBA_MIRRORS:=stable/}
 
@@ -116,6 +116,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}
 
diff --git a/net/samba35/distinfo b/net/samba35/distinfo
index 7c28bb2c575..5936d689614 100644
--- a/net/samba35/distinfo
+++ b/net/samba35/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2013/08/12 02:47:32 taca Exp $
+$NetBSD: distinfo,v 1.17 2014/03/03 08:46:45 obache Exp $
 
 SHA1 (samba-3.5.22.tar.gz) = 6c807dc64c0cd02bd560c4cfc5fe485964777e49
 RMD160 (samba-3.5.22.tar.gz) = ed8d8f9c5c1123334773fa9d47dca1e32ce54b6b
 Size (samba-3.5.22.tar.gz) = 35385144 bytes
 SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
-SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
+SHA1 (patch-ab) = eb680f72ab0118e57d1b322aba869ac798b27e17
 SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
 SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
 SHA1 (patch-ae) = 6698c698dc64c0f3df159157d182eae6aaa70958
diff --git a/net/samba35/patches/patch-ab b/net/samba35/patches/patch-ab
index f6dbd84389d..142932eb0fd 100644
--- a/net/samba35/patches/patch-ab
+++ b/net/samba35/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
+$NetBSD: patch-ab,v 1.2 2014/03/03 08:46:45 obache Exp $
 
 --- ../examples/smb.conf.default.orig	2010-01-14 10:12:10.000000000 +0000
 +++ ../examples/smb.conf.default
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/12/06 17:01:23 adam Exp $
  # 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
-- 
cgit v1.2.3