From 5ed3c00f2c9fb23726f4a873b497a7a23c18603e Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Wed, 20 Jun 2001 19:26:25 +0000 Subject: Majorly clean this port up. --- lang/gcc30/Makefile | 48 +++++++++++++++++------------------------------- lang/gcc30/pkg-plist | 10 ++++------ 2 files changed, 21 insertions(+), 37 deletions(-) (limited to 'lang') diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile index a6dc26803a9f..ed41776f21ec 100644 --- a/lang/gcc30/Makefile +++ b/lang/gcc30/Makefile @@ -12,12 +12,9 @@ SNAPVER= ${SNAPDATE:S/-//g} PORTNAME= gcc-30snap PORTVERSION= ${SNAPVER} CATEGORIES= lang java -MASTER_SITES= ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/ \ - ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \ - ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \ - ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \ - ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \ - ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ +MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \ + ${MASTER_SITE_SOURCEWARE} +MASTER_SITE_SUBDIR= gcc/snapshots/${SNAPDATE} DISTFILES= gcc-core-${SNAPVER}${EXTRACT_SUFX} \ gcc-g++-${SNAPVER}${EXTRACT_SUFX} \ gcc-g77-${SNAPVER}${EXTRACT_SUFX} \ @@ -42,11 +39,6 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL} .endif -##WRKSRC= ${WRKDIR}/gcc-${SNAPVER} -##CONFIGURE_WRKSRC= ${WRKDIR}/build -##BUILD_WRKSRC= ${WRKDIR}/build -##INSTALL_WRKSRC= ${WRKDIR}/build -##CONFIGURE_SCRIPT= ${WRKSRC}/configure EGCS_REV= 3.0 SRCDIR= ${WRKDIR}/gcc-${SNAPVER} WRKSRC= ${WRKDIR}/build @@ -58,7 +50,6 @@ USE_GMAKE= yes 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 .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared .else @@ -72,18 +63,15 @@ CONFIGURE_ARGS+= --enable-threads=posix ALL_TARGET= bootstrap MAN1= cpp30.1 g++30.1 g77-30.1 gcc30.1 gcov30.1 +pre-fetch: + @${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${ARCH}-portbld-freebsd${OSREL}" + pre-configure: - @(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \ - ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \ - ${SRCDIR}/gcc/config/freebsd.h ) @# Keep from running `autoconf' and `autoheader' since we modified @# configure.in by patching it. - ##@touch ${WRKSRC}/gcc/configure - ##@touch ${WRKSRC}/gcc/cstamp-h.in @touch ${SRCDIR}/gcc/configure @touch ${SRCDIR}/gcc/cstamp-h.in @${MKDIR} ${CONFIGURE_WRKSRC} - #${RM} -rf ${SRCDIR}/libjava pre-build: cd ${SRCDIR} ; contrib/gcc_update --touch @@ -92,7 +80,7 @@ pre-install: ${MKDIR} ${PREFIX}/info post-install: - @${RM} -f ${PREFIX}/bin/c++ + @${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++ @${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt @(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \ ${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \ @@ -106,24 +94,22 @@ post-install: do \ strip $$prog ; \ done ) - ${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/gcc30 - ${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/g++30 - ${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/g77-30 - ${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/g++filt30 - ${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/gcov30 +.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ + ${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}30 + -( test -e ${PREFIX}/man/man1/${file}.1 \ + && ${MV} -f ${PREFIX}/man/man1/${file}.1 \ + ${PREFIX}/man/man1/${file}30.1 ) +.endfor +.for file in g77 + ${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}-30 + ${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/${file}-30.1 +.endfor ${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER} - ${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++ - ${RM} -f ${PREFIX}/bin/cpp # These 3 libraries are moved from PREFIX/lib to avoid conflicts # with the stock compiler. ${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB} ${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB} -${MV} -f ${PREFIX}/lib/ieee ${TARGLIB} - ${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/gcc30.1 - ${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/g++30.1 - ${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/g77-30.1 - ${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/cpp30.1 - ${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/gcov30.1 #.if defined(WANT_SHAREDLIBS) # ${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB} #.endif diff --git a/lang/gcc30/pkg-plist b/lang/gcc30/pkg-plist index 8bed5d940f3b..2d1703049e5d 100644 --- a/lang/gcc30/pkg-plist +++ b/lang/gcc30/pkg-plist @@ -1,18 +1,19 @@ @comment $FreeBSD$ +bin/cpp30 bin/g++filt30 bin/g++30 bin/g77-30 bin/gcc30 bin/gcov30 -bin/%%GNU_HOST%%-gcc -bin/%%GNU_HOST%%-g++ +bin/%%GNU_HOST%%-gcc30 +bin/%%GNU_HOST%%-g++30 bin/gccbug-%%SNAPVER%% bin/gcj bin/gcjh +bin/jar bin/jv-scan bin/jcf-dump @comment not needed post-libstdc++-v3: %%GNU_HOST%%/include/_G_config.h -%%GNU_HOST%%/include/assert.h @comment Insert PLIST.gcc-lib here @comment -=[ begin PLIST.gcc-lib ]=- @comment -=[ end PLIST.gcc-lib ]=- @@ -80,7 +81,6 @@ info/gcc.info-32 info/gcc.info-33 info/gcc.info-34 info/gcc.info-35 -info/gcc.info-36 info/gcc.info-3 info/gcc.info-4 info/gcc.info-5 @@ -94,5 +94,3 @@ info/gcj.info @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%% -- cgit v1.2.3