[120428] trunk/dports/devel/pcrexx

[jmr at macports.org]

Revision: 120428
          https://trac.macports.org/changeset/120428
Author:   jmr at macports.org
Date:     2014-05-27 19:15:51 -0700 (Tue, 27 May 2014)
Log Message:
-----------
pcrexx: fix build failures on Mavericks and with universal variant (#43726, #43783, maintainer timeout)

Modified Paths:
--------------
    trunk/dports/devel/pcrexx/Portfile

Added Paths:
-----------
    trunk/dports/devel/pcrexx/files/patch-Makefile.am.diff
    trunk/dports/devel/pcrexx/files/patch-pcrexx.h.diff

Removed Paths:
-------------
    trunk/dports/devel/pcrexx/files/patch-doc_Makefile.in.diff

Modified: trunk/dports/devel/pcrexx/Portfile
===================================================================
--- trunk/dports/devel/pcrexx/Portfile	2014-05-28 02:09:43 UTC (rev 120427)
+++ trunk/dports/devel/pcrexx/Portfile	2014-05-28 02:15:51 UTC (rev 120428)
@@ -28,8 +28,10 @@
 
 depends_lib	port:pcre
 
-patchfiles	patch-doc_Makefile.in.diff
+patchfiles	patch-Makefile.am.diff patch-pcrexx.h.diff
 
+use_autoreconf	yes
+
 configure.args	--mandir=${prefix}/share/man		\
 		--with-pcre-include=${prefix}/include	\
 		--with-pcre-lib=${prefix}/lib

Added: trunk/dports/devel/pcrexx/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/devel/pcrexx/files/patch-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/devel/pcrexx/files/patch-Makefile.am.diff	2014-05-28 02:15:51 UTC (rev 120428)
@@ -0,0 +1,37 @@
+--- doc/Makefile.am.orig	2003-02-24 03:37:03.000000000 +1100
++++ doc/Makefile.am	2014-05-23 09:33:20.000000000 +1000
+@@ -4,5 +4,5 @@
+ DOC_FILES = html/* ../README ../COPYING ../AUTHORS ../INSTALL ../ChangeLog ../config.log
+ 
+ install-data-local:
+-	$(INSTALL) -m 755 -d $(prefix)/doc/libpcre++-$(VERSION)
+-	$(INSTALL) -m 644 $(DOC_FILES) $(prefix)/doc/libpcre++-$(VERSION)/
+\ No newline at end of file
++	$(INSTALL) -m 755 -d $(DESTDIR)$(datarootdir)/doc/libpcre++-$(VERSION)
++	$(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(datarootdir)/doc/libpcre++-$(VERSION)/
+--- examples/Makefile.am.orig	2003-06-27 07:04:35.000000000 +1000
++++ examples/Makefile.am	2014-05-23 08:53:40.000000000 +1000
+@@ -10,4 +10,4 @@
+ search_demo_SOURCES  = search_demo.cc
+ search_demo_LDADD    = $(pcre_linklib)
+ 
+-CXXFLAGS        = -Wall -Wstrict-prototypes -O -g
+\ No newline at end of file
++AM_CXXFLAGS        = -Wall -Wstrict-prototypes -O -g
+--- libpcre++/Makefile.am.orig	2003-06-25 07:58:52.000000000 +1000
++++ libpcre++/Makefile.am	2014-05-23 08:55:55.000000000 +1000
+@@ -5,4 +5,4 @@
+ 
+ 
+ 
+-CXXFLAGS             = -Wall -Wstrict-prototypes -O -g
+\ No newline at end of file
++AM_CXXFLAGS             = -Wall -Wstrict-prototypes -O -g
+--- test/Makefile.am.orig	2003-06-27 23:33:48.000000000 +1000
++++ test/Makefile.am	2014-05-23 08:54:39.000000000 +1000
+@@ -4,4 +4,4 @@
+ test_SOURCES    = test.cc
+ test_LDADD      = $(pcre_linklib)
+ 
+-CXXFLAGS        = -Wall -Wstrict-prototypes -O -g
++AM_CXXFLAGS        = -Wall -Wstrict-prototypes -O -g

Deleted: trunk/dports/devel/pcrexx/files/patch-doc_Makefile.in.diff
===================================================================
--- trunk/dports/devel/pcrexx/files/patch-doc_Makefile.in.diff	2014-05-28 02:09:43 UTC (rev 120427)
+++ trunk/dports/devel/pcrexx/files/patch-doc_Makefile.in.diff	2014-05-28 02:15:51 UTC (rev 120428)
@@ -1,13 +0,0 @@
---- doc/Makefile.in.orig	2004-08-24 17:38:04.000000000 -0600
-+++ doc/Makefile.in	2009-07-16 01:44:37.000000000 -0600
-@@ -232,8 +232,8 @@
- 
- 
- install-data-local:
--	$(INSTALL) -m 755 -d $(prefix)/doc/libpcre++-$(VERSION)
--	$(INSTALL) -m 644 $(DOC_FILES) $(prefix)/doc/libpcre++-$(VERSION)/
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/doc/libpcre++-$(VERSION)
-+	$(INSTALL) -m 644 $(DOC_FILES) $(DESTDIR)$(prefix)/share/doc/libpcre++-$(VERSION)/
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.

Added: trunk/dports/devel/pcrexx/files/patch-pcrexx.h.diff
===================================================================
--- trunk/dports/devel/pcrexx/files/patch-pcrexx.h.diff	                        (rev 0)
+++ trunk/dports/devel/pcrexx/files/patch-pcrexx.h.diff	2014-05-28 02:15:51 UTC (rev 120428)
@@ -0,0 +1,15 @@
+--- libpcre++/pcre++.h.orig	2004-08-25 09:37:55.000000000 +1000
++++ libpcre++/pcre++.h	2014-05-23 09:48:05.000000000 +1000
+@@ -47,11 +47,11 @@
+ #include <map>
+ #include <stdexcept>
+ #include <iostream>
++#include <clocale>
+ 
+ 
+ extern "C" {
+   #include <pcre.h>
+-  #include <locale.h>
+ }
+ 
+ namespace pcrepp {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140527/ea7136a7/attachment.html>