- Update from 4.9 to 4.9.1

- Convert USE_GMAKE to USES
- Add stage support
- Convert LIB_DEPENDS to new syntax

while here:
- Convert some "if's" to options helpers

PR:		ports/184838
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 23 insertions, 36 deletions

diff --git a/science/silo/Makefile b/science/silo/Makefile
index b98e8e925aac..7c62ef27aa44 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	silo
-PORTVERSION=	4.9
+PORTVERSION=	4.9.1
 DISTVERSIONSUFFIX=	-bsd
 CATEGORIES=	science
 MASTER_SITES=	https://wci.llnl.gov/codes/${PORTNAME}/silo-${PORTVERSION}/
@@ -18,49 +18,39 @@ OPTIONS_RADIO=	EXCLUSIVE
 OPTIONS_RADIO_EXCLUSIVE=	FORTRAN QT4
 OPTIONS_DEFAULT=	QT4
 
-NO_LATEST_LINK=	yes
+OPTIONS_SUB=	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 <bsd.port.options.mk>
+FORTRAN_CONFIGURE_ENABLE=	fortran
+FORTRAN_USE=			FORTRAN=yes
 
-.if ${PORT_OPTIONS:MFORTRAN}
-USE_FORTRAN=	yes
-.else
-CONFIGURE_ARGS+=	--disable-fortran
-.endif
+PYTHON_CONFIGURE_ENABLE=	pythonmodule
+PYTHON_USE=			PYTHON=yes
+
+QT4_USE=			XORG=xext,xi,xmu,xt \
+				QT4=gui,linguist_build,moc_build,uic_build
+QT4_CONFIGURE_ON=		--with-Qt-dir=${QT_PREFIX} \
+				--with-Qt-lib="QtGui -lQtCore"
+
+.include <bsd.port.options.mk>
 
 .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 "
-.else
-PLIST_SUB+=	HDF5="@comment " NOHDF5=""
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
-CONFIGURE_ARGS+=	--enable-pythonmodule
-PLIST_SUB+=	PYTHON=""
+PLIST_SUB+=	SUFX_HDF5="h5"
 .else
-PLIST_SUB+=	PYTHON="@comment "
+PLIST_SUB+=	SUFX_HDF5=""
 .endif
 
 .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-extract:
@@ -86,7 +76,7 @@ post-patch:
 
 .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 <bsd.port.mk>
diff --git a/science/silo/distinfo b/science/silo/distinfo
index 454b4a0a579c..1cd1d332aea8 100644
--- a/science/silo/distinfo
+++ b/science/silo/distinfo
@@ -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
diff --git a/science/silo/pkg-plist b/science/silo/pkg-plist
index 88614d973fc2..8c5ef0caf806 100644
--- a/science/silo/pkg-plist
+++ b/science/silo/pkg-plist
@@ -9,9 +9,6 @@ include/silo.h
 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