aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/gnat/Makefile27
-rw-r--r--lang/gnat/distinfo12
-rw-r--r--lang/gnat/files/patch-Makefile.rtl14
-rw-r--r--lang/gnat/files/patch-aa6
-rw-r--r--lang/gnat/files/patch-ab8
-rw-r--r--lang/gnat/files/patch-ac8
-rw-r--r--lang/gnat/files/patch-ad6
-rw-r--r--lang/gnat/files/patch-af4
-rw-r--r--lang/gnat/files/patch-ag4
-rw-r--r--lang/gnat/pkg-plist1
10 files changed, 45 insertions, 45 deletions
diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile
index b793529a1c80..ef343e3ce111 100644
--- a/lang/gnat/Makefile
+++ b/lang/gnat/Makefile
@@ -13,19 +13,22 @@
# using symbolic links.
PORTNAME= gnat
-PORTVERSION= 2009
-PORTREVISION= 4
+PORTVERSION= 2010
+PORTREVISION= 0
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL}:boot
MASTER_SITE_SUBDIR= deischen/gcc/:boot
DISTFILES= ${gcc_srcfile}:gcc ${gnat_srcfile}:gnat
-MAINTAINER= eischen@vigrid.com
+MAINTAINER= deischen@freebsd.org
COMMENT= The GNU Ada Compiler system
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
mpfr.4:${PORTSDIR}/math/mpfr
+LICENSE_COMB= multi
+LICENSE= GPLv3 LGPL3
+
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
@@ -41,20 +44,20 @@ MAN7= ${fsf_mans:S/$/${fsf_suffix}.7/}
.include <bsd.port.pre.mk>
-gcc_version= 4.3.4
+gcc_version= 4.3.6
fsf_mans= fsf-funding gfdl gpl
fsf_suffix= -${PORTNAME}
gnuhost= ${CONFIGURE_TARGET}
targlib= ${PREFIX}/lib/gcc-gnat
targlibexec= ${PREFIX}/libexec/gcc-gnat
-gcc_srcdir= gcc-43-src
-gnat_srcdir= gnat-gpl-2009-src
+gcc_srcdir= gcc-4_3-branch-src
+gnat_srcdir= gnat-gpl-2010-src
gcc_wrksrc= ${WRKDIR}/${gcc_srcdir}
gnat_wrksrc= ${WRKDIR}/${gnat_srcdir}
# http://libre.adacore.com/:gcc
# http://libre.adacore.com/:gnat
-gcc_srcfile= gcc-43-branch-20090519-src.tgz
-gnat_srcfile= gnat-gpl-2009-src.tgz
+gcc_srcfile= gcc-4_3-branch-rev160200-src.tgz
+gnat_srcfile= gnat-gpl-2010-src.tgz
PATCH_WRKSRC= ${gcc_wrksrc}
@@ -117,11 +120,10 @@ CONFIGURE_ENV+= ${COMPILE_DATA} CC=${GNATGCC} PATH=${have_boot}
MAKE_ENV+= ${COMPILE_DATA} PATH=${have_boot}
# Shared library handling
-WANT_SHAREDLIBS=yes
.if defined(WANT_SHAREDLIBS)
CONFIGURE_ARGS+= --enable-shared
USE_LDCONFIG= ${PREFIX}/lib ${targlib}
-LIBRARY_VERSION= 2009
+LIBRARY_VERSION= 2010
PLIST_SUB+= SHAREDLIB=""
.else
CONFIGURE_ARGS+= --disable-shared
@@ -130,15 +132,14 @@ PLIST_SUB+= SHAREDLIB="@comment "
# Check for GNAT sources.
.if !exists(${DISTDIR}/${gnat_srcfile}) && !defined(PACKAGE_BUILDING)
-IGNORE= Because of licensing and registration restrictions, you must fetch the source distribution manually. Please access http://libre.adacore.com/ with a web browser, register (it's free), and log in. Download the source files: ${gnat_srcfile} ${gcc_srcfile} and place them in ${DISTDIR}.
+IGNORE= You must fetch the source distribution manually. Please access http://libre.adacore.com/ with a web browsern and download the source files: ${gnat_srcfile} ${gcc_srcfile} placing them in ${DISTDIR}.
.endif
pre-patch:
@${ECHO} "===> Applying FreeBSD ports tree patches for gcc34."
@${ECHO} "===> Applying GNAT supplied patches for gcc43."
@( cd ${gcc_wrksrc}/; \
- ${CAT} ${gnat_wrksrc}/src/gcc-43.dif \
- | ${AWK} ' { sub("\r", ""); print $0 }' | ${PATCH} ${PATCH_ARGS} )
+ ${CAT} ${gnat_wrksrc}/src/gcc-43.dif | ${PATCH} ${PATCH_ARGS} )
@${ECHO} "===> Moving GNAT compiler sources into GCC tree."
@( ${MV} ${gnat_wrksrc}/src/ada ${gcc_wrksrc}/gcc )
diff --git a/lang/gnat/distinfo b/lang/gnat/distinfo
index 1de542a5f4a0..7491831da04c 100644
--- a/lang/gnat/distinfo
+++ b/lang/gnat/distinfo
@@ -1,9 +1,9 @@
-MD5 (gnat-gpl-2009-src.tgz) = d97caa02e4a63362c63edf9d751c05fc
-SHA256 (gnat-gpl-2009-src.tgz) = c6cb6eb3b85279ea84c9fa647b4ad758f9998cf433fd5ae5d786b228c4da7186
-SIZE (gnat-gpl-2009-src.tgz) = 8815034
-MD5 (gcc-43-branch-20090519-src.tgz) = e1e0226265c0dcf135ba911328678026
-SHA256 (gcc-43-branch-20090519-src.tgz) = d06739a60357d51a94d47a38aee85d4f446ac362aae85b4cd5cebfbc40f74734
-SIZE (gcc-43-branch-20090519-src.tgz) = 38747866
+MD5 (gnat-gpl-2010-src.tgz) = b20032bbaa640e8bbb93e41bf6b02d72
+SHA256 (gnat-gpl-2010-src.tgz) = e89b6209e382680a49b3821bf6f13e87780e05f91e4c386821807f6205da4bd2
+SIZE (gnat-gpl-2010-src.tgz) = 9276344
+MD5 (gcc-4_3-branch-rev160200-src.tgz) = d2f137f3d5078cfe12e5be17e808235e
+SHA256 (gcc-4_3-branch-rev160200-src.tgz) = 0aa86252f3000b1ab17ec5ec2634d9161d6efdb3ee9ea29450a8769a194f3893
+SIZE (gcc-4_3-branch-rev160200-src.tgz) = 38790282
MD5 (gnat-2005-boot.tgz) = 7acdf038fef00afe95c2a8c84c005426
SHA256 (gnat-2005-boot.tgz) = c1d7b1558e377f412d78cb2bf832489c288862d25be21b566e8e0fb2803425d9
SIZE (gnat-2005-boot.tgz) = 10387392
diff --git a/lang/gnat/files/patch-Makefile.rtl b/lang/gnat/files/patch-Makefile.rtl
index bec2cc3de2fd..a9b0bfd0bd15 100644
--- a/lang/gnat/files/patch-Makefile.rtl
+++ b/lang/gnat/files/patch-Makefile.rtl
@@ -1,10 +1,10 @@
---- gcc/ada/Makefile.rtl.orig 2009-06-22 09:24:44.000000000 -0400
-+++ gcc/ada/Makefile.rtl 2009-06-22 09:25:12.000000000 -0400
-@@ -479,6 +479,7 @@
- s-maccod$(objext) \
- s-mantis$(objext) \
- s-mastop$(objext) \
-+ s-oscons$(objext) \
+--- gcc/ada/Makefile.rtl.orig 2010-03-27 12:44:36.000000000 -0400
++++ gcc/ada/Makefile.rtl 2010-09-28 11:18:21.000000000 -0400
+@@ -505,6 +505,7 @@
+ s-memory$(objext) \
+ s-objrea$(objext) \
s-os_lib$(objext) \
++ s-oscons$(objext) \
s-osprim$(objext) \
s-pack03$(objext) \
+ s-pack05$(objext) \
diff --git a/lang/gnat/files/patch-aa b/lang/gnat/files/patch-aa
index 25c224ea8d4e..aa2051d42a29 100644
--- a/lang/gnat/files/patch-aa
+++ b/lang/gnat/files/patch-aa
@@ -1,6 +1,6 @@
---- gcc/Makefile.in.orig 2009-06-18 08:32:18.000000000 -0400
-+++ gcc/Makefile.in 2009-06-18 08:32:34.000000000 -0400
-@@ -3923,7 +3923,7 @@
+--- gcc/Makefile.in.orig 2010-09-28 11:10:55.000000000 -0400
++++ gcc/Makefile.in 2010-09-28 11:13:07.000000000 -0400
+@@ -3944,7 +3944,7 @@
# Install the driver last so that the window when things are
# broken is small.
install: install-common $(INSTALL_HEADERS) \
diff --git a/lang/gnat/files/patch-ab b/lang/gnat/files/patch-ab
index 10c67e074c37..bf9f0e776732 100644
--- a/lang/gnat/files/patch-ab
+++ b/lang/gnat/files/patch-ab
@@ -1,10 +1,10 @@
---- gcc/ada/env.c.orig 2009-05-19 07:22:35.000000000 -0400
-+++ gcc/ada/env.c 2009-06-18 08:35:36.000000000 -0400
-@@ -168,6 +168,7 @@
+--- gcc/ada/env.c.orig 2010-06-03 02:19:06.000000000 -0400
++++ gcc/ada/env.c 2010-09-28 11:05:55.000000000 -0400
+@@ -167,6 +167,7 @@
}
#elif (defined (__vxworks) && defined (__RTP__)) || defined (__APPLE__)
-+ || defined(__FreeBSD__)
++ || defined(__FreeBSD__)
setenv (name, value, 1);
#else
diff --git a/lang/gnat/files/patch-ac b/lang/gnat/files/patch-ac
index caef4bb04fc8..cded7b727d57 100644
--- a/lang/gnat/files/patch-ac
+++ b/lang/gnat/files/patch-ac
@@ -1,11 +1,11 @@
---- gcc/ada/gcc-interface/Makefile.in.orig 2009-05-19 07:11:52.000000000 -0400
-+++ gcc/ada/gcc-interface/Makefile.in 2009-06-18 08:40:38.000000000 -0400
-@@ -1083,7 +1083,7 @@
+--- gcc/ada/gcc-interface/Makefile.in.orig 2010-05-30 06:46:25.000000000 -0400
++++ gcc/ada/gcc-interface/Makefile.in 2010-09-28 11:03:31.000000000 -0400
+@@ -1166,7 +1166,7 @@
GNATLIB_SHARED = gnatlib-shared-dual
EH_MECHANISM=-gcc
- THREADSLIB= -lpthread
+ THREADSLIB= $(PTHREAD_LIBS)
GMEM_LIB = gmemlib
- PREFIX_OBJS = $(PREFIX_REAL_OBJS)
LIBRARY_VERSION := $(LIB_VERSION)
+ endif
diff --git a/lang/gnat/files/patch-ad b/lang/gnat/files/patch-ad
index 636634e4e6b0..2cf0fc351752 100644
--- a/lang/gnat/files/patch-ad
+++ b/lang/gnat/files/patch-ad
@@ -1,6 +1,6 @@
---- gcc/ada/make.adb.orig 2009-05-19 07:25:03.000000000 -0400
-+++ gcc/ada/make.adb 2009-06-18 08:42:56.000000000 -0400
-@@ -666,7 +666,7 @@
+--- gcc/ada/make.adb.orig 2010-06-03 02:22:55.000000000 -0400
++++ gcc/ada/make.adb 2010-09-28 11:04:31.000000000 -0400
+@@ -649,7 +649,7 @@
-- Compiler, Binder & Linker Data and Subprograms --
----------------------------------------------------
diff --git a/lang/gnat/files/patch-af b/lang/gnat/files/patch-af
index 4331c839d442..c4c54206c3e7 100644
--- a/lang/gnat/files/patch-af
+++ b/lang/gnat/files/patch-af
@@ -1,5 +1,5 @@
---- gcc/ada/gnatlink.adb.save 2009-05-19 07:24:49.000000000 -0400
-+++ gcc/ada/gnatlink.adb 2009-06-18 08:44:09.000000000 -0400
+--- gcc/ada/gnatlink.adb.orig 2010-06-03 02:22:26.000000000 -0400
++++ gcc/ada/gnatlink.adb 2010-09-28 11:04:58.000000000 -0400
@@ -137,7 +137,7 @@
-- This table collects the arguments to be passed to compile the binder
-- generated file.
diff --git a/lang/gnat/files/patch-ag b/lang/gnat/files/patch-ag
index 003f60df6a1e..58783fd6b8ce 100644
--- a/lang/gnat/files/patch-ag
+++ b/lang/gnat/files/patch-ag
@@ -1,5 +1,5 @@
---- gcc/ada/gnatchop.adb.orig 2009-05-19 07:24:47.000000000 -0400
-+++ gcc/ada/gnatchop.adb 2009-06-18 08:45:13.000000000 -0400
+--- gcc/ada/gnatchop.adb.orig 2010-06-03 02:22:23.000000000 -0400
++++ gcc/ada/gnatchop.adb 2010-09-28 11:05:12.000000000 -0400
@@ -45,7 +45,7 @@
Config_File_Name : constant String_Access := new String'("gnat.adc");
-- The name of the file holding the GNAT configuration pragmas
diff --git a/lang/gnat/pkg-plist b/lang/gnat/pkg-plist
index 21d33ee8680a..5c53d7892059 100644
--- a/lang/gnat/pkg-plist
+++ b/lang/gnat/pkg-plist
@@ -7,7 +7,6 @@ bin/gnatfind
bin/gnatgcc
bin/gnatgccbug
bin/gnatgcov
-bin/gnathtml.pl
bin/gnatkr
bin/gnatlink
bin/gnatls