kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve lib/charset.alias conflicts. PR pkg/42199

Browse source
This commit is contained in:
tnn 2009-10-21 16:51:46 +00:00
parent 5faa52a064
commit 14c60a3dd6
12 changed files with 63 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editors/zile/Makefile
View file

@ -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"

3
editors/zile/PLIST
View file

@ -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

3
editors/zile/distinfo
View file

@ -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

12
editors/zile/patches/patch-aa Normal file
View file

@ -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 ; \

5
math/pspp/Makefile
View file

@ -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"

3
math/pspp/PLIST
View file

@ -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

3
math/pspp/distinfo
View file

@ -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

14
math/pspp/patches/patch-ab Normal file
View file

@ -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) ; \

10
textproc/groff/Makefile
View file

@ -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"

3
textproc/groff/PLIST
View file

@ -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

3
textproc/groff/distinfo
View file

@ -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

14
textproc/groff/patches/patch-ab Normal file
View file

@ -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 \