[pkgsrc/trunk]: pkgsrc/net/poptop Correctly reference location of the logwtmp...

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c181fa2374ed
branches:  trunk
changeset: 487284:c181fa2374ed
user:      cube <cube%pkgsrc.org@localhost>
date:      Wed Jan 12 12:28:04 2005 +0000

description:
Correctly reference location of the logwtmp plugin.  Otherwise it makes
pppd fail and the connection doesn't happen.  PKGREVISION++.

diffstat:

 net/poptop/Makefile         |   8 +++++++-
 net/poptop/distinfo         |   4 ++--
 net/poptop/patches/patch-ac |  17 +++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r 044987b8470b -r c181fa2374ed net/poptop/Makefile
--- a/net/poptop/Makefile       Wed Jan 12 11:58:57 2005 +0000
+++ b/net/poptop/Makefile       Wed Jan 12 12:28:04 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/01/01 06:26:41 cube Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/12 12:28:04 cube Exp $
 #
 
 DISTNAME=      pptpd-1.2.1
 PKGNAME=       ${DISTNAME:S/pptpd/poptop/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=poptop/}
 
@@ -22,6 +23,11 @@
 SUBST_FILES.sysconf=   defaults.h pptpd.8 pptpd.conf.5
 SUBST_SED.sysconf=     -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},
 
+SUBST_CLASSES+=                logwtmp
+SUBST_STAGE.logwtmp=   post-patch
+SUBST_FILES.logwtmp=   pptpctrl.c
+SUBST_SED.logwtmp=     -e s,@@PREFIX@@,${PREFIX},
+
 RCD_SCRIPTS=   pptpd
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
diff -r 044987b8470b -r c181fa2374ed net/poptop/distinfo
--- a/net/poptop/distinfo       Wed Jan 12 11:58:57 2005 +0000
+++ b/net/poptop/distinfo       Wed Jan 12 12:28:04 2005 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2005/01/01 06:26:41 cube Exp $
+$NetBSD: distinfo,v 1.6 2005/01/12 12:28:04 cube Exp $
 
 SHA1 (pptpd-1.2.1.tar.gz) = ffbeff5d8a8c0725125ec0682b0871e927aefba4
 Size (pptpd-1.2.1.tar.gz) = 180974 bytes
 SHA1 (patch-aa) = 40e5873fc582040112e97477e3709e729245d4c9
 SHA1 (patch-ab) = 43741ecf4f1f52113814ccd0f70a9ab173c0667f
-SHA1 (patch-ac) = 9414c9d086913d8a322629d87f3ed79ecbd4059f
+SHA1 (patch-ac) = e2e9ef357670eb394457218ee2c9468d2400bbb1
 SHA1 (patch-ad) = 451e6811622114c4e99df3b9ff31238bfa6623ed
 SHA1 (patch-ae) = 7072ce9eacbdc52632c2eb8341dc4519d6d79d78
 SHA1 (patch-af) = f087f8b16566701ab51dbb967a126c710f785213
diff -r 044987b8470b -r c181fa2374ed net/poptop/patches/patch-ac
--- a/net/poptop/patches/patch-ac       Wed Jan 12 11:58:57 2005 +0000
+++ b/net/poptop/patches/patch-ac       Wed Jan 12 12:28:04 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/10/08 04:32:23 dbj Exp $
+$NetBSD: patch-ac,v 1.2 2005/01/12 12:28:04 cube Exp $
 
---- pptpctrl.c.orig    Wed Sep 22 20:01:28 1999
-+++ pptpctrl.c Sat Sep 25 21:27:35 1999
-@@ -33,6 +33,7 @@
+--- pptpctrl.c.orig    2004-04-28 13:36:07.000000000 +0200
++++ pptpctrl.c
+@@ -32,6 +32,7 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #ifdef HAVE_OPENPTY
@@ -10,3 +10,12 @@
  #ifdef HAVE_PTY_H
  #include <pty.h>
  #endif
+@@ -734,7 +735,7 @@ static void launch_pppd(char **pppaddrs,
+ 
+         if (pptp_logwtmp) {
+                  pppd_argv[an++] = "plugin";
+-                 pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
++                 pppd_argv[an++] = "@@PREFIX@@/lib/pptpd/pptpd-logwtmp.so";
+                  pppd_argv[an++] = "pptpd-original-ip";
+                  pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
+         }