Honour PKG_SYSCONFDIR. Bump PKGREVISION to 1.

5 files changed, 22 insertions, 12 deletions

diff --git a/net/socks4/Makefile b/net/socks4/Makefile
index 09542be5892..5f2352662f9 100644
--- a/net/socks4/Makefile
+++ b/net/socks4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2002/08/25 18:39:35 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/01 22:03:49 jmmv Exp $
 #
 
 DISTNAME=	export.socks.cstc.4.2.2
 PKGNAME=	socks4-2.2
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/socks.cstc.4.2
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.nec.com/pub/socks/socks4/
@@ -18,13 +19,21 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_BUILDLINK2=		# defined
+USE_PKGINSTALL=		yes
 MAKE_ENV+=		OPTIMIZE="${CFLAGS}"
 
+EGDIR=		${PREFIX}/share/examples/socks4
+CONF_FILES=	${EGDIR}/socks.conf ${PKG_SYSCONFDIR}/socks.conf
+
 post-patch:
 	@cd ${WRKSRC};							\
 	${SED} -e "s|@PREFIX@|${PREFIX}|g"				\
+		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"		\
 		include/socks.h > ${WRKSRC}/include/socks.h.new;	\
 	${MV} include/socks.h.new include/socks.h
 	@${ECHO} "sockd 0.0.0.0 0.0.0.0" >> ${WRKSRC}/socks.conf
 
+pre-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/socks4/PLIST b/net/socks4/PLIST
index 879f03a6713..c80a54e069e 100644
--- a/net/socks4/PLIST
+++ b/net/socks4/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/01 22:03:49 jmmv Exp $
 bin/rfinger
 bin/rwhois
 bin/rftp
 bin/rtelnet
-etc/socks.conf
 lib/libsocks4.a
 libexec/sockd
 man/man1/rfinger.1
@@ -15,3 +14,5 @@ man/man5/sockd.conf.5
 man/man5/sockd.route.5
 man/man5/socks.conf.5
 man/man8/sockd.8
+share/examples/socks4/socks.conf
+@dirrm share/examples/socks4
diff --git a/net/socks4/distinfo b/net/socks4/distinfo
index 6cb44c81a8d..316c57493da 100644
--- a/net/socks4/distinfo
+++ b/net/socks4/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/06/28 20:20:49 jlam Exp $
+$NetBSD: distinfo,v 1.4 2003/05/01 22:03:49 jmmv Exp $
 
 SHA1 (export.socks.cstc.4.2.2.tar.gz) = 7d8d041c82213f9fd60f64aadf9c1ade418e15db
 Size (export.socks.cstc.4.2.2.tar.gz) = 278805 bytes
-SHA1 (patch-aa) = af111863aaefe008e420ee010b54591081ad81c4
-SHA1 (patch-ab) = e0206c1fece2b8ec63a7fa24b92d1b8ba3ce5c72
+SHA1 (patch-aa) = f95f67f90ddf1cf0dbf9c56a97dc7eafe1b5bfe5
+SHA1 (patch-ab) = fd3f119add1144b24eb2cec578c011bcb397e875
 SHA1 (patch-ac) = d3988d7ae5103bd7849305bb555d7cf3b1574ddc
 SHA1 (patch-ad) = 321d88cf5863f8c3f0b5b3623a1af2c4753f5eb3
 SHA1 (patch-ae) = 6bb9ffb57bb45f3a427059ddeee1f8cfd5489ab4
diff --git a/net/socks4/patches/patch-aa b/net/socks4/patches/patch-aa
index b734081bc49..278b4377e0c 100644
--- a/net/socks4/patches/patch-aa
+++ b/net/socks4/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2001/06/28 20:20:49 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2003/05/01 22:03:50 jmmv Exp $
 
 --- Makefile.orig	Wed Sep  6 22:24:02 1995
 +++ Makefile
@@ -131,7 +131,7 @@ $NetBSD: patch-aa,v 1.6 2001/06/28 20:20:49 jlam Exp $
  
  
 +install.conf:
-+	${INSTALL} -m 0644 socks.conf ${PREFIX}/etc
++	${INSTALL} -m 0644 socks.conf ${PREFIX}/share/examples/socks4
 +
 +install.lib:
 +	${INSTALL} -m 0644 lib/libsocks.a ${PREFIX}/lib/libsocks4.a
diff --git a/net/socks4/patches/patch-ab b/net/socks4/patches/patch-ab
index 7d0ba84c6ff..e6d7ca4d8ac 100644
--- a/net/socks4/patches/patch-ab
+++ b/net/socks4/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:10:58 agc Exp $
+$NetBSD: patch-ab,v 1.3 2003/05/01 22:03:50 jmmv Exp $
 
 --- include/socks.h	1998/06/11 13:02:06	1.1
 +++ include/socks.h	1998/06/11 13:04:33
@@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:10:58 agc Exp $
  
  /* Control file for versatile clients */
 -#define SOCKS_CONF	"/etc/socks.conf"
-+#define SOCKS_CONF	"@PREFIX@/etc/socks.conf"
++#define SOCKS_CONF	"@PKG_SYSCONFDIR@/socks.conf"
  
  /*
   * Default port number for SOCKS services.
@@ -30,7 +30,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:10:58 agc Exp $
   * and its services.
   */
 -#define SOCKD_CONF	"/etc/sockd.conf"
-+#define SOCKD_CONF	"@PREFIX@/etc/sockd.conf"
++#define SOCKD_CONF	"@PKG_SYSCONFDIR@/sockd.conf"
  
  /*
   * Define this if your SOCKS server is multi-homed (i.e.,
@@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:10:58 agc Exp $
   * This has no effects if MULTIHOMED_SERVER is undefined.
   */
 -#define SOCKD_ROUTE_FILE "/etc/sockd.route"
-+#define SOCKD_ROUTE_FILE "@PREFIX@/etc/sockd.route"
++#define SOCKD_ROUTE_FILE "@PKG_SYSCONFDIR@/sockd.route"
  
  /* Current SOCKS protocol version */
  #define SOCKS_VERSION	4