fix broken/incomplete PKG_SYSCONFDIR handling

5 files changed, 44 insertions, 22 deletions

diff --git a/security/mirrordir/Makefile b/security/mirrordir/Makefile
index 647425c824c..defee721e51 100644
--- a/security/mirrordir/Makefile
+++ b/security/mirrordir/Makefile
@@ -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 @@ USE_LIBTOOL=	yes
 
 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 --git a/security/mirrordir/PLIST b/security/mirrordir/PLIST
index 43f4f092590..97a154019ab 100644
--- a/security/mirrordir/PLIST
+++ b/security/mirrordir/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:13:32 joerg Exp $
-bin/mirrordir
-bin/forward
+@comment $NetBSD: PLIST,v 1.4 2009/10/29 22:24:51 tnn Exp $
 bin/copydir
-bin/recursdir
+bin/forward
+bin/mirrordir
 bin/pslogin
+bin/recursdir
 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/libmirrordirz.la
 lib/libdiffie.la
-man/man1/mirrordir.1
+lib/libmirrordirz.la
 man/man1/copydir.1
-man/man1/recursdir.1
+man/man1/forward.1
+man/man1/mirrordir.1
 man/man1/pslogin.1
+man/man1/recursdir.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 --git a/security/mirrordir/distinfo b/security/mirrordir/distinfo
index 66b95031333..d66f093e22a 100644
--- a/security/mirrordir/distinfo
+++ b/security/mirrordir/distinfo
@@ -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 --git a/security/mirrordir/patches/patch-ab b/security/mirrordir/patches/patch-ab
index 9950c24a5de..ad00b99f91e 100644
--- a/security/mirrordir/patches/patch-ab
+++ b/security/mirrordir/patches/patch-ab
@@ -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 --git a/security/mirrordir/patches/patch-ad b/security/mirrordir/patches/patch-ad
new file mode 100644
index 00000000000..827c6e292d0
--- /dev/null
+++ b/security/mirrordir/patches/patch-ad
@@ -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 =