From 6606d7a97ef3f01971202118120a4f1f45f28777 Mon Sep 17 00:00:00 2001
From: salo <salo@pkgsrc.org>
Date: Sat, 15 Feb 2003 05:18:09 +0000
Subject: Updated to version 3.2.1.

Addresses PR pkg/20340 by Tracy Di Marco White.

Changes:

- fix CONF_FILES usage (don't install jwhois.conf twice(!))
- cleanups

3.2.1:
======
- Updated jwhois.conf
---
 net/jwhois/Makefile         | 15 +++++++++------
 net/jwhois/PLIST            |  5 +++--
 net/jwhois/distinfo         |  7 ++++---
 net/jwhois/patches/patch-ab | 13 +++++++++++++
 4 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 net/jwhois/patches/patch-ab

(limited to 'net')

diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 6c722bc9de2..405afdeeee4 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/01/28 22:03:52 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2003/02/15 05:18:09 salo Exp $
 #
 
-DISTNAME=		jwhois-3.2.0
+DISTNAME=		jwhois-3.2.1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNU:=jwhois/}
 
@@ -19,12 +19,15 @@ CONFIGURE_ARGS+=	--with-cache
 
 INFO_FILES=		jwhois.info
 
-EGDIR=			${PREFIX}/share/examples
-CONF_FILES=		${EGDIR}/jwhois.conf ${PKG_SYSCONFDIR}/jwhois.conf
-CONF_FILES_PERMS=	/dev/null /var/db/jwhois.db			\
+EGDIR=			${PREFIX}/share/examples/jwhois
+CONF_FILES=		${EGDIR}/jwhois.conf.default	\
+			${PKG_SYSCONFDIR}/jwhois.conf
+CONF_FILES_PERMS=	/dev/null /var/db/jwhois.db	\
 			${ROOT_USER} nogroup 0664
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf ${PREFIX}/share/examples
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf	\
+		${EGDIR}/jwhois.conf.default
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/texinfo.mk"
diff --git a/net/jwhois/PLIST b/net/jwhois/PLIST
index bd2e029c541..02b42d624a4 100644
--- a/net/jwhois/PLIST
+++ b/net/jwhois/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/02/15 05:18:09 salo Exp $
 bin/jwhois
 @unexec	${INSTALL_INFO} --delete %D/info/jwhois.info %D/info/dir
 info/jwhois.info
 @exec	${INSTALL_INFO} %D/info/jwhois.info %D/info/dir
 man/man1/jwhois.1
 man/sv/man1/jwhois.1
-share/examples/jwhois.conf
+share/examples/jwhois/jwhois.conf.default
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/jwhois.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/jwhois.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/jwhois.mo
@@ -13,3 +13,4 @@ ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/jwhois.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/jwhois.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/jwhois.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/jwhois.mo
+@dirrm share/examples/jwhois
diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo
index cb2b45a1929..a4024cd6b34 100644
--- a/net/jwhois/distinfo
+++ b/net/jwhois/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/08/25 21:50:00 jlam Exp $
+$NetBSD: distinfo,v 1.8 2003/02/15 05:18:09 salo Exp $
 
-SHA1 (jwhois-3.2.0.tar.gz) = dc325c688c56a31acd494029a053a7497a8df843
-Size (jwhois-3.2.0.tar.gz) = 361144 bytes
+SHA1 (jwhois-3.2.1.tar.gz) = d515079df2c58a7d3b7bdfed887a20f0b6ebbcbe
+Size (jwhois-3.2.1.tar.gz) = 377777 bytes
 SHA1 (patch-aa) = 649e4ff47b7ae8985573cd4bc53954d3cd4d5fe3
+SHA1 (patch-ab) = e2b35b66adae6caba8a778194ff0238a31006b0b
diff --git a/net/jwhois/patches/patch-ab b/net/jwhois/patches/patch-ab
new file mode 100644
index 00000000000..0af78a43599
--- /dev/null
+++ b/net/jwhois/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2003/02/15 05:18:09 salo Exp $
+
+--- example/Makefile.in.orig	Sat Feb  1 00:12:20 2003
++++ example/Makefile.in	Sat Feb 15 06:01:39 2003
+@@ -184,7 +184,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+ install-exec-am:
+ 
-- 
cgit v1.2.3