diff options
| author | tnn <tnn> | 2009-10-21 16:51:46 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2009-10-21 16:51:46 +0000 |
| commit | b4d0f021693cc18ac5a9e4a8d3692096a5b0713f (patch) | |
| tree | f030fcd39f7dd2b9d5cfe42e3c169420a25ddef3 /textproc/groff | |
| parent | e76904d41b771456a0bb80588ace692ed1d91be2 (diff) | |
| download | pkgsrc-b4d0f021693cc18ac5a9e4a8d3692096a5b0713f.tar.gz | |
resolve lib/charset.alias conflicts. PR pkg/42199
Diffstat (limited to 'textproc/groff')
| -rw-r--r-- | textproc/groff/Makefile | 10 | ||||
| -rw-r--r-- | textproc/groff/PLIST | 3 | ||||
| -rw-r--r-- | textproc/groff/distinfo | 3 | ||||
| -rw-r--r-- | textproc/groff/patches/patch-ab | 14 |
4 files changed, 23 insertions, 7 deletions
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 \ |