[53101] trunk/dports

krischik at macports.org krischik at macports.org
Mon Jun 29 09:34:31 PDT 2009


Revision: 53101
          http://trac.macports.org/changeset/53101
Author:   krischik at macports.org
Date:     2009-06-29 09:34:30 -0700 (Mon, 29 Jun 2009)
Log Message:
-----------
Change gnat to gcc 4.4 - update related libraries as well.

Modified Paths:
--------------
    trunk/dports/devel/gnat-booch95/Portfile
    trunk/dports/devel/gnat-gprbuild/Portfile
    trunk/dports/lang/gnat-gcc/Portfile
    trunk/dports/lang/gnat-gcc/files/gnat-gcc

Modified: trunk/dports/devel/gnat-booch95/Portfile
===================================================================
--- trunk/dports/devel/gnat-booch95/Portfile	2009-06-29 15:51:46 UTC (rev 53100)
+++ trunk/dports/devel/gnat-booch95/Portfile	2009-06-29 16:34:30 UTC (rev 53101)
@@ -1,71 +1,63 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # $Id$
 
-PortSystem			1.0
+PortSystem	    1.0
 
-name                gnat-booch95
-version             20090216
-revision            1
-platforms           darwin
-categories          devel
-maintainers         macports.org:krischik
-description         The Ada 95 Booch Components
-long_description	The Ada 95 Booch Components
+name		    gnat-booch95
+version		    20090629
+revision	    1
+platforms	    darwin
+categories	    devel
+maintainers	    macports.org:krischik
+description	    The Ada 95 Booch Components
+long_description    The Ada 95 Booch Components
 
-homepage			http://booch95.sourceforge.net
-master_sites	    sourceforge:booch95
+homepage	    http://booch95.sourceforge.net
+master_sites	    sourceforge:gnuada
 
-distfiles			bc-${version}.7z 
-worksrcdir			bc-${version}
+distfiles	    bc-${version}.7z
+worksrcdir	    bc-${version}
 
-checksums           md5     2c5af5267c8f4a3b237f0338d4b9a337 \
-                    sha1    095d7590ff92fbef93ca5703de6802cb4793ba13 \
-                    rmd160  7475bb5fcc40b0ae447386f2e3469244b6a74439
+checksums           md5     3e5c7443db6e5beb7cdfe3706c9d9226 \
+                    sha1    1fa7d43d59232375b03bc21a3fbbb6a873b8e22d \
+                    rmd160  5d61b3784ca1e3744acd8297946d299fd8bebfe2
 
-use_bzip2			yes
+use_7z		    yes
 use_parallel_build  yes
 use_configure	    no
 
-depends_lib         port:gnat-gcc
-depends_build		port:p7zip
+depends_lib	    port:gnat-gcc
+depends_build	    port:p7zip
 
