--- science/silo/Makefile 2013-11-06 22:05:45.000000000 +0900 +++ science/silo/Makefile 2013-12-17 00:00:00.000000000 +0900 @@ -2,7 +2,7 @@ # $FreeBSD: head/science/silo/Makefile 327767 2013-09-20 22:48:30Z bapt $ PORTNAME= silo -PORTVERSION= 4.9 +PORTVERSION= 4.9.1 DISTVERSIONSUFFIX= -bsd CATEGORIES= science MASTER_SITES= https://wci.llnl.gov/codes/${PORTNAME}/silo-${PORTVERSION}/ @@ -20,13 +20,11 @@ NO_LATEST_LINK= yes -USES= readline -USE_GMAKE= yes +USES= gmake readline GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared --disable-static USE_LDCONFIG= yes -NO_STAGE= yes .include .if ${PORT_OPTIONS:MFORTRAN} @@ -36,11 +34,11 @@ .endif .if ${PORT_OPTIONS:MHDF5} -LIB_DEPENDS+= hdf5:${PORTSDIR}/science/hdf5 +LIB_DEPENDS+= libhdf5.so:${PORTSDIR}/science/hdf5 CONFIGURE_ARGS+= --with-hdf5=${LOCALBASE}/include,${LOCALBASE}/lib -PLIST_SUB+= HDF5="" NOHDF5="@comment " +PLIST_SUB+= SUFX_HDF5="h5" .else -PLIST_SUB+= HDF5="@comment " NOHDF5="" +PLIST_SUB+= SUFX_HDF5="" .endif .if ${PORT_OPTIONS:MPYTHON} @@ -53,9 +51,10 @@ .if ${PORT_OPTIONS:MQT4} USE_XORG= xext xi xmu xt -USE_QT4= qt3support linguist_build moc_build uic_build +USE_QT4= gui linguist_build moc_build uic_build QT_NONSTANDARD= yes CONFIGURE_ARGS+= --with-Qt-dir=${QT_PREFIX} +CONFIGURE_ARGS+= --with-Qt-lib="QtGui -lQtCore" PLIST_SUB+= QT4="" DESKTOP_ENTRIES="Silex" "Silex browser for Silo files" "" "silex" "" true .else @@ -86,7 +85,7 @@ .if defined(MAINTAINER_MODE) regression-test: build - @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${GMAKE} check + @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .endif .include --- science/silo/distinfo 2013-11-06 22:05:45.000000000 +0900 +++ science/silo/distinfo 2013-12-17 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (silo-4.9-bsd.tar.gz) = ae82c23345ab2334f9a0f89d7d05d7c99b9489800d9b153c917a40c55577c783 -SIZE (silo-4.9-bsd.tar.gz) = 11993390 +SHA256 (silo-4.9.1-bsd.tar.gz) = 7d19f570309d0c235171e39f5b726abc77a3093227db900a59473b1762e82313 +SIZE (silo-4.9.1-bsd.tar.gz) = 11994742 --- science/silo/pkg-plist 2013-11-06 22:05:45.000000000 +0900 +++ science/silo/pkg-plist 2013-12-17 00:00:00.000000000 +0900 @@ -9,9 +9,6 @@ include/silo.inc %%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 +lib/libsilo%%SUFX_HDF5%%.la +lib/libsilo%%SUFX_HDF5%%.so +lib/libsilo%%SUFX_HDF5%%.so.0