Index: head/science/silo/Makefile
===================================================================
--- head/science/silo/Makefile	(revision 217429)
+++ head/science/silo/Makefile	(revision 217430)
@@ -1,79 +1,65 @@
 # New ports collection makefile for:	silo
 # Date created:		17 jul 2008
 # Whom: 		Pedro F. Giffuni <giffunip@tutopia.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	silo
 PORTVERSION=	4.6.1
 CATEGORIES=	science
 MASTER_SITES=	https://wci.llnl.gov/codes/${PORTNAME}/silo-${PORTVERSION}/
 
 MAINTAINER=	giffunip@tutopia.com
 COMMENT=	A mesh and field I/O library and scientific database
 
 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_ARGS= --enable-shared
+CONFIGURE_ENV+=	${MAKE_ENV}
+CONFIGURE_ARGS=	--enable-shared
 USE_LDCONFIG=	yes
 
 USE_XLIB=	yes
 USE_QT_VER=	3
 QT_COMPONENTS=	moc uic
 
-OPTIONS=	PYTHON	"Enable Python Module" Off \
-		HDF5	"Enable HDF5 Driver" Off \
-		SILEXB	"Enable Silex Browser" Off \
-		FORTRAN "Compile Fortran interface" Off \
-		OPTIMIZATION "Enable extra optimizations" On
-
-USE_PYTHON=	yes
-
-.include <bsd.port.pre.mk>
-
 .ifdef WITH_PYTHON
+USE_PYTHON=	yes
 CONFIGURE_ARGS+=	--enable-pythonmodule
 PLIST_SUB+=	WITH_PYTHON=""
 .else
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
+.ifdef WITH_FORTRAN
+USE_FORTRAN=	yes
+CONFIGURE_ARGS+=	--enable-fortran
+.else
+CONFIGURE_ARGS+=	--disable-fortran
+.endif
+
 .ifdef WITH_HDF5
 LIB_DEPENDS+=	hdf5.0:${PORTSDIR}/science/hdf5
 CONFIGURE_ARGS= --with-hdf5=${LOCALBASE}
 PLIST_SUB+=	WITH_HDF5=""
 PLIST_SUB+=	WITH_HDF5="@comment "
 .else
 PLIST_SUB+=	WITH_HDF5="@comment "
 PLIST_SUB+=	WITH_NCDF=""
 .endif
 
-.ifdef WITH_SILEXB
-CONFIGURE_ARGS+=	--enable-silex
-PLIST_SUB+=	WITH_SILEXB=""
-.else
-PLIST_SUB+=	WITH_SILEXB="@comment "
-.endif
-
-.ifdef WITH_FORTRAN
-USE_FORTRAN=	yes
-CONFIGURE_ARGS+=	--enable-fortran
-.else
-CONFIGURE_ARGS+=	--disable-fortran
-.endif
-
 .ifdef WITH_OPTIMIZATION
 CONFIGURE_ARGS+=	--enable-optimization
 .endif
 
+post-install:
+	@${RM} ${PREFIX}/lib/libsilo.settings
+
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Property changes on: head/science/silo/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/science/silo/pkg-plist
===================================================================
--- head/science/silo/pkg-plist	(revision 217429)
+++ head/science/silo/pkg-plist	(revision 217430)
@@ -1,16 +1,16 @@
-%%WITH_SILEXB%%bin/browser
+bin/browser
 bin/silodiff
 bin/silex
 bin/silock
 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_HDF5%%lib/libsiloh5.a
 %%WITH_HDF5%%lib/libsiloh5.la
 %%WITH_HDF5%%lib/libsiloh5.so

Property changes on: head/science/silo/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property