update to 0.8.14

this is basically a maintainance release

also fix doc location, closes PR pkg/31052 by Matthew Luckie

7 files changed, 98 insertions, 122 deletions

diff --git a/chat/ser/Makefile b/chat/ser/Makefile
index fba98e588be..452aeaa5f4c 100644
--- a/chat/ser/Makefile
+++ b/chat/ser/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.15 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/09/08 18:13:48 drochner Exp $
 #
 
-DISTNAME=	ser-0.8.10_src
-PKGNAME=	ser-0.8.10
-PKGREVISION=	5
-CATEGORIES=	chat
-MASTER_SITES=	ftp://ftp.berlios.de/pub/ser/latest/src/
+DISTNAME=	ser-0.8.14_src
+PKGNAME=	ser-0.8.14
+CATEGORIES=	chat net comms
+MASTER_SITES=	ftp://ftp.berlios.de/pub/ser/0.8.14/src/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.iptel.org/ser/
 COMMENT=	SIP express router
 
-WRKSRC=		${WRKDIR}/ser-0.8.10
+WRKSRC=		${WRKDIR}/ser-0.8.14
 
 USE_TOOLS+=	gmake
 USE_PKGINSTALL=	yes
@@ -23,11 +22,8 @@ CONF_FILES=		${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg
 REQD_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+= cfg-prefix=${PREFIX}/share/examples
 MAKE_ENV+= EGDIR=${EGDIR}
 
-.include "../../mk/mysql.buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/ser/PLIST b/chat/ser/PLIST
index 078950d2751..62f7c9aeab9 100644
--- a/chat/ser/PLIST
+++ b/chat/ser/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/06/18 05:57:05 hira Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/09/08 18:13:48 drochner Exp $
 sbin/ser
 sbin/serctl
 sbin/ser_mysql.sh
@@ -6,12 +6,22 @@ sbin/gen_ha1
 share/examples/ser/ser.cfg
 lib/ser/modules/acc.so
 lib/ser/modules/auth.so
+lib/ser/modules/auth_db.so
+lib/ser/modules/auth_diameter.so
+lib/ser/modules/dbtext.so
+lib/ser/modules/domain.so
+lib/ser/modules/enum.so
 lib/ser/modules/exec.so
-lib/ser/modules/im.so
-lib/ser/modules/jabber.so
+lib/ser/modules/ext.so
+lib/ser/modules/group.so
+lib/ser/modules/mangler.so
 lib/ser/modules/maxfwd.so
+lib/ser/modules/mediaproxy.so
 lib/ser/modules/msilo.so
-lib/ser/modules/mysql.so
+lib/ser/modules/nathelper.so
+lib/ser/modules/pa.so
+lib/ser/modules/pdt.so
+lib/ser/modules/permissions.so
 lib/ser/modules/pike.so
 lib/ser/modules/print.so
 lib/ser/modules/registrar.so
@@ -20,29 +30,47 @@ lib/ser/modules/sl.so
 lib/ser/modules/sms.so
 lib/ser/modules/textops.so
 lib/ser/modules/tm.so
+lib/ser/modules/uri.so
 lib/ser/modules/usrloc.so
-doc/ser/README
-doc/ser/README.cfg
-doc/ser/INSTALL
-doc/ser/README-MODULES
-doc/ser/AUTHORS
-doc/ser/README.acc
-doc/ser/README.auth
-doc/ser/README.exec
-doc/ser/README.im
-doc/ser/README.jabber
-doc/ser/README.maxfwd
-doc/ser/README.pike
-doc/ser/README.print
-doc/ser/README.registrar
-doc/ser/README.rr
-doc/ser/README.sl
-doc/ser/README.sms
-doc/ser/README.textops
-doc/ser/README.tm
-doc/ser/README.usrloc
+lib/ser/modules/vm.so
+lib/ser/modules/xlog.so
+share/doc/ser/NEWS
+share/doc/ser/README
+share/doc/ser/INSTALL
+share/doc/ser/README-MODULES
+share/doc/ser/AUTHORS
+share/doc/ser/README.acc
+share/doc/ser/README.auth
+share/doc/ser/README.auth_db
+share/doc/ser/README.auth_diameter
+share/doc/ser/README.dbtext
+share/doc/ser/README.domain
+share/doc/ser/README.enum
+share/doc/ser/README.exec
+share/doc/ser/README.ext
+share/doc/ser/README.group
+share/doc/ser/README.mangler
+share/doc/ser/README.maxfwd
+share/doc/ser/README.msilo
+share/doc/ser/README.nathelper
+share/doc/ser/README.pa
+share/doc/ser/README.pdt
+share/doc/ser/README.permissions
+share/doc/ser/README.pike
+share/doc/ser/README.print
+share/doc/ser/README.registrar
+share/doc/ser/README.rr
+share/doc/ser/README.sl
+share/doc/ser/README.sms
+share/doc/ser/README.textops
+share/doc/ser/README.tm
+share/doc/ser/README.uri
+share/doc/ser/README.usrloc
+share/doc/ser/README.vm
+share/doc/ser/README.xlog
 man/man8/ser.8
 man/man5/ser.cfg.5
-@dirrm doc/ser
+@dirrm share/examples/ser
+@dirrm share/doc/ser
 @dirrm lib/ser/modules
 @dirrm lib/ser
diff --git a/chat/ser/distinfo b/chat/ser/distinfo
index a62e224dfb9..d2864b157fd 100644
--- a/chat/ser/distinfo
+++ b/chat/ser/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/06/18 12:39:52 hira Exp $
+$NetBSD: distinfo,v 1.9 2005/09/08 18:13:48 drochner 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) = 9b91738bdfe999a5ac655073b4def3fcd16c43d7
-SHA1 (patch-ab) = 5ec50d206955619e3f73c3f6da5e40c1e86426ec
-SHA1 (patch-ac) = 98bd0bc672c6183f8ee6a8dba3ea01500fcdb80d
-SHA1 (patch-ad) = ef31745ff25338cb8031074f3f9956f33cca04ce
+SHA1 (ser-0.8.14_src.tar.gz) = 91553951247506850d66da25819333b61b150d1d
+RMD160 (ser-0.8.14_src.tar.gz) = 72c3a0793f3dd88584ee65b3751ccf8a3776f840
+Size (ser-0.8.14_src.tar.gz) = 1551881 bytes
+SHA1 (patch-aa) = f32fe747a92205db3600e8958dce289cc809bca7
+SHA1 (patch-ad) = aa7a962546fbfcbecde79d68c0765ae34c2916da
diff --git a/chat/ser/patches/patch-aa b/chat/ser/patches/patch-aa
index 7fce1b8c201..0b1dd6f796b 100644
--- a/chat/ser/patches/patch-aa
+++ b/chat/ser/patches/patch-aa
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2005/06/18 12:39:52 hira Exp $
+$NetBSD: patch-aa,v 1.7 2005/09/08 18:13:48 drochner Exp $
 
