diff options
| author | tnn <tnn@pkgsrc.org> | 2009-10-21 16:51:46 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-10-21 16:51:46 +0000 |
| commit | ea49cd7ffb44d39dcf2ca28e4fceccb37954c541 (patch) | |
| tree | f030fcd39f7dd2b9d5cfe42e3c169420a25ddef3 /math | |
| parent | a3c9d4cf8e0f0590e4f22580a23adee91975bf15 (diff) | |
| download | pkgsrc-ea49cd7ffb44d39dcf2ca28e4fceccb37954c541.tar.gz | |
resolve lib/charset.alias conflicts. PR pkg/42199
Diffstat (limited to 'math')
| -rw-r--r-- | math/pspp/Makefile | 5 | ||||
| -rw-r--r-- | math/pspp/PLIST | 3 | ||||
| -rw-r--r-- | math/pspp/distinfo | 3 | ||||
| -rw-r--r-- | math/pspp/patches/patch-ab | 14 |
4 files changed, 21 insertions, 4 deletions
diff --git a/math/pspp/Makefile b/math/pspp/Makefile index 74117ded002..7ef2ee2d1d0 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.41 2009/09/04 21:39:10 asau Exp $ +# $NetBSD: Makefile,v 1.42 2009/10/21 16:51:46 tnn Exp $ # DISTNAME= pspp-0.6.1 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU:=pspp/} @@ -28,6 +29,8 @@ INFO_FILES= # PLIST TEST_TARGET= check USE_NCURSES= yes +# we only want the charset.alias file, so no buildlinkery for libiconv +DEPENDS+= libiconv-[0-9]*:../../converters/libiconv .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/math/pspp/PLIST b/math/pspp/PLIST index fbe82db8d4c..2860b63df71 100644 --- a/math/pspp/PLIST +++ b/math/pspp/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.8 2009/09/04 21:39:10 asau Exp $ +@comment $NetBSD: PLIST,v 1.9 2009/10/21 16:51:46 tnn Exp $ bin/pspp ${PLIST.x11}bin/psppire info/pspp-dev.info info/pspp.info.gz -lib/charset.alias ${PLIST.x11}lib/pspp/libpsppire.la ${PLIST.x11}lib/pspp/libpsppwidgets.la share/examples/pspp/devices diff --git a/math/pspp/distinfo b/math/pspp/distinfo index 89388b2bc8a..972467e19a5 100644 --- a/math/pspp/distinfo +++ b/math/pspp/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.13 2009/09/04 21:39:10 asau Exp $ +$NetBSD: distinfo,v 1.14 2009/10/21 16:51:46 tnn Exp $ SHA1 (pspp-0.6.1.tar.gz) = 22f335053a3e1d3861bfc2d87536b9a6fc5a1ae7 RMD160 (pspp-0.6.1.tar.gz) = 930fc58b77ff50819cd7449147dab5906e872850 Size (pspp-0.6.1.tar.gz) = 3217033 bytes SHA1 (patch-aa) = c7024562eee77aa558931cab387d250e046f11e4 +SHA1 (patch-ab) = e457be95e8b0658ca225137f4fed5f8bf6d77e4d SHA1 (patch-ad) = 34446abc6b187300e22a1fe764ea55df7c3dd43a diff --git a/math/pspp/patches/patch-ab b/math/pspp/patches/patch-ab new file mode 100644 index 00000000000..6f2982ccc19 --- /dev/null +++ b/math/pspp/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.3 2009/10/21 16:51:46 tnn Exp $ + +--- gl/Makefile.in.orig 2008-10-10 06:12:08.000000000 +0200 ++++ gl/Makefile.in +@@ -1586,6 +1586,9 @@ iconv_open-osf.h: iconv_open-osf.gperf + + all-local: charset.alias ref-add.sed ref-del.sed + install-exec-local: all-local ++ # charset.alias provided by pkgsrc/converters/libiconv ++ ++install-exec-local_dontuse: + test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) + if test -f $(charset_alias); then \ + sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ |