Revision: 77326 http://trac.macports.org/changeset/77326 Author: css@macports.org Date: 2011-03-27 03:29:07 -0700 (Sun, 27 Mar 2011) Log Message: ----------- doxygen: cleaned up patching to use -p1 and removed obsolete diffs. Modified Paths: -------------- trunk/dports/textproc/doxygen/Portfile trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff Removed Paths: ------------- trunk/dports/textproc/doxygen/files/patch-portable.cpp.diff trunk/dports/textproc/doxygen/files/patch-qtools_qglobal.h.diff Modified: trunk/dports/textproc/doxygen/Portfile =================================================================== --- trunk/dports/textproc/doxygen/Portfile 2011-03-27 08:02:06 UTC (rev 77325) +++ trunk/dports/textproc/doxygen/Portfile 2011-03-27 10:29:07 UTC (rev 77326) @@ -4,7 +4,7 @@ name doxygen version 1.7.3 -revision 2 +revision 3 categories textproc devel maintainers css description Documentation system for several programming languages @@ -36,6 +36,7 @@ depends_build-append bin:perl:perl5 bin:flex:flex bin:bison:bison bin:ginstall:coreutils depends_lib port:libpng path:bin/dot:graphviz port:libiconv +patch.post_args -p1 configure.universal_args-delete --disable-dependency-tracking configure.pre_args --prefix ${prefix} @@ -133,10 +134,3 @@ set arch_flags ${configure.universal_cflags} } } - -pre-patch { - if {[variant_isset tcl]} { - reinplace "s|^--- 746doxygen-svn/|--- |" ${distpath}/doxygen\+tcl.patch - reinplace "s|^+++ doxygen-svn/|+++ |" ${distpath}/doxygen\+tcl.patch - } -} Modified: trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff =================================================================== --- trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff 2011-03-27 08:02:06 UTC (rev 77325) +++ trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff 2011-03-27 10:29:07 UTC (rev 77326) @@ -1,5 +1,5 @@ ---- addon/doxywizard/Makefile.in.orig 2008-12-06 08:14:58.000000000 -0500 -+++ addon/doxywizard/Makefile.in 2009-01-30 20:39:50.000000000 -0500 +--- a/addon/doxywizard/Makefile.in.orig 2008-12-06 08:14:58.000000000 -0500 ++++ b/addon/doxywizard/Makefile.in 2009-01-30 20:39:50.000000000 -0500 @@ -30,7 +30,8 @@ install: Deleted: trunk/dports/textproc/doxygen/files/patch-portable.cpp.diff =================================================================== --- trunk/dports/textproc/doxygen/files/patch-portable.cpp.diff 2011-03-27 08:02:06 UTC (rev 77325) +++ trunk/dports/textproc/doxygen/files/patch-portable.cpp.diff 2011-03-27 10:29:07 UTC (rev 77326) @@ -1,12 +0,0 @@ ---- src/portable.cpp.orig 2008-06-09 06:43:07.000000000 -0400 -+++ src/portable.cpp 2009-02-10 17:57:00.000000000 -0500 -@@ -380,8 +380,7 @@ - // libiconv is a mess. For some platforms/version the prototype of inbuf is - // "const char **", for others it is "char **". C++ requires the proper cast to - // avoid a compile error, that is were the CASTNEEDED is for. --#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) && \ -- !((defined(_OS_MAC_) || defined(Q_OS_MACX) )&& (_LIBICONV_VERSION==0x010B))) \ -+#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) ) \ - || defined(_OS_SOLARIS_) \ - || defined(_OS_NETBSD_) \ - ) Deleted: trunk/dports/textproc/doxygen/files/patch-qtools_qglobal.h.diff =================================================================== --- trunk/dports/textproc/doxygen/files/patch-qtools_qglobal.h.diff 2011-03-27 08:02:06 UTC (rev 77325) +++ trunk/dports/textproc/doxygen/files/patch-qtools_qglobal.h.diff 2011-03-27 10:29:07 UTC (rev 77326) @@ -1,12 +0,0 @@ ---- qtools/qglobal.h.orig 2009-06-26 16:47:58.000000000 -0700 -+++ qtools/qglobal.h 2009-06-26 16:48:10.000000000 -0700 -@@ -86,9 +86,6 @@ - # if !defined(MAC_OS_X_VERSION_10_5) - # define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1 - # endif --# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) --# error "This version of Mac OS X is unsupported" --# endif - #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__) - #define _OS_MSDOS_ - #elif defined(OS2) || defined(_OS2) || defined(__OS2__)