diff options
| author | joerg <joerg@pkgsrc.org> | 2008-06-12 02:14:13 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-06-12 02:14:13 +0000 |
| commit | ba171a91fab519f587b027c1a2888cb6e3fce049 (patch) | |
| tree | c12b9c282e2706cb6bac87456615dfdf2b256e55 /net/pptp | |
| parent | 3ba79d294eb62e9c75cc32d37b4af7759af8c9d6 (diff) | |
| download | pkgsrc-ba171a91fab519f587b027c1a2888cb6e3fce049.tar.gz | |
Add DESTDIR support.
Diffstat (limited to 'net/pptp')
| -rw-r--r-- | net/pptp/Makefile | 19 | ||||
| -rw-r--r-- | net/pptp/distinfo | 4 | ||||
| -rw-r--r-- | net/pptp/patches/patch-ah | 30 |
3 files changed, 31 insertions, 22 deletions
diff --git a/net/pptp/Makefile b/net/pptp/Makefile index d7f02595659..c8ffec4252f 100644 --- a/net/pptp/Makefile +++ b/net/pptp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/05/12 09:30:55 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2008/06/12 02:14:41 joerg Exp $ DISTNAME= pptp-1.7.0 PKGREVISION= 2 @@ -9,21 +9,22 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pptpclient.sourceforge.net/ COMMENT= PPTP client package for Microsoft VPN servers (no encryption yet) +PKG_DESTDIR_SUPPORT= user-destdir + NOT_FOR_PLATFORM= Interix-*-* -MAKE_ENV+= ROOT_USER=${ROOT_USER} -MAKE_FLAGS+= BINDIR=${PREFIX:Q}/sbin -MAKE_FLAGS+= MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}/man8 -MAKE_FLAGS+= PPPDIR=${PREFIX:Q}/share/examples/pptp +MAKE_FLAGS+= BINDIR=${PREFIX}/sbin +MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR:Q}/man8 +MAKE_FLAGS+= PPPDIR=${PREFIX}/share/examples/pptp -INSTALLATION_DIRS= bin ${PKGMANDIR:Q}/man8 share/examples/pptp +INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/examples/pptp INSTALLATION_DIRS+= share/doc/pptp/Documentation share/doc/pptp/Reference DOCDIR= ${PREFIX}/share/doc/pptp post-install: - cd ${WRKSRC:Q}/Documentation && ${INSTALL_DATA} * ${DOCDIR:Q}/Documentation - cd ${WRKSRC:Q}/Reference && ${INSTALL_DATA} * ${DOCDIR:Q}/Reference - cd ${WRKSRC:Q} && ${INSTALL_DATA} INSTALL NEWS README USING ${DOCDIR:Q} + cd ${WRKSRC}/Documentation && ${INSTALL_DATA} * ${DESTDIR}${DOCDIR}/Documentation + cd ${WRKSRC}/Reference && ${INSTALL_DATA} * ${DESTDIR}${DOCDIR}/Reference + cd ${WRKSRC} && ${INSTALL_DATA} INSTALL NEWS README USING ${DESTDIR}${DOCDIR} .include "../../mk/bsd.prefs.mk" diff --git a/net/pptp/distinfo b/net/pptp/distinfo index e7e47990fc5..756919b67fb 100644 --- a/net/pptp/distinfo +++ b/net/pptp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/05/12 09:30:55 joerg Exp $ +$NetBSD: distinfo,v 1.7 2008/06/12 02:14:41 joerg Exp $ SHA1 (pptp-1.7.0.tar.gz) = fc96e8a765bf17eb02ce1584d8e9d024b68ab5a7 RMD160 (pptp-1.7.0.tar.gz) = 62c947379c44102945a198ddc914d5aa634db13c @@ -6,4 +6,4 @@ Size (pptp-1.7.0.tar.gz) = 227699 bytes SHA1 (patch-ab) = 01d8346064bee226adb11035d98c2f06523b8e4a SHA1 (patch-ac) = 8a0dd645ed0a766375a803fecda80d716c441d52 SHA1 (patch-ad) = a037ba927c181f812ecd5c1ea2d344483d8ad4bf -SHA1 (patch-ah) = 3a08c64c0cff8ca3d7e78ce445e7b126076c1425 +SHA1 (patch-ah) = 7e8bef0f85fedce4588e6615c0c1f54eebfe218d diff --git a/net/pptp/patches/patch-ah b/net/pptp/patches/patch-ah index 0831bccdcdc..cb05bfe4890 100644 --- a/net/pptp/patches/patch-ah +++ b/net/pptp/patches/patch-ah @@ -1,15 +1,23 @@ -$NetBSD: patch-ah,v 1.1 2006/04/14 10:32:02 rillig Exp $ +$NetBSD: patch-ah,v 1.2 2008/06/12 02:14:41 joerg Exp $ -Not everyone wants to install this as root. - ---- Makefile.orig 2005-07-28 03:15:10.000000000 +0200 -+++ Makefile 2006-03-14 14:41:35.000000000 +0100 -@@ -55,7 +55,7 @@ test: vector_test +--- Makefile.orig 2005-07-28 01:15:10.000000000 +0000 ++++ Makefile +@@ -54,12 +54,12 @@ distclean: clobber + test: vector_test install: - mkdir -p $(BINDIR) +- mkdir -p $(BINDIR) - install -o root -m 555 pptp $(BINDIR) -+ install -o ${ROOT_USER} -m 555 pptp $(BINDIR) - mkdir -p $(MANDIR) - install -m 644 pptp.8 $(MANDIR) - mkdir -p $(PPPDIR) +- mkdir -p $(MANDIR) +- install -m 644 pptp.8 $(MANDIR) +- mkdir -p $(PPPDIR) +- install -m 644 options.pptp $(PPPDIR) ++ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${BINDIR} ++ ${BSD_INSTALL_PROGRAM} pptp ${DESTDIR}${BINDIR} ++ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR} ++ ${BSD_INSTALL_MAN} pptp.8 ${DESTDIR}${MANDIR} ++ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PPPDIR} ++ ${BSD_INSTALL_DATA} options.pptp ${DESTDIR}${PPPDIR} + + uninstall: + $(RM) $(BINDIR)/pptp $(MANDIR)/pptp.8 |