summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn>2009-10-21 16:51:46 +0000
committertnn <tnn>2009-10-21 16:51:46 +0000
commit7512e949eaa9199c6d2d1e9e5165e00068fca508 (patch)
treef030fcd39f7dd2b9d5cfe42e3c169420a25ddef3
parentc63b1fc7f4191910aab8a7f99c17fd5f4b6baf94 (diff)
downloadpkgsrc-7512e949eaa9199c6d2d1e9e5165e00068fca508.tar.gz
resolve lib/charset.alias conflicts. PR pkg/42199
-rw-r--r--editors/zile/Makefile5
-rw-r--r--editors/zile/PLIST3
-rw-r--r--editors/zile/distinfo3
-rw-r--r--editors/zile/patches/patch-aa12
-rw-r--r--math/pspp/Makefile5
-rw-r--r--math/pspp/PLIST3
-rw-r--r--math/pspp/distinfo3
-rw-r--r--math/pspp/patches/patch-ab14
-rw-r--r--textproc/groff/Makefile10
-rw-r--r--textproc/groff/PLIST3
-rw-r--r--textproc/groff/distinfo3
-rw-r--r--textproc/groff/patches/patch-ab14
12 files changed, 63 insertions, 15 deletions
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 6311775690c..7acc6ccd858 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2009/07/19 11:49:10 zafer Exp $
+# $NetBSD: Makefile,v 1.25 2009/10/21 16:51:46 tnn Exp $
DISTNAME= zile-2.3.9
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= http://ftp.gnu.org/gnu/zile/
@@ -17,6 +18,8 @@ GNU_CONFIGURE= yes
INFO_FILES= # PLIST
+# we only want the charset.alias file, so no buildlinkery for libiconv
+DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
.include "../../devel/libgetopt/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/zile/PLIST b/editors/zile/PLIST
index 04949d7a1cd..17b32df9dcf 100644
--- a/editors/zile/PLIST
+++ b/editors/zile/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2009/07/19 11:49:10 zafer Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/10/21 16:51:46 tnn Exp $
bin/zile
-lib/charset.alias
man/man1/zile.1
share/zile/FAQ
share/zile/dotzile.sample
diff --git a/editors/zile/distinfo b/editors/zile/distinfo
index 3ffd6f563c4..478b23b6c8d 100644
--- a/editors/zile/distinfo
+++ b/editors/zile/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/07/19 11:49:10 zafer Exp $
+$NetBSD: distinfo,v 1.9 2009/10/21 16:51:46 tnn Exp $
SHA1 (zile-2.3.9.tar.gz) = e3d90bcdfd40ce8ad31e2154fe78a9abf679796b
RMD160 (zile-2.3.9.tar.gz) = 2d15bc0cd7d58fe75779f9adf5152de646dd7373
Size (zile-2.3.9.tar.gz) = 706848 bytes
+SHA1 (patch-aa) = 7a955b340c77b4c539b3d5ea7880c06d777dc424
diff --git a/editors/zile/patches/patch-aa b/editors/zile/patches/patch-aa
new file mode 100644
index 00000000000..7d96680fc57
--- /dev/null
+++ b/editors/zile/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.5 2009/10/21 16:51:46 tnn Exp $
+
+--- lib/Makefile.in.orig 2009-07-08 16:10:42.000000000 +0200
++++ lib/Makefile.in
+@@ -1221,6 +1221,7 @@ install-exec-local: all-local
+ else \
+ need_charset_alias=false ; \
+ fi ; \
++ need_charset_alias=false`# provided by pkgsrc/converters/libiconv`; \
+ if $$need_charset_alias; then \
+ $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+ fi ; \
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) ; \
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 926fd79b342..bee63e4d5e9 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2009/08/14 15:41:18 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2009/10/21 16:51:46 tnn Exp $
#
DISTNAME= groff-1.20.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=groff/}
@@ -99,7 +99,9 @@ post-patch:
post-install:
${INSTALL_DATA} ${WRKDIR}/mdoc.local \
${DESTDIR}${PREFIX}/share/groff/site-tmac
- ${FIND} ${PREFIX}/lib/groff/site-tmac -type f -print | \
- ${SED} 's;${PREFIX}/;;g' > ${WRKDIR}/PLIST-local
+ ${FIND} ${DESTDIR}${PREFIX}/lib/groff/site-tmac -type f -print | \
+ ${SED} 's;${DESTDIR}${PREFIX}/;;g' > ${WRKDIR}/PLIST-local
+# we only want the charset.alias file, so no buildlinkery for libiconv
+DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index d5970b7ae15..b9a27423fe2 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/08/01 19:13:15 dholland Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/10/21 16:51:46 tnn Exp $
bin/addftinfo
bin/afmtodit
bin/${GNU_PREFIX}eqn
@@ -40,7 +40,6 @@ bin/${GNU_PREFIX}tbl
bin/tfmtodit
bin/${GNU_PREFIX}troff
info/groff.info
-lib/charset.alias
lib/groff/groffer/func.pl
lib/groff/groffer/man.pl
lib/groff/groffer/perl_test.pl
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index 4d78d648649..78f5d4cb921 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2009/02/24 20:41:45 wiz Exp $
+$NetBSD: distinfo,v 1.14 2009/10/21 16:51:46 tnn Exp $
SHA1 (groff-1.20.1.tar.gz) = 3066587d73df73c2bda235034f4515cf52d22549
RMD160 (groff-1.20.1.tar.gz) = ec311727206d183fb04f1b4bd01c1284142fdb52
Size (groff-1.20.1.tar.gz) = 3594658 bytes
SHA1 (patch-aa) = 3c74f1b8e809da5359d4702f0f5f299593601209
+SHA1 (patch-ab) = 35f8a7f724ab13bedda8ad8bc54bcbede37f12c7
SHA1 (patch-ac) = 7c29e3ca0c0a2e5389ff436ff5c15c9a0a4d7581
SHA1 (patch-ae) = 777b9b4d5f39da5acf8d79616ae9d42025772fc5
diff --git a/textproc/groff/patches/patch-ab b/textproc/groff/patches/patch-ab
new file mode 100644
index 00000000000..d20f1607123
--- /dev/null
+++ b/textproc/groff/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.6 2009/10/21 16:51:46 tnn Exp $
+
+--- src/libs/libgroff/Makefile.sub.orig 2009-01-09 15:25:52.000000000 +0100
++++ src/libs/libgroff/Makefile.sub
+@@ -153,6 +153,9 @@ MKINSTALLDIRS = $(SHELL) $(top_srcdir)/m
+
+ install_data: install_charset_data
+ install_charset_data:
++ # provided by pkgsrc/converters/libiconv
++
++install_charset_data_disabled:
+ test $(GLIBC21) != no || $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+ sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias \