Complete move of chat/ser to net/ser. Addresses PR 36059.

8 files changed, 3 insertions, 234 deletions

diff --git a/chat/Makefile b/chat/Makefile
index 276dbd69610..f342a020213 100644
--- a/chat/Makefile
+++ b/chat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2007/03/12 12:43:20 tron Exp $
+# $NetBSD: Makefile,v 1.122 2007/03/23 06:26:18 wiz Exp $
 #
 
 COMMENT=	Communication programs
@@ -79,7 +79,6 @@ SUBDIR+=	quirc
 SUBDIR+=	riece
 SUBDIR+=	roxirc
 SUBDIR+=	scrollz
-SUBDIR+=	ser
 SUBDIR+=	silc-client
 SUBDIR+=	silc-client-icb
 SUBDIR+=	silc-server
diff --git a/chat/ser/DESCR b/chat/ser/DESCR
deleted file mode 100644
index f22ae05fc5c..00000000000
--- a/chat/ser/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-SIP Express Router (ser) is a high-performance, configurable, free
-SIP ( RFC3261 ) server . It can act as registrar, proxy or redirect
-server. SER features an application-server interface, presence
-support, SMS gateway, SIMPLE2Jabber gateway, RADIUS/syslog accounting
-and authorization, server status monitoring, FCP security, etc.
diff --git a/chat/ser/Makefile b/chat/ser/Makefile
deleted file mode 100644
index 4d6bde789d2..00000000000
--- a/chat/ser/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2006/11/11 16:48:14 rillig Exp $
-#
-
-DISTNAME=	ser-0.8.14_src
-PKGNAME=	ser-0.8.14
-PKGREVISION=	1
-CATEGORIES=	chat net comms
-MASTER_SITES=	ftp://ftp.berlios.de/pub/ser/0.8.14/src/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.iptel.org/ser/
-COMMENT=	SIP express router
-
-WRKSRC=		${WRKDIR}/ser-0.8.14
-
-USE_TOOLS+=	flex gmake yacc
-
-PKG_SYSCONFSUBDIR=	ser
-EGDIR=			${PREFIX}/share/examples/ser
-CONF_FILES=		${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg
-
-REQD_DIRS=	${EGDIR}
-
-MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
-MAKE_ENV+= cfg-prefix=${PREFIX}/share/examples
-MAKE_ENV+= EGDIR=${EGDIR:Q}
-
-CHECK_PORTABILITY_SKIP+=	scripts/sc
-
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/chat/ser/PLIST b/chat/ser/PLIST
deleted file mode 100644
index 62f7c9aeab9..00000000000
--- a/chat/ser/PLIST
+++ /dev/null
@@ -1,76 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/09/08 18:13:48 drochner Exp $
-sbin/ser
-sbin/serctl
-sbin/ser_mysql.sh
-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/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/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
-lib/ser/modules/rr.so
-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
-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 share/examples/ser
-@dirrm share/doc/ser
-@dirrm lib/ser/modules
-@dirrm lib/ser
diff --git a/chat/ser/distinfo b/chat/ser/distinfo
deleted file mode 100644
index 0b79d05fc3c..00000000000
--- a/chat/ser/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.10 2005/12/13 19:51:44 joerg Exp $
-
-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) = c3d5e9c97995f45fc0367502ae699c3cdb605f77
-SHA1 (patch-ad) = aa7a962546fbfcbecde79d68c0765ae34c2916da
diff --git a/chat/ser/patches/patch-aa b/chat/ser/patches/patch-aa
deleted file mode 100644
index 9cc6163a528..00000000000
--- a/chat/ser/patches/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2005/12/13 19:51:44 joerg Exp $
-
---- Makefile.defs.orig	2004-07-27 11:38:33.000000000 +0000
-+++ 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
--cfg-dir = etc/ser/
-+cfg-dir = ser/
-+eg-dir  = $(EGDIR)/
- bin-dir = sbin/
- modules-dir = lib/ser/modules/
- ifeq ($(OS), linux)
-@@ -104,6 +105,10 @@ ifeq ($(OS), netbsd)
- 	doc-dir = share/doc/ser
- 	man-dir = man/
- else
-+ifeq ($(OS), dragonfly)
-+	doc-dir = share/doc/ser
-+	man-dir = man/
-+else
- ifeq ($(OS), darwin)
- 	doc-dir = share/doc/ser/
- 	man-dir = man/
-@@ -115,9 +120,10 @@ endif
- endif
- endif
- endif
-+endif
- ut-prefix = bin/
- # target dirs for various stuff
--cfg-target = $(prefix)/$(cfg-dir)
-+cfg-target = $(PKG_SYSCONFDIR)/
- modules-target = $(prefix)/$(modules-dir)
- 
- 
-@@ -133,10 +139,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
--INSTALL-DOC = $(INSTALL) -m 644
--INSTALL-MAN = $(INSTALL) -m 644
-+INSTALL-BIN = $(INSTALL) -c -m 755
-+INSTALL-MODULES = $(INSTALL) -c -m 755
-+INSTALL-DOC = $(INSTALL) -c -m 644
-+INSTALL-MAN = $(INSTALL) -c -m 644
- 
- #set some vars from the environment (and not make builtins)
- CC   := $(shell echo "$${CC}")
-@@ -639,6 +645,7 @@ ifeq	($(CC_NAME), suncc)
- endif
- 
- endif #mode=release
-+LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
- 
- 
- #*FLAGS used for compiling the modules
-@@ -743,6 +750,19 @@ ifeq ($(OS), netbsd)
- 	LIBS= -lfl 
- endif
- 
-+ifeq ($(OS), dragonfly)
-+	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \
-+		-DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL
-+	ifneq ($(found_lock_method), yes)
-+		DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems
-+		found_lock_method=yes
-+		LIBS= -pthread -lfl  #dlopen is in libc
-+	else
-+		LIBS= -lfl  #dlopen is in libc
-+	endif
-+	YACC=yacc
-+endif
-+
- # OS X support, same as freebsd
- ifeq ($(OS), darwin)
- 	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \
diff --git a/chat/ser/patches/patch-ad b/chat/ser/patches/patch-ad
deleted file mode 100644
index d07b9bb8227..00000000000
--- a/chat/ser/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/09/08 18:13:48 drochner Exp $
-
---- 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.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)
- 
- install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1
diff --git a/net/Makefile b/net/Makefile
index 916f8462aab..9919316f3d4 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.660 2007/03/20 13:32:10 tron Exp $
+# $NetBSD: Makefile,v 1.661 2007/03/23 06:26:18 wiz Exp $
 #
 
 COMMENT=	Networking tools
@@ -403,6 +403,7 @@ SUBDIR+=	scli
 SUBDIR+=	sdig
 SUBDIR+=	sdist
 SUBDIR+=	sendfile
+SUBDIR+=	ser
 SUBDIR+=	sharity-light
 SUBDIR+=	sipcalc
 SUBDIR+=	sipsak