diff options
| -rw-r--r-- | net/userppp/Makefile | 10 | ||||
| -rw-r--r-- | net/userppp/distinfo | 8 | ||||
| -rw-r--r-- | net/userppp/patches/patch-aa | 17 | ||||
| -rw-r--r-- | net/userppp/patches/patch-ab | 21 | ||||
| -rw-r--r-- | net/userppp/patches/patch-ac | 13 |
5 files changed, 44 insertions, 25 deletions
diff --git a/net/userppp/Makefile b/net/userppp/Makefile index f38da25aa86..a73989978c0 100644 --- a/net/userppp/Makefile +++ b/net/userppp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/08/25 09:00:45 obache Exp $ +# $NetBSD: Makefile,v 1.24 2008/12/18 13:55:24 joerg Exp $ DISTNAME= ppp-001107.src PKGNAME= userppp-001107 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.awfulhak.org/~brian/ COMMENT= User-PPP package as found in FreeBSD and OpenBSD +PKG_DESTDIR_SUPPORT= user-destdir + ONLY_FOR_PLATFORM= NetBSD-*-* WRKSRC= ${WRKDIR}/${DISTNAME:S/.src//} @@ -29,14 +31,18 @@ SUBST_SED.cfgdir+= -e "s,/usr/share,${PREFIX}/share," .include "../../mk/bsd.prefs.mk" +SPECIAL_PERMS+= sbin/ppp ${REAL_ROOT_USER} ${USERPPP_GROUP} 04554 + USERPPP_GROUP?= network -MAKE_ENV+= USERPPP_GROUP=${USERPPP_GROUP:Q} +MAKE_ENV+= USERPPP_GROUP=${USERPPP_GROUP:Q} BINOWN=${ROOT_USER} PKG_GROUPS= ${USERPPP_GROUP} PKG_GROUPS_VARS+= USERPPP_GROUP BUILD_DEFS+= USERPPP_GROUP +USE_BSD_MAKEFILE= yes + INSTALLATION_DIRS= ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin INSTALLATION_DIRS+= share/examples/ppp diff --git a/net/userppp/distinfo b/net/userppp/distinfo index 19c7d760b45..425941ad65f 100644 --- a/net/userppp/distinfo +++ b/net/userppp/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2007/08/25 09:00:45 obache Exp $ +$NetBSD: distinfo,v 1.9 2008/12/18 13:55:24 joerg Exp $ SHA1 (ppp-001107.src.tar.gz) = 3ba073a99f747579d8ffbe7f80b72a2af924eca2 RMD160 (ppp-001107.src.tar.gz) = 58ed989cef856d0f3004d7c4bffe2f97f784d797 Size (ppp-001107.src.tar.gz) = 380594 bytes -SHA1 (patch-aa) = 963d960f8e619e33f8dd6af8b5efde147c7cd971 -SHA1 (patch-ab) = 5ab766f145ba0a62651dd4d358f4011dad9d5cd9 -SHA1 (patch-ac) = 22825b6be3847679a5f49a102a8e5a37d44d93fd +SHA1 (patch-aa) = 8d1efeeb00c37fdd67cb5ee27c840036902e4340 +SHA1 (patch-ab) = 6331d2d80355a1cc3f81c7ea560632afb823f5db +SHA1 (patch-ac) = d690cd343e54fde2dfbc94a07d3bb26807d57f51 SHA1 (patch-ad) = 76e6caa21f9f0f78c71d4bc45fad4329c5d3a2e2 SHA1 (patch-ae) = d5e91493078e9c46d12940f1007be2d2a070d1bc SHA1 (patch-af) = 1bd43fe67231b5664b245add5d6a19061ad909ec diff --git a/net/userppp/patches/patch-aa b/net/userppp/patches/patch-aa index 142e4ca5606..dfd16ea23c3 100644 --- a/net/userppp/patches/patch-aa +++ b/net/userppp/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.3 2007/08/25 09:00:45 obache Exp $ +$NetBSD: patch-aa,v 1.4 2008/12/18 13:55:24 joerg Exp $ ---- Makefile.orig Tue Nov 7 05:45:45 2000 -+++ Makefile Tue Nov 7 16:42:17 2000 -@@ -1,8 +1,9 @@ +--- Makefile.orig 2000-11-07 06:45:45.000000000 +0100 ++++ Makefile +@@ -1,12 +1,13 @@ SUBDIR+=libhack ppp pppctl -EXAMPLES=/usr/share/examples/ppp -+EXAMPLES=${PREFIX}/share/examples/ppp -+MYCONFDIR=${PKG_SYSCONFDIR} ++EXAMPLES=${DESTDIR}${PREFIX}/share/examples/ppp ++MYCONFDIR=${DESTDIR}${PKG_SYSCONFDIR} .include <bsd.subdir.mk> afterinstall: - if [ ! -d /etc/ppp ]; then mkdir -p /etc/ppp; chmod 755 /etc/ppp; fi @@ -14,3 +14,8 @@ $NetBSD: patch-aa,v 1.3 2007/08/25 09:00:45 obache Exp $ mkdir -p $(EXAMPLES) for cfg in examples/ppp/*; \ do \ + head -1 $$cfg | grep -q '^#!' && mode=555 || mode=444; \ +- install -c -o bin -g bin -m $$mode $$cfg $(EXAMPLES); \ ++ ${BSD_INSTALL_DATA} -m $$mode $$cfg $(EXAMPLES); \ + done + @echo "Please read the README.changes file." diff --git a/net/userppp/patches/patch-ab b/net/userppp/patches/patch-ab index 36830e88dee..838cf02eca7 100644 --- a/net/userppp/patches/patch-ab +++ b/net/userppp/patches/patch-ab @@ -1,17 +1,22 @@ -$NetBSD: patch-ab,v 1.5 2007/08/25 09:00:46 obache Exp $ +$NetBSD: patch-ab,v 1.6 2008/12/18 13:55:24 joerg Exp $ ---- ppp/Makefile.orig 2000-11-07 05:45:44.000000000 +0000 +--- ppp/Makefile.orig 2000-11-07 06:45:44.000000000 +0100 +++ ppp/Makefile -@@ -29,7 +29,7 @@ BINMODE=554 - BINMODE=4554 - BINOWN= root +@@ -23,13 +23,6 @@ LDADD+= -lcrypto -lutil -lz .endif + .endif + DPADD+= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ} +-.if defined(NOSUID) || defined(PPP_NOSUID) +-BINMODE=554 +-.else +-BINMODE=4554 +-BINOWN= root +-.endif -BINGRP= network -+BINGRP= ${USERPPP_GROUP} OS!= uname -s .if ${OS} == FreeBSD MAN8= ppp.8 -@@ -90,7 +90,7 @@ CFLAGS+=-DNORADIUS +@@ -90,7 +83,7 @@ CFLAGS+=-DNORADIUS .else .if !defined(RELEASE_CRUNCH) SRCS+= radius.c @@ -20,7 +25,7 @@ $NetBSD: patch-ab,v 1.5 2007/08/25 09:00:46 obache Exp $ DPADD+= ${LIBRADIUS} .endif .endif -@@ -121,9 +121,8 @@ chap_ms.o mppe.o id.o nat_cmd.o radius.o +@@ -121,9 +114,8 @@ chap_ms.o mppe.o id.o nat_cmd.o radius.o # To cope with uucplock changes: # Note, uucplock.c and libutil.h do not really belong here ! diff --git a/net/userppp/patches/patch-ac b/net/userppp/patches/patch-ac index fbeb37984e0..f942db62115 100644 --- a/net/userppp/patches/patch-ac +++ b/net/userppp/patches/patch-ac @@ -1,12 +1,15 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/11/07 17:26:58 ad Exp $ +$NetBSD: patch-ac,v 1.2 2008/12/18 13:55:24 joerg Exp $ --- pppctl/Makefile.orig Tue Nov 7 15:15:10 2000 +++ pppctl/Makefile Tue Nov 7 15:15:18 2000 -@@ -13,7 +13,6 @@ +@@ -12,10 +12,6 @@ MAN8= pppctl.8 + MAN= pppctl.8 .endif - # To install correctly: +-# To install correctly: -BINDIR=/usr/sbin - BINOWN=root - +-BINOWN=root +- .include <bsd.prog.mk> + LDADD+= -lutil + DPADD+= ${LIBUTIL} |