diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-01-17 06:11:11 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-01-17 06:11:11 +0000 |
| commit | e6853f80837674447f43a45c344f62ddd63fc9e7 (patch) | |
| tree | 0a1126503ba44473bdf340a513964ff76ea05477 /databases | |
| parent | forgot to commit. a build fix for gfortran. (diff) | |
* Migrate to gfortran.
* Bump port revision.
* Use gfortran compiled blas/lapack.
Approved by: portmgr(kris)
Notes
Notes:
svn path=/head/; revision=182592
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/grass-i18n/Makefile | 15 | ||||
| -rw-r--r-- | databases/grass-i18n/files/patch-configure.in | 29 |
2 files changed, 42 insertions, 2 deletions
diff --git a/databases/grass-i18n/Makefile b/databases/grass-i18n/Makefile index e62932e2be5c..5c038d8b001b 100644 --- a/databases/grass-i18n/Makefile +++ b/databases/grass-i18n/Makefile @@ -6,7 +6,7 @@ PORTNAME= grass-i18n PORTVERSION= 5.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://www.grass-japan.org/FOSS4G/GRASS/:grass \ http://www.grass-japan.org/FOSS4G/ipafonts/:ipafonts @@ -24,10 +24,19 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ fftw.2:${PORTSDIR}/math/fftw \ freetype.9:${PORTSDIR}/print/freetype2 \ gdbm.3:${PORTSDIR}/databases/gdbm \ - lapack.3:${PORTSDIR}/math/lapack + blas.2:${PORTSDIR}/math/blas \ + lapack.4:${PORTSDIR}/math/lapack CONFLICTS= grass-[0-9]* +WANT_FORTRAN= yes #dummy but future use +BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 +FC= gfortran42 +F77= gfortran42 +CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}" +FORTRANLIBS= -lgfortranbegin -lgfortran +GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. + FILES_SRC= grass${PORTVERSION}_i18n_src${EXTRACT_SUFX} FILES_TKI18N= tcltkgrass-i18n${EXTRACT_SUFX} FILES_FONTS= grass${PORTVERSION}_i686-pc-linux-i18n-ipafull-gnu_bin${EXTRACT_SUFX} @@ -110,10 +119,12 @@ post-extract: .endfor post-patch: + ${DIRNAME} `${LOCALBASE}/bin/${F77} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR ${CP} ${WRKSRC}/configure.in ${WRKSRC}/configure.in.orig ${SED} ${CONFIGURE_IN_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ < ${WRKSRC}/configure.in.orig \ > ${WRKSRC}/configure.in + ${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" -e "s+%%FORTRANLIBS%%+${FORTRANLIBS}+" ${WRKSRC}/configure.in post-install: cd ${WRKDIR}/tcltkgrass-i18n/scripts && ${TAR} cf - . | \ diff --git a/databases/grass-i18n/files/patch-configure.in b/databases/grass-i18n/files/patch-configure.in index ef3d4c4840c3..d097d1d5f337 100644 --- a/databases/grass-i18n/files/patch-configure.in +++ b/databases/grass-i18n/files/patch-configure.in @@ -47,3 +47,32 @@ # With FreeType library directory +--- configure.in~ Wed Jan 17 14:41:52 2007 ++++ configure.in Wed Jan 17 14:52:32 2007 +@@ -335,7 +335,7 @@ + AC_CHECK_PROGS(F77, g77 f77) + AC_PATH_PROG(PERL, perl, no) + AC_HEADER_STDC +-AC_CHECK_HEADERS(curses.h limits.h termio.h termios.h unistd.h values.h g2c.h f2c.h) ++AC_CHECK_HEADERS(curses.h limits.h termio.h termios.h unistd.h values.h) + AC_CHECK_HEADERS(sys/ioctl.h sys/mtio.h sys/resource.h sys/time.h) + AC_CHECK_HEADERS(sys/timeb.h sys/types.h sys/utsname.h) + AC_CHECK_HEADERS(libintl.h iconv.h) +@@ -934,7 +934,7 @@ + + LOC_CHECK_LIB_PATH(blas,BLAS,BLASLIB) + +-LOC_CHECK_LIBS(blas,dnrm2_,BLAS,$BLASLIB,BLASLIB,$MATHLIB,,,-lg2c) ++LOC_CHECK_LIBS(blas,dnrm2_,BLAS,$BLASLIB,BLASLIB,$MATHLIB,,,%%GCCLIBDIR%% %%FORTRANLIBS%%) + + AC_DEFINE(HAVE_LIBBLAS) + +@@ -960,7 +960,7 @@ + + LOC_CHECK_LIB_PATH(lapack,LAPACK,LAPACKLIB) + +-LOC_CHECK_LIBS(lapack,dgesv_,LAPACK,$LAPACKLIB,LAPACKLIB,$BLASLIB $MATHLIB,,,-lg2c) ++LOC_CHECK_LIBS(lapack,dgesv_,LAPACK,$LAPACKLIB,LAPACKLIB,$BLASLIB $MATHLIB,,,%%GCCLIBDIR%% %%FORTRANLIBS%%) + + AC_DEFINE(HAVE_LIBLAPACK) + |