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
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/06/01 00:26:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/20 11:46:34 obache Exp $
#
DISTNAME= ser-0.8.14_src
@@ -10,22 +10,28 @@
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.iptel.org/ser/
COMMENT= SIP express router
+LICENSE= gnu-gpl-v2
-WRKSRC= ${WRKDIR}/ser-0.8.14
+PKG_DESTDIR_SUPPORT= user-destdir
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+
USE_TOOLS+= flex gmake yacc
PKG_SYSCONFSUBDIR= ser
-EGDIR= ${PREFIX}/share/examples/ser
-CONF_FILES= ${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg
+EGDIR= share/examples/ser
+CONF_FILES= ${PREFIX}/${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg
-REQD_DIRS= ${EGDIR}
+REQD_DIRS= ${PREFIX}/${EGDIR}
MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
MAKE_ENV+= cfg-prefix=${PREFIX}/share/examples
MAKE_ENV+= EGDIR=${EGDIR:Q}
+INSTALL_ENV+= BASEDIR=${DESTDIR}
CHECK_PORTABILITY_SKIP+= scripts/sc
+
+INSTALLATION_DIRS+= ${EGDIR}
.include "options.mk"
--- 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,16 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2008/08/17 22:40:26 dholland Exp $
+$NetBSD: patch-aa,v 1.4 2011/03/20 11:46:34 obache Exp $
---- Makefile.defs.orig 2004-07-27 07:38:33.000000000 -0400
-+++ Makefile.defs 2008-08-17 18:34:04.000000000 -0400
-@@ -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)
+--- Makefile.defs.orig 2004-07-27 11:38:33.000000000 +0000
++++ Makefile.defs
@@ -85,9 +85,14 @@ man-prefix = $(basedir)$(prefix)
ut-prefix = $(basedir)$(prefix)
--- 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,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2011/03/20 11:46:34 obache Exp $
---- Makefile.orig 2004-07-27 01:18:34.000000000 +0200
+--- Makefile.orig 2004-07-26 23:18:34.000000000 +0000
+++ Makefile
@@ -252,15 +252,10 @@ $(man-prefix)/$(man-dir)/man5:
mkdir -p $(man-prefix)/$(man-dir)/man5
@@ -16,8 +16,8 @@
- 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
++ < etc/ser.cfg > $(cfg-prefix)/$(eg-dir)ser.cfg
++ chmod 644 $(cfg-prefix)/$(eg-dir)ser.cfg
# $(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1