Sun Mar 20 11:46:35 2011 UTC ()
* LICENSE=gnu-gpl-v2
* add user-destdir installation support


(obache)
diff -r1.2 -r1.3 pkgsrc/net/ser/Makefile
diff -r1.3 -r1.4 pkgsrc/net/ser/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/net/ser/patches/patch-ad
cvs diff -r1.2 -r1.3 pkgsrc/net/ser/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ser/Makefile 2007/06/01 00:26:36 1.2
+++ pkgsrc/net/ser/Makefile 2011/03/20 11:46:34 1.3
@@ -1,33 +1,39 @@ @@ -1,33 +1,39 @@
1# $NetBSD: Makefile,v 1.2 2007/06/01 00:26:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2011/03/20 11:46:34 obache Exp $
2# 2#
3 3
4DISTNAME= ser-0.8.14_src 4DISTNAME= ser-0.8.14_src
5PKGNAME= ser-0.8.14 5PKGNAME= ser-0.8.14
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= net comms 7CATEGORIES= net comms
8MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.14/src/ 8MASTER_SITES= ftp://ftp.berlios.de/pub/ser/0.8.14/src/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.iptel.org/ser/ 11HOMEPAGE= http://www.iptel.org/ser/
12COMMENT= SIP express router 12COMMENT= SIP express router
 13LICENSE= gnu-gpl-v2
13 14
14WRKSRC= ${WRKDIR}/ser-0.8.14 15PKG_DESTDIR_SUPPORT= user-destdir
 16
 17WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
15 18
16USE_TOOLS+= flex gmake yacc 19USE_TOOLS+= flex gmake yacc
17 20
18PKG_SYSCONFSUBDIR= ser 21PKG_SYSCONFSUBDIR= ser
19EGDIR= ${PREFIX}/share/examples/ser 22EGDIR= share/examples/ser
20CONF_FILES= ${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg 23CONF_FILES= ${PREFIX}/${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg
21 24
22REQD_DIRS= ${EGDIR} 25REQD_DIRS= ${PREFIX}/${EGDIR}
23 26
24MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q} 27MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
25MAKE_ENV+= cfg-prefix=${PREFIX}/share/examples 28MAKE_ENV+= cfg-prefix=${PREFIX}/share/examples
26MAKE_ENV+= EGDIR=${EGDIR:Q} 29MAKE_ENV+= EGDIR=${EGDIR:Q}
 30INSTALL_ENV+= BASEDIR=${DESTDIR}
27 31
28CHECK_PORTABILITY_SKIP+= scripts/sc 32CHECK_PORTABILITY_SKIP+= scripts/sc
29 33
 34INSTALLATION_DIRS+= ${EGDIR}
 35
30.include "options.mk" 36.include "options.mk"
31 37
32.include "../../mk/pthread.buildlink3.mk" 38.include "../../mk/pthread.buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/net/ser/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/ser/patches/patch-aa 2008/08/17 22:40:26 1.3
+++ pkgsrc/net/ser/patches/patch-aa 2011/03/20 11:46:34 1.4
@@ -1,26 +1,17 @@ @@ -1,26 +1,17 @@
1$NetBSD: patch-aa,v 1.3 2008/08/17 22:40:26 dholland Exp $ 1$NetBSD: patch-aa,v 1.4 2011/03/20 11:46:34 obache Exp $
2 2
3--- Makefile.defs.orig 2004-07-27 07:38:33.000000000 -0400 3--- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000
4+++ Makefile.defs 2008-08-17 18:34:04.000000000 -0400 4+++ Makefile.defs
5@@ -77,7 +77,7 @@ prefix = $(PREFIX) 
6 BASEDIR ?= 
7 basedir = $(BASEDIR) 
8 # install prefixes for various stuff 
9-cfg-prefix = $(basedir)$(prefix) 
10+cfg-prefix = $(basedir)$(prefix)/share/examples 
11 bin-prefix = $(basedir)$(prefix) 
12 modules-prefix = $(basedir)$(prefix) 
13 doc-prefix = $(basedir)$(prefix) 
14@@ -85,9 +85,14 @@ man-prefix = $(basedir)$(prefix) 5@@ -85,9 +85,14 @@ man-prefix = $(basedir)$(prefix)
15 ut-prefix = $(basedir)$(prefix) 6 ut-prefix = $(basedir)$(prefix)
16  7
17 # dirs 8 # dirs
18-cfg-dir = etc/ser/ 9-cfg-dir = etc/ser/
19+cfg-dir = ser/ 10+cfg-dir = ser/
20+eg-dir = $(EGDIR)/ 11+eg-dir = $(EGDIR)/
21 bin-dir = sbin/ 12 bin-dir = sbin/
22 modules-dir = lib/ser/modules/ 13 modules-dir = lib/ser/modules/
23+ifeq (1, 1) 14+ifeq (1, 1)
24+ doc-dir = share/doc/ser 15+ doc-dir = share/doc/ser
25+ man-dir = $(PKGMANDIR) 16+ man-dir = $(PKGMANDIR)
26+else 17+else
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/ser/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/ser/patches/patch-ad 2007/03/23 06:24:49 1.1.1.1
+++ pkgsrc/net/ser/patches/patch-ad 2011/03/20 11:46:34 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ad,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $ 1$NetBSD: patch-ad,v 1.2 2011/03/20 11:46:34 obache Exp $
2 2
3--- Makefile.orig 2004-07-27 01:18:34.000000000 +0200 3--- Makefile.orig 2004-07-26 23:18:34.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -252,15 +252,10 @@ $(man-prefix)/$(man-dir)/man5: 5@@ -252,15 +252,10 @@ $(man-prefix)/$(man-dir)/man5:
6 mkdir -p $(man-prefix)/$(man-dir)/man5 6 mkdir -p $(man-prefix)/$(man-dir)/man5
7  7
8 # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work 8 # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
9-install-cfg: $(cfg-prefix)/$(cfg-dir) 9-install-cfg: $(cfg-prefix)/$(cfg-dir)
10+install-cfg: 10+install-cfg:
11 sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \ 11 sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \
12- < etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.sample 12- < etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
13- chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample 13- chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
14- if [ -z "${skip_cfg_install}" -a \ 14- if [ -z "${skip_cfg_install}" -a \
15- ! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \ 15- ! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
16- mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \ 16- mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
17- $(cfg-prefix)/$(cfg-dir)ser.cfg; \ 17- $(cfg-prefix)/$(cfg-dir)ser.cfg; \
18- fi 18- fi
19+ < etc/ser.cfg > $(eg-dir)ser.cfg 19+ < etc/ser.cfg > $(cfg-prefix)/$(eg-dir)ser.cfg
20+ chmod 644 $(eg-dir)ser.cfg 20+ chmod 644 $(cfg-prefix)/$(eg-dir)ser.cfg
21 # $(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir) 21 # $(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
22  22
23 install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1 23 install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1