From owner-svn-ports-all@FreeBSD.ORG  Mon Feb 10 15:05:29 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 7FEC99CC;
 Mon, 10 Feb 2014 15:05: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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6B3741625;
 Mon, 10 Feb 2014 15:05: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 s1AF5T4b073075;
 Mon, 10 Feb 2014 15:05:29 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AF5TdV073073;
 Mon, 10 Feb 2014 15:05:29 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201402101505.s1AF5TdV073073@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 10 Feb 2014 15:05:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343644 - in head/devel/shapelib: . 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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Feb 2014 15:05:29 -0000

Author: sunpoet
Date: Mon Feb 10 15:05:28 2014
New Revision: 343644
URL: http://svnweb.freebsd.org/changeset/ports/343644
QAT: https://qat.redports.org/buildarchive/r343644/

Log:
  - Restore %%ENDIAN%% which was accidentally removed in r288687
  - Remove unnecessary %%LIBTOOL%% substitution
  
  PR:		ports/186583
  Submitted by:	tijl

Modified:
  head/devel/shapelib/Makefile
  head/devel/shapelib/files/patch-contrib-Makefile

Modified: head/devel/shapelib/Makefile
==============================================================================
--- head/devel/shapelib/Makefile	Mon Feb 10 15:04:40 2014	(r343643)
+++ head/devel/shapelib/Makefile	Mon Feb 10 15:05:28 2014	(r343644)
@@ -3,7 +3,7 @@
 
 PORTNAME=	shapelib
 PORTVERSION=	1.3.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel geography
 MASTER_SITES=	http://download.osgeo.org/shapelib/ \
 		ftp://ftp.remotesensing.org/shapelib/ \
@@ -41,7 +41,6 @@ ENDIAN=		-D_BIG_ENDIAN	# mips*eb, powerp
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|%%LIBTOOL%%|${LIBTOOL}|g' \
 		-e 's|%%ENDIAN%%|${ENDIAN}|g' \
 		-e 's|%%PROJ%%|${PROJ}|g' \
 			${WRKSRC}/Makefile ${WRKSRC}/contrib/Makefile

Modified: head/devel/shapelib/files/patch-contrib-Makefile
==============================================================================
--- head/devel/shapelib/files/patch-contrib-Makefile	Mon Feb 10 15:04:40 2014	(r343643)
+++ head/devel/shapelib/files/patch-contrib-Makefile	Mon Feb 10 15:05:28 2014	(r343644)
@@ -8,7 +8,7 @@
 +#ENDIAN	=	-D_LITTLE_ENDIAN
  
 -CFLAGS	=	-g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
-+CFLAGS	+=	 -D_LITTLE_ENDIAN %%PROJ%% -I.. -I$(LOCALBASE)/include -L$(LOCALBASE)/lib
++CFLAGS	+=	 %%ENDIAN%% %%PROJ%% -I.. -I$(LOCALBASE)/include -L$(LOCALBASE)/lib
  
  SHPOBJ	=	../shpopen.o ../dbfopen.o ../safileio.o