diff options
| author | pettai <pettai@pkgsrc.org> | 2010-10-24 16:55:03 +0000 |
|---|---|---|
| committer | pettai <pettai@pkgsrc.org> | 2010-10-24 16:55:03 +0000 |
| commit | d9eb3e59e59c16383529f06c117f7d1a3312f864 (patch) | |
| tree | e00eed0f8a828d8dae1ab1450f1d4fb2885716fe /net | |
| parent | 0962370269cfa8d91fea15cd66b22fe6279d1e32 (diff) | |
| download | pkgsrc-d9eb3e59e59c16383529f06c117f7d1a3312f864.tar.gz | |
Missed the included patch in PR pkg/38038, now its also appended
Diffstat (limited to 'net')
| -rw-r--r-- | net/pptp/Makefile | 21 | ||||
| -rw-r--r-- | net/pptp/distinfo | 4 | ||||
| -rw-r--r-- | net/pptp/patches/patch-ah | 11 |
3 files changed, 27 insertions, 9 deletions
diff --git a/net/pptp/Makefile b/net/pptp/Makefile index 42362928ef1..78555121c1e 100644 --- a/net/pptp/Makefile +++ b/net/pptp/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.14 2010/10/24 16:16:28 pettai Exp $ +# $NetBSD: Makefile,v 1.15 2010/10/24 16:55:03 pettai Exp $ DISTNAME= pptp-1.7.1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pptpclient/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pptpclient.sourceforge.net/ -COMMENT= PPTP client package for Microsoft VPN servers (no encryption yet) +COMMENT= PPTP client package for Microsoft VPN servers LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir @@ -30,9 +31,17 @@ post-install: .include "../../mk/bsd.prefs.mk" # Not quite yet---special config for MPPE in pppd. -#.if defined(PPTP_USE_MPPE) -#DEPENDS+= ppp-mppe-2.3.9:../../net/ppp-mppe -#CONFIGURE_ARGS+= --with-pppd=${PREFIX}/sbin/pppd -#.endif +.if defined(PPTP_USE_MPPE) +DEPENDS+= pppd>=2.4.3:../../net/ppp +MAKE_FLAGS+= PPPD=${PREFIX}/sbin/pppd +.else +MAKE_FLAGS+= PPPD=/usr/sbin/pppd +.endif + +SUBST_CLASSES+= pptp +SUBST_MESSAGE.pptp= "Fixing hardcoded paths." +SUBST_STAGE.pptp= post-patch +SUBST_FILES.pptp= pptp.8 +SUBST_SED.pptp= -e 's,/usr,${PREFIX},g' .include "../../mk/bsd.pkg.mk" diff --git a/net/pptp/distinfo b/net/pptp/distinfo index e789a1b5758..f320b36d04b 100644 --- a/net/pptp/distinfo +++ b/net/pptp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2010/10/24 16:16:28 pettai Exp $ +$NetBSD: distinfo,v 1.9 2010/10/24 16:55:03 pettai Exp $ SHA1 (pptp-1.7.1.tar.gz) = cc2e4f40c5e3316bede41ec0a092a32025682851 RMD160 (pptp-1.7.1.tar.gz) = f510262e8c06058d754d6d73d1b289fcdbc54dc7 @@ -6,4 +6,4 @@ Size (pptp-1.7.1.tar.gz) = 229024 bytes SHA1 (patch-ab) = 01d8346064bee226adb11035d98c2f06523b8e4a SHA1 (patch-ac) = 8a0dd645ed0a766375a803fecda80d716c441d52 SHA1 (patch-ad) = a037ba927c181f812ecd5c1ea2d344483d8ad4bf -SHA1 (patch-ah) = 7e8bef0f85fedce4588e6615c0c1f54eebfe218d +SHA1 (patch-ah) = 51dd733794ed8c3c30aeb908487767cb6fef3e9a diff --git a/net/pptp/patches/patch-ah b/net/pptp/patches/patch-ah index cb05bfe4890..a39bfd4922d 100644 --- a/net/pptp/patches/patch-ah +++ b/net/pptp/patches/patch-ah @@ -1,7 +1,16 @@ -$NetBSD: patch-ah,v 1.2 2008/06/12 02:14:41 joerg Exp $ +$NetBSD: patch-ah,v 1.3 2010/10/24 16:55:03 pettai Exp $ --- Makefile.orig 2005-07-28 01:15:10.000000000 +0000 +++ Makefile +@@ -4,7 +4,7 @@ + + ################################################################# + # CHANGE THIS LINE to point to the location of your pppd binary. +-PPPD = /usr/sbin/pppd ++#PPPD = /usr/sbin/pppd + ################################################################# + + BINDIR=$(DESTDIR)/usr/sbin @@ -54,12 +54,12 @@ distclean: clobber test: vector_test |