-extract {
-    system "
-	pushd ${workpath};
-	    7za x ${distpath}/${distfile};
-	popd;
-    "
-}
-
 build {
     system "
-	pushd ${workpath}/${worksrcdir}/GNAT;
-	    gnumake release;
-	    gnumake debug;
-	popd;
+    pushd ${workpath}/${worksrcdir}/GNAT;
+	gnumake release;
+	gnumake debug;
+    popd;
     "
 }
 
 destroot {
-	xinstall -m 775	-d ${destroot}/${prefix}/lib/booch
-	xinstall -m 775 -d ${destroot}/${prefix}/include/booch/src
-	xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT
-	xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release
-	xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/obj
-	xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/lib
-	xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug
-	xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/obj
-	xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/lib
+    xinstall -m 775 -d ${destroot}/${prefix}/lib/booch
+    xinstall -m 775 -d ${destroot}/${prefix}/include/booch/src
+    xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT
+    xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release
+    xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/obj
+    xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/lib
+    xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug
+    xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/obj
+    xinstall -m 775 -d ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/lib
 
-	eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/lib/*]	${destroot}/${prefix}/lib/booch
-	eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/src/*]								${destroot}/${prefix}/include/booch/src
-	eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Makefile]						${destroot}/${prefix}/include/booch/GNAT
-	eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/booch_95.gpr]					${destroot}/${prefix}/include/booch/GNAT
-	eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/obj/*]	${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/obj
-	eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/lib/*]	${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/lib
-	eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Debug/obj/*]		${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/obj
-	eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Debug/lib/*]		${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/lib
+    eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/lib/*]    ${destroot}/${prefix}/lib/booch
+    eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/src/*]				    ${destroot}/${prefix}/include/booch/src
+    eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Makefile]			    ${destroot}/${prefix}/include/booch/GNAT
+    eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/booch_95.gpr]		    ${destroot}/${prefix}/include/booch/GNAT
+    eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/obj/*]    ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/obj
+    eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Release/lib/*]    ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Release/lib
+    eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Debug/obj/*]	    ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/obj
+    eval xinstall -m 664 [glob ${workpath}/${worksrcdir}/GNAT/Darwin-i686-Debug/lib/*]	    ${destroot}/${prefix}/include/booch/GNAT/Darwin-i686-Debug/lib
 }
 
-# vim: set nowrap tabstop=4 shiftwidth=4 softtabstop=4 noexpandtab :
+# vim: set nowrap tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab :
 # vim: set textwidth=0 filetype=tcl foldmethod=marker nospell :

Modified: trunk/dports/devel/gnat-gprbuild/Portfile
===================================================================
--- trunk/dports/devel/gnat-gprbuild/Portfile	2009-06-29 15:51:46 UTC (rev 53100)
+++ trunk/dports/devel/gnat-gprbuild/Portfile	2009-06-29 16:34:30 UTC (rev 53101)
@@ -5,7 +5,7 @@
 
 name		    	gnat-gprbuild
 version		    	1.2.0
-#revision	    	1
+revision	    	1
 platforms	    	darwin
 categories	    	devel
 maintainers	    	macports.org:krischik
@@ -34,7 +34,8 @@
 use_parallel_build  	yes
 use_configure	    	yes
 
-depends_lib	    	port:gnat-gcc
+depends_lib	    	port:gnat-gcc	    \
+			port:gnat-xmlada
 
 build.args	    	--jobs=4
 configure.env-append    ADA_PROJECT_PATH=${prefix}/lib/gnat

Modified: trunk/dports/lang/gnat-gcc/Portfile
===================================================================
--- trunk/dports/lang/gnat-gcc/Portfile	2009-06-29 15:51:46 UTC (rev 53100)
+++ trunk/dports/lang/gnat-gcc/Portfile	2009-06-29 16:34:30 UTC (rev 53101)
@@ -1,179 +1,208 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # $Id$
+# vim: set fileencoding=utf-8 tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab filetype=tcl :
 
-PortSystem  1.0
+PortSystem	1.0
 
-name            gnat-gcc
-version         4.3.3
-revision        4
-platforms       darwin
-categories      lang
-maintainers     krischik
-description     The GNU compiler collection with GNAT
-long_description The GNU compiler collection, including front ends for \
-                C, C++, Ada, Objective-C, Objective-C++, Java and Fortran95.
+name			gnat-gcc
+version			4.4.0
+#revision		4
+platforms		darwin
+categories		lang
+maintainers		krischik
+description		The GNU compiler collection with GNAT
+long_description	The GNU compiler collection, including front ends for \
+			C, C++, Ada, Objective-C, Objective-C++, Java and Fortran95.
 
-homepage        http://gcc.gnu.org/
-master_sites    ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/releases/gcc-${version}/ \
-                ftp://ftp.gwdg.de/pub/linux/gcc/releases/gcc-${version}/ \
-                ftp://gcc.ftp.nluug.nl/mirror/languages/gcc/releases/gcc-${version}/ \
-                ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/ \
-                gnu:/gcc/gcc-${version}
+homepage		http://gcc.gnu.org/
+master_sites	ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/releases/gcc-${version}/ \
+		ftp://ftp.gwdg.de/pub/linux/gcc/releases/gcc-${version}/ \
+		ftp://gcc.ftp.nluug.nl/mirror/languages/gcc/releases/gcc-${version}/ \
+		ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/ \
+		gnu:/gcc/gcc-${version}
 
-set dcore       gcc-core-${version}.tar.bz2
-set dada        gcc-ada-${version}.tar.bz2
-set dfort       gcc-fortran-${version}.tar.bz2
-set dcxx        gcc-g++-${version}.tar.bz2
-set djava       gcc-java-${version}.tar.bz2
-set dobjc       gcc-objc-${version}.tar.bz2
-distfiles       ${dcore} ${dada} ${dfort} ${dcxx} ${djava} ${dobjc}
+set dcore		gcc-core-${version}.tar.bz2
+set dada		gcc-ada-${version}.tar.bz2
+set dfort		gcc-fortran-${version}.tar.bz2
+set dcxx		gcc-g++-${version}.tar.bz2
+set djava		gcc-java-${version}.tar.bz2
+set dobjc		gcc-objc-${version}.tar.bz2
+distfiles		${dcore} ${dada} ${dfort} ${dcxx} ${djava} ${dobjc}
 
-checksums       ${dcore} sha1 b907061e5788d7060bfb94396152ba9fc0786f91  \
-                ${dada}  sha1 5111d261d8d7254305831e8577eb5eb7d9cf33fb  \
-                ${dfort} sha1 14d8a5974fa16dcd5a9e2452db7fa9afc46b3be4  \
-                ${dcxx} sha1 cb41dc7f52a23167b1dfdadadd437bbecb1dce05   \
-                ${djava} sha1 4af4318b80b54a7e2c14c26834f467ce1362273a  \
-                ${dobjc} sha1 2459c314ebb9c8661870b42a146def33826cf147
+checksums		${dcore} sha1 081c5a1e49157b9c48fe97497633b6ff39032eb5 \
+			${dada}  sha1 07c110a2918f20638524d8ded22581d4cb9204a8 \
+			${dfort} sha1 5f9e32d9061937e7706d35d2d5458675352b1368 \
+			${dcxx} sha1 063d5acca79ec00276cf6ebdba414804abf3fcb6 \
+			${djava} sha1 94c2b5f541db6961c60ae30e0ac8b822fae4f3d3 \
+			${dobjc} sha1 21cd70e01c211553c59123c62b4f33330ad212c4
 
-use_bzip2       yes
+use_bzip2		yes
 
 # gmp and mpfr are not universal
-universal_variant       no
+universal_variant	no
 
-depends_lib     port:gmp port:mpfr port:libiconv
+depends_lib		port:gmp port:mpfr port:libiconv
 
-set major       4.3
+set major		4.4
 
-worksrcdir      build
+worksrcdir		build
+dist_subdir		gcc43
 
-build.args	--jobs=4
-
 pre-configure {
-    file mkdir ${worksrcpath}
+	file mkdir ${worksrcpath}
 }
 
-configure.cmd   ../gcc-${version}/configure
-configure.args  --enable-languages=c,c++,ada,objc,obj-c++,java,fortran \
-        --libdir=${prefix}/lib/${name} \
-        --includedir=${prefix}/include/${name} \
-        --infodir=${prefix}/share/info \
-        --mandir=${prefix}/share/man \
-        --with-local-prefix=${prefix} \
-        --with-system-zlib \
-        --disable-nls \
-        --program-suffix=-gnat-${major} \
-        --with-gxx-include-dir=${prefix}/include/${name}/c++/ \
-        --with-gmp=${prefix} \
-        --with-mpfr=${prefix}
+configure.cmd	../gcc-${version}/configure
+configure.args	--enable-languages=c,c++,ada,objc,obj-c++,java,fortran \
+		--libdir=${prefix}/lib/${name} \
+		--includedir=${prefix}/include/${name} \
+		--infodir=${prefix}/share/info \
+		--mandir=${prefix}/share/man \
+		--with-local-prefix=${prefix} \
+		--with-system-zlib \
+		--disable-nls \
+		--program-suffix=-gnat-${major} \
+		--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
+		--with-gmp=${prefix} \
+		--with-mpfr=${prefix}
 # do NOT use MacPorts binutils -- they do not work
-configure.env-append    AR_FOR_TARGET=/usr/bin/ar \
-            AS_FOR_TARGET=/usr/bin/as \
-            LD_FOR_TARGET=/usr/bin/ld \
-            NM_FOR_TARGET=/usr/bin/nm \
-            OBJDUMP_FOR_TARGET=/usr/bin/objdump \
-            RANLIB_FOR_TARGET=/usr/bin/ranlib \
-            STRIP_FOR_TARGET=/usr/bin/strip \
-            LIPO_FOR_TARGET=/usr/bin/lipo
+configure.env-append	AR_FOR_TARGET=/usr/bin/ar \
+			AS_FOR_TARGET=/usr/bin/as \
+			LD_FOR_TARGET=/usr/bin/ld \
+			NM_FOR_TARGET=/usr/bin/nm \
+			OBJDUMP_FOR_TARGET=/usr/bin/objdump \
+			RANLIB_FOR_TARGET=/usr/bin/ranlib \
+			STRIP_FOR_TARGET=/usr/bin/strip
+#			LIPO_FOR_TARGET=/usr/bin/lipo
 
-use_parallel_build  yes
+use_parallel_build	yes
 
 destroot.target install install-info-host
 # install-info # errors on objc-info files
 
 post-destroot {
-    # move manuals to gcc43-specific directory
-    xinstall -m 755 -d ${destroot}${prefix}/share/gcc43/man/man7
-    xinstall -m 755 -d ${destroot}${prefix}/share/gcc43/info
-    eval xinstall -m 0644 [glob ${destroot}${prefix}/share/man/man7/*]  ${destroot}${prefix}/share/gcc43/man/man7
-    eval xinstall -m 0644 [glob ${destroot}${prefix}/share/info/*] ${destroot}${prefix}/share/gcc43/info
-    # install/copy ffitarget.h only if we have it
-    if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
-        file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
-    }
-    # install select file for gcc_select
-    xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
-    xinstall -m 444 ${filespath}/gnat-gcc ${destroot}${prefix}/etc/select/gcc/
+	file delete -force ${destroot}${prefix}/share/man/man7 \
+		${destroot}${prefix}/share/info
+	# install/copy ffitarget.h only if we have it
+	if {![catch {set ffitarget.h [glob ${destroot}${prefix}/lib/${name}/gcc/*/${version}/include/ffitarget.h]} result]} {
+		file copy ${ffitarget.h} ${destroot}${prefix}/include/${name}/
+	}
+	# install select file for gcc_select
+	xinstall -m 755 -d ${destroot}${prefix}/etc/select/gcc
+	xinstall -m 444 ${filespath}/gnat-gcc ${destroot}${prefix}/etc/select/gcc/
 }
 
