diff options
| author | jlam <jlam> | 2005-08-19 22:26:21 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-08-19 22:26:21 +0000 |
| commit | 7a86cb5a550d85474a4f405e1964c7ad9e1a8119 (patch) | |
| tree | f6c9a28ee6b82fa31ad4815ee102360e152bb157 /converters | |
| parent | 8b47c94b40c7451d59e72fe47bd425cbef8fc2c6 (diff) | |
| download | pkgsrc-7a86cb5a550d85474a4f405e1964c7ad9e1a8119.tar.gz | |
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 (limited to 'converters')
| -rw-r--r-- | converters/libiconv/Makefile | 5 | ||||
| -rw-r--r-- | converters/libiconv/PLIST.common | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index e644e511f8a..da903cfeab8 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 --git a/converters/libiconv/PLIST.common b/converters/libiconv/PLIST.common index d251dceab91..0aa46268682 100644 --- a/converters/libiconv/PLIST.common +++ b/converters/libiconv/PLIST.common @@ -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_close.3.html 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 |