[pkgsrc/trunk]: pkgsrc/converters/libiconv Put the charset.alias file into pl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/252db8e48255
branches:  trunk
changeset: 498327:252db8e48255
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Aug 19 22:26:21 2005 +0000

description:
Put the charset.alias file into place using REQD_FILES instead of
CONF_FILES since we need it to always be present for libiconv to
function properly.  It's now no longer removed automatically at
deinstallation if it differs from the stock charset.alias file, meaning
it's now preserved in case the user made modifications to the file;
however a warning will be output that the file can be safely removed
if you don't need it anymore.  Bump the PKGREVISION to 1.

diffstat:

 converters/libiconv/Makefile     |  5 +++--
 converters/libiconv/PLIST.common |  3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r ea4e2e17f656 -r 252db8e48255 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Fri Aug 19 22:24:09 2005 +0000
+++ b/converters/libiconv/Makefile      Fri Aug 19 22:26:21 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/08/19 22:26:21 jlam Exp $
 
 DISTNAME=      libiconv-1.10
+PKGREVISION=   1
 CATEGORIES=    converters
 MASTER_SITES=  ${MASTER_SITE_GNU:=libiconv/}
 
@@ -17,7 +18,7 @@
 TEST_TARGET=           check
 
 EGDIR=                 ${PREFIX}/share/examples/libiconv
-CONF_FILES=            ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
+REQD_FILES=            ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias
 
 MAKE_ENV+=             PAX="${PAX}"
 
diff -r ea4e2e17f656 -r 252db8e48255 converters/libiconv/PLIST.common
--- a/converters/libiconv/PLIST.common  Fri Aug 19 22:24:09 2005 +0000
+++ b/converters/libiconv/PLIST.common  Fri Aug 19 22:26:21 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.6 2005/07/28 15:15:18 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2005/08/19 22:26:21 jlam Exp $
 bin/iconv
 include/iconv.h
 include/libcharset.h
@@ -16,6 +16,5 @@
 share/doc/html/libiconv/iconv_open.3.html
 share/doc/html/libiconv/iconvctl.3.html
 share/examples/libiconv/charset.alias
-@unexec ${RM} -f %D/lib/charset.alias
 @dirrm share/examples/libiconv
 @dirrm share/doc/html/libiconv