aboutsummaryrefslogtreecommitdiff
path: root/lang/gcc42
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2005-12-21 21:14:08 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2005-12-21 21:14:08 +0000
commit10290a3326e0610967284a7fb87f3a2cfec9053e (patch)
treebdf133ac30ba888936359dbc022a82033b519637 /lang/gcc42
parent0848f66751fb80f8bbfc1c3e6eb49b06349d001f (diff)
downloadports-10290a3326e0610967284a7fb87f3a2cfec9053e.tar.gz
ports-10290a3326e0610967284a7fb87f3a2cfec9053e.zip
Notes
Diffstat (limited to 'lang/gcc42')
-rw-r--r--lang/gcc42/Makefile15
-rw-r--r--lang/gcc42/pkg-plist2
2 files changed, 12 insertions, 5 deletions
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 1cc667d80f3a..8232cedc1073 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
BUILD_DEPENDS= ${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
.endif
-CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+CONFLICTS= gcc-4.0.* gcc-4.1.*
LATEST_LINK?= gcc42${PKGNAMESUFFIX}
NOT_FOR_ARCHS= alpha
USE_BISON= yes
@@ -69,7 +69,8 @@ CONFIGURE_ARGS+= --disable-nls \
--with-libiconv-prefix=${LOCALBASE} \
--program-suffix=${SUFFIX} \
--libdir=${TARGLIB} \
- --with-gxx-include-dir=${TARGLIB}/include/c++/
+ --with-gxx-include-dir=${TARGLIB}/include/c++/ \
+ --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
CONFIGURE_ENV= RANLIB=:
.if defined(WITH_JAVA_AWT)
CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk #--enable-gtk-cairo=yes
@@ -90,13 +91,17 @@ MAN1= cpp${SUFFIX}.1 \
g++${SUFFIX}.1 \
gcc${SUFFIX}.1 \
gcov${SUFFIX}.1
-INFO= cpp cppinternals gcc gccinstall gccint
+INFO= gcc${SUFFIX}/cpp \
+ gcc${SUFFIX}/cppinternals \
+ gcc${SUFFIX}/gcc \
+ gcc${SUFFIX}/gccinstall \
+ gcc${SUFFIX}/gccint
.if defined(WITH_FORTRAN)
DISTFILES+= gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
MAN1+= gfortran${SUFFIX}.1
-INFO+= gfortran
+INFO+= gcc${SUFFIX}/gfortran
PLIST_SUB+= FORTRAN=""
.else
PLIST_SUB+= FORTRAN="@comment "
@@ -121,7 +126,7 @@ MAN1+= fastjar${SUFFIX}.1 \
jcf-dump${SUFFIX}.1 \
jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+= gcj fastjar
+INFO+= gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
PLIST_SUB+= JAVA=""
.else
CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 85974006f10b..2b8c35f1bc6c 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -15,6 +15,8 @@ include/ssp/string.h
include/ssp/stdio.h
include/ssp/unistd.h
@unexec rmdir %D/include/ssp 2>/dev/null || true
+info/gcc%%SUFFIX%%/dir
+@unexec rmdir %D/info/gcc%%SUFFIX%% 2>/dev/null || true
%%FORTRAN%%bin/gfortran%%SUFFIX%%
%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
%%JAVA%%bin/addr2name.awk%%SUFFIX%%