[pkgsrc/trunk]: pkgsrc/security/mirrordir fix broken/incomplete PKG_SYSCONFDI...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3a7084b903f
branches:  trunk
changeset: 400901:b3a7084b903f
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Oct 29 22:24:51 2009 +0000

description:
fix broken/incomplete PKG_SYSCONFDIR handling

diffstat:

 security/mirrordir/Makefile         |  12 ++++++++++--
 security/mirrordir/PLIST            |  26 +++++++++++++-------------
 security/mirrordir/distinfo         |   5 +++--
 security/mirrordir/patches/patch-ab |  10 +++++-----
 security/mirrordir/patches/patch-ad |  13 +++++++++++++
 5 files changed, 44 insertions(+), 22 deletions(-)

diffs (121 lines):

diff -r c37a75c0fdcf -r b3a7084b903f security/mirrordir/Makefile
--- a/security/mirrordir/Makefile       Thu Oct 29 22:00:58 2009 +0000
+++ b/security/mirrordir/Makefile       Thu Oct 29 22:24:51 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:07 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2009/10/29 22:24:51 tnn Exp $
 #
 
 DISTNAME=      mirrordir-0.10.49
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security net
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
@@ -17,6 +17,14 @@
 
 EGDIR=         ${PREFIX}/share/examples/mirrordir
 
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/ssocket
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/pam.d
+
 CONF_FILES=    ${EGDIR}/secure-mcservusers ${PKG_SYSCONFDIR}/secure-mcservusers
+CONF_FILES+=   ${EGDIR}/ssocket/accept.cs ${PKG_SYSCONFDIR}/ssocket/accept.cs
+CONF_FILES+=   ${EGDIR}/ssocket/arcencrypt.cs ${PKG_SYSCONFDIR}/ssocket/arcencrypt.cs
+CONF_FILES+=   ${EGDIR}/ssocket/arcinit.cs ${PKG_SYSCONFDIR}/ssocket/arcinit.cs
+CONF_FILES+=   ${EGDIR}/ssocket/connect.cs ${PKG_SYSCONFDIR}/ssocket/connect.cs
+CONF_FILES+=   ${EGDIR}/pam.d/secure-mcserv ${PKG_SYSCONFDIR}/pam.d/secure-mcserv
 
 .include "../../mk/bsd.pkg.mk"
diff -r c37a75c0fdcf -r b3a7084b903f security/mirrordir/PLIST
--- a/security/mirrordir/PLIST  Thu Oct 29 22:00:58 2009 +0000
+++ b/security/mirrordir/PLIST  Thu Oct 29 22:24:51 2009 +0000
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:13:32 joerg Exp $
-bin/mirrordir
+@comment $NetBSD: PLIST,v 1.4 2009/10/29 22:24:51 tnn Exp $
+bin/copydir
 bin/forward
-bin/copydir
+bin/mirrordir
+bin/pslogin
 bin/recursdir
-bin/pslogin
 bin/secure-mcserv
-etc/pam.d/secure-mcserv
-etc/ssocket/accept.cs
-etc/ssocket/connect.cs
-etc/ssocket/arcencrypt.cs
-etc/ssocket/arcinit.cs
+lib/libdiffie.la
 lib/libmirrordirz.la
-lib/libdiffie.la
+man/man1/copydir.1
+man/man1/forward.1
 man/man1/mirrordir.1
-man/man1/copydir.1
+man/man1/pslogin.1
 man/man1/recursdir.1
-man/man1/pslogin.1
 man/man1/secure-mcserv.1
-man/man1/forward.1
+share/examples/mirrordir/pam.d/secure-mcserv
 share/examples/mirrordir/secure-mcservusers
+share/examples/mirrordir/ssocket/accept.cs
+share/examples/mirrordir/ssocket/arcencrypt.cs
+share/examples/mirrordir/ssocket/arcinit.cs
+share/examples/mirrordir/ssocket/connect.cs
diff -r c37a75c0fdcf -r b3a7084b903f security/mirrordir/distinfo
--- a/security/mirrordir/distinfo       Thu Oct 29 22:00:58 2009 +0000
+++ b/security/mirrordir/distinfo       Thu Oct 29 22:24:51 2009 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.4 2009/10/29 22:24:51 tnn Exp $
 
 SHA1 (mirrordir-0.10.49.tar.gz) = 71fe3178d59fbfd0f76b11626ae50d3a3fbbb691
 RMD160 (mirrordir-0.10.49.tar.gz) = 42c6103a997612b86427279afc832f81184ae4e2
 Size (mirrordir-0.10.49.tar.gz) = 459867 bytes
 SHA1 (patch-aa) = 92f875f5e9d22abc8304b602675d5d1775b9471f
-SHA1 (patch-ab) = 790c3a80bc45f04f43c8fed59631f56505d82e59
+SHA1 (patch-ab) = d51e250e6910a1528572dd33b37991a7d7c9afdd
 SHA1 (patch-ac) = 3e84b4f18452e94586492df848366917debab264
+SHA1 (patch-ad) = 4c0ea285f4796028398d61a0e6af319ef644c2d0
diff -r c37a75c0fdcf -r b3a7084b903f security/mirrordir/patches/patch-ab
--- a/security/mirrordir/patches/patch-ab       Thu Oct 29 22:00:58 2009 +0000
+++ b/security/mirrordir/patches/patch-ab       Thu Oct 29 22:24:51 2009 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/12/19 14:44:07 agc Exp $
+$NetBSD: patch-ab,v 1.2 2009/10/29 22:24:51 tnn Exp $
 
---- pam/Makefile.in    2001/12/19 13:54:20     1.1
-+++ pam/Makefile.in    2001/12/19 13:54:39
-@@ -75,9 +75,9 @@
+--- pam/Makefile.in.orig       2000-01-16 22:19:31.000000000 +0100
++++ pam/Makefile.in
+@@ -75,9 +75,9 @@ WRAPLIB = @WRAPLIB@
  system = @system@
  
  pkgdata_DATA = secure-mcserv
 -pkgdatadir = /etc/pam.d
-+pkgdatadir = ${PKG_SYSCONFDIR}/pam.d
++pkgdatadir = ${prefix}/share/examples/mirrordir/pam.d
  sysconf_DATA = secure-mcservusers
 -sysconfdir = /etc
 +sysconfdir = ${prefix}/share/examples/mirrordir
diff -r c37a75c0fdcf -r b3a7084b903f security/mirrordir/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/mirrordir/patches/patch-ad       Thu Oct 29 22:24:51 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2009/10/29 22:24:51 tnn Exp $
+
+--- scripts/Makefile.in.orig   2000-01-16 22:19:32.000000000 +0100
++++ scripts/Makefile.in
+@@ -77,7 +77,7 @@ WRAPLIB = @WRAPLIB@
+ system = @system@
+ 
+ sysconf_DATA = accept.cs connect.cs arcencrypt.cs arcinit.cs
+-sysconfdir = ${prefix}/etc/ssocket
++sysconfdir = ${prefix}/share/examples/mirrordir/ssocket
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =