[pkgsrc/trunk]: pkgsrc/devel/glib2 Disable installing charset.alias, which ma...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f2d68f7b801
branches:  trunk
changeset: 473755:8f2d68f7b801
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Apr 24 04:54:07 2004 +0000

description:
Disable installing charset.alias, which makes this package conflict
with libiconv when pkgviews is enabled.  Suggested by recht@.

diffstat:

 devel/glib2/PLIST            |   3 +--
 devel/glib2/distinfo         |   3 ++-
 devel/glib2/patches/patch-af |  23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r bb93d30438db -r 8f2d68f7b801 devel/glib2/PLIST
--- a/devel/glib2/PLIST Sat Apr 24 04:47:04 2004 +0000
+++ b/devel/glib2/PLIST Sat Apr 24 04:54:07 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/04/01 18:13:31 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/04/24 04:54:07 minskim Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -70,7 +70,6 @@
 include/glib/glib-2.0/gobject/gvaluearray.h
 include/glib/glib-2.0/gobject/gvaluecollector.h
 include/glib/glib-2.0/gobject/gvaluetypes.h
-@comment belongs to libiconv: lib/charset.alias
 lib/glib-2.0/include/glibconfig.h
 lib/libglib-2.0.a
 lib/libglib-2.0.la
diff -r bb93d30438db -r 8f2d68f7b801 devel/glib2/distinfo
--- a/devel/glib2/distinfo      Sat Apr 24 04:47:04 2004 +0000
+++ b/devel/glib2/distinfo      Sat Apr 24 04:54:07 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2004/04/17 10:37:12 jmmv Exp $
+$NetBSD: distinfo,v 1.29 2004/04/24 04:54:07 minskim Exp $
 
 SHA1 (glib-2.4.0.tar.bz2) = 17822e7180791f18c1723110e9e757dc5526440c
 Size (glib-2.4.0.tar.bz2) = 2034272 bytes
@@ -7,3 +7,4 @@
 SHA1 (patch-ac) = 5f3d1446a41e71f1bf5556a1dd2a2a04e77d45da
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
+SHA1 (patch-af) = c7f29961a832b65feef0e8f4cf218491a440f68c
diff -r bb93d30438db -r 8f2d68f7b801 devel/glib2/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-af      Sat Apr 24 04:54:07 2004 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-af,v 1.5 2004/04/24 04:54:07 minskim Exp $
+
+--- glib/libcharset/Makefile.in.orig   2004-03-16 11:13:14.000000000 -0600
++++ glib/libcharset/Makefile.in
+@@ -528,18 +528,6 @@ uninstall-am: uninstall-info-am uninstal
+       uninstall-am uninstall-info-am uninstall-local
+ 
+ install-exec-local: all-local
+-      $(mkinstalldirs) $(DESTDIR)$(libdir)
+-      if test -f $(charset_alias); then \
+-        sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+-        $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-        rm -f $(charset_tmp) ; \
+-      else \
+-        if test @GLIBC21@ = no; then \
+-          sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+-          $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-          rm -f $(charset_tmp) ; \
+-        fi ; \
+-      fi
+ 
+ uninstall-local: all-local
+       if test -f $(charset_alias); then \