From owner-svn-ports-all@FreeBSD.ORG Fri Jul 4 06:46:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CFB8D4F; Fri, 4 Jul 2014 06:46:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1DD5C254B; Fri, 4 Jul 2014 06:46:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s646kSTn062637; Fri, 4 Jul 2014 06:46:28 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s646kSlC062635; Fri, 4 Jul 2014 06:46:28 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201407040646.s646kSlC062635@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Fri, 4 Jul 2014 06:46:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360548 - in head/graphics/gdal-grass: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jul 2014 06:46:29 -0000 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@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 +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 +.include 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