svn commit: r337350 - in branches/2014Q1/devel/pcre++: . files

[Mathieu Arnold]

Author: mat
Date: Tue Dec 24 13:01:05 2013
New Revision: 337350
URL: http://svnweb.freebsd.org/changeset/ports/337350

Log:
  MFH: r337339
  
  - Fix build with clang
  - Respect CXXFLAGS
  - Add LICENSE
  - Support staging, strip library
  
  PR:		ports/184897
  Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>
  Approved by:	portmgr (implicit)

Added:
  branches/2014Q1/devel/pcre++/files/patch-libpcre++__pcre++.h
     - copied unchanged from r337339, head/devel/pcre++/files/patch-libpcre++__pcre++.h
Deleted:
  branches/2014Q1/devel/pcre++/files/patch-doc::Makefile.in
  branches/2014Q1/devel/pcre++/files/patch-ltmain.sh
Modified:
  branches/2014Q1/devel/pcre++/Makefile   (contents, props changed)
  branches/2014Q1/devel/pcre++/pkg-plist   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/devel/pcre++/Makefile
==============================================================================
--- branches/2014Q1/devel/pcre++/Makefile	Tue Dec 24 12:58:04 2013	(r337349)
+++ branches/2014Q1/devel/pcre++/Makefile	Tue Dec 24 13:01:05 2013	(r337350)
@@ -3,31 +3,39 @@
 
 PORTNAME=	pcre++
 PORTVERSION=	0.9.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.daemon.de/idisk/Apps/pcre++/
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A wrapper class around the pcre library
+COMMENT=	Wrapper class around the pcre library
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
+LICENSE=	LGPL21
 
-PCRE_CONFIG?=	${LOCALBASE}/bin/pcre-config
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
+USES=		gmake
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	`${PCRE_CONFIG} --cflags`
-LDFLAGS+=	`${PCRE_CONFIG} --libs`
 USE_LDCONFIG=	yes
 
-MAN3=		Pcre.3
-PLIST_SUB=	VERSION=${PORTVERSION}
+CPPFLAGS+=	$$(${PCRE_CONFIG} --cflags)
+LDFLAGS+=	$$(${PCRE_CONFIG} --libs)
 
 DOCSDIR=	${PREFIX}/share/doc/lib${PORTNAME}-${PORTVERSION}
 
-NO_STAGE=	yes
+PCRE_CONFIG?=	${LOCALBASE}/bin/pcre-config
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O -g|\@CXXFLAGS\@|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's| ../COPYING|| ; \
+		 s| $$(prefix)/doc| $${DESTDIR}$$(prefix)/share/doc|' \
+		${WRKSRC}/doc/Makefile.in
+.for i in examples/Makefile.in libpcre++/Makefile.in test/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|-O -g|@CXXFLAGS@|' ${WRKSRC}/${i}
+.endfor
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpcre++.so.0
 
 .include <bsd.port.mk>

Copied: branches/2014Q1/devel/pcre++/files/patch-libpcre++__pcre++.h (from r337339, head/devel/pcre++/files/patch-libpcre++__pcre++.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/devel/pcre++/files/patch-libpcre++__pcre++.h	Tue Dec 24 13:01:05 2013	(r337350, copy of r337339, head/devel/pcre++/files/patch-libpcre++__pcre++.h)
@@ -0,0 +1,15 @@
+--- libpcre++/pcre++.h.orig
++++ libpcre++/pcre++.h
+@@ -47,11 +47,11 @@
+ #include <map>
+ #include <stdexcept>
+ #include <iostream>
++#include <clocale>
+ 
+ 
+ extern "C" {
+   #include <pcre.h>
+-  #include <locale.h>
+ }
+ 
+ namespace pcrepp {

Modified: branches/2014Q1/devel/pcre++/pkg-plist
==============================================================================
--- branches/2014Q1/devel/pcre++/pkg-plist	Tue Dec 24 12:58:04 2013	(r337349)
+++ branches/2014Q1/devel/pcre++/pkg-plist	Tue Dec 24 13:01:05 2013	(r337350)
@@ -4,8 +4,8 @@ lib/libpcre++.a
 lib/libpcre++.la
 lib/libpcre++.so
 lib/libpcre++.so.0
+man/man3/Pcre.3.gz
 %%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/README