diff -urN /usr/ports/science/silo/Makefile science/silo/Makefile --- /usr/ports/science/silo/Makefile 2012-12-30 22:11:56.000000000 +0900 +++ science/silo/Makefile 2013-02-27 04:05:17.000000000 +0900 @@ -1,76 +1,92 @@ -# New ports collection makefile for: silo -# Date created: 17 jul 2008 -# Whom: Pedro F. Giffuni -# +# Created by: Pedro F. Giffuni # $FreeBSD: head/science/silo/Makefile 309662 2012-12-30 12:03:51Z beat $ -# PORTNAME= silo -PORTVERSION= 4.6.2 -PORTREVISION= 8 +PORTVERSION= 4.9 +DISTVERSIONSUFFIX= -bsd CATEGORIES= science MASTER_SITES= https://wci.llnl.gov/codes/${PORTNAME}/silo-${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org -COMMENT= A mesh and field I/O library and scientific database +COMMENT= Mesh and field I/O library and scientific database -LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYRIGHT -DEPRECATED= Depends on QT3; unmaintained -EXPIRATION_DATE= 2013-07-01 - -USE_AUTOTOOLS= libtool -GNU_CONFIGURE= yes -CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +OPTIONS_DEFINE= HDF5 PYTHON +OPTIONS_RADIO= EXCLUSIVE +OPTIONS_RADIO_EXCLUSIVE= FORTRAN QT4 +OPTIONS_DEFAULT= QT4 NO_LATEST_LINK= yes + +USE_READLINE= yes USE_GMAKE= yes -CONFIGURE_ARGS= --enable-shared +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-shared --disable-static USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes -USE_QT_VER= 3 +.include -.ifdef WITH_PYTHON -USE_PYTHON= yes -CONFIGURE_ARGS+= --enable-pythonmodule -PLIST_SUB+= WITH_PYTHON="" +.if ${PORT_OPTIONS:MFORTRAN} +USE_FORTRAN= yes .else -PLIST_SUB+= WITH_PYTHON="@comment " +CONFIGURE_ARGS+= --disable-fortran .endif -.ifdef WITH_HDF5 -USE_FORTRAN= yes -CONFIGURE_ENV+= ${MAKE_ENV} -CONFIGURE_ARGS+= --enable-fortran +.if ${PORT_OPTIONS:MHDF5} +LIB_DEPENDS+= hdf5:${PORTSDIR}/science/hdf5 +CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE}/include,${LOCALBASE}/lib +PLIST_SUB+= HDF5="" NOHDF5="@comment " .else -CONFIGURE_ARGS+= --disable-fortran +PLIST_SUB+= HDF5="@comment " NOHDF5="" .endif -.ifdef WITH_HDF5 -LIB_DEPENDS+= hdf5.0:${PORTSDIR}/science/hdf5 -CONFIGURE_ARGS= --with-hdf5=${LOCALBASE}/include,${LOCALBASE}/lib -PLIST_SUB+= WITH_HDF5="" -PLIST_SUB+= WITH_NCDF="@comment " -LIBSILO= libsiloh5 +.if ${PORT_OPTIONS:MPYTHON} +USE_PYTHON= yes +CONFIGURE_ARGS+= --enable-pythonmodule +PLIST_SUB+= PYTHON="" .else -PLIST_SUB+= WITH_HDF5="@comment " -PLIST_SUB+= WITH_NCDF="" -LIBSILO= libsilo +PLIST_SUB+= PYTHON="@comment " .endif -.ifdef WITH_OPTIMIZATION -CONFIGURE_ARGS+= --enable-optimization +.if ${PORT_OPTIONS:MQT4} +USE_XORG= xext xi xmu xt +USE_QT4= qt3support linguist_build moc_build uic_build +QT_NONSTANDARD= yes +CONFIGURE_ARGS+= --with-Qt-dir=${QT_PREFIX} +PLIST_SUB+= QT4="" +DESKTOP_ENTRIES="Silex" "Silex browser for Silo files" "" "silex" "" true +.else +CONFIGURE_ARGS+= --disable-silex +PLIST_SUB+= QT4="@comment " .endif -post-install: - @${RM} ${PREFIX}/lib/libsilo*.settings - @${MV} ${PREFIX}/lib/${LIBSILO}.so ${PREFIX}/lib/${LIBSILO}.so.4 - @${LN} -sf ${PREFIX}/lib/${LIBSILO}.so.4 ${PREFIX}/lib/${LIBSILO}.so +post-extract: + @${CHMOD} -R a+rX ${WRKSRC} + +post-patch: + @${REINPLACE_CMD} -e \ + 's|\(_Qt_dir/include\)"|\1/qt4"| ; \ + s|\(_Qt_dir/lib\)"|\1/qt4"| ; \ + s|\(/uic\)"|\1-qt4"| ; \ + s|\(/moc\)"|\1-qt4"| ; \ + s|\(/lrelease\)"|\1-qt4"| ; \ + s|\(/lupdate\)"|\1-qt4"|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/-avoid-version/s|^|#| ; \ + /^install-data-am/s|:.*|:|' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e \ + '/-ldl/s|^|#|' ${WRKSRC}/tests/Makefile.in + @${REINPLACE_CMD} -e \ + 's|@libdir@|@pythondir@|' ${WRKSRC}/tools/python/Makefile.in + @${REINPLACE_CMD} -e \ + 's|\(INBUILD\));|\1, me);|' ${WRKSRC}/src/hdf5_drv/silo_hdf5.c -.ifdef MAINTAINER_MODE +.if defined(MAINTAINER_MODE) regression-test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check + @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${GMAKE} check .endif .include diff -urN /usr/ports/science/silo/distinfo science/silo/distinfo --- /usr/ports/science/silo/distinfo 2012-11-08 06:58:31.000000000 +0900 +++ science/silo/distinfo 2013-02-26 16:00:54.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (silo-4.6.2.tar.gz) = 333b7642eb3d95121d1e9e7dc1695f1164fc83583f0733c8c6d876b67c20815c -SIZE (silo-4.6.2.tar.gz) = 11020008 +SHA256 (silo-4.9-bsd.tar.gz) = ae82c23345ab2334f9a0f89d7d05d7c99b9489800d9b153c917a40c55577c783 +SIZE (silo-4.9-bsd.tar.gz) = 11993390 diff -urN /usr/ports/science/silo/files/patch-tests+Makefile.in science/silo/files/patch-tests+Makefile.in --- /usr/ports/science/silo/files/patch-tests+Makefile.in 2012-11-08 06:58:31.000000000 +0900 +++ science/silo/files/patch-tests+Makefile.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- tests/Makefile.in.orig 2008-03-27 13:56:49.000000000 -0500 -+++ tests/Makefile.in 2008-03-27 13:57:36.000000000 -0500 -@@ -407,7 +407,7 @@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lcompat - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LOCAL = @LOCAL@ diff -urN /usr/ports/science/silo/pkg-descr science/silo/pkg-descr --- /usr/ports/science/silo/pkg-descr 2012-11-08 06:58:31.000000000 +0900 +++ science/silo/pkg-descr 2013-02-27 00:32:26.000000000 +0900 @@ -1,24 +1,8 @@ -A mesh and field I/O library and scientific database - -Silo is a library for reading and writing a wide variety of scientific -data to binary, disk files. The files Silo produces and the data within -them can be easily shared and exchanged between wholly independently -developed applications running on disparate computing platforms. - -Consequently, Silo facilitates the development of general purpose tools -for processing scientific data. One of the more popular tools that process -Silo data files is the VisIt visualization tool. - -Silo supports gridless (point) meshes, structured meshes, unstructured-zoo -and unstructured-arbitrary-polyhedral meshes, block structured AMR meshes, -constructive solid geometry (CSG) meshes, piecewise-constant (e.g. -zone-centered) and piecewise-linear (e.g. node-centered) variables defined -on the node, edge, face or volume elements of meshes as well as the -decomposition of meshes into arbitrary subset hierarchies including -materials and mixing materials. In addition, Silo supports a wide variety -of other useful objects to address various scientific computing -application needs.Although the Silo library is a serial library, it has -some key features which enable it to be applied quite effectively and -scalably in parallel. +Silo is a library for reading and writing a wide variety of scientific +data to binary, disk files. The files Silo produces and the data within +them can be easily shared and exchanged between wholly independently +developed applications running on disparate computing platforms. +Consequently, Silo facilitates the development of general purpose tools +for processing scientific data. WWW: https://wci.llnl.gov/codes/silo/ diff -urN /usr/ports/science/silo/pkg-plist science/silo/pkg-plist --- /usr/ports/science/silo/pkg-plist 2012-11-08 06:58:31.000000000 +0900 +++ science/silo/pkg-plist 2013-02-26 22:34:43.000000000 +0900 @@ -1,19 +1,17 @@ bin/browser -bin/silodiff -bin/silex +%%QT4%%bin/silex bin/silock +bin/silodiff bin/silofile +include/ioperf.h +include/pmpio.h include/silo.h include/silo.inc -include/pmpio.h -%%WITH_PYTHON%%lib/Silo.a -%%WITH_PYTHON%%lib/Silo.la -%%WITH_PYTHON%%lib/Silo.so -%%WITH_NCDF%%lib/libsilo.a -%%WITH_NCDF%%lib/libsilo.la -%%WITH_NCDF%%lib/libsilo.so -%%WITH_NCDF%%lib/libsilo.so.4 -%%WITH_HDF5%%lib/libsiloh5.a -%%WITH_HDF5%%lib/libsiloh5.la -%%WITH_HDF5%%lib/libsiloh5.so -%%WITH_HDF5%%lib/libsiloh5.so.4 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/Silo.la +%%PYTHON%%%%PYTHON_SITELIBDIR%%/Silo.so +%%NOHDF5%%lib/libsilo.la +%%NOHDF5%%lib/libsilo.so +%%NOHDF5%%lib/libsilo.so.0 +%%HDF5%%lib/libsiloh5.la +%%HDF5%%lib/libsiloh5.so +%%HDF5%%lib/libsiloh5.so.0