summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorobache <obache>2007-12-22 13:01:07 +0000
committerobache <obache>2007-12-22 13:01:07 +0000
commite84a973becaaa96389b9c36f854951e47ab8ca6a (patch)
treec0ba1269b2c1cdba656e44d5bec08b9ebd8dd87e /net
parent4af4630ec526e32427e4d4de39a60e359ac61076 (diff)
downloadpkgsrc-e84a973becaaa96389b9c36f854951e47ab8ca6a.tar.gz
Fix a patch, lost 'create example directory'.
Then DESTDIR ready.
Diffstat (limited to 'net')
-rw-r--r--net/rp-l2tp/Makefile6
-rw-r--r--net/rp-l2tp/distinfo4
-rw-r--r--net/rp-l2tp/patches/patch-ab5
3 files changed, 10 insertions, 5 deletions
diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
index 504d3843b89..0eec5da208e 100644
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/12/22 13:01:07 obache Exp $
#
DISTNAME= rp-l2tp-0.3
@@ -16,6 +16,10 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
USE_TOOLS+= gmake
+INSTALL_MAKE_FLAGS+= RPM_INSTALL_ROOT=${DESTDIR:Q}
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
post-patch:
for f in l2tp.conf.5 l2tpd.8; do \
${MV} ${WRKSRC}/man/$$f ${WRKSRC}/man/$$f.in && \
diff --git a/net/rp-l2tp/distinfo b/net/rp-l2tp/distinfo
index bf6e377fe50..20eee521192 100644
--- a/net/rp-l2tp/distinfo
+++ b/net/rp-l2tp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2006/05/12 09:41:15 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/12/22 13:01:08 obache Exp $
SHA1 (rp-l2tp-0.3.tar.gz) = 3f4f08a5271f0adf1dd90567851f1a8e223ecb72
RMD160 (rp-l2tp-0.3.tar.gz) = 25ed4a68a01c08f3acee1ce01a90673a568db55f
Size (rp-l2tp-0.3.tar.gz) = 191418 bytes
SHA1 (patch-aa) = a351d8bcea431bc47a0a375c770d07e059103841
-SHA1 (patch-ab) = 9013297a1e6fede036894be04413feb0cc1bb803
+SHA1 (patch-ab) = 4a30988989688b1cdc30fdd73edd7fd60509d2e3
SHA1 (patch-ac) = ed6cb031b458027f7df8a97a051a1f12bc6b5e00
SHA1 (patch-ad) = 943de75b5928bca92ec739106f3c5679189557c3
SHA1 (patch-ae) = 62c6d5fb9ddd69467fbb6ed6b502add0ae646a29
diff --git a/net/rp-l2tp/patches/patch-ab b/net/rp-l2tp/patches/patch-ab
index e81189192e6..d715b970dab 100644
--- a/net/rp-l2tp/patches/patch-ab
+++ b/net/rp-l2tp/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
+$NetBSD: patch-ab,v 1.2 2007/12/22 13:01:08 obache Exp $
--- Makefile.in.orig 2002-09-30 21:33:55.000000000 +0100
+++ Makefile.in 2003-12-18 10:24:07.000000000 +0000
@@ -34,12 +34,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/12/18 16:39:18 agc Exp $
libevent/libevent.a:
test -d libevent || ln -s ../libevent .
-@@ -82,8 +91,7 @@
+@@ -82,8 +91,8 @@
install: all
-mkdir -p $(RPM_INSTALL_ROOT)$(sbindir)
$(install) -m 755 -s l2tpd $(RPM_INSTALL_ROOT)$(sbindir)
- -mkdir -p $(RPM_INSTALL_ROOT)/etc/l2tp
- $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)/etc/l2tp/l2tp.conf.example
++ -mkdir -p $(RPM_INSTALL_ROOT)${PREFIX}/share/examples
+ $(install) -m 644 l2tp.conf $(RPM_INSTALL_ROOT)${PREFIX}/share/examples/l2tp.conf
-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man8
-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man5