From owner-svn-ports-head@freebsd.org  Thu Oct 20 01:25:05 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 22DB1C183A7;
 Thu, 20 Oct 2016 01:25:05 +0000 (UTC) (envelope-from cpm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E8EA1AC8;
 Thu, 20 Oct 2016 01:25:04 +0000 (UTC) (envelope-from cpm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9K1P4V8041483;
 Thu, 20 Oct 2016 01:25:04 GMT (envelope-from cpm@FreeBSD.org)
Received: (from cpm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9K1P4U8041482;
 Thu, 20 Oct 2016 01:25:04 GMT (envelope-from cpm@FreeBSD.org)
Message-Id: <201610200125.u9K1P4U8041482@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org
 using -f
From: "Carlos J. Puga Medina" <cpm@FreeBSD.org>
Date: Thu, 20 Oct 2016 01:25:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424299 - head/devel/jsoncpp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Oct 2016 01:25:05 -0000

Author: cpm
Date: Thu Oct 20 01:25:03 2016
New Revision: 424299
URL: https://svnweb.freebsd.org/changeset/ports/424299

Log:
  devel/jsoncpp: Fix bad REINPLACE_CMD of jsoncpp.pc
  
  - Remove extra ${PREFIX} in jsoncpp/Makefile
  
  % pkgconf --libs --cflags jsoncpp
  -I/usr/local//usr/local/include/jsoncpp -L/usr/local//usr/local/lib -ljsoncpp
  
  Notice the extra /usr/local.
  
  PR:		213553
  Reported by:	John Hein <z7dr6ut7gs@snkmail.com>
  Approved by:	yuri@rawbw.com (maintainer), koobs (mentor)
  MFH:		2016Q4

Modified:
  head/devel/jsoncpp/Makefile

Modified: head/devel/jsoncpp/Makefile
==============================================================================
--- head/devel/jsoncpp/Makefile	Thu Oct 20 01:16:16 2016	(r424298)
+++ head/devel/jsoncpp/Makefile	Thu Oct 20 01:25:03 2016	(r424299)
@@ -41,8 +41,8 @@ do-install:
 	${CP} ${WRKSRC}/pkg-config/jsoncpp.pc.in ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
 	@${REINPLACE_CMD} -i '' \
 		-e 's|@CMAKE_INSTALL_PREFIX@|${PREFIX}|g' \
-		-e 's|@LIBRARY_INSTALL_DIR@|${PREFIX}/lib|g' \
-		-e 's|@INCLUDE_INSTALL_DIR@|${PREFIX}/include/jsoncpp|g' \
+		-e 's|@LIBRARY_INSTALL_DIR@|lib|g' \
+		-e 's|@INCLUDE_INSTALL_DIR@|include/jsoncpp|g' \
 		-e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc