- Add missing USE_LDCONFIG

- Use USES=libtool
- Fix USE_PYTHON
- Convert to new options helper
- Bump PORTREVISION for package change
- Do not hard-coded PORTVERSION in PLIST
- Bump PORTREVISION for graphics/geos shlib change

2 files changed, 24 insertions, 36 deletions

diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index f135ef26c008..d20912d45b05 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -3,47 +3,38 @@
 
 PORTNAME=	geos
 PORTVERSION=	3.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
-MASTER_SITES=	http://download.osgeo.org/geos/
+MASTER_SITES=	http://download.osgeo.org/geos/ \
+		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	GEOS implements all the OpenGIS "Simple Features for SQL"
 
 LICENSE=	LGPL21
 
-USE_AUTOTOOLS=	libtool
-USES=		gmake tar:bzip2
-GNU_CONFIGURE=	yes
-
 OPTIONS_DEFINE=	PHP PYTHON RUBY
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MRUBY}
-BUILD_DEPENDS+=	swig1.3:${PORTSDIR}/devel/swig13
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=		yes
-CONFIGURE_ARGS+=	--enable-python
-.endif
-
-.if ${PORT_OPTIONS:MPHP}
-USE_PHP=		yes
-USE_PHP_BUILD=		yes
-CONFIGURE_ARGS+=	--enable-php
-.endif
-
-.if ${PORT_OPTIONS:MRUBY}
-USE_RUBY=		yes
-CONFIGURE_ARGS+=	--enable-ruby
-CONFIGURE_ENV+=		RUBY="${RUBY}"
-.endif
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USES=		gmake libtool tar:bzip2
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+PHP_BUILD_DEPENDS=	${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
+PHP_CONFIGURE_ENABLE=	php
+PHP_USE=		PHP=yes PHP_BUILD=yes
+PYTHON_BUILD_DEPENDS=	${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
+PYTHON_CONFIGURE_ENABLE=python
+PYTHON_USE=		PYTHON=2
+RUBY_BUILD_DEPENDS=	${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
+RUBY_CONFIGURE_ENABLE=	ruby
+RUBY_CONFIGURE_ENV=	RUBY="${RUBY}"
+RUBY_USE=		RUBY=yes
 
 post-install:
-	@${LN} -s ${PREFIX}/lib/libgeos-${PORTVERSION}.so \
-		${STAGEDIR}${PREFIX}/lib/libgeos.so.0
+	${LN} -s ${PREFIX}/lib/libgeos-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libgeos.so.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgeos-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libgeos_c.so.1.8.2
 
 .include <bsd.port.mk>
diff --git a/graphics/geos/pkg-plist b/graphics/geos/pkg-plist
index 926890c1fe17..2b56b93b3a0f 100644
--- a/graphics/geos/pkg-plist
+++ b/graphics/geos/pkg-plist
@@ -372,15 +372,14 @@ include/geos/util/UnsupportedOperationException.h
 include/geos/util/math.h
 include/geos/version.h
 include/geos_c.h
-lib/libgeos-3.4.2.so
+lib/libgeos-%%PORTVERSION%%.so
 lib/libgeos.a
-lib/libgeos.la
 lib/libgeos.so
 lib/libgeos.so.0
 lib/libgeos_c.a
-lib/libgeos_c.la
 lib/libgeos_c.so
-lib/libgeos_c.so.9
+lib/libgeos_c.so.1
+lib/libgeos_c.so.1.8.2
 @dirrmtry lib/geos
 @dirrm include/geos/util
 @dirrm include/geos/triangulate/quadedge
@@ -423,7 +422,6 @@ lib/libgeos_c.so.9
 @dirrm include/geos
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos.pth
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyc
@@ -431,7 +429,6 @@ lib/libgeos_c.so.9
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/geos
 %%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.a
-%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.la
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.so
 %%RUBY%%@dirrmtry %%RUBY_SITEARCHLIBDIR%%/
 %%PHP%%lib/php/20100525/geos.so