---- Makefile.defs.orig	2002-11-13 02:21:28.000000000 +0900
-+++ Makefile.defs	2005-06-18 21:32:06.000000000 +0900
-@@ -16,7 +16,6 @@
- 			-e s/armv4l/arm/)
- 
-  # install location
--PREFIX = /usr/local
- prefix = $(PREFIX)
- # install path is $(basedir) $(prefix) 
- # example:
-@@ -33,7 +32,8 @@
+--- Makefile.defs.orig	2004-07-27 13:38:33.000000000 +0200
++++ Makefile.defs
+@@ -77,7 +77,7 @@ prefix = $(PREFIX)
+ BASEDIR ?=
+ basedir = $(BASEDIR)
+ # install prefixes for various stuff
+-cfg-prefix = $(basedir)$(prefix)
++cfg-prefix = $(basedir)$(prefix)/share/examples
+ bin-prefix = $(basedir)$(prefix)
+ modules-prefix = $(basedir)$(prefix)
+ doc-prefix = $(basedir)$(prefix)
+@@ -85,7 +85,8 @@ man-prefix = $(basedir)$(prefix)
  ut-prefix = $(basedir)$(prefix)
  
  # dirs
@@ -20,7 +21,7 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39:52 hira Exp $
  bin-dir = sbin/
  modules-dir = lib/ser/modules/
  ifeq ($(OS), linux)
-@@ -45,7 +45,7 @@
+@@ -117,7 +118,7 @@ endif
  endif
  ut-prefix = bin/
  # target dirs for various stuff
@@ -29,9 +30,9 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39:52 hira Exp $
  modules-target = $(prefix)/$(modules-dir)
  
  
