svn commit: r424343 - branches/2016Q4/devel/jsoncpp

[Carlos J. Puga Medina]

Author: cpm
Date: Thu Oct 20 17:17:56 2016
New Revision: 424343
URL: https://svnweb.freebsd.org/changeset/ports/424343

Log:
  MFH: r424299
  
  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 at snkmail.com>
  Approved by:	yuri at rawbw.com (maintainer), koobs (mentor)
  
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q4/devel/jsoncpp/Makefile
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/devel/jsoncpp/Makefile
==============================================================================
--- branches/2016Q4/devel/jsoncpp/Makefile	Thu Oct 20 17:16:57 2016	(r424342)
+++ branches/2016Q4/devel/jsoncpp/Makefile	Thu Oct 20 17:17:56 2016	(r424343)
@@ -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