diff options
| -rw-r--r-- | lang/gcc3/Makefile | 14 | ||||
| -rw-r--r-- | lang/gcc3/PLIST | 76 | ||||
| -rw-r--r-- | lang/gcc3/distinfo | 8 | ||||
| -rw-r--r-- | lang/gcc3/patches/patch-aa | 14 |
4 files changed, 20 insertions, 92 deletions
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile index ecf4c1b07a8..e7218475d0e 100644 --- a/lang/gcc3/Makefile +++ b/lang/gcc3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2003/05/25 09:26:40 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/05/25 16:29:20 grant Exp $ # -DISTNAME= gcc-3.2.2 +DISTNAME= gcc-3.3 PKGNAME= ${DISTNAME:C|gcc|gcc3|} CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/} @@ -25,10 +25,11 @@ CONFIGURE_ARGS= --host=${MACHINE_GNU_PLATFORM} CONFIGURE_ARGS+= --infodir=${PREFIX}/info CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} -FILES_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} GCC_PREFIX=${GCC_PREFIX} -MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} +# as this is named gcc3, use DISTNAME instead. +FILES_SUBST+= PKGNAME_NOREV=${DISTNAME} GCC_PREFIX=${GCC_PREFIX} +MESSAGE_SUBST+= PKGNAME_NOREV=${DISTNAME} -TEXINFO_REQD= 4.1 +TEXINFO_REQD= 4.2 INFO_FILES= cpp.info g77.info gcc.info gcj.info @@ -47,7 +48,8 @@ ALL_TARGET= bootstrap . endif .endif -GCC_PREFIX= ${PREFIX}/${PKGNAME_NOREV} +# as this is named gcc3, use DISTNAME instead. +GCC_PREFIX= ${PREFIX}/${DISTNAME} PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC pre-configure: diff --git a/lang/gcc3/PLIST b/lang/gcc3/PLIST index b07139bf329..f13eaca8761 100644 --- a/lang/gcc3/PLIST +++ b/lang/gcc3/PLIST @@ -1,95 +1,21 @@ -@comment $NetBSD: PLIST,v 1.2 2003/05/02 13:36:52 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/05/25 16:29:20 grant Exp $ @unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir info/cpp.info -info/cpp.info-1 -info/cpp.info-2 -info/cpp.info-3 -info/cpp.info-4 -info/cpp.info-5 @exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir @unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir info/g77.info -info/g77.info-1 -info/g77.info-2 -info/g77.info-3 -info/g77.info-4 -info/g77.info-5 -info/g77.info-6 -info/g77.info-7 -info/g77.info-8 -info/g77.info-9 -info/g77.info-10 -info/g77.info-11 -info/g77.info-12 -info/g77.info-13 -info/g77.info-14 -info/g77.info-15 -info/g77.info-16 -info/g77.info-17 -info/g77.info-18 -info/g77.info-19 -info/g77.info-20 -info/g77.info-21 @exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir @unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir info/gcc.info -info/gcc.info-1 -info/gcc.info-2 -info/gcc.info-3 -info/gcc.info-4 -info/gcc.info-5 -info/gcc.info-6 -info/gcc.info-7 -info/gcc.info-8 -info/gcc.info-9 -info/gcc.info-10 -info/gcc.info-11 -info/gcc.info-12 -info/gcc.info-13 -info/gcc.info-14 -info/gcc.info-15 -info/gcc.info-16 -info/gcc.info-17 -info/gcc.info-18 -info/gcc.info-19 -info/gcc.info-20 -info/gcc.info-21 -info/gcc.info-22 -info/gcc.info-23 @exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir @unexec ${INSTALL_INFO} --delete %D/info/gccint.info %D/info/dir info/gccint.info -info/gccint.info-1 -info/gccint.info-2 -info/gccint.info-3 -info/gccint.info-4 -info/gccint.info-5 -info/gccint.info-6 -info/gccint.info-7 -info/gccint.info-8 -info/gccint.info-9 -info/gccint.info-10 -info/gccint.info-11 -info/gccint.info-12 -info/gccint.info-13 -info/gccint.info-14 -info/gccint.info-15 -info/gccint.info-16 -info/gccint.info-17 -info/gccint.info-18 -info/gccint.info-19 -info/gccint.info-20 -info/gccint.info-21 -info/gccint.info-22 -info/gccint.info-23 @exec ${INSTALL_INFO} %D/info/gccint.info %D/info/dir @unexec ${INSTALL_INFO} --delete %D/info/cppinternals.info %D/info/dir info/cppinternals.info @exec ${INSTALL_INFO} %D/info/cppinternals.info %D/info/dir @unexec ${INSTALL_INFO} --delete %D/info/gcj.info %D/info/dir info/gcj.info -info/gcj.info-1 -info/gcj.info-2 @exec ${INSTALL_INFO} %D/info/gcj.info %D/info/dir share/examples/gcc/mk.conf @dirrm share/examples/gcc diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo index 9d0133c31c4..91d6f9929e9 100644 --- a/lang/gcc3/distinfo +++ b/lang/gcc3/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2003/05/24 18:38:58 jschauma Exp $ +$NetBSD: distinfo,v 1.7 2003/05/25 16:29:20 grant Exp $ -SHA1 (gcc-3.2.2.tar.gz) = 152883d3e1f6190298cb7be43076abeaeac6c2a9 -Size (gcc-3.2.2.tar.gz) = 26664960 bytes -SHA1 (patch-aa) = 6e9e7eeb7e9ddc043eb2b7c3cb05e7b6112e813b +SHA1 (gcc-3.3.tar.gz) = b05f4008c8a08282fc374c408e8167cabd073cff +Size (gcc-3.3.tar.gz) = 31046469 bytes +SHA1 (patch-aa) = 029b1f58f75f3a28b69894dfc87e5fa5eab257d9 SHA1 (patch-ab) = 3cb04098b3d97b1da9d24d64197dcea2771c9624 SHA1 (patch-ac) = 1bd470366c793bfb12895e365ac4e9f3e5fda101 SHA1 (patch-ad) = b4023140daf745d613b26909247bdf9e4066c8a4 diff --git a/lang/gcc3/patches/patch-aa b/lang/gcc3/patches/patch-aa index e37bce84d6f..27366ef41e1 100644 --- a/lang/gcc3/patches/patch-aa +++ b/lang/gcc3/patches/patch-aa @@ -1,20 +1,20 @@ -$NetBSD: patch-aa,v 1.1 2003/04/14 04:30:22 salo Exp $ +$NetBSD: patch-aa,v 1.2 2003/05/25 16:29:21 grant Exp $ ---- Makefile.in.orig Tue Jan 28 22:53:32 2003 -+++ Makefile.in Sun Apr 13 12:38:31 2003 -@@ -150,11 +150,11 @@ +--- Makefile.in.orig Wed May 14 10:18:14 2003 ++++ Makefile.in +@@ -153,11 +153,11 @@ M4 = `if [ -f $$r/m4/m4 ] ; \ - # For an installed makeinfo, we require it to be from texinfo 4 or + # For an installed makeinfo, we require it to be from texinfo 4.2 or # higher, else we use the "missing" dummy. -MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ - then echo $$r/texinfo/makeinfo/makeinfo ; \ - else if (makeinfo --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ - then echo makeinfo; else echo $$s/missing makeinfo; fi; fi` +#MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ +# then echo $$r/texinfo/makeinfo/makeinfo ; \ +# else if (makeinfo --version \ -+# | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \ ++# | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ +# then echo makeinfo; else echo $$s/missing makeinfo; fi; fi` # This just becomes part of the MAKEINFO definition passed down to |