[103089] trunk/dports/textproc/doxygen

[ryandesign at macports.org]

Revision: 103089
          https://trac.macports.org/changeset/103089
Author:   ryandesign at macports.org
Date:     2013-02-13 15:57:22 -0800 (Wed, 13 Feb 2013)
Log Message:
-----------
doxygen: actually fix UsingTheRightCompiler all the time, by reinplacing flags only in tmake.conf (#37522)

Modified Paths:
--------------
    trunk/dports/textproc/doxygen/Portfile

Removed Paths:
-------------
    trunk/dports/textproc/doxygen/files/patch-libmd5-compiler.diff

Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile	2013-02-13 23:38:58 UTC (rev 103088)
+++ trunk/dports/textproc/doxygen/Portfile	2013-02-13 23:57:22 UTC (rev 103089)
@@ -38,7 +38,7 @@
 depends_build-append	bin:perl:perl5 port:flex port:bison
 depends_lib		port:libpng path:bin/dot:graphviz port:libiconv
 
-patchfiles	    patch-configure.diff patch-libmd5-compiler.diff
+patchfiles	    patch-configure.diff
 
 patch.pre_args      -p1
 configure.universal_args-delete --disable-dependency-tracking
@@ -91,16 +91,10 @@
 
 	# remove flag that is not defined for gcc and only suppresses some warnings for clang
     if {[string match *gcc* ${configure.compiler}]} {
-		reinplace "s|-Wno-invalid-source-encoding||g" ${worksrcpath}/libmd5/Makefile.libmd5 \
-			${worksrcpath}/src/Makefile.libdoxycfg \
-			${worksrcpath}/tmake/lib/macosx-c++/tmake.conf \
-			${worksrcpath}/tmake/lib/macosx-intel-c++/tmake.conf \
-			${worksrcpath}/tmake/lib/macosx-uni-c++/tmake.conf
+		reinplace "s|-Wno-invalid-source-encoding||g" ${tmake_conf}
 	}
 }
 
-use_parallel_build	no
-
 build.target		all
 
 destroot.target		install

Deleted: trunk/dports/textproc/doxygen/files/patch-libmd5-compiler.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-libmd5-compiler.diff	2013-02-13 23:38:58 UTC (rev 103088)
+++ trunk/dports/textproc/doxygen/files/patch-libmd5-compiler.diff	2013-02-13 23:57:22 UTC (rev 103089)
@@ -1,15 +0,0 @@
---- a/libmd5/Makefile.libmd5	2013-01-04 15:20:03.000000000 +0100
-+++ b/libmd5/Makefile.libmd5	2013-01-04 15:20:15.000000000 +0100
-@@ -7,11 +7,9 @@
- 
- ####### Compiler, tools and options
- 
--CC	=	cc
--CXX	=	c++
- CFLAGS	=	-pipe -Wall -W -Wno-deprecated-declarations -Wno-invalid-source-encoding -g -fstack-protector
- CXXFLAGS=	-pipe -D__FreeBSD__=6 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int -Wall -W -Wno-deprecated-declarations -Wno-invalid-source-encoding -g -fstack-protector
--INCPATH	=	-I/usr/local/include
-+INCPATH	=
- AR	=	ar cq
- RANLIB	=	ranlib
- MOC	=	/usr/bin/moc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130213/10a50666/attachment.html>