Use PKG_SYSCONFDIR framework. Bump PKGREVISION.

This closes PR pkg/30546.

5 files changed, 43 insertions, 16 deletions

diff --git a/chat/ser/Makefile b/chat/ser/Makefile
index 71ef20b5291..f093473df25 100644
--- a/chat/ser/Makefile
+++ b/chat/ser/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/18 05:57:05 hira Exp $
 #
 
 DISTNAME=	ser-0.8.10_src
 PKGNAME=	ser-0.8.10
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.berlios.de/pub/ser/latest/src/
 
@@ -14,10 +14,18 @@ COMMENT=	SIP express router
 WRKSRC=		${WRKDIR}/ser-0.8.10
 
 USE_TOOLS+=	gmake
+USE_PKGINSTALL=	yes
+
+PKG_SYSCONFSUBDIR=	ser
+EGDIR=			${PREFIX}/share/examples/ser
+CONF_FILES=		${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg
+
+MAKE_DIRS=	${EGDIR}
 
 MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
 MAKE_ENV+= BUILDLINK_PREFIX.mysql-client=${BUILDLINK_PREFIX.mysql-client:Q}
 MAKE_ENV+= BUILDLINK_PREFIX.expat=${BUILDLINK_PREFIX.expat:Q}
+MAKE_ENV+= EGDIR=${EGDIR}
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/chat/ser/PLIST b/chat/ser/PLIST
index 90926a32aea..078950d2751 100644
--- a/chat/ser/PLIST
+++ b/chat/ser/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/16 14:51:17 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/06/18 05:57:05 hira Exp $
 sbin/ser
 sbin/serctl
 sbin/ser_mysql.sh
 sbin/gen_ha1
-ser/ser.cfg
+share/examples/ser/ser.cfg
 lib/ser/modules/acc.so
 lib/ser/modules/auth.so
 lib/ser/modules/exec.so
@@ -43,7 +43,6 @@ doc/ser/README.tm
 doc/ser/README.usrloc
 man/man8/ser.8
 man/man5/ser.cfg.5
-@dirrm ser
 @dirrm doc/ser
 @dirrm lib/ser/modules
 @dirrm lib/ser
diff --git a/chat/ser/distinfo b/chat/ser/distinfo
index 3081eb5d0e2..a76d2b76a8a 100644
--- a/chat/ser/distinfo
+++ b/chat/ser/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 15:59:13 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/06/18 05:57:05 hira Exp $
 
 SHA1 (ser-0.8.10_src.tar.gz) = d3e88ff5eccf1c77b5b21637dd7c1ad3068ae89d
 RMD160 (ser-0.8.10_src.tar.gz) = f804e319d719a9e8b4146fc981bd403200b31d93
 Size (ser-0.8.10_src.tar.gz) = 931150 bytes
-SHA1 (patch-aa) = 40c28c6855a99468b5081eb21007d6b0e6744527
+SHA1 (patch-aa) = e07c79670189543ca320f117b351fb0d7d09a29b
 SHA1 (patch-ab) = 5ec50d206955619e3f73c3f6da5e40c1e86426ec
 SHA1 (patch-ac) = 98bd0bc672c6183f8ee6a8dba3ea01500fcdb80d
+SHA1 (patch-ad) = ef31745ff25338cb8031074f3f9956f33cca04ce
diff --git a/chat/ser/patches/patch-aa b/chat/ser/patches/patch-aa
index e7ce8ecec5a..7af915223a8 100644
--- a/chat/ser/patches/patch-aa
+++ b/chat/ser/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2005/06/18 05:57:05 hira Exp $
 
---- Makefile.defs.orig	2002-11-12 17:21:28.000000000 +0000
-+++ Makefile.defs	2003-09-16 15:42:29.000000000 +0100
+--- Makefile.defs.orig	2002-11-13 02:21:28.000000000 +0900
++++ Makefile.defs	2005-06-18 11:11:16.000000000 +0900
 @@ -16,7 +16,6 @@
  			-e s/armv4l/arm/)
  
@@ -10,16 +10,17 @@ $NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $
  prefix = $(PREFIX)
  # install path is $(basedir) $(prefix) 
  # example:
-@@ -33,7 +32,7 @@
+@@ -33,7 +32,8 @@
  ut-prefix = $(basedir)$(prefix)
  
  # dirs
 -cfg-dir = etc/ser/
 +cfg-dir = ser/
++eg-dir  = $(EGDIR)/
  bin-dir = sbin/
  modules-dir = lib/ser/modules/
  ifeq ($(OS), linux)
-@@ -45,7 +44,7 @@
+@@ -45,7 +45,7 @@
  endif
  ut-prefix = bin/
  # target dirs for various stuff
@@ -28,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $
  modules-target = $(prefix)/$(modules-dir)
  
  
-@@ -59,10 +58,10 @@
+@@ -59,10 +59,10 @@
  endif
  
  # INSTALL-CFG = $(INSTALL) -m 644
@@ -43,7 +44,7 @@ $NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $
  
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -446,6 +445,7 @@
+@@ -446,6 +446,7 @@
  endif
  
  endif #mode=release
@@ -51,7 +52,7 @@ $NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $
  
  
  #*FLAGS used for compiling the modules
-@@ -473,8 +473,10 @@
+@@ -473,8 +474,10 @@
  	DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN
  endif
  ifneq ($(OS), openbsd)
@@ -62,7 +63,7 @@ $NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $
  
  
  #os specific stuff
-@@ -520,7 +522,7 @@
+@@ -520,7 +523,7 @@
  ifeq ($(OS), netbsd)
  	DEFS+=-DHAVE_SOCKADDR_SA_LEN
  	YACC=yacc
diff --git a/chat/ser/patches/patch-ad b/chat/ser/patches/patch-ad
new file mode 100644
index 00000000000..a162087ef8c
--- /dev/null
+++ b/chat/ser/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2005/06/18 05:57:05 hira Exp $
+
+--- Makefile.orig	2002-11-12 21:31:25.000000000 +0900
++++ Makefile	2005-06-18 11:33:25.000000000 +0900
+@@ -156,10 +156,10 @@
+ $(man-prefix)/$(man-dir)/man5:
+ 		mkdir -p $(man-prefix)/$(man-dir)/man5
+ 
+-install-cfg: $(cfg-prefix)/$(cfg-dir)
++install-cfg:
+ 		sed -e "s#/usr/lib/ser/modules/#$(modules-target)#g" \
+-			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg
+-		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg
++			< etc/ser.cfg > $(eg-dir)ser.cfg
++		chmod 644 $(eg-dir)ser.cfg
+ #		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
+ 
+ install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1