[pkgsrc/trunk]: pkgsrc/net/userppp Fixes installation directory issue, report...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f706d0bb6dd
branches:  trunk
changeset: 532624:0f706d0bb6dd
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Aug 25 09:00:45 2007 +0000

description:
Fixes installation directory issue, reported in PR 36779.
Honor PKG_SYSCONFDIR and PKGMANDIR.
Use SUBST framework instead of manual sed.
And pkglintfy.

Bump PKGREVISION.

diffstat:

 net/userppp/Makefile         |  22 +++++++++++++---------
 net/userppp/PLIST            |   3 +--
 net/userppp/distinfo         |   8 ++++----
 net/userppp/patches/patch-aa |   4 ++--
 net/userppp/patches/patch-ab |   4 ++--
 net/userppp/patches/patch-ad |   4 ++--
 6 files changed, 24 insertions(+), 21 deletions(-)

diffs (133 lines):

diff -r 27a495e1c7d1 -r 0f706d0bb6dd net/userppp/Makefile
--- a/net/userppp/Makefile      Sat Aug 25 06:40:39 2007 +0000
+++ b/net/userppp/Makefile      Sat Aug 25 09:00:45 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/07/04 20:54:54 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2007/08/25 09:00:45 obache Exp $
 
 DISTNAME=              ppp-001107.src
 PKGNAME=               userppp-001107
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net
 MASTER_SITES=          http://www.NetBSD.org/~ad/
 
@@ -15,17 +15,17 @@
 WRKSRC=                        ${WRKDIR}/${DISTNAME:S/.src//}
 MANCOMPRESSED_IF_MANZ= YES
 
+PKG_SYSCONFSUBDIR=     ppp
+
 CFLAGS+=       -fno-strict-aliasing
 # fix build on -current for wrong is* arguments (char instead of unsigned char)
 BUILDLINK_TRANSFORM+=  rm:-Werror
 
-post-patch:
-       (cd ${WRKSRC};                                                  \
-       for i in ppp/ppp.8 pppctl/pppctl.8; do \
-               ${SED}  -e "s,/etc/ppp,${PREFIX}/etc/ppp,"              \
-                       -e "s,/usr/share,${PREFIX}/share,"              \
-                       $$i > $$i.done; ${MV} $$i.done $$i;             \
-       done)
+SUBST_CLASSES+=                cfgdir
+SUBST_STAGE.cfgdir=    do-configure
+SUBST_FILES.cfgdir=    ppp/ppp.8 pppctl/pppctl.8
+SUBST_SED.cfgdir=      -e "s,/etc/ppp,${PKG_SYSCONFDIR},"
+SUBST_SED.cfgdir+=     -e "s,/usr/share,${PREFIX}/share,"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -35,5 +35,9 @@
 PKG_GROUPS=    ${USERPPP_GROUP}
 
 PKG_GROUPS_VARS+=      USERPPP_GROUP
+BUILD_DEFS+=           USERPPP_GROUP
+
+INSTALLATION_DIRS=     ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
+INSTALLATION_DIRS+=    share/examples/ppp
 
 .include "../../mk/bsd.pkg.mk"
diff -r 27a495e1c7d1 -r 0f706d0bb6dd net/userppp/PLIST
--- a/net/userppp/PLIST Sat Aug 25 06:40:39 2007 +0000
+++ b/net/userppp/PLIST Sat Aug 25 09:00:45 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/14 12:12:32 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/08/25 09:00:45 obache Exp $
 man/cat8/ppp.0
 man/cat8/pppctl.0
 man/man8/ppp.8
@@ -21,5 +21,4 @@
 share/examples/ppp/ppp.secret.sample
 share/examples/ppp/ppp.secret.span-isp
 share/examples/ppp/ppp.secret.span-isp.working
-@unexec ${RMDIR} %D/etc/ppp >/dev/null 2>&1 || ${TRUE}
 @dirrm share/examples/ppp
diff -r 27a495e1c7d1 -r 0f706d0bb6dd net/userppp/distinfo
--- a/net/userppp/distinfo      Sat Aug 25 06:40:39 2007 +0000
+++ b/net/userppp/distinfo      Sat Aug 25 09:00:45 2007 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.7 2005/09/04 20:13:06 abs Exp $
+$NetBSD: distinfo,v 1.8 2007/08/25 09:00:45 obache 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) = 50a3fc373f329071fe2a01da2db68487d7936365
-SHA1 (patch-ab) = aeeb13e78729c2b6e12da1abf503843041e4473d
+SHA1 (patch-aa) = 963d960f8e619e33f8dd6af8b5efde147c7cd971
+SHA1 (patch-ab) = 5ab766f145ba0a62651dd4d358f4011dad9d5cd9
 SHA1 (patch-ac) = 22825b6be3847679a5f49a102a8e5a37d44d93fd
