svn commit: r352862 - head/science/cdo
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sat May 3 03:43:20 UTC 2014
Author: sunpoet
Date: Sat May 3 03:43:18 2014
New Revision: 352862
URL: http://svnweb.freebsd.org/changeset/ports/352862
QAT: https://qat.redports.org/buildarchive/r352862/
Log:
- Update to 1.6.3
- Add CGRIBEX and UDUNITS options
- Turn JASPER on by default
- Adjust HDF5 and NetCDF dependency
- Strip shared library
Changes: https://code.zmaw.de/news/240
https://code.zmaw.de/news/217
Modified:
head/science/cdo/Makefile
head/science/cdo/distinfo
head/science/cdo/pkg-plist
Modified: head/science/cdo/Makefile
==============================================================================
--- head/science/cdo/Makefile Sat May 3 03:33:23 2014 (r352861)
+++ head/science/cdo/Makefile Sat May 3 03:43:18 2014 (r352862)
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= cdo
-PORTVERSION= 1.6.1
-PORTREVISION= 1
+PORTVERSION= 1.6.3
CATEGORIES= science
-MASTER_SITES= https://code.zmaw.de/attachments/download/5824/ \
+MASTER_SITES= https://code.zmaw.de/attachments/download/7220/ \
LOCAL/sunpoet
MAINTAINER= sunpoet at FreeBSD.org
@@ -13,29 +12,46 @@ COMMENT= Climate Data Operators
LICENSE= GPLv2
-BROKEN= Fails to post-build
-
-OPTIONS_DEFINE= HDF5 JASPER NETCDF PROJ SZIP
-OPTIONS_DEFAULT=HDF5 NETCDF PROJ SZIP
+OPTIONS_DEFINE= CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS
+OPTIONS_DEFAULT=CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS
OPTIONS_SUB= yes
CPPFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ARGS= --enable-cdi-lib --program-transform-name="" --with-zlib=/usr
+CONFIGURE_ARGS= --disable-cgribex \
+ --disable-data \
+ --disable-extra \
+ --disable-grib \
+ --disable-ieg \
+ --disable-service
+ --enable-cdi-lib \
+ --program-transform-name="" \
+ --with-zlib=/usr
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib -pthread
USE_LDCONFIG= yes
-USES= gmake pathfix
+USES= gmake libtool pathfix
-HDF5_CONFIGURE_ARGS= --with-hdf5=${LOCALBASE}
-HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5-18
-JASPER_CONFIGURE_ARGS= --with-jasper=${LOCALBASE}
+CGRIBEX_CONFIGURE_OFF= --without-cgribex
+CGRIBEX_CONFIGURE_ON= --with-cgribex=${LOCALBASE}
+CGRIBEX_LIB_DEPENDS= libcgribex.so:${PORTSDIR}/science/cgribex
+HDF5_CONFIGURE_OFF= --without-hdf5
+HDF5_CONFIGURE_ON= --with-hdf5=${LOCALBASE}
+HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5
+JASPER_CONFIGURE_OFF= --without-jasper
+JASPER_CONFIGURE_ON= --with-jasper=${LOCALBASE}
JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper
-NETCDF_CONFIGURE_ARGS= --with-netcdf=${LOCALBASE}
-NETCDF_LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf4
-PROJ_CONFIGURE_ARGS= --with-proj=${LOCALBASE}
+NETCDF_CONFIGURE_OFF= --without-netcdf
+NETCDF_CONFIGURE_ON= --with-netcdf=${LOCALBASE}
+NETCDF_LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf
+PROJ_CONFIGURE_OFF= --without-proj
+PROJ_CONFIGURE_ON= --with-proj=${LOCALBASE}
PROJ_LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj
-SZIP_CONFIGURE_ARGS= --with-szlib=${LOCALBASE}
+SZIP_CONFIGURE_OFF= --without-szlib
+SZIP_CONFIGURE_ON= --with-szlib=${LOCALBASE}
SZIP_LIB_DEPENDS= libsz.so:${PORTSDIR}/science/szip
+UDUNITS_CONFIGURE_OFF= --without-udunits2
+UDUNITS_CONFIGURE_ON= --with-udunits2=${LOCALBASE}
+UDUNITS_LIB_DEPENDS= libudunits2.so:${PORTSDIR}/science/udunits
.include <bsd.port.options.mk>
@@ -54,22 +70,15 @@ CFLAGS+= -DPTHREAD_MUTEXATTR_CONDATTR
.endif
post-patch:
-.if ${PORT_OPTIONS:MNETCDF}
- @${REINPLACE_CMD} \
- -e '/bin_PROGRAMS = / s|$$| cdotest|' \
- -e '/noinst_PROGRAMS = / s| cdotest||' \
- ${WRKSRC}/src/Makefile.in
-.endif
-
-post-build:
-.if ${PORT_OPTIONS:MNETCDF}
- @cd ${WRKSRC}/src/ && ${SETENV} CDO_PATH=${WRKSRC}/src/cdo ${WRKSRC}/src/cdotest
-.endif
+ @${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcdi.so.0
regression-test test: build
- @cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
+.if ${PORT_OPTIONS:MNETCDF}
+ @cd ${WRKSRC}/ && ${SETENV} CDO_PATH=src/cdo src/cdotest
+.endif
+ cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
.include <bsd.port.post.mk>
Modified: head/science/cdo/distinfo
==============================================================================
--- head/science/cdo/distinfo Sat May 3 03:33:23 2014 (r352861)
+++ head/science/cdo/distinfo Sat May 3 03:43:18 2014 (r352862)
@@ -1,2 +1,2 @@
-SHA256 (cdo-1.6.1.tar.gz) = 0d06fa59d082ee718dfa0c19c5463c49badba340a2094a7a2b71e09366309a82
-SIZE (cdo-1.6.1.tar.gz) = 6110790
+SHA256 (cdo-1.6.3.tar.gz) = 115fcd50e32e6c8d263dba4c91ee09b974972a8aa3134ee06ae8c4532fd41c2e
+SIZE (cdo-1.6.3.tar.gz) = 6386188
Modified: head/science/cdo/pkg-plist
==============================================================================
--- head/science/cdo/pkg-plist Sat May 3 03:33:23 2014 (r352861)
+++ head/science/cdo/pkg-plist Sat May 3 03:43:18 2014 (r352862)
@@ -1,10 +1,9 @@
bin/cdi
bin/cdo
-%%NETCDF%%bin/cdotest
include/cdi.h
include/cdi.inc
lib/libcdi.a
-lib/libcdi.la
lib/libcdi.so
lib/libcdi.so.0
+lib/libcdi.so.0.0.0
libdata/pkgconfig/cdi.pc
More information about the svn-ports-head
mailing list