svn commit: r357881 - head/graphics/geos

[John Marino]

Author: marino
Date: Sun Jun 15 13:38:36 2014
New Revision: 357881
URL: http://svnweb.freebsd.org/changeset/ports/357881
QAT: https://qat.redports.org/buildarchive/r357881/

Log:
  graphics/geos: Fix PHP option, reset mainatainer
  
  The PHP option was hardcoded to lang/php5, but it reportedly works on other
  versions of PHP.  It also installs a PHP module, so it should have had a
  run depends on PHP as well as a build depends (hence the revump)
  
  Also:
    * Remove USE_LDCONFIG, I don't see why it's here
    * convert USE_BZIP2
    * Reset maintainer due to history of timeouts and non-responsiveness to
      this PR
    * respect 80 columns
  
  PR:		178431
  Submitted by:	mcdouga9 (egr.msu.edu)
  Fixes by:	marino

Modified:
  head/graphics/geos/Makefile

Modified: head/graphics/geos/Makefile
==============================================================================
--- head/graphics/geos/Makefile	Sun Jun 15 13:12:21 2014	(r357880)
+++ head/graphics/geos/Makefile	Sun Jun 15 13:38:36 2014	(r357881)
@@ -3,22 +3,20 @@
 
 PORTNAME=	geos
 PORTVERSION=	3.4.2
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 
-MAINTAINER=	konstantin at saurbier.net
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	GEOS implements all the OpenGIS "Simple Features for SQL"
 
 LICENSE=	LGPL21
 
 USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
-USE_LDCONFIG=	yes
-USES=		gmake
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	PHP PYTHON RUBY
-
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
@@ -33,7 +31,8 @@ CONFIGURE_ARGS+=	--enable-python
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5
+USE_PHP=		yes
+USE_PHP_BUILD=		yes
 CONFIGURE_ARGS+=	--enable-php
 .endif
 
@@ -44,6 +43,7 @@ CONFIGURE_ENV+=		RUBY="${RUBY}"
 .endif
 
 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
 
 .include <bsd.port.mk>