-@@ -59,10 +59,10 @@
- endif
- 
+@@ -133,10 +134,10 @@ endif
+ INSTALL-TOUCH = touch          # used to create the file first (good to 
+                                #  make solaris install work)
  # INSTALL-CFG = $(INSTALL) -m 644
 -INSTALL-BIN = $(INSTALL) -m 755
 -INSTALL-MODULES = $(INSTALL) -m 755
@@ -44,7 +45,7 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39:52 hira Exp $
  
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -446,6 +446,7 @@
+@@ -639,6 +640,7 @@ ifeq	($(CC_NAME), suncc)
  endif
  
  endif #mode=release
@@ -52,23 +53,3 @@ $NetBSD: patch-aa,v 1.6 2005/06/18 12:39:52 hira Exp $
  
  
  #*FLAGS used for compiling the modules
-@@ -473,8 +474,10 @@
- 	DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN
- endif
- ifneq ($(OS), openbsd)
-+ifneq ($(OS), netbsd)
- 	DEFS+=-DHAVE_SCHED_YIELD
- endif
-+endif
- 
- 
- #os specific stuff
-@@ -520,7 +523,7 @@
- ifeq ($(OS), netbsd)
- 	DEFS+=-DHAVE_SOCKADDR_SA_LEN
- 	YACC=yacc
--	LIBS= -lfl  -lc_r
-+	LIBS= -lfl  -lpthread
- endif
- 
- ifneq (,$(findstring CYGWIN, $(OS)))
diff --git a/chat/ser/patches/patch-ab b/chat/ser/patches/patch-ab
deleted file mode 100644
index eb8f40dd163..00000000000
--- a/chat/ser/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/05/09 23:58:19 wiz Exp $
-
---- modules/jabber/Makefile-	2003-08-24 06:35:44.000000000 +0900
-+++ modules/jabber/Makefile	2003-08-24 06:37:30.000000000 +0900
-@@ -8,7 +8,7 @@
- auto_gen=
- NAME=jabber.so
- # expat.h location
--DEFS+=-I/usr/local/include
--LIBS=-L/usr/local/lib -lexpat
-+DEFS+=-I${BUILDLINK_PREFIX.expat}/include
-+LIBS=-Wl,-R${BUILDLINK_PREFIX.expat}/lib -L${BUILDLINK_PREFIX.expat}/lib -lexpat
- 
- include ../../Makefile.modules
diff --git a/chat/ser/patches/patch-ac b/chat/ser/patches/patch-ac
deleted file mode 100644
index 387aba86ef9..00000000000
--- a/chat/ser/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/05/09 23:58:19 wiz Exp $
-
---- modules/mysql/Makefile-	2003-08-24 06:40:29.000000000 +0900
-+++ modules/mysql/Makefile	2003-08-24 06:41:14.000000000 +0900
-@@ -5,11 +5,9 @@
- auto_gen=
- NAME=mysql.so
- # mysql.h locations (freebsd,openbsd  solaris)
--DEFS +=-I/usr/local/include -I/usr/local/mysql/include \
-+DEFS +=-I${BUILDLINK_PREFIX.mysql-client}/include
- # libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD
- # (Debian does the right thing and puts it in /usr/lib)
--LIBS=-L/usr/lib/mysql -L /usr/local/lib -L/usr/local/lib/mysql \
--		-L/usr/local/mysql/lib/mysql/ \
--		-lmysqlclient -lz 
-+LIBS=-Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -lmysqlclient -lz 
- 
- include ../../Makefile.modules
diff --git a/chat/ser/patches/patch-ad b/chat/ser/patches/patch-ad
index a162087ef8c..d07b9bb8227 100644
--- a/chat/ser/patches/patch-ad
+++ b/chat/ser/patches/patch-ad
@@ -1,16 +1,21 @@
-$NetBSD: patch-ad,v 1.1 2005/06/18 05:57:05 hira Exp $
+$NetBSD: patch-ad,v 1.2 2005/09/08 18:13:48 drochner 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:
+--- Makefile.orig	2004-07-27 01:18:34.000000000 +0200
++++ Makefile
+@@ -252,15 +252,10 @@ $(man-prefix)/$(man-dir)/man5:
  		mkdir -p $(man-prefix)/$(man-dir)/man5
- 
+ 		
+ # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
 -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
+ 		sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \
+-			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
+-		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
+-		if [ -z "${skip_cfg_install}" -a \
+-				! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
+-			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
+-				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
+-		fi
 +			< etc/ser.cfg > $(eg-dir)ser.cfg
 +		chmod 644 $(eg-dir)ser.cfg
  #		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)