aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CVSROOT/modules1
-rw-r--r--MOVED1
-rw-r--r--devel/thrift/Makefile2
-rw-r--r--games/allacrost/Makefile2
-rw-r--r--lang/Makefile1
-rw-r--r--lang/gcc40/Makefile113
-rw-r--r--lang/gcc40/distinfo12
-rw-r--r--lang/gcc40/files/patch-ltconfig14
-rw-r--r--lang/gcc40/pkg-descr6
-rw-r--r--lang/gcc40/pkg-plist13
-rw-r--r--lang/yarv/Makefile2
11 files changed, 4 insertions, 163 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules
index e4769197ff94..fe2c7951c0b2 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -3468,7 +3468,6 @@ gcc295 ports/lang/gcc295
gcc32 ports/lang/gcc32
gcc33 ports/lang/gcc33
gcc34 ports/lang/gcc34
-gcc40 ports/lang/gcc40
gcc41 ports/lang/gcc41
gcc41-withgcjawt ports/lang/gcc41-withgcjawt
gcc42 ports/lang/gcc42
diff --git a/MOVED b/MOVED
index 5306677e021a..50cb8b1281b8 100644
--- a/MOVED
+++ b/MOVED
@@ -3324,3 +3324,4 @@ print/gimp-devel-gutenprint|print/gimp-gutenprint|2007-10-24|Gimp 2.4.0 released
print/yatex-mule||2007-10-25|Has expired: emacs19 and related ports are obsolete
devel/py-qt4-qct|devel/qct|2007-10-26|Since it's an application but not a Py/Qt library the port was renamed
net-mgmt/wispy-tools|net-mgmt/spectools|2007-10-29|project renamed
+lang/gcc40|lang/gcc42|2007-11-04|Superseded by gcc41 and later, gcc42 being the recommended update path
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 9c49ea2d6ffc..29f9badc6040 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost \
event:${PORTSDIR}/devel/libevent
USE_AUTOTOOLS= libtool:15
-USE_GCC= 4.0+
+USE_GCC= 4.2+
USE_LDCONFIG= yes
CONFIGURE_ARGS= --with-boost=${LOCALBASE} \
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index b8e1db3e0b0f..561a4be9316a 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
USE_LUA= 5.0
USE_SDL= sdl mixer ttf net
USE_GL= yes
-USE_GCC= 4.0+
+USE_GCC= 4.2+
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --datadir=${DATADIR}
diff --git a/lang/Makefile b/lang/Makefile
index 2602aff9d47a..301d5bf04458 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -80,7 +80,6 @@
SUBDIR += gcc32
SUBDIR += gcc33
SUBDIR += gcc34
- SUBDIR += gcc40
SUBDIR += gcc41
SUBDIR += gcc41-withgcjawt
SUBDIR += gcc42
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
deleted file mode 100644
index adeb323c73e8..000000000000
--- a/lang/gcc40/Makefile
+++ /dev/null
@@ -1,113 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for: egcs
-# Date created: 9 Jan 1998
-# Whom: John Polstra <jdp@polstra.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= gcc
-PORTVERSION= 4.0.4
-PORTREVISION= 1
-PORTEPOCH= 1
-CATEGORIES= lang
-VERSIONSTRING= ${PORTVERSION}
-MASTER_SITES= ${MASTER_SITE_GCC}
-MASTER_SITE_SUBDIR= releases/gcc-${VERSIONSTRING}
-DISTFILES= gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
- gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-
-MAINTAINER?= gerald@FreeBSD.org
-COMMENT?= GNU Compiler Collection 4.0
-
-SUFFIX= 40
-LATEST_LINK?= gcc${SUFFIX}${PKGNAMESUFFIX}
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_ICONV= yes
-USE_PERL5_BUILD=yes
-
-PATCH_WRKSRC= ${SRCDIR}
-CONFIGURE_SCRIPT= ../${SRCDIR:C/${WRKDIR}//}/configure
-NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
-.endif
-
-SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
-WRKSRC= ${WRKDIR}/build
-TARGLIB= ${PREFIX}/lib/gcc-${PORTVERSION}
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-nls \
- --with-system-zlib \
- --with-libiconv-prefix=${LOCALBASE} \
- --program-suffix=${SUFFIX} \
- --libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/
-MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
-ALL_TARGET= bootstrap-lean
-USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
- SUFFIX=${SUFFIX}
-MAN1= cpp${SUFFIX}.1 \
- g++${SUFFIX}.1 \
- gcc${SUFFIX}.1 \
- gcov${SUFFIX}.1
-INFO= gcc${SUFFIX}/cpp \
- gcc${SUFFIX}/cppinternals \
- gcc${SUFFIX}/gcc \
- gcc${SUFFIX}/gccinstall \
- gcc${SUFFIX}/gccint
-
-pre-everything::
- @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} target=${CONFIGURE_TARGET}"
-
-post-patch:
- @${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
- ${SRCDIR}/gcc/version.c
-
-pre-configure:
- cd ${SRCDIR} ; contrib/gcc_update --touch
- @${RM} -f ${SRCDIR}/gcc/*/*.info*
- @${MKDIR} ${CONFIGURE_WRKSRC}
-
-post-build:
- @${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
- @${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
- @${ECHO_MSG} "This assumes that you have the dejagnu port installed."
-
-check: build
- cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
-
-post-install:
- # man pages can only be generated if Perl >= 5.6 is installed;
- # fake them otherwise.
- for mp in ${_MANPAGES}; do \
- ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
- done
- ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
- ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
- ${MV} -f ${PREFIX}/include/mf-runtime.h \
- ${TARGLIB}/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/include
- ${RM} -f ${TARGLIB}/*.la
- # Add target libraries and include files to packaging list.
- ${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} libexec/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
- cd ${PREFIX} ; if [ -d $d ]; then \
- ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
- ${FIND} $d -type d | ${SORT} -r \
- | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
- fi
-.endfor
- ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
- ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
- cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
-
-.include <bsd.port.post.mk>
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
deleted file mode 100644
index 5f4e60d38eed..000000000000
--- a/lang/gcc40/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 (gcc-core-4.0.4.tar.bz2) = 193e0a7a471cca70e374974bc5a60137
-SHA256 (gcc-core-4.0.4.tar.bz2) = e9bf58c761a4f988311aef6b41f12fd5c7e51d09477468fb73826aecc1be32e7
-SIZE (gcc-core-4.0.4.tar.bz2) = 15583411
-MD5 (gcc-g++-4.0.4.tar.bz2) = 5c79e6af5b49dd9cfd22001f3856f447
-SHA256 (gcc-g++-4.0.4.tar.bz2) = c1ff47701a5dc77690fe9e687001546b54f03b7383a89d5b4b11178aaf31f76e
-SIZE (gcc-g++-4.0.4.tar.bz2) = 2698519
-MD5 (gcc-objc-4.0.4.tar.bz2) = df19999fc0e1f715f66d8a6c097a6aaa
-SHA256 (gcc-objc-4.0.4.tar.bz2) = 6f3b376b1f5f54816cab27f4dc5d168e8cc91c7705a740321d406b80bc584c56
-SIZE (gcc-objc-4.0.4.tar.bz2) = 242758
-MD5 (gcc-testsuite-4.0.4.tar.bz2) = d33261f41392b6163645130580cbb7c2
-SHA256 (gcc-testsuite-4.0.4.tar.bz2) = 15c7db7bc8fd6703a2410e9eb3a46befeaf541e1f45a029b83ed12cbd1ed2265
-SIZE (gcc-testsuite-4.0.4.tar.bz2) = 3153551
diff --git a/lang/gcc40/files/patch-ltconfig b/lang/gcc40/files/patch-ltconfig
deleted file mode 100644
index 238574b8adac..000000000000
--- a/lang/gcc40/files/patch-ltconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: ltconfig
-===================================================================
---- ltconfig
-+++ ltconfig (working copy)
-@@ -1133,7 +1133,7 @@
- ;;
-
- freebsd*)
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-
diff --git a/lang/gcc40/pkg-descr b/lang/gcc40/pkg-descr
deleted file mode 100644
index b0aa32c8a8e2..000000000000
--- a/lang/gcc40/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-GCC, the GNU Compiler Collection includes C, C++, and Objective-C.
-
-This port installs the various front ends as gcc40, g++40, and
-so forth into the ${PREFIX}/bin directory.
-
-WWW: http://gcc.gnu.org/
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
deleted file mode 100644
index af92003847f0..000000000000
--- a/lang/gcc40/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $FreeBSD$
-bin/c++%%SUFFIX%%
-bin/cpp%%SUFFIX%%
-bin/g++%%SUFFIX%%
-bin/gcc%%SUFFIX%%
-bin/gccbug%%SUFFIX%%
-bin/gcov%%SUFFIX%%
-bin/%%GNU_HOST%%-c++%%SUFFIX%%
-bin/%%GNU_HOST%%-g++%%SUFFIX%%
-bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc%%SUFFIX%%
-info/gcc%%SUFFIX%%/dir
-@comment Insert PLIST.lib here
diff --git a/lang/yarv/Makefile b/lang/yarv/Makefile
index b3b9da62af33..d6c2aa3c7f15 100644
--- a/lang/yarv/Makefile
+++ b/lang/yarv/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR= ruby
MAINTAINER= mukai@jmuk.org
COMMENT= Yet Another Ruby Virtual-machine
-USE_GCC= 4.0+
+USE_GCC= 4.2+
USE_LDCONFIG= yes
USE_OPENSSL= yes
USE_RUBY= yes