[125503] trunk/dports/textproc/colorer

[ryandesign at macports.org]

Revision: 125503
          https://trac.macports.org/changeset/125503
Author:   ryandesign at macports.org
Date:     2014-09-18 19:29:16 -0700 (Thu, 18 Sep 2014)
Log Message:
-----------
colorer: allow compiling with clang; use requested C++ library and revbump to rebuild with libc++ on applicable systems; move insertion of -arch flags to patch files; become maintainer

Modified Paths:
--------------
    trunk/dports/textproc/colorer/Portfile
    trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff

Added Paths:
-----------
    trunk/dports/textproc/colorer/files/patch-src-colorer-makefile.gcc.diff

Modified: trunk/dports/textproc/colorer/Portfile
===================================================================
--- trunk/dports/textproc/colorer/Portfile	2014-09-19 02:22:18 UTC (rev 125502)
+++ trunk/dports/textproc/colorer/Portfile	2014-09-19 02:29:16 UTC (rev 125503)
@@ -5,11 +5,11 @@
 
 name            colorer
 version         take5.be5
-revision        1
+revision        2
 license         MPL-1.1 GPL-2 LGPL-2.1
 categories      textproc devel
 platforms       darwin
-maintainers     nomaintainer
+maintainers     ryandesign openmaintainer
 description     A library that provides source text syntax highlighting services
 
 long_description \
@@ -37,34 +37,27 @@
 variant universal {}
 
 patchfiles      patch-Makefile.in.diff \
+                patch-src-colorer-makefile.gcc.diff \
                 patch-src-libcolorer-makefile.gcc.diff
 
 post-patch {
-    # Use makefile.macos for colorer
-    reinplace {/\/colorer/s/gcc/macos/} ${worksrcpath}/Makefile.in
-
     # error: cast from 'int*' to 'int' loses precision
     reinplace s/int(/bool(/ ${worksrcpath}/src/shared/unicode/BitArray.cpp
 
     # Do not force installation as root
     reinplace {s/-g 0 -o 0//} ${worksrcpath}/Makefile.in
-
-    reinplace "/^CPPFLAGS/s:\$: [get_canonical_archflags cc]:" \
-        ${worksrcpath}/src/shared/makefile.colorer.gcc
-    reinplace -E "/^(LIB)?FLAGS/s:\$: [get_canonical_archflags ld]:" \
-        ${worksrcpath}/src/colorer/makefile.macos \
-        ${worksrcpath}/src/libcolorer/makefile.gcc
 }
 
-# error: taking the address of a temporary object of type 'DString'
-compiler.blacklist *clang*
-
 configure.cmd   sh src/libcolorer/linux/configure
 configure.args  --srcdir=.
 
 build.target colorer
 # Yes, this build system uses "CPP" for the C compiler and "LINK" for the C++ compiler.
-build.args          CPP=${configure.cc} \
+build.args          ARCHFLAGS="[get_canonical_archflags]" \
+                    CPP=${configure.cc} \
+                    CPPFLAGS_CUSTOM="[get_canonical_archflags] -Wno-error=address-of-temporary" \
+                    FLAGS= \
+                    LIBINC="/usr/lib/${configure.cxx_stdlib}.dylib" \
                     LINK=${configure.cxx} \
                     prefix=${prefix}
 use_parallel_build yes

Added: trunk/dports/textproc/colorer/files/patch-src-colorer-makefile.gcc.diff
===================================================================
--- trunk/dports/textproc/colorer/files/patch-src-colorer-makefile.gcc.diff	                        (rev 0)
+++ trunk/dports/textproc/colorer/files/patch-src-colorer-makefile.gcc.diff	2014-09-19 02:29:16 UTC (rev 125503)
@@ -0,0 +1,12 @@
+Use -arch flags
+--- src/colorer/makefile.gcc.orig	2006-11-24 17:14:38.000000000 -0600
++++ src/colorer/makefile.gcc	2014-09-18 20:48:15.000000000 -0500
+@@ -8,7 +8,7 @@
+ include ../shared/makefile.colorer.gcc
+ 
+ LIBINC = -lc -lm -lstdc++
+-LIBFLAGS = $(objs) $(FLAGS) -o $(TARGET) $(LIBINC)
++LIBFLAGS = $(objs) $(FLAGS) -o $(TARGET) $(LIBINC) $(ARCHFLAGS)
+ 
+ include makefile.core
+ 

Modified: trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff
===================================================================
--- trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff	2014-09-19 02:22:18 UTC (rev 125502)
+++ trunk/dports/textproc/colorer/files/patch-src-libcolorer-makefile.gcc.diff	2014-09-19 02:29:16 UTC (rev 125503)
@@ -1,8 +1,9 @@
 Change library extension to .dylib
 Create library with -dynamiclib
 Use -install_name
+Use -arch flags
 --- src/libcolorer/makefile.gcc.orig	2006-11-24 17:14:40.000000000 -0600
-+++ src/libcolorer/makefile.gcc	2014-09-04 22:14:17.000000000 -0500
++++ src/libcolorer/makefile.gcc	2014-09-18 20:48:15.000000000 -0500
 @@ -1,5 +1,5 @@
  
 -TARGET=libcolorer.so
@@ -15,7 +16,7 @@
  
  LIBINC = -lstdc++
 -LIBFLAGS = $(coreobjects) -shared -o $(TARGET) $(LIBINC)
-+LIBFLAGS = $(coreobjects) -dynamiclib -install_name $(prefix)/lib/$(TARGET) -o $(TARGET) $(LIBINC)
++LIBFLAGS = $(coreobjects) -dynamiclib -install_name $(prefix)/lib/$(TARGET) -o $(TARGET) $(LIBINC) $(ARCHFLAGS)
  
  
 -libcolorer.so: $(coreobjects)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140918/8d9a6685/attachment-0001.html>