In case it's useful to anyone, this is a first cut at a diff to update
net/ser to 0.8.14.
Couple of things I noticed and/or wondered about (I haven't done
much work with the ports tree before)...
It looks like sparc64 works now (well, built ok, and I've been
registering a sip client against ser on OpenBSD 3.7/sparc64 for a few
hours and passed a few dozen calls and it seems to be running ok),
so I added it to ONLY_FOR_ARCHS.
SER normally builds with strange compiler options (-O9 -funroll-loops
-mcpu=foo, where foo=athlon on i386) and I haven't done anything to
change these yet - would this be sensible?
SER doesn't build all the modules automatically any more, e.g. jabber
(which had dependency on expat), mysql (obviously depending on mysql
client library). There are Makefile options to enable these, so I
guess one of flavors or multi-packages might be appropriate for these
(but I'm not sure which: I guess multi-packages since they're separate
.so files). Some other options (including some common ones, e.g.
logging accounting records to mysql or radius) need Makefile patches,
I wondered if anyone could point me in the direction of any other
ports with similar problems so I could look at how they handle this?
Anyway here's the diff:
Only in ser-0.8.14/pkg: PLIST-mysql
Only in ser/patches: patch-modules_mysql_Makefile
--- ser/Makefile Thu Dec 16 00:31:25 2004
+++ ser-0.8.14/Makefile Mon Jul 4 23:22:41 2005
@@ -2,9 +2,9 @@
COMMENT= "SIP Express Router"
-ONLY_FOR_ARCHS= i386 sparc
+ONLY_FOR_ARCHS= i386 sparc sparc64
-VERSION= 0.8.10
+VERSION= 0.8.14
DISTNAME= ser-${VERSION}_src
PKGNAME= ser-${VERSION}
CATEGORIES= net
@@ -27,9 +27,6 @@
USE_GMAKE= Yes
ALL_TARGET= all ser.cfg
-
-LIB_DEPENDS= lib/mysql/mysqlclient.10::databases/mysql \
- expat.2::textproc/expat
do-install:
cd ${WRKDIST}; ${MAKE_PROGRAM} PREFIX=${WRKINST}${TRUEPREFIX} install
diff -ur ser/distinfo ser-0.8.14/distinfo
--- ser/distinfo Wed Jan 5 17:15:00 2005
+++ ser-0.8.14/distinfo Mon Jul 4 16:28:49 2005
@@ -1,4 +1,4 @@
-MD5 (ser-0.8.10_src.tar.gz) = a3a06a9bc15f82321a6d9bc31d582c33
-RMD160 (ser-0.8.10_src.tar.gz) = f804e319d719a9e8b4146fc981bd403200b31d93
-SHA1 (ser-0.8.10_src.tar.gz) = d3e88ff5eccf1c77b5b21637dd7c1ad3068ae89d
-SIZE (ser-0.8.10_src.tar.gz) = 931150
+MD5 (ser-0.8.14_src.tar.gz) = 3e2e12c8dfbd7dad9199304093de0838
+RMD160 (ser-0.8.14_src.tar.gz) = 72c3a0793f3dd88584ee65b3751ccf8a3776f840
+SHA1 (ser-0.8.14_src.tar.gz) = 91553951247506850d66da25819333b61b150d1d
+SIZE (ser-0.8.14_src.tar.gz) = 1551881
diff -ur ser/patches/patch-Makefile ser-0.8.14/patches/patch-Makefile
--- ser/patches/patch-Makefile Wed Jan 15 22:24:51 2003
+++ ser-0.8.14/patches/patch-Makefile Mon Jul 4 16:56:23 2005
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.2 2003/01/15 22:24:51 jakob Exp $
---- Makefile.orig Tue Nov 12 13:31:25 2002
-+++ Makefile Wed Jan 15 18:27:48 2003
-@@ -124,7 +124,7 @@ sunpkg:
+--- Makefile.orig Tue Jul 27 00:18:34 2004
++++ Makefile Mon Jul 4 16:53:56 2005
+@@ -219,7 +219,7 @@
rm -rf tmp/ser_sun_pkg
@@ -10,15 +10,20 @@
install-doc install-man
.PHONY: dbinstall
-@@ -156,11 +156,12 @@ $(man-prefix)/$(man-dir)/man8:
- $(man-prefix)/$(man-dir)/man5:
+@@ -252,16 +252,12 @@
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)
+ser.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
-# $(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
+ < etc/ser.cfg > ser.cfg
+
@@ -26,4 +31,4 @@
+ $(INSTALL-CFG) ser.cfg $(cfg-prefix)/$(cfg-dir)
install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1
- $(INSTALL-BIN) ser $(bin-prefix)/$(bin-dir)
+ $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/ser
diff -ur ser/patches/patch-Makefile_defs ser-0.8.14/patches/patch-Makefile_defs
--- ser/patches/patch-Makefile_defs Wed Jan 15 17:24:17 2003
+++ ser-0.8.14/patches/patch-Makefile_defs Mon Jul 4 16:50:08 2005
@@ -1,42 +1,37 @@
$OpenBSD: patch-Makefile_defs,v 1.1.1.1 2003/01/15 17:24:17 jakob Exp $
---- Makefile.defs.orig Tue Nov 12 18:21:28 2002
-+++ Makefile.defs Wed Jan 15 18:13:13 2003
-@@ -25,7 +25,7 @@ prefix = $(PREFIX)
- # prefix=/usr/local
- basedir =
+--- Makefile.defs.orig Tue Jul 27 12:38:33 2004
++++ Makefile.defs Mon Jul 4 16:49:20 2005
+@@ -77,7 +77,7 @@
+ BASEDIR ?=
+ basedir = $(BASEDIR)
# install prefixes for various stuff
-cfg-prefix = $(basedir)$(prefix)
+cfg-prefix =
bin-prefix = $(basedir)$(prefix)
modules-prefix = $(basedir)$(prefix)
doc-prefix = $(basedir)$(prefix)
-@@ -33,19 +33,19 @@ man-prefix = $(basedir)$(prefix)
+@@ -85,7 +85,7 @@
ut-prefix = $(basedir)$(prefix)
-
+
# dirs
-cfg-dir = etc/ser/
+cfg-dir = /etc/
bin-dir = sbin/
modules-dir = lib/ser/modules/
ifeq ($(OS), linux)
- doc-dir = share/doc/ser/
- man-dir = share/man/
- else
-- doc-dir=doc/ser/
-+ doc-dir=share/doc/ser/
- man-dir=man/
+@@ -117,7 +117,7 @@
endif
ut-prefix = bin/
# target dirs for various stuff
-cfg-target = $(prefix)/$(cfg-dir)
+cfg-target = $(cfg-dir)
modules-target = $(prefix)/$(modules-dir)
-
-
-@@ -58,7 +58,7 @@ INSTALL = install
- TAR= tar
- endif
-
+
+
+@@ -132,7 +132,7 @@
+
+ INSTALL-TOUCH = touch # used to create the file first (good to
+ # make solaris install work)
-# INSTALL-CFG = $(INSTALL) -m 644
+INSTALL-CFG = $(INSTALL) -m 644
INSTALL-BIN = $(INSTALL) -m 755
diff -ur ser/patches/patch-modules_jabber_Makefile
ser-0.8.14/patches/patch-modules_jabber_Makefile
--- ser/patches/patch-modules_jabber_Makefile Wed Jan 15 22:45:20 2003
+++ ser-0.8.14/patches/patch-modules_jabber_Makefile Mon Jul 4 16:59:18 2005
@@ -1,15 +1,9 @@
$OpenBSD: patch-modules_jabber_Makefile,v 1.2 2003/01/15 22:45:20 jakob Exp $
---- modules/jabber/Makefile.orig Mon Nov 11 15:34:53 2002
-+++ modules/jabber/Makefile Wed Jan 15 12:22:53 2003
-@@ -8,7 +8,9 @@
- auto_gen=
- NAME=jabber.so
- # expat.h location
--DEFS+=-I/usr/local/include
--LIBS=-L/usr/local/lib -lexpat
-+DEFS+=-I${LOCALBASE}/include
-+LIBS=-L${LOCALBASE}/lib -lexpat
-
+--- modules/jabber/Makefile.orig Mon Jun 2 16:41:21 2003
++++ modules/jabber/Makefile Mon Jul 4 16:58:07 2005
+@@ -18,3 +18,5 @@
+ LIBS=-L$(LOCALBASE)/lib -L/usr/pkg/lib -lexpat
+
include ../../Makefile.modules
+
+CFLAGS+= -fno-stack-protector
diff -ur ser/pkg/PLIST ser-0.8.14/pkg/PLIST
--- ser/pkg/PLIST Wed Sep 15 19:17:45 2004
+++ ser-0.8.14/pkg/PLIST Mon Jul 4 17:24:33 2005
@@ -4,11 +4,8 @@
lib/ser/modules/acc.so
lib/ser/modules/auth.so
lib/ser/modules/exec.so
-lib/ser/modules/im.so
-lib/ser/modules/jabber.so
lib/ser/modules/maxfwd.so
lib/ser/modules/msilo.so
-lib/ser/modules/mysql.so
lib/ser/modules/pike.so
lib/ser/modules/print.so
lib/ser/modules/registrar.so
@@ -22,7 +19,6 @@
@man man/man8/ser.8
sbin/gen_ha1
sbin/ser
-sbin/ser_mysql.sh
sbin/serctl
share/doc/ser/
share/doc/ser/AUTHORS
@@ -31,10 +27,7 @@
share/doc/ser/README-MODULES
share/doc/ser/README.acc
share/doc/ser/README.auth
-share/doc/ser/README.cfg
share/doc/ser/README.exec
-share/doc/ser/README.im
-share/doc/ser/README.jabber
share/doc/ser/README.maxfwd
share/doc/ser/README.pike
share/doc/ser/README.print
