[102643] trunk/dports/textproc/doxygen

[jeremyhu at macports.org]

Revision: 102643
          https://trac.macports.org/changeset/102643
Author:   jeremyhu at macports.org
Date:     2013-02-05 09:11:30 -0800 (Tue, 05 Feb 2013)
Log Message:
-----------
doxygen: Use the right compiler (#37522) to fix +universal (#37555)

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

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

Removed Paths:
-------------
    trunk/dports/textproc/doxygen/files/lion.patch

Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile	2013-02-05 16:57:27 UTC (rev 102642)
+++ trunk/dports/textproc/doxygen/Portfile	2013-02-05 17:11:30 UTC (rev 102643)
@@ -38,9 +38,9 @@
 depends_build-append	bin:perl:perl5 port:flex port:bison
 depends_lib		port:libpng path:bin/dot:graphviz port:libiconv
 
-#patchfiles	lion.patch
+patchfiles	    patch-libmd5-compiler.diff
 
-patch.post_args     -p1
+patch.pre_args      -p1
 configure.universal_args-delete --disable-dependency-tracking
 
 configure.pre_args	--prefix ${prefix}

Deleted: trunk/dports/textproc/doxygen/files/lion.patch
===================================================================
--- trunk/dports/textproc/doxygen/files/lion.patch	2013-02-05 16:57:27 UTC (rev 102642)
+++ trunk/dports/textproc/doxygen/files/lion.patch	2013-02-05 17:11:30 UTC (rev 102643)
@@ -1,31 +0,0 @@
---- a/qtools/qglobal.h.orig	2011-06-17 00:14:03.000000000 -0700
-+++ a/qtools/qglobal.h	2011-06-17 00:19:32.000000000 -0700
-@@ -78,19 +78,22 @@
- #  define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3
- #  include <AvailabilityMacros.h>
- #  if !defined(MAC_OS_X_VERSION_10_3)
--#     define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 1
-+#     define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 10
- #  endif
- #  if !defined(MAC_OS_X_VERSION_10_4)
--#       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
-+#       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 10
- #  endif
- #  if !defined(MAC_OS_X_VERSION_10_5)
--#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
-+#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 10
- #  endif
- #  if !defined(MAC_OS_X_VERSION_10_6)
--#       define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1
-+#       define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 10
- #  endif
--#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_6)
--#    error "This version of Mac OS X is unsupported"
-+#  if !defined(MAC_OS_X_VERSION_10_7)
-+#       define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 10
-+#  endif
-+#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_7)
-+#    warning "This version of Mac OS X is unsupported"
- #  endif
- #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
- #define _OS_MSDOS_

Added: trunk/dports/textproc/doxygen/files/patch-libmd5-compiler.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-libmd5-compiler.diff	                        (rev 0)
+++ trunk/dports/textproc/doxygen/files/patch-libmd5-compiler.diff	2013-02-05 17:11:30 UTC (rev 102643)
@@ -0,0 +1,15 @@
+--- 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/20130205/77ae396f/attachment.html>