diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-01-18 02:28:26 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-01-18 02:28:26 +0000 |
| commit | 7088c85c1090ad14a25208c72459eedbd09a79b4 (patch) | |
| tree | b27a3ada73c30bda8db23a5d2b6fcec5326b597e /science | |
| parent | Should not use WITH_FORTRAN. (diff) | |
* Migrate to gfortran.
* Bump port revision.
Approved by: portmgr(kris)
Notes
Notes:
svn path=/head/; revision=182682
Diffstat (limited to 'science')
| -rw-r--r-- | science/cdf/Makefile | 16 | ||||
| -rw-r--r-- | science/cdf/distinfo | 6 | ||||
| -rw-r--r-- | science/cdf/files/patch-src+include+cdfdist.h | 13 |
3 files changed, 24 insertions, 11 deletions
diff --git a/science/cdf/Makefile b/science/cdf/Makefile index a26f479da9af..a93115c53e29 100644 --- a/science/cdf/Makefile +++ b/science/cdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= cdf3 PORTVERSION= 3.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= science MASTER_SITES= ${MASTER_SITE_LOCAL} \ ftp://nssdcftp.gsfc.nasa.gov/standards/cdf/dist/cdf${VER}/unix-linux/ \ @@ -19,13 +19,17 @@ DIST_SUBDIR= ${PKGNAME} MAINTAINER= thierry@FreeBSD.org COMMENT= Device independent view of the CDF data model -MAKE_FLAGS= INSTALLDIR=${PREFIX} OS=${OPSYS:L} ENV=gnu \ - FORTRAN=yes F77=${F77} +MAKE_FLAGS= INSTALLDIR=${PREFIX} OS=${OPSYS:L} ENV=gnu \ + FORTRAN=yes FC_freebsd=${F77} USE_LDCONFIG= yes VER= ${PORTVERSION:S/.//} -F77?= f77 +WANT_FORTRAN= yes #dummy but future use +BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 +FC= gfortran42 +F77= gfortran42 +MAKE_ENV+= FFLAGS="${FFLAGS}" WRKSRC= ${WRKDIR}/cdf${VER}-dist SUB_FILES= pkg-message @@ -40,10 +44,6 @@ PORTDOCS= CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt BROKEN= Does not compile on ${ARCH} .endif -.if ${OSVERSION} >= 700000 -WITH_FORTRAN= yes -.endif - pre-configure: .for def in ${DEFS} ${REINPLACE_CMD} -e 's|<path>|${PREFIX}|' \ diff --git a/science/cdf/distinfo b/science/cdf/distinfo index 5687435a7102..5a3bc2825d78 100644 --- a/science/cdf/distinfo +++ b/science/cdf/distinfo @@ -1,3 +1,3 @@ -MD5 (cdf3-3.1_6/cdf31-dist-cdf.tar.gz) = 7ff40108c9898ad5cd2fe432ede961cb -SHA256 (cdf3-3.1_6/cdf31-dist-cdf.tar.gz) = 62961877b2912c70e813f97f5226de808dc108e637638197ac88fc52ab5dbfec -SIZE (cdf3-3.1_6/cdf31-dist-cdf.tar.gz) = 934350 +MD5 (cdf3-3.1_7/cdf31-dist-cdf.tar.gz) = 7ff40108c9898ad5cd2fe432ede961cb +SHA256 (cdf3-3.1_7/cdf31-dist-cdf.tar.gz) = 62961877b2912c70e813f97f5226de808dc108e637638197ac88fc52ab5dbfec +SIZE (cdf3-3.1_7/cdf31-dist-cdf.tar.gz) = 934350 diff --git a/science/cdf/files/patch-src+include+cdfdist.h b/science/cdf/files/patch-src+include+cdfdist.h new file mode 100644 index 000000000000..937a48be3275 --- /dev/null +++ b/science/cdf/files/patch-src+include+cdfdist.h @@ -0,0 +1,13 @@ +Gfortran uses only one underscore(?) + +--- src/include/cdflib.h~ Wed Oct 4 05:13:39 2006 ++++ src/include/cdflib.h Wed Jan 17 15:46:50 2007 +@@ -356,7 +356,7 @@ + defined(__MINGW32__) + # if (defined(linux) && !defined(__ICC)) || defined(__CYGWIN__) || \ + defined(macosX) || \ +- defined(sun) || defined(__MINGW32__) || defined(__FreeBSD__) ++ defined(sun) || defined(__MINGW32__) + # define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep__ + # else + # define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep_ |