fortran: now part of unified gcc spell, this is now a transitional package so that spells can be moved over to the sub depends stuff

10 files changed, 15 insertions, 127 deletions

diff --git a/gnu/fortran/BUILD b/gnu/fortran/BUILD
index e7199c1a35..27ba77ddaf 100755
--- a/gnu/fortran/BUILD
+++ b/gnu/fortran/BUILD
@@ -1,30 +1 @@
-# take multilib option from GCC
-# ignore return value as it is only available on x86_64
-persistent_read  gcc  GCC_MULTILIB  GCC_MULTILIB
-# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087
-persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
-persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
-
-sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
-
-if [[ $CROSS_INSTALL == on ]]; then
-  OPTS="--host=$HOST $OPTS"
-else
-  OPTS="--build=$HOST $OPTS"
-fi  &&
-
-cd $SOURCE_DIRECTORY.bld                                   &&
-$SOURCE_DIRECTORY/configure                                \
-             --prefix=${INSTALL_ROOT}/usr                  \
-             --libdir=${INSTALL_ROOT}/usr/lib              \
-             --infodir=${INSTALL_ROOT}/usr/share/info      \
-             --mandir=${INSTALL_ROOT}/usr/share/man        \
-             --enable-threads=posix                        \
-             --with-system-zlib                            \
-             --enable-languages=f95                        \
-             $GCC_MULTILIB                                 \
-             $OPTS                                         &&
-
-make_single                                                    &&
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-     profiledbootstrap-lean
+true
diff --git a/gnu/fortran/DEPENDS b/gnu/fortran/DEPENDS
index ef57546558..f1b3fc8407 100755
--- a/gnu/fortran/DEPENDS
+++ b/gnu/fortran/DEPENDS
@@ -1,9 +1 @@
-. $GRIMOIRE/libcompat  &&
-depends  gcc   &&
-if  [[  $VERSION != $(installed_version gcc) ]]; then
-  force_depends  gcc
-fi  &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs
+depends -sub FORTRAN gcc
diff --git a/gnu/fortran/DETAILS b/gnu/fortran/DETAILS
index 293d9e21d7..278c8b9d14 100755
--- a/gnu/fortran/DETAILS
+++ b/gnu/fortran/DETAILS
@@ -1,22 +1,5 @@
            SPELL=fortran
          VERSION=4.3.3
-          SOURCE=gcc-core-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
-   SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
-   SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
-         SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
-  SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-  SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-
-#upstream signatures
-         SOURCE3=$SOURCE.sig
-  SOURCE3_URL[0]=${SOURCE_URL[0]}.sig
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
-  SOURCE3_IGNORE=signature
-         SOURCE4=$SOURCE2.sig
-  SOURCE4_URL[0]=${SOURCE2_URL[0]}.sig
-      SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
-  SOURCE4_IGNORE=signature
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
          ENTERED=20040705
diff --git a/gnu/fortran/FINAL b/gnu/fortran/FINAL
deleted file mode 100755
index 14a9914fe6..0000000000
--- a/gnu/fortran/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-rm_source_dir  $SOURCE_DIRECTORY.bld                       &&
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/fortran/HISTORY b/gnu/fortran/HISTORY
index e74dada0fc..35fa33a90b 100644
--- a/gnu/fortran/HISTORY
+++ b/gnu/fortran/HISTORY
@@ -1,3 +1,14 @@
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f@codemages.net>
+	* BUILD: do nothing
+	* DEPENDS: depend on gcc with fortran
+	* DETAILS: no more sources
+	* INSTALL: do nothing
+	* PRE_BUILD: do nothing
+	* POST_REMOVE: removed
+	* POST_RESURRECT: removed
+	* specs_fortran: removed
+	* FINAL: removed
+
 2009-05-29 Eric Sandall <sandalle@sourcemage.org>
 	* BUILD: Install libraries to $INSTALL_ROOT/usr/lib instead of
 	  $INSTALL_ROOT/usr/lib64 on 64bit arch
diff --git a/gnu/fortran/INSTALL b/gnu/fortran/INSTALL
index 642c9a2b45..27ba77ddaf 100755
--- a/gnu/fortran/INSTALL
+++ b/gnu/fortran/INSTALL
@@ -1,14 +1 @@
-#
-# Bug #10647, also fixed in devel Sorcery
-#
-cd  $SOURCE_DIRECTORY.bld  &&
-
-make -C gcc lang.install-common lang.install-man  &&
-install -c gcc/f951 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
-sedit 's,lib64,lib,' $HOST/libgfortran/Makefile &&
-make -C $HOST/libgfortran/ install  &&
-
-# specs file stuff
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-mkdir -p $SPECSDIR/specs-local                             &&
-cp $SCRIPT_DIRECTORY/specs_fortran $SPECSDIR/specs-local
+true
diff --git a/gnu/fortran/POST_REMOVE b/gnu/fortran/POST_REMOVE
deleted file mode 100755
index 2ab4140f07..0000000000
--- a/gnu/fortran/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/fortran/POST_RESURRECT b/gnu/fortran/POST_RESURRECT
deleted file mode 100755
index b6c486727f..0000000000
--- a/gnu/fortran/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
-cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/fortran/PRE_BUILD b/gnu/fortran/PRE_BUILD
index ada199a9ef..27ba77ddaf 100755
--- a/gnu/fortran/PRE_BUILD
+++ b/gnu/fortran/PRE_BUILD
@@ -1,9 +1 @@
-if [ "$(installed_version gcc)" != "$VERSION" ]; then
-  message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version gcc), not $VERSION!"
-  message "Update gcc first.${DEFAULT_COLOR}"
-  return 1;
-fi
-default_pre_build                &&
-cd $BUILD_DIRECTORY              &&
-unpack_file 2                    &&
-mk_source_dir  $SOURCE_DIRECTORY.bld
+true
diff --git a/gnu/fortran/specs_fortran b/gnu/fortran/specs_fortran
deleted file mode 100644
index 2100d39c99..0000000000
--- a/gnu/fortran/specs_fortran
+++ /dev/null
@@ -1,41 +0,0 @@
-@f77-cpp-input:
-cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) %{E|M|MM:%(cpp_debug_options)} %{!M:%{!MM:%{!E: -o %|.f |\n f951 %|.f %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*} -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}
-
-@f95-cpp-input:
-cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) %{E|M|MM:%(cpp_debug_options)} %{!M:%{!MM:%{!E: -o %|.f95 |\n f951 %|.f95 %(cc1_options) %{J*} %{I*} -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}
-
-@f77:
-%{!E:f951 %i %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*} %{!fsyntax-only:%(invoke_as)}}
-
-@f95:
-%{!E:f951 %i %(cc1_options) %{J*} %{I*} %{!fsyntax-only:%(invoke_as)}}
-
-.F:
-@f77-cpp-input
-
-.fpp:
-@f77-cpp-input
-
-.FPP:
-@f77-cpp-input
-
-.F90:
-@f95-cpp-input
-
-.F95:
-@f95-cpp-input
-
-.f:
-@f77
-
-.for:
-@f77
-
-.FOR:
-@f77
-
-.f90:
-@f95
-
-.f95:
-@f95