-SHA1 (patch-ad) = 815f2fcfcade3e6d5d257869cf4157d57d11d2c3
+SHA1 (patch-ad) = 76e6caa21f9f0f78c71d4bc45fad4329c5d3a2e2
 SHA1 (patch-ae) = d5e91493078e9c46d12940f1007be2d2a070d1bc
 SHA1 (patch-af) = 1bd43fe67231b5664b245add5d6a19061ad909ec
 SHA1 (patch-ag) = 3c722b11ee8e0986fc0e6cc052176a72007e8f1b
diff -r 27a495e1c7d1 -r 0f706d0bb6dd net/userppp/patches/patch-aa
--- a/net/userppp/patches/patch-aa      Sat Aug 25 06:40:39 2007 +0000
+++ b/net/userppp/patches/patch-aa      Sat Aug 25 09:00:45 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2000/11/07 18:11:47 ad Exp $
+$NetBSD: patch-aa,v 1.3 2007/08/25 09:00:45 obache Exp $
 
 --- Makefile.orig      Tue Nov  7 05:45:45 2000
 +++ Makefile   Tue Nov  7 16:42:17 2000
@@ -6,7 +6,7 @@
  SUBDIR+=libhack ppp pppctl
 -EXAMPLES=/usr/share/examples/ppp
 +EXAMPLES=${PREFIX}/share/examples/ppp
-+MYCONFDIR=${PREFIX}/etc/ppp
++MYCONFDIR=${PKG_SYSCONFDIR}
  .include <bsd.subdir.mk>
  afterinstall:
 -      if [ ! -d /etc/ppp ]; then mkdir -p /etc/ppp; chmod 755 /etc/ppp; fi
diff -r 27a495e1c7d1 -r 0f706d0bb6dd net/userppp/patches/patch-ab
--- a/net/userppp/patches/patch-ab      Sat Aug 25 06:40:39 2007 +0000
+++ b/net/userppp/patches/patch-ab      Sat Aug 25 09:00:45 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2005/09/03 21:30:11 abs Exp $
+$NetBSD: patch-ab,v 1.5 2007/08/25 09:00:46 obache Exp $
 
 --- ppp/Makefile.orig  2000-11-07 05:45:44.000000000 +0000
 +++ ppp/Makefile
@@ -25,7 +25,7 @@
  # To cope with uucplock changes:
  # Note, uucplock.c and libutil.h do not really belong here !
 -CFLAGS+=-I. -I../libhack
-+CFLAGS+=-D_PATH_PPP=\"${PREFIX}/etc/ppp\" -I. -I../libhack
++CFLAGS+=-D_PATH_PPP=\"${PKG_SYSCONFDIR}\" -I. -I../libhack
  SRCS+=uucplock.c
 -BINDIR=/usr/sbin
  
diff -r 27a495e1c7d1 -r 0f706d0bb6dd net/userppp/patches/patch-ad
--- a/net/userppp/patches/patch-ad      Sat Aug 25 06:40:39 2007 +0000
+++ b/net/userppp/patches/patch-ad      Sat Aug 25 09:00:45 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/11/07 17:26:58 ad Exp $
+$NetBSD: patch-ad,v 1.2 2007/08/25 09:00:46 obache Exp $
 
 --- /dev/null  Sat Jul 29 16:32:22 2000
 +++ Makefile.inc       Tue Nov  7 15:24:26 2000
 @@ -0,0 +1,2 @@
 +BINDIR=       ${PREFIX}/sbin
-+MANDIR=       ${PREFIX}/man
++MANDIR=       ${PREFIX}/${PKGMANDIR}