From a933145c5e62112ceb77e97cfbc6e1a51fdad309 Mon Sep 17 00:00:00 2001
From: Beech Rintoul <beech@FreeBSD.org>
Date: Sat, 26 Jul 2008 04:48:42 +0000
Subject: [PATCH] - Fix build

Submitted by:	Pedro Giffuni <pfgshield-freebsd@yahoo.com> (maintainer)
---
 science/silo/Makefile  | 10 +++++++++-
 science/silo/pkg-plist |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/science/silo/Makefile b/science/silo/Makefile
index 756f5c7b4e67..10bbc75ee8e3 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -17,9 +17,10 @@ LIB_DEPENDS=	netcdf.4:${PORTSDIR}/science/netcdf
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include"	\
+		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 
 USE_GMAKE=	yes
-CONFIGURE_ENV+=	${MAKE_ENV}
 CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
 
@@ -31,12 +32,14 @@ QT_COMPONENTS=	moc uic
 USE_PYTHON=	yes
 CONFIGURE_ARGS+=	--enable-pythonmodule
 PLIST_SUB+=	WITH_PYTHON=""
+LIBSILO=	Silo
 .else
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
 .ifdef WITH_FORTRAN
 USE_FORTRAN=	yes
+CONFIGURE_ENV+=	${MAKE_ENV}
 CONFIGURE_ARGS+=	--enable-fortran
 .else
 CONFIGURE_ARGS+=	--disable-fortran
@@ -47,9 +50,12 @@ LIB_DEPENDS+=	hdf5.0:${PORTSDIR}/science/hdf5
 CONFIGURE_ARGS= --with-hdf5=${LOCALBASE}
 PLIST_SUB+=	WITH_HDF5=""
 PLIST_SUB+=	WITH_HDF5="@comment "
+LIBSILO=	libsiloh5
 .else
 PLIST_SUB+=	WITH_HDF5="@comment "
 PLIST_SUB+=	WITH_NCDF=""
+LIBSILO=	libsilo
+
 .endif
 
 .ifdef WITH_OPTIMIZATION
@@ -58,6 +64,8 @@ CONFIGURE_ARGS+=	--enable-optimization
 
 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
 
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check
diff --git a/science/silo/pkg-plist b/science/silo/pkg-plist
index 983b2fc9437c..8b49e219fa0d 100644
--- a/science/silo/pkg-plist
+++ b/science/silo/pkg-plist
@@ -8,9 +8,12 @@ include/pmpio.h
 %%WITH_PYTHON%%lib/Silo.a
 %%WITH_PYTHON%%lib/Silo.la
 %%WITH_PYTHON%%lib/Silo.so
+%%WITH_PYTHON%%lib/Silo.so.4
 %%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