From owner-svn-ports-all@FreeBSD.ORG Sun Apr 6 05:46:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A1A6A9C5; Sun, 6 Apr 2014 05:46:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8AB9B8D9; Sun, 6 Apr 2014 05:46:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s365kkf3006914; Sun, 6 Apr 2014 05:46:46 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s365kkKB006913; Sun, 6 Apr 2014 05:46:46 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201404060546.s365kkKB006913@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 6 Apr 2014 05:46:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350294 - head/science/cdo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Apr 2014 05:46:46 -0000 Author: sunpoet Date: Sun Apr 6 05:46:46 2014 New Revision: 350294 URL: http://svnweb.freebsd.org/changeset/ports/350294 QAT: https://qat.redports.org/buildarchive/r350294/ Log: - Add LICENSE - Remove HDF5 1.6.x and NetCDF 3.x support - Convert to new options helper - Strip shared library - Use MAKE_CMD - Support STAGEDIR - Bump PORTREVISION for dependency and package change Modified: head/science/cdo/Makefile Modified: head/science/cdo/Makefile ============================================================================== --- head/science/cdo/Makefile Sun Apr 6 05:46:41 2014 (r350293) +++ head/science/cdo/Makefile Sun Apr 6 05:46:46 2014 (r350294) @@ -3,6 +3,7 @@ PORTNAME= cdo PORTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= science MASTER_SITES= https://code.zmaw.de/attachments/download/5824/ \ LOCAL/sunpoet @@ -10,8 +11,11 @@ MASTER_SITES= https://code.zmaw.de/attac MAINTAINER= sunpoet@FreeBSD.org COMMENT= Climate Data Operators +LICENSE= GPLv2 + OPTIONS_DEFINE= HDF5 JASPER NETCDF PROJ SZIP OPTIONS_DEFAULT=HDF5 NETCDF PROJ SZIP +OPTIONS_SUB= yes CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --enable-cdi-lib --program-transform-name="" --with-zlib=/usr @@ -20,56 +24,25 @@ LDFLAGS+= -L${LOCALBASE}/lib -pthread USE_LDCONFIG= yes USES= gmake pathfix -HDF5_VER?= 18 -NETCDF_VER?= 4 +HDF5_CONFIGURE_ARGS= --with-hdf5=${LOCALBASE} +HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5-18 +JASPER_CONFIGURE_ARGS= --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} +PROJ_LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj +SZIP_CONFIGURE_ARGS= --with-szlib=${LOCALBASE} +SZIP_LIB_DEPENDS= libsz.so:${PORTSDIR}/science/szip -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MNETCDF} && ${PORT_OPTIONS:MHDF5} && ${NETCDF_VER} == 4 && ${HDF5_VER} == 16 -IGNORE= netCDF 4 requires HDF5 1.8 -.endif - -.if ${PORT_OPTIONS:MNETCDF} && (${NETCDF_VER} == 4) -HDF5_VER= 18 -WITH_HDF5= yes -.endif - -.if ${PORT_OPTIONS:MHDF5} -CONFIGURE_ARGS+=--with-hdf5=${LOCALBASE} -WITH_SZIP= yes -.if (${HDF5_VER} == 18) -LIB_DEPENDS+= hdf5.7:${PORTSDIR}/science/hdf5-18 -.else -LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5 -.endif +.if ${PORT_OPTIONS:MHDF5} && !${PORT_OPTIONS:MSZIP} +IGNORE= HDF5 option requires SZIP option .endif -.if ${PORT_OPTIONS:MJASPER} -CONFIGURE_ARGS+=--with-jasper=${LOCALBASE} -LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper -.endif - -.if ${PORT_OPTIONS:MNETCDF} -CONFIGURE_ARGS+=--with-netcdf=${LOCALBASE} -.if (${NETCDF_VER} == 4) -LIB_DEPENDS+= netcdf.7:${PORTSDIR}/science/netcdf4 -.else -LIB_DEPENDS+= netcdf.4:${PORTSDIR}/science/netcdf -.endif -PLIST_SUB= NETCDF="" -.else -PLIST_SUB= NETCDF="@comment " -.endif - -.if ${PORT_OPTIONS:MPROJ} -CONFIGURE_ARGS+=--with-proj=${LOCALBASE} -LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj -.endif - -.if ${PORT_OPTIONS:MSZIP} -CONFIGURE_ARGS+=--with-szlib=${LOCALBASE} -LIB_DEPENDS+= sz:${PORTSDIR}/science/szip +.if ${PORT_OPTIONS:MNETCDF} && !${PORT_OPTIONS:MHDF5} +IGNORE= NETCDF option requires HDF5 option .endif .include @@ -91,7 +64,10 @@ post-build: @cd ${WRKSRC}/src/ && ${SETENV} CDO_PATH=${WRKSRC}/src/cdo ${WRKSRC}/src/cdotest .endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcdi.so.0 + regression-test test: build - @cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE} check + @cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include