From 806e16211ef5261d30e43fffc91752893f428b3a Mon Sep 17 00:00:00 2001
From: Rong-En Fan <rafan@FreeBSD.org>
Date: Tue, 14 Nov 2006 01:22:36 +0000
Subject: - Do not overwrite configuration file. Bump PORTREVISION - Use
 DATADIR and USE_ICONV

---
 print/wprint/Makefile  | 12 ++++++++++--
 print/wprint/pkg-plist | 24 +++++++++++++-----------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/print/wprint/Makefile b/print/wprint/Makefile
index 8585fd20e92b..81cddbba9341 100644
--- a/print/wprint/Makefile
+++ b/print/wprint/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	wprint
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://mirror2.unixfreunde.de/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,9 +16,9 @@ MASTER_SITES=	http://mirror2.unixfreunde.de/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mozilla/HtmlDoc/Netscape Postscript Filter
 
-LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv \
-		freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
+USE_ICONV=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -30,5 +31,12 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/wprint\.conf|${PREFIX}/etc/wprint.conf|g" \
 		${WRKSRC}/${file}
 .endfor
+	@${REINPLACE_CMD} -e 's,$$(srcdir)/wprint.conf $$(sysconfdir),$$(srcdir)/wprint.conf $$(sysconfdir)/wprint.conf.dist,g' \
+		${WRKSRC}/etc/Makefile.in
+
+post-install:
+	@if [ ! -f ${PREFIX}/etc/wprint.conf ]; then \
+	  ${CP} -p ${PREFIX}/etc/wprint.conf.dist ${PREFIX}/etc/wprint.conf ; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/print/wprint/pkg-plist b/print/wprint/pkg-plist
index 8744f576bc8b..ccf04a2067de 100644
--- a/print/wprint/pkg-plist
+++ b/print/wprint/pkg-plist
@@ -1,12 +1,14 @@
 bin/wprint
-etc/wprint.conf
-share/wprint/COURR_SE.TTF
-share/wprint/COURR_SE.TXT
-share/wprint/README.test
-share/wprint/netscape.ps
-share/wprint/news.eo.gif
-share/wprint/search.eo.gif
-share/wprint/test.html
-share/wprint/test.sh
-share/wprint/wprint-test.conf
-@dirrm share/wprint
+@unexec if cmp -s %D/etc/wprint.conf.dist %D/etc/wprint.conf; then rm -f %D/etc/wprint.conf; fi
+etc/wprint.conf.dist
+@exec if [ ! -f %D/etc/wprint.conf ] ; then cp -p %D/%F %B/wprint.conf; fi
+%%DATADIR%%/COURR_SE.TTF
+%%DATADIR%%/COURR_SE.TXT
+%%DATADIR%%/README.test
+%%DATADIR%%/netscape.ps
+%%DATADIR%%/news.eo.gif
+%%DATADIR%%/search.eo.gif
+%%DATADIR%%/test.html
+%%DATADIR%%/test.sh
+%%DATADIR%%/wprint-test.conf
+@dirrm %%DATADIR%%
-- 
cgit v1.2.3