From ad059afe0eaa6f13de6c30ff60132873e381cb13 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 19 Sep 2003 12:34:26 +0000 Subject: Don't install info pages, to avoid conflict with binutils package. Bump PKGREVISION. --- cross/avr-binutils/Makefile | 5 ++--- cross/avr-binutils/PLIST | 25 +------------------------ cross/avr-binutils/distinfo | 5 ++++- cross/avr-binutils/patches/patch-ae | 13 +++++++++++++ cross/avr-binutils/patches/patch-af | 13 +++++++++++++ cross/avr-binutils/patches/patch-ag | 13 +++++++++++++ 6 files changed, 46 insertions(+), 28 deletions(-) create mode 100644 cross/avr-binutils/patches/patch-ae create mode 100644 cross/avr-binutils/patches/patch-af create mode 100644 cross/avr-binutils/patches/patch-ag (limited to 'cross') diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile index 687406dd807..1f2b01dddd7 100644 --- a/cross/avr-binutils/Makefile +++ b/cross/avr-binutils/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2003/08/09 10:36:58 seb Exp $ +# $NetBSD: Makefile,v 1.4 2003/09/19 12:34:26 wiz Exp $ # FreeBSD Id: ports/devel/avr-binutils/Makefile,v 1.9 2003/03/07 06:00:08 ade Exp DISTNAME= binutils-2.13.2.1 PKGNAME= avr-binutils-2.13.2.1 +PKGREVISION= 1 CATEGORIES= cross MASTER_SITES= ${MASTER_SITE_SOURCEWARE:=binutils/releases/} @@ -18,8 +19,6 @@ USE_MAKEINFO= YES CONFIGURE_ARGS= --target=avr -INFO_FILES= as.info binutils.info ld.info - # Prevent the need to run texi2pod.pl and pod2man hence # the need for perl as build dependency. post-configure: diff --git a/cross/avr-binutils/PLIST b/cross/avr-binutils/PLIST index c7d1eaf2e6b..f92d3ed33d4 100644 --- a/cross/avr-binutils/PLIST +++ b/cross/avr-binutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/08/07 13:41:35 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/09/19 12:34:26 wiz Exp $ avr/bin/ar avr/bin/as avr/bin/ld @@ -99,29 +99,6 @@ man/man1/avr-windres.1 man/man1/avr-c++filt.1 man/man1/avr-as.1 man/man1/avr-ld.1 -info/as.info -info/as.info-1 -info/as.info-10 -info/as.info-11 -info/as.info-2 -info/as.info-3 -info/as.info-4 -info/as.info-5 -info/as.info-6 -info/as.info-7 -info/as.info-8 -info/as.info-9 -info/binutils.info -info/binutils.info-1 -info/binutils.info-2 -info/binutils.info-3 -info/ld.info -info/ld.info-1 -info/ld.info-2 -info/ld.info-3 -info/ld.info-4 -info/ld.info-5 -info/ld.info-6 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/binutils.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/binutils.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gas.mo diff --git a/cross/avr-binutils/distinfo b/cross/avr-binutils/distinfo index 7b48061ce5a..e3ccfe0a14a 100644 --- a/cross/avr-binutils/distinfo +++ b/cross/avr-binutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/07/15 21:46:26 wennmach Exp $ +$NetBSD: distinfo,v 1.2 2003/09/19 12:34:26 wiz Exp $ SHA1 (binutils-2.13.2.1.tar.gz) = d13624807c6b47fec870096a65d47cce4cf82370 Size (binutils-2.13.2.1.tar.gz) = 12980018 bytes @@ -6,3 +6,6 @@ SHA1 (patch-aa) = 1e5af4a428314b46fa9c5b5c00e63406d692a0e2 SHA1 (patch-ab) = abc8b9f823b27d756e1588af45af266efa038d03 SHA1 (patch-ac) = 9261e61c68d50ba771ff74d3dba0670796a256af SHA1 (patch-ad) = 306fa82019efec11ae8ed18bf6853934a0f6c16f +SHA1 (patch-ae) = 8d1f64fa51ed4fb7bbed49f3cedb20c1e08bce0d +SHA1 (patch-af) = 92f0a4156ed6ea1027dcdffbbf41f05732b6dba9 +SHA1 (patch-ag) = f86a7ee67047287a12c8006daf26ca1771d05622 diff --git a/cross/avr-binutils/patches/patch-ae b/cross/avr-binutils/patches/patch-ae new file mode 100644 index 00000000000..5993f63fa97 --- /dev/null +++ b/cross/avr-binutils/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2003/09/19 12:34:27 wiz Exp $ + +--- binutils/doc/Makefile.in.orig Tue Jul 16 04:04:37 2002 ++++ binutils/doc/Makefile.in +@@ -167,7 +167,7 @@ CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = + TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi` + TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex +-INFO_DEPS = binutils.info ++INFO_DEPS = + DVIS = binutils.dvi + TEXINFOS = binutils.texi + man1dir = $(mandir)/man1 diff --git a/cross/avr-binutils/patches/patch-af b/cross/avr-binutils/patches/patch-af new file mode 100644 index 00000000000..a59b314aad9 --- /dev/null +++ b/cross/avr-binutils/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2003/09/19 12:34:27 wiz Exp $ + +--- gas/doc/Makefile.in.orig Thu Jan 2 02:23:16 2003 ++++ gas/doc/Makefile.in +@@ -181,7 +181,7 @@ CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = + TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi` + TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex +-INFO_DEPS = as.info ++INFO_DEPS = + DVIS = as.dvi + TEXINFOS = as.texinfo + man1dir = $(mandir)/man1 diff --git a/cross/avr-binutils/patches/patch-ag b/cross/avr-binutils/patches/patch-ag new file mode 100644 index 00000000000..dca7d927eef --- /dev/null +++ b/cross/avr-binutils/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2003/09/19 12:34:28 wiz Exp $ + +--- ld/Makefile.in.orig Thu Jan 2 01:56:31 2003 ++++ ld/Makefile.in +@@ -512,7 +512,7 @@ CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ + TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi` + TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex +-INFO_DEPS = ld.info ++INFO_DEPS = + DVIS = ld.dvi + TEXINFOS = ld.texinfo + man1dir = $(mandir)/man1 -- cgit v1.2.3