From 9a20bf673191501f160cc4be0107cac2ac35e6f9 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Mon, 4 Mar 2002 21:08:06 +0000 Subject: Sync with gcc30's style. This includes changing the name from g to 31, using a single .info file rather than the mirage of them, and switch to using the .bz2 distfiles. --- lang/gcc40/Makefile | 38 +++++++++++++------------- lang/gcc40/distinfo | 10 +++---- lang/gcc40/pkg-plist | 76 +++++++++++----------------------------------------- 3 files changed, 39 insertions(+), 85 deletions(-) (limited to 'lang/gcc40') diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index 7dfd6210c0dc..a9689b10517e 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -9,7 +9,7 @@ SNAPDATE= 2002-02-25 SNAPVER= ${SNAPDATE:S/-//g} -PORTNAME= gcc-devel +PORTNAME= gcc31 PORTVERSION= ${SNAPVER} CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_SOURCEWARE} \ @@ -26,8 +26,10 @@ DISTFILES= \ MAINTAINER= obrien@FreeBSD.org -LATEST_LINK= gcc31 NO_CDROM= 'dated material' +LATEST_LINK= gcc31 + +USE_BZIP2= yes .if defined(NETWINDER_SS) BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm @@ -37,12 +39,7 @@ EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= |cpio -idum EXTRACT_ONLY= .endif -PATCH_ARGS= -d ${SRCDIR} -E ${PATCH_STRIP} -.if !defined(PATCH_DEBUG) -PATCH_ARGS+= --forward --quiet -.endif -PATCH_WRKDIR= ${SRCDIR} -#CONFIGURE_SCRIPT= ../gcc-${SNAPVER}/configure +PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure .include @@ -67,6 +64,7 @@ USE_BISON= yes CONFIGURE_ARGS= --disable-nls --with-gnu-as --with-gnu-ld \ --with-gxx-include-dir=${TARGLIB}/include/g++ #CONFIGURE_ARGS+= --program-prefix=e +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared .else @@ -78,8 +76,8 @@ CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-threads=posix .endif ALL_TARGET= bootstrap -#MAN1= gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1 -MAN1= gg++.1 +#MAN1= cpp31.1 g++31.1 g77-31.1 gcc31.1 gcov31.1 +MAN1= g++31.1 pre-fetch: @${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${ARCH}-portbld-freebsd${OSREL}" @@ -96,9 +94,10 @@ post-extract: pre-configure: @# Keep from running `autoconf' and `autoheader' since we modified @# configure.in by patching it. - @touch ${SRCDIR}/gcc/configure - @touch ${SRCDIR}/gcc/cstamp-h.in + @${TOUCH} ${SRCDIR}/gcc/configure + @${TOUCH} ${SRCDIR}/gcc/cstamp-h.in @${MKDIR} ${CONFIGURE_WRKSRC} + @${RM} -f ${SRCDIR}/gcc/*/*.info* pre-build: cd ${SRCDIR} ; contrib/gcc_update --touch @@ -121,15 +120,15 @@ post-install: do \ strip $$prog ; \ done ) -.for file in gcc g++ cpp g++filt gcov - ${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file} - -( test -e ${PREFIX}/man/man1/${file}.1 \ +.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh jv-scan jcf-dump jar grepjar + ${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}31 + -( ${TEST} -e ${PREFIX}/man/man1/${file}.1 \ && ${MV} -f ${PREFIX}/man/man1/${file}.1 \ - ${PREFIX}/man/man1/g${file}.1 ) + ${PREFIX}/man/man1/${file}31.1 ) .endfor .for file in g77 - ${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file} - #${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1 + ${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}-31 + #${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/${file}-31.1 .endfor ${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER} # These 3 libraries are moved from PREFIX/lib to avoid conflicts @@ -140,7 +139,7 @@ post-install: #.if defined(WANT_SHAREDLIBS) # ${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB} #.endif -.for info in cpp g77 gcc +.for info in cpp cppinternals g77 gcc gcj install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir .endfor cd ${PREFIX} ;\ @@ -149,6 +148,7 @@ post-install: cd ${PREFIX} ;\ ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \ | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib + (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo index 42a9cd63ee24..336b2b1e969a 100644 --- a/lang/gcc40/distinfo +++ b/lang/gcc40/distinfo @@ -1,5 +1,5 @@ -MD5 (gcc-core-20020225.tar.gz) = 5848c1594cdc13caae2f5cdc01a6caf2 -MD5 (gcc-g++-20020225.tar.gz) = c60571251afb5bf6f2a5a446f8d2fa4a -MD5 (gcc-g77-20020225.tar.gz) = a61b9140ed91c1dbe5b09d16f619c310 -MD5 (gcc-java-20020225.tar.gz) = c614bfb85f7b88438b4c8e98e1efa997 -MD5 (gcc-objc-20020225.tar.gz) = fe81f0debf72b2315e7884338b289272 +MD5 (gcc-core-20020225.tar.bz2) = a1d6a6d6d5b5116061c69d1114581a0f +MD5 (gcc-g++-20020225.tar.bz2) = e434b91945db07d55c528696384a77b3 +MD5 (gcc-g77-20020225.tar.bz2) = 3fbe3e1e73be55477f5d6658805b3878 +MD5 (gcc-java-20020225.tar.bz2) = 534bef8761bede48bb16c2cc213bf53a +MD5 (gcc-objc-20020225.tar.bz2) = 966e62ce336cfd18e2d5ff904f5ec830 diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist index 98e3d99960b2..78cfd4f85d6e 100644 --- a/lang/gcc40/pkg-plist +++ b/lang/gcc40/pkg-plist @@ -1,79 +1,33 @@ @comment $FreeBSD$ -bin/gg++filt -bin/gg++ -bin/gg77 -bin/ggcc -bin/ggcov -bin/%%GNU_HOST%%-gcc -bin/%%GNU_HOST%%-g++ +bin/g++filt31 +bin/g++31 +bin/g77-31 +bin/gcc31 +bin/gcov31 +bin/%%GNU_HOST%%-gcc31 +bin/%%GNU_HOST%%-g++31 bin/gccbug-%%SNAPVER%% -bin/gcj -bin/gcjh -bin/jv-scan -bin/jcf-dump +bin/gcj31 +bin/gcjh31 +bin/jv-scan31 +bin/jcf-dump31 +bin/jar31 +bin/grepjar31 @comment not needed post-libstdc++-v3: %%GNU_HOST%%/include/_G_config.h @comment Insert PLIST.gcc-lib here @comment -=[ begin PLIST.gcc-lib ]=- @comment -=[ end PLIST.gcc-lib ]=- -@unexec install-info --delete %D/info/c-tree.info %D/info/dir @unexec install-info --delete %D/info/cppinternals.info %D/info/dir @unexec install-info --delete %D/info/gcc.info %D/info/dir @unexec install-info --delete %D/info/g77.info %D/info/dir info/cpp.info -info/cpp.info-1 -info/cpp.info-2 -info/cpp.info-3 info/cppinternals.info info/g77.info -info/g77.info-1 -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-2 -info/g77.info-20 -info/g77.info-21 -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/gcc.info -info/gcc.info-1 -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-2 -info/gcc.info-20 -info/gcc.info-21 -info/gcc.info-22 -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/gcj.info -@exec install-info %D/info/c-tree.info %D/info/dir @exec install-info %D/info/cppinternals.info %D/info/dir @exec install-info %D/info/g77.info %D/info/dir @exec install-info %D/info/gcc.info %D/info/dir @exec install-info %D/info/gcj.info %D/info/dir -@dirrm %%GNU_HOST%%/include -@dirrm %%GNU_HOST%% +@comment @dirrm %%GNU_HOST%%/include +@comment @dirrm %%GNU_HOST%% -- cgit v1.2.3