aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authorgerald <gerald@FreeBSD.org>2004-11-07 19:40:15 +0800
committergerald <gerald@FreeBSD.org>2004-11-07 19:40:15 +0800
commitef8e6bc3007147a0d7b96564bc28ea1817a41d00 (patch)
treed6dc8c026f73b9356b1eeeff3b32b11cc84027dc /lang
parent6cf8629a7c0a89b4e7e894269bc90d36dc7fdbe7 (diff)
downloadfreebsd-ports-gnome-ef8e6bc3007147a0d7b96564bc28ea1817a41d00.tar.gz
freebsd-ports-gnome-ef8e6bc3007147a0d7b96564bc28ea1817a41d00.tar.zst
freebsd-ports-gnome-ef8e6bc3007147a0d7b96564bc28ea1817a41d00.zip
Revert those changes from the prevision commit (revision 1.181) that were
accidental, considering obrien's log entry and the breakage caused. Spotted by: kris (on behalf of pointyhat)
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc/Makefile16
-rw-r--r--lang/gcc40/Makefile16
-rw-r--r--lang/gcc41/Makefile16
-rw-r--r--lang/gcc42/Makefile16
-rw-r--r--lang/gcc43/Makefile16
-rw-r--r--lang/gcc44/Makefile16
-rw-r--r--lang/gcc45/Makefile16
-rw-r--r--lang/gcc46/Makefile16
-rw-r--r--lang/gcc47/Makefile16
-rw-r--r--lang/gcc48/Makefile16
10 files changed, 40 insertions, 120 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index f808bf3d8f34..f638b1a8aa75 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -6,9 +6,6 @@
# $FreeBSD$
#
-# FIXME: needed to make gcc40 port work for now.
-WITHOUT_LIBJAVA= yes
-
PORTNAME= gcc
PORTVERSION= 4.0.0
PORTREVISION= 20041024
@@ -20,16 +17,9 @@ MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING}
DISTFILES= \
gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
+ gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.if !defined(WITHOUT_OBJC)
-DISTFILES+= gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_FORTRAN)
-DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
-.if !defined(WITHOUT_LIBJAVA)
-DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
MAINTAINER?= gerald@FreeBSD.org
COMMENT?= GNU Compiler Collection 4.0
@@ -57,6 +47,8 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
+# FIXME: needed to make gcc40 port work for now.
+WITHOUT_LIBJAVA= yes
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build