From owner-svn-ports-all@freebsd.org  Sat Jul 11 15:27:19 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78EBC998444;
 Sat, 11 Jul 2015 15:27:19 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 611BC1F30;
 Sat, 11 Jul 2015 15:27:19 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6BFRJCt043218;
 Sat, 11 Jul 2015 15:27:19 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6BFRJ8L043217;
 Sat, 11 Jul 2015 15:27:19 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201507111527.t6BFRJ8L043217@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 11 Jul 2015 15:27:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r391743 - head/devel/shapelib
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.20
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: Sat, 11 Jul 2015 15:27:19 -0000

Author: sunpoet
Date: Sat Jul 11 15:27:18 2015
New Revision: 391743
URL: https://svnweb.freebsd.org/changeset/ports/391743

Log:
  - Convert to new options target helper

Modified:
  head/devel/shapelib/Makefile

Modified: head/devel/shapelib/Makefile
==============================================================================
--- head/devel/shapelib/Makefile	Sat Jul 11 14:40:58 2015	(r391742)
+++ head/devel/shapelib/Makefile	Sat Jul 11 15:27:18 2015	(r391743)
@@ -22,14 +22,6 @@ USE_LDCONFIG=	yes
 
 PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPROJ}
-PROJ=		-DPROJ4
-.else
-PROJ=		-DNO_PROJ4
-.endif
-
 .include <bsd.port.pre.mk>
 
 # Ref: /usr/share/mk/bsd.endian.mk
@@ -40,10 +32,13 @@ ENDIAN=		-D_BIG_ENDIAN	# mips*eb, powerp
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|%%ENDIAN%%|${ENDIAN}|g' \
-		-e 's|%%PROJ%%|${PROJ}|g' \
-			${WRKSRC}/Makefile ${WRKSRC}/contrib/Makefile
+	@${REINPLACE_CMD} -e 's|%%ENDIAN%%|${ENDIAN}|g' ${WRKSRC}/contrib/Makefile
+
+post-patch-PROJ-off:
+	@${REINPLACE_CMD} -e 's|%%PROJ%%|-DNO_PROJ4|g' ${WRKSRC}/Makefile ${WRKSRC}/contrib/Makefile
+
+post-patch-PROJ-on:
+	@${REINPLACE_CMD} -e 's|%%PROJ%%|-DPROJ4|g' ${WRKSRC}/Makefile ${WRKSRC}/contrib/Makefile
 
 post-install:
 	${LN} -s libshp.so.1 ${STAGEDIR}${PREFIX}/lib/libshp.so