-platform darwin 7 {
-    depends_build-append    port:gmake
-    build.cmd               gmake
-#   configure.cflags-append -force_cpusubtype_ALL
-#   configure.env           BOOT_CFLAGS="-g -O2 -force_cpusubtype_ALL"
-#   build.args-append   XCFLAGS=-force_cpusubtype_ALL
-}
+#platform darwin 7 {
+#	configure.cflags-append	-force_cpusubtype_ALL
+#	confgiure.env	BOOT_CFLAGS="-g -O2 -force_cpusubtype_ALL"
+#	build.args-append	XCFLAGS=-force_cpusubtype_ALL
+#}
 
 platform powerpc {
-    configure.args-append --disable-multilib
+	configure.args-append --disable-multilib
 }
 
-# Java support does not compile on 10.4/x86
-platform darwin 8 i386 {
-    configure.args-delete   --enable-languages=c,c++,ada,objc,obj-c++,java,fortran
-    configure.args-append   --enable-languages=c,c++,ada,objc,obj-c++,fortran
+# odcctools currently do not compile for x64 - move to variant for the time being
+variant odcctools \
+	description "Use the odcctools instead of the system provided ones - does not work for x64 currently!" {
+	depends_lib-append	port:odcctools
+	patch {
+		reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
+			${workpath}/gcc-${version}/gcc/config/darwin.h
+	}
+	configure.args-append	--with-as=${prefix}/bin/odas \
+				--with-ld=${prefix}/bin/odld \
+				--with-ar=${prefix}/bin/odar
 }
 
-# odcctools currently do not compile for x64 - move to variant for the time being
-#variant odcctools \
-#   description "Use the odcctools instead of the system provided ones - does not work for x64 currently!" {
-#   depends_lib-append  port:odcctools
-#   patch {
-#       reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|g" \
-#           ${workpath}/gcc-${version}/gcc/config/darwin.h
-#   }
-#   configure.args-append   --with-as=${prefix}/bin/odas \
-#               --with-ld=${prefix}/bin/odld \
-#               --with-ar=${prefix}/bin/odar
+#variant x86_64										\
+	#description "Create an Intel 64 bit compiler." {
+	#configure.args-append				\
+		#--build=i386-apple-darwin9		\
+		#--host=i386-apple-darwin9		\
+		#--target=x86_64-apple-darwin9
+		##APXSLDFLAGS='-arch x86_64'		\
+		##--with-apxs=/usr/sbin/apxs
+		##CFLAGS='-arch x86_64'			\
 #}
 
-#variant x86_64                                     \
-    #description "Create an Intel 64 bit compiler." {
-    #configure.args-append              \
-        #--build=i386-apple-darwin9     \
-        #--host=i386-apple-darwin9      \
-        #--target=x86_64-apple-darwin9
-        ##APXSLDFLAGS='-arch x86_64'        \
-        ##--with-apxs=/usr/sbin/apxs
-        ##CFLAGS='-arch x86_64'         \
-#}
-
 #
 # Ada is the only language apart from C which is self hosted - meaning: you need
 # an ada compiler to compile ada. hence it is just a variant.
 #
-variant macada                                        \
-    description "Uses MacAda compiler (http://www.macada.org) to bootstrap!"  {
-    configure.cc            /usr/local/ada-4.3/bin/gcc
-    configure.cpp           /usr/local/ada-4.3/bin/cpp
-    configure.cxx           /usr/local/ada-4.3/bin/g++
-    configure.objc          /usr/local/ada-4.3/bin/gcc
-    configure.env-append    PATH=/usr/local/ada-4.3/bin:$env(PATH)
-    configure.env-append    GNATMAKE=/usr/local/ada-4.3/bin/gnatmake
-    configure.env-append    GNATBIND=/usr/local/ada-4.3/bin/gnatbind
+variant macada									\
+    description "Uses MacAda compiler (http://www.macada.org) to bootstrap!"	{
+    set bootprefix=/usr/local/ada-4.3
+    configure.cc		${bootprefix}/bin/gcc
+    configure.cpp		${bootprefix}/bin/cpp
+    configure.cxx		${bootprefix}/bin/g++
+    configure.objc		${bootprefix}/bin/gcc
+    configure.env-append	PATH=${bootprefix}/bin:$env(PATH)
+    configure.env-append	GNATMAKE=${bootprefix}/bin/gnatmake
+    configure.env-append	GNATBIND=${bootprefix}/bin/gnatbind
 }
 
-variant gnuada                                                    \
-    description "Uses the GnuAda (http://gnuada.sourceforge.net/) compiler to bootstrap!" {
-    configure.cc            /opt/local/bin/gcc-gnat-4.3
-    configure.cpp           /opt/local/bin/cpp-gnat-4.3
-    configure.cxx           /opt/local/bin/g++-gnat-4.3
-    configure.objc          /opt/local/bin/gcc-gnat-4.3
-    configure.env-append    PATH=/opt/local/bin:$env(PATH)
-    configure.env-append    GNATMAKE=/opt/local/bin/gnatmake
-    configure.env-append    GNATBIND=/opt/local/bin/gnatbind
+variant gnatgpl										\
+    description "Uses GNAT/GPL compiler (http://libre.adacore.com) to bootstrap!"	{
+    set bootprefix=/opt/gnat-2009-x86_64-apple-darwin9.6.0-bin
+    configure.cc		${bootprefix}/bin/gcc
+    configure.cpp		${bootprefix}/bin/cpp
+    configure.cxx		${bootprefix}/bin/g++
+    configure.objc		${bootprefix}/bin/gcc
+    configure.env-append	PATH=${bootprefix}/bin:$env(PATH)
+    configure.env-append	GNATMAKE=${bootprefix}/bin/gnatmake
+    configure.env-append	GNATBIND=${bootprefix}/bin/gnatbind
 }
 
-variant ada                                                    \
-    description "Uses the MacPorts Ada compiler to bootstrap!" {
-    configure.cc            ${prefix}/bin/gcc-gnat-4.3
-    configure.cpp           ${prefix}/bin/cpp-gnat-4.3
-    configure.cxx           ${prefix}/bin/g++-gnat-4.3
-    configure.objc          ${prefix}/bin/gcc-gnat-4.3
-    configure.env-append    PATH=${prefix}/bin:$env(PATH)
-    configure.env-append    GNATMAKE=${prefix}/bin/gnatmake
-    configure.env-append    GNATBIND=${prefix}/bin/gnatbind
+variant gnuada											\
+    description "Uses the GnuAda (http://gnuada.sourceforge.net/) compiler to bootstrap!"	{
+    set bootprefix=/opt/local
+    configure.cc		${bootprefix}/bin/gcc-gnat-4.3
+    configure.cpp		${bootprefix}/bin/cpp-gnat-4.3
+    configure.cxx		${bootprefix}/bin/g++-gnat-4.3
+    configure.objc		${bootprefix}/bin/gcc-gnat-4.3
+    configure.env-append	PATH=${bootprefix}/bin:$env(PATH)
+    configure.env-append	GNATMAKE=${bootprefix}/bin/gnatmake
+    configure.env-append	GNATBIND=${bootprefix}/bin/gnatbind
 }
 
+variant ada											\
+    description "Uses the MacPorts Ada (http://www.macports.org/) compiler to bootstrap!"	{
+    configure.cc		${prefix}/bin/gcc
+    configure.cpp		${prefix}/bin/cpp
+    configure.cxx		${prefix}/bin/g++
+    configure.objc		${prefix}/bin/gcc
+    configure.env-append	PATH=${prefix}/bin:$env(PATH)
+    configure.env-append	GNATMAKE=${prefix}/bin/gnatmake
+    configure.env-append	GNATBIND=${prefix}/bin/gnatbind
+}
+
+pre-configure {
+    if {![variant_isset macada] &&  ![variant_isset gnatgpl] &&  ![variant_isset gnuada]  &&  ![variant_isset ada]} {
+	ui_msg "######################################################"
+	ui_msg "#  You need to install an Ada compiler and then	     #"
+	ui_msg "#  choose an appropiate variant.                     #"
+	ui_msg "######################################################"
+    }
+}
+
+post-configure {
+    file delete								\
+	${workpath}/gcc-${version}/gcc/ada/mlib-tgt-specific.adb
+    file copy								\
+	${workpath}/gcc-${version}/gcc/ada/mlib-tgt-specific-darwin.adb	\
+	${workpath}/gcc-${version}/gcc/ada/mlib-tgt-specific.adb
+}
+
+post-activate {
+    ui_msg "######################################################"
+    ui_msg "#  Remember to activate the compiler with:           #"
+    ui_msg "#                                                    #"
+    ui_msg "#  sudo gcc_select gnat-gcc                          #"
+    ui_msg "######################################################"
+}
+
+
 livecheck.check regex
-livecheck.url   http://gcc.gnu.org/gcc-4.3/
-livecheck.regex GCC (4\\.3\\.\[0-9\])
+livecheck.url	http://gcc.gnu.org/gcc-4.4/
+livecheck.regex GCC (4\\.4\\.\[0-9\])

Modified: trunk/dports/lang/gnat-gcc/files/gnat-gcc
===================================================================
--- trunk/dports/lang/gnat-gcc/files/gnat-gcc	2009-06-29 15:51:46 UTC (rev 53100)
+++ trunk/dports/lang/gnat-gcc/files/gnat-gcc	2009-06-29 16:34:30 UTC (rev 53101)
@@ -1,7 +1,7 @@
-bin/gcc-gnat-4.3
-bin/cpp-gnat-4.3
-bin/c++-gnat-4.3
-bin/g++-gnat-4.3
-bin/gcj-gnat-4.3
-bin/gcov-gnat-4.3
-bin/gfortran-gnat-4.3
+bin/gcc-gnat-4.4
+bin/cpp-gnat-4.4
+bin/c++-gnat-4.4
+bin/g++-gnat-4.4
+bin/gcj-gnat-4.4
+bin/gcov-gnat-4.4
+bin/gfortran-gnat-4.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090629/04bc6e26/attachment-0001.html>


More information about the macports-changes mailing list