svn commit: r360548 - in head/graphics/gdal-grass: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Jul  4 06:46:28 2014
New Revision: 360548
URL: http://svnweb.freebsd.org/changeset/ports/360548
QAT: https://qat.redports.org/buildarchive/r360548/

Log:
  - Unbreak this port
  - Support STAGEDIR
  - Remove unnecessary WRKSRC
  - Update GRASS_INST_DIR
  - Bump PORTREVISION
  - Cosmetic change

Added:
  head/graphics/gdal-grass/files/
  head/graphics/gdal-grass/files/patch-Makefile.in   (contents, props changed)
Modified:
  head/graphics/gdal-grass/Makefile

Modified: head/graphics/gdal-grass/Makefile
==============================================================================
--- head/graphics/gdal-grass/Makefile	Fri Jul  4 06:41:44 2014	(r360547)
+++ head/graphics/gdal-grass/Makefile	Fri Jul  4 06:46:28 2014	(r360548)
@@ -3,40 +3,32 @@
 
 PORTNAME=	gdal-grass
 PORTVERSION=	1.4.3
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.osgeo.org/gdal/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	GDAL drivers for GRASS raster and vector files
 
-BROKEN=		Fails to configure
+LICENSE=	MIT
 
-BUILD_DEPENDS=	grass>6:${PORTSDIR}/databases/grass
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
-RUN_DEPENDS=	grass>6:${PORTSDIR}/databases/grass
-
-GRASS_INST_DIR=	grass-6.4.2
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES=		gmake
+BUILD_DEPENDS=	grass>=6:${PORTSDIR}/databases/grass
+LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
+		libgrass_gis.so:${PORTSDIR}/databases/grass
+RUN_DEPENDS=	grass>=6:${PORTSDIR}/databases/grass
+
+ALL_TARGET=	# empty
+CONFIGURE_ARGS=	--with-autoload=${PREFIX}/lib/gdalplugins \
+		--with-gdal=${LOCALBASE}/bin/gdal-config \
+		--with-grass=${LOCALBASE}/${GRASS_INST_DIR}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gdal=${LOCALBASE}/bin/gdal-config \
-		--with-grass=${LOCALBASE}/${GRASS_INST_DIR} \
-		--with-autoload=${GDAL_AUTOLOAD_DIR}
-ALL_TARGET=
-NO_STAGE=	yes
+USE_GCC=	yes	# from databases/grass
+USES=		gmake
 
-.include <bsd.port.pre.mk>
+GRASS_INST_DIR!=${MAKE} -C ${.CURDIR}/../../databases/grass/ -V GRASS_INST_DIR
 
 pre-install:
-	${MKDIR} ${PREFIX}/share/gdal
-
-.if !defined(GDAL_AUTOLOAD_DIR)
-GDAL_AUTOLOAD_DIR=${PREFIX}/lib/gdalplugins
-.endif
-
-.if !defined (GRASS_INST_DIR)
-GRASS_INST_DIR=	grass
-.endif
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gdalplugins/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/gdal/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/graphics/gdal-grass/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/gdal-grass/files/patch-Makefile.in	Fri Jul  4 06:46:28 2014	(r360548)
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	2007-08-06 05:54:24.000000000 +0800
++++ Makefile.in	2014-07-04 10:44:22.506228799 +0800
+@@ -13,9 +13,9 @@
+ 
+ LIBS	=	@LIBS@
+ 
+-GRASSTABLES_DIR = @prefix@/share/gdal/grass
++GRASSTABLES_DIR = $(DESTDIR)@prefix@/share/gdal/grass
+ 
+-AUTOLOAD_DIR	=	@AUTOLOAD_DIR@
++AUTOLOAD_DIR	=	$(DESTDIR)@AUTOLOAD_DIR@
+ 
+ GLIBNAME =	gdal_GRASS.so
+ OLIBNAME =	ogr_GRASS.so