diff options
| author | minskim <minskim@pkgsrc.org> | 2004-04-24 04:54:07 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-04-24 04:54:07 +0000 |
| commit | 934e766989551f10e54af56474f81af702367d5c (patch) | |
| tree | fe4584083f0f703cbb9e710c1bab73b4cc7019a0 /devel/glib2 | |
| parent | a78de6776f43fd5ca648163eecd5cd8119bcc863 (diff) | |
| download | pkgsrc-934e766989551f10e54af56474f81af702367d5c.tar.gz | |
Disable installing charset.alias, which makes this package conflict
with libiconv when pkgviews is enabled. Suggested by recht@.
Diffstat (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/PLIST | 3 | ||||
| -rw-r--r-- | devel/glib2/distinfo | 3 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-af | 23 |
3 files changed, 26 insertions, 3 deletions
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST index 3ae07a3c428..46c421b22e5 100644 --- a/devel/glib2/PLIST +++ b/devel/glib2/PLIST @@ -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/gvalue.h 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 --git a/devel/glib2/distinfo b/devel/glib2/distinfo index d7e0bacfecc..cf8d1c0ccde 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -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-ab) = a231346877b6246e086312fda107a90dffdd0adb SHA1 (patch-ac) = 5f3d1446a41e71f1bf5556a1dd2a2a04e77d45da SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 +SHA1 (patch-af) = c7f29961a832b65feef0e8f4cf218491a440f68c diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af new file mode 100644 index 00000000000..657023b31c5 --- /dev/null +++ b/devel/glib2/patches/patch-af @@ -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 \ |