[143539] trunk/dports/textproc/doxygen
cal at macports.org
cal at macports.org
Mon Dec 14 14:14:19 PST 2015
Revision: 143539
https://trac.macports.org/changeset/143539
Author: cal at macports.org
Date: 2015-12-14 14:14:18 -0800 (Mon, 14 Dec 2015)
Log Message:
-----------
doxygen: Update to 1.8.10, openmaintainer, #48231
Maintainer timeout. Additionally backport patch to fix build against flex 2.6.
Closes #48231, #49881
Modified Paths:
--------------
trunk/dports/textproc/doxygen/Portfile
Added Paths:
-----------
trunk/dports/textproc/doxygen/files/8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch
trunk/dports/textproc/doxygen/files/a8c73cdbe37cc53c398002d20e94037552a8fb55.patch
trunk/dports/textproc/doxygen/files/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch
trunk/dports/textproc/doxygen/files/patch-doc-CMakeLists.txt-man-to-share-man.diff
trunk/dports/textproc/doxygen/files/patch-doc-CMakeLists.txt.diff
trunk/dports/textproc/doxygen/files/patch-examples-CMakeLists.txt.diff
trunk/dports/textproc/doxygen/files/patch-src-portable_c.c.diff
Removed Paths:
-------------
trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff
trunk/dports/textproc/doxygen/files/patch-configure.diff
Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile 2015-12-14 22:08:42 UTC (rev 143538)
+++ trunk/dports/textproc/doxygen/Portfile 2015-12-14 22:14:18 UTC (rev 143539)
@@ -2,9 +2,10 @@
# $Id$
PortSystem 1.0
+PortGroup cmake 1.0
name doxygen
-version 1.8.9.1
+version 1.8.10
categories textproc devel
maintainers css openmaintainer
license GPL-2
@@ -35,8 +36,8 @@
distfiles ${distname}.src${extract.suffix}
checksums ${distname}.src${extract.suffix} \
- rmd160 103d45b36129a0a04b809050b7251acf6f9dacde \
- sha256 d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec
+ rmd160 be064f0e8f00e6e20ed7c128f595e7010be1f23a \
+ sha256 cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93
depends_build-append bin:perl:perl5 \
bin:python2.7:python27 \
@@ -44,9 +45,13 @@
port:bison
license_noconflict perl5 python27
-depends_lib port:libpng \
- port:libiconv
+depends_lib port:libpng
+patchfiles patch-src-portable_c.c.diff \
+ cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch \
+ 8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch \
+ a8c73cdbe37cc53c398002d20e94037552a8fb55.patch
+
post-extract {
# Use our flex
delete ${worksrcpath}/src/ce_lex.cpp
@@ -79,69 +84,28 @@
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
-patchfiles patch-configure.diff
-post-patch {
- reinplace "s/echo -n/printf/g" ${worksrcpath}/configure
+# build fails out of source :/
+cmake.out_of_source no
- # ensure correct compilers and compiler options are used
- reinplace "/^TMAKE_CC\[\[:space:\]\]/s%=.*%= ${configure.cc} ${configure.cppflags} [get_canonical_archflags cc]%" ${tmake_conf}
- reinplace "/^TMAKE_CXX\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.cppflags} ${cxx_stdlibflags} [get_canonical_archflags cxx]%" ${tmake_conf}
- reinplace "/^TMAKE_LINK\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.ldflags} ${cxx_stdlibflags} [get_canonical_archflags ld]%" ${tmake_conf}
- reinplace "/^TMAKE_LINK_SHLIB\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${cxx_stdlibflags} [get_canonical_archflags ld]%" ${tmake_conf}
- reinplace "s|-mmacosx-version-min=10.5||g" ${tmake_conf}
-
- # make sure LIBICONV_PLUG is undefined (this flag is necessary for the
- # system-installed libiconv, but breaks linking with the MacPorts installed
- # one)
- reinplace "s|#define LIBICONV_PLUG||g" ${worksrcpath}/src/portable_c.c
-
- # may not be strictly necessary, but remove trailing '/' from DESTDIR
- reinplace "s|\$(DESTDIR)/|\$(DESTDIR)|g" ${worksrcpath}/Makefile.in
-
- # link with doxygen's libmd5, avoiding a libwww port conflict
- reinplace "s|-lmd5|../lib/libmd5.a|" ${worksrcpath}/src/doxygen.pro.in
-
- # do not require GNU install; BSD install suffices
- reinplace "s,-n \"`\$j/\$i --version 2>/dev/null \| grep utils`\",-x \"\$j/\$i\",g" ${worksrcpath}/configure
-
- # 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" ${tmake_conf}
- }
-}
-
-build.type gnu
-
-configure.universal_args-delete \
- --disable-dependency-tracking
-configure.pre_args --prefix ${prefix}
-configure.args --make ${build.cmd} \
- --python python2.7
-
-build.target all
-
-destroot.target install
destroot.args INSTALL=${prefix} \
DOCDIR=${prefix}/share/doc/doxygen \
MAN1DIR=share/man/man1
-variant docs description {Include the doxygen PDF documentation and LaTeX} requires {latex} {
- patchfiles-delete patch-configure.diff
+variant docs description {Include the doxygen HTML and PDF documentation} {
+ configure.args-append -Dbuild_doc=YES \
+ -EPSTOPDF=${prefix}/bin/epstopdf
- configure.args-append --docdir ${prefix}/share/doc \
- --dot ${prefix}/bin/dot
+ patchfiles-append patch-doc-CMakeLists.txt.diff \
+ patch-doc-CMakeLists.txt-man-to-share-man.diff \
+ patch-examples-CMakeLists.txt.diff
- depends_build-append path:bin/dot:graphviz
- build.target-append pdf
- use_parallel_build no
-
- destroot.target-append install_docs
-}
-
-variant latex description {Support LaTeX/PDF doxygen output} {
- depends_build-append bin:pdflatex:texlive-latex \
+ depends_build-append path:bin/dot:graphviz \
bin:gs:ghostscript \
+ port:texlive \
port:texlive-latex-extra
+
+ build.target-append docs
+ use_parallel_build no
}
variant wizard description {Include the GUI wizard based on Qt4} {
@@ -150,45 +114,9 @@
PortGroup qt4 1.0
# tell configure to make the wizard app
- configure.args-append --with-doxywizard
-
- # on Macs, qmake builds .app directories; when installing, copy
- # this directory to the correct location (via the reinplace below).
- patchfiles-append patch-addon_doxywizard_Makefile.in.diff
-
- post-patch {
- # allow for universal building, if desired
- reinplace "/CONFIG/s at x86@${qt_arch_types}@" \
- ${worksrcpath}/addon/doxywizard/doxywizard.pro.in
-
- # give doxywizard the more mac-like name of DoxyWizard
- reinplace "/^TARGET\[\[:space:\]\]/s%=.*%= DoxyWizard%" \
- ${worksrcpath}/addon/doxywizard/doxywizard.pro.in
-
- # fix final install location
- reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|" \
- ${worksrcpath}/addon/doxywizard/Makefile.in
-
- # use the correct QMAKE command; the other should work, but
- # this one is guaranteed to.
- reinplace "s|QMAKE=qmake|QMAKE=${qt_qmake_cmd}|g" \
- ${worksrcpath}/addon/doxywizard/Makefile.in
- }
-
- post-destroot {
- # allow doxywizard to be called from the command line
- ln -s ${applications_dir}/DoxyWizard.app/Contents/MacOS/DoxyWizard ${destroot}${prefix}/bin/doxywizard
- }
+ configure.args-append -Dbuild_wizard=YES
}
-platform darwin {
- # Specify the platform explicitly to avoid a universal build.
- global tmake_conf
-
- set tmake_conf ${worksrcpath}/tmake/lib/macosx-c++/tmake.conf
- configure.args-append --platform macosx-c++
-}
-
livecheck.type regex
livecheck.url http://www.stack.nl/~dimitri/doxygen/download.html
livecheck.regex {latest version of doxygen is (\d+(?:\.\d+)*)}
Added: trunk/dports/textproc/doxygen/files/8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch
===================================================================
--- trunk/dports/textproc/doxygen/files/8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch (rev 0)
+++ trunk/dports/textproc/doxygen/files/8c51120ad55b440b738ef0b96f8169d84a7ae88a.patch 2015-12-14 22:14:18 UTC (rev 143539)
@@ -0,0 +1,109 @@
+From 8c51120ad55b440b738ef0b96f8169d84a7ae88a Mon Sep 17 00:00:00 2001
+From: Dimitri van Heesch <dimitri at stack.nl>
+Date: Sun, 22 Nov 2015 13:58:59 +0100
+Subject: [PATCH] Support flex-2.6.0
+Upstream-Status: Backport [https://github.com/doxygen/doxygen/commit/8c51120ad55b440b738ef0b96f8169d84a7ae88a]
+
+---
+ src/code.l | 4 ++--
+ src/commentscan.l | 4 ++--
+ src/fortrancode.l | 6 +++---
+ src/pycode.l | 2 +-
+ src/vhdlcode.l | 2 +-
+ src/xmlcode.l | 2 +-
+ 6 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/code.l b/src/code.l
+index 25719af..f014924 100644
+--- ./src/code.l
++++ ./src/code.l
+@@ -3700,7 +3700,7 @@ void codeFreeScanner()
+ extern "C" { // some bogus code to keep the compiler happy
+ void codeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+-#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
++#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
++#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
+diff --git a/src/commentscan.l b/src/commentscan.l
+index 2629857..ffed075 100644
+--- ./src/commentscan.l
++++ ./src/commentscan.l
+@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
+ // but we need to know the position in the input buffer where this
+ // rule matched.
+ // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
+-#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
++#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
+ inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
+ #else
+ inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
+@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
+ g_memberGroupHeader.resize(0);
+ parseMore=TRUE;
+ needNewEntry = TRUE;
+-#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
++#if YY_FLEX_MAJOR_VERSION>=2 && (YY_FLEX_MINOR_VERSION>5 || (YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33))
+ inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
+ #else
+ inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
+diff --git a/src/fortrancode.l b/src/fortrancode.l
+index 352912b..82e78c1 100644
+--- ./src/fortrancode.l
++++ ./src/fortrancode.l
+@@ -1302,11 +1302,11 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
+ return;
+ }
+
+-#if !defined(YY_FLEX_SUBMINOR_VERSION)
++#if !defined(YY_FLEX_SUBMINOR_VERSION)
+ extern "C" { // some bogus code to keep the compiler happy
+- void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
++ void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #else
+ extern "C" { // some bogus code to keep the compiler happy
+diff --git a/src/pycode.l b/src/pycode.l
+index f58f7c1..2b2a668 100644
+--- ./src/pycode.l
++++ ./src/pycode.l
+@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
+ extern "C" { // some bogus code to keep the compiler happy
+ void pycodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
+diff --git a/src/vhdlcode.l b/src/vhdlcode.l
+index 6957048..e4ae0e7 100644
+--- ./src/vhdlcode.l
++++ ./src/vhdlcode.l
+@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
+ extern "C" { // some bogus code to keep the compiler happy
+ void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #endif
+
+diff --git a/src/xmlcode.l b/src/xmlcode.l
+index 2bef4a0..fd36ebb 100644
+--- ./src/xmlcode.l
++++ ./src/xmlcode.l
+@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
+ extern "C" { // some bogus code to keep the compiler happy
+ void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
Added: trunk/dports/textproc/doxygen/files/a8c73cdbe37cc53c398002d20e94037552a8fb55.patch
===================================================================
--- trunk/dports/textproc/doxygen/files/a8c73cdbe37cc53c398002d20e94037552a8fb55.patch (rev 0)
+++ trunk/dports/textproc/doxygen/files/a8c73cdbe37cc53c398002d20e94037552a8fb55.patch 2015-12-14 22:14:18 UTC (rev 143539)
@@ -0,0 +1,37 @@
+From a8c73cdbe37cc53c398002d20e94037552a8fb55 Mon Sep 17 00:00:00 2001
+From: lameventanas <lameventanas at gmail.com>
+Date: Wed, 25 Nov 2015 20:18:54 +0900
+Subject: [PATCH] Fixed preprocessor macros for flex version check
+Upstream-Status: Backport [https://github.com/doxygen/doxygen/commit/a8c73cdbe37cc53c398002d20e94037552a8fb55]
+
+---
+ src/code.l | 2 +-
+ src/pycode.l | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/code.l b/src/code.l
+index f014924..5b8a084 100644
+--- ./src/code.l
++++ ./src/code.l
+@@ -3700,7 +3700,7 @@ void codeFreeScanner()
+ extern "C" { // some bogus code to keep the compiler happy
+ void codeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
+diff --git a/src/pycode.l b/src/pycode.l
+index 2b2a668..c3219d9 100644
+--- ./src/pycode.l
++++ ./src/pycode.l
+@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
+ extern "C" { // some bogus code to keep the compiler happy
+ void pycodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_MAJOR_VERISON<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
Added: trunk/dports/textproc/doxygen/files/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch
===================================================================
--- trunk/dports/textproc/doxygen/files/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch (rev 0)
+++ trunk/dports/textproc/doxygen/files/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb.patch 2015-12-14 22:14:18 UTC (rev 143539)
@@ -0,0 +1,105 @@
+From cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka at exherbo.org>
+Date: Thu, 19 Nov 2015 12:00:54 +0100
+Subject: [PATCH] Support flex-2.6.0
+Upstream-Status: Backport [https://github.com/doxygen/doxygen/commit/cf936efb8ae99dd297b6afb9c6a06beb81f5b0fb]
+
+The version checks only considered YY_FLEX_SUBMINOR_VERSION and did not
+take YY_FLEX_MINOR_VERSION into account, which made them fail with
+flex-2.6.0.
+---
+ src/code.l | 2 +-
+ src/commentscan.l | 4 ++--
+ src/fortrancode.l | 2 +-
+ src/pycode.l | 2 +-
+ src/vhdlcode.l | 2 +-
+ src/xmlcode.l | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/code.l b/src/code.l
+index 3323580..25719af 100644
+--- ./src/code.l
++++ ./src/code.l
+@@ -3700,7 +3700,7 @@ void codeFreeScanner()
+ extern "C" { // some bogus code to keep the compiler happy
+ void codeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #endif
+
+diff --git a/src/commentscan.l b/src/commentscan.l
+index cf892a0..2629857 100644
+--- ./src/commentscan.l
++++ ./src/commentscan.l
+@@ -1128,7 +1128,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
+ // but we need to know the position in the input buffer where this
+ // rule matched.
+ // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
+-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
++#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+ inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
+ #else
+ inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
+@@ -1190,7 +1190,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
+ g_memberGroupHeader.resize(0);
+ parseMore=TRUE;
+ needNewEntry = TRUE;
+-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
++#if YY_FLEX_MINOR_VERSION>5 || YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+ inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
+ #else
+ inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
+diff --git a/src/fortrancode.l b/src/fortrancode.l
+index fb91a83..352912b 100644
+--- ./src/fortrancode.l
++++ ./src/fortrancode.l
+@@ -1306,7 +1306,7 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
+ extern "C" { // some bogus code to keep the compiler happy
+ void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #else
+ extern "C" { // some bogus code to keep the compiler happy
+diff --git a/src/pycode.l b/src/pycode.l
+index 3c41a69..f58f7c1 100644
+--- ./src/pycode.l
++++ ./src/pycode.l
+@@ -1503,7 +1503,7 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
+ extern "C" { // some bogus code to keep the compiler happy
+ void pycodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
+diff --git a/src/vhdlcode.l b/src/vhdlcode.l
+index 369ae48..6957048 100644
+--- ./src/vhdlcode.l
++++ ./src/vhdlcode.l
+@@ -1613,7 +1613,7 @@ void codeFreeVhdlScanner()
+ extern "C" { // some bogus code to keep the compiler happy
+ void vhdlcodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #endif
+
+diff --git a/src/xmlcode.l b/src/xmlcode.l
+index 15b5d7e..2bef4a0 100644
+--- ./src/xmlcode.l
++++ ./src/xmlcode.l
+@@ -407,7 +407,7 @@ void resetXmlCodeParserState()
+ extern "C" { // some bogus code to keep the compiler happy
+ void xmlcodeYYdummy() { yy_flex_realloc(0,0); }
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
++#elif YY_FLEX_MINOR_VERSION<6 && YY_FLEX_SUBMINOR_VERSION<33
+ #error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+
Deleted: trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff 2015-12-14 22:08:42 UTC (rev 143538)
+++ trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff 2015-12-14 22:14:18 UTC (rev 143539)
@@ -1,12 +0,0 @@
---- 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
-@@ -30,7 +30,8 @@
-
- install:
- $(INSTTOOL) -d $(INSTALL)/bin
-- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin
-+ $(INSTTOOL) -d $(DESTDIR)__APPLICATIONS_DIR__
-+ /bin/cp -R ../../bin/*.app $(DESTDIR)__APPLICATIONS_DIR__
- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
- cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
Deleted: trunk/dports/textproc/doxygen/files/patch-configure.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-configure.diff 2015-12-14 22:08:42 UTC (rev 143538)
+++ trunk/dports/textproc/doxygen/files/patch-configure.diff 2015-12-14 22:14:18 UTC (rev 143539)
@@ -1,30 +0,0 @@
---- configure.orig
-+++ configure
-@@ -480,27 +480,6 @@
- echo "using $f_insttool";
-
-
--# - check for dot ------------------------------------------------------------
--
--printf " Checking for dot (part of GraphViz)... "
--if test "$f_dot" = NO; then
-- dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-- dot_prog=NO
-- for j in $dot_dirs; do
-- if test -x "$j/dot"; then
-- dot_prog="$j/dot"
-- break 2
-- fi
-- done
-- f_dot="$dot_prog"
--fi
--
--if test "$f_dot" = NO; then
-- echo "not found!";
--else
-- echo "using $f_dot"
--fi
--
- # - check for sqlite3 ---------------------------------------------------------
-
- if test "$f_sqlite3" = YES; then
Added: trunk/dports/textproc/doxygen/files/patch-doc-CMakeLists.txt-man-to-share-man.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-doc-CMakeLists.txt-man-to-share-man.diff (rev 0)
+++ trunk/dports/textproc/doxygen/files/patch-doc-CMakeLists.txt-man-to-share-man.diff 2015-12-14 22:14:18 UTC (rev 143539)
@@ -0,0 +1,15 @@
+Install documentation in share/man rather than man
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Clemens Lang <cal at macports.org>
+--- doc/CMakeLists.txt.orig 2015-12-14 23:04:15.000000000 +0100
++++ doc/CMakeLists.txt 2015-12-14 23:04:25.000000000 +0100
+@@ -86,7 +86,7 @@
+ "${PROJECT_BINARY_DIR}/man/doxywizard.1"
+ "${PROJECT_BINARY_DIR}/man/doxysearch.1"
+ "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
+- DESTINATION man/man1
++ DESTINATION share/man/man1
+ )
+
+ install(FILES
Added: trunk/dports/textproc/doxygen/files/patch-doc-CMakeLists.txt.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-doc-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/textproc/doxygen/files/patch-doc-CMakeLists.txt.diff 2015-12-14 22:14:18 UTC (rev 143539)
@@ -0,0 +1,16 @@
+--- doc/CMakeLists.txt.orig 2015-06-20 16:49:50.000000000 -0500
++++ doc/CMakeLists.txt 2015-07-04 09:52:19.000000000 -0500
+@@ -16,11 +16,9 @@
+
+ # copy all doc files
+ add_custom_target(copy_docs)
+-foreach(doc_file ${DOC_FILES})
+- add_custom_command(TARGET copy_docs PRE_BUILD
++add_custom_command(TARGET copy_docs PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E
+- copy ${doc_file} ${DOXYDOCS})
+-endforeach()
++ copy_directory . ${DOXYDOCS})
+
+ add_custom_target(docs
+ COMMENT "Generating documentation in ${DOXYDOCS}"
Added: trunk/dports/textproc/doxygen/files/patch-examples-CMakeLists.txt.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-examples-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/textproc/doxygen/files/patch-examples-CMakeLists.txt.diff 2015-12-14 22:14:18 UTC (rev 143539)
@@ -0,0 +1,16 @@
+--- examples/CMakeLists.txt.orig 2015-06-20 16:50:23.000000000 -0500
++++ examples/CMakeLists.txt 2015-07-04 09:59:18.000000000 -0500
+@@ -10,11 +10,9 @@
+
+ # copy all example files
+ add_custom_target(copy_examples)
+-foreach(example_file ${EXAMPLE_FILES})
+- add_custom_command(TARGET copy_examples PRE_BUILD
++add_custom_command(TARGET copy_examples PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E
+- copy ${example_file} ${PROJECT_BINARY_DIR}/examples)
+-endforeach()
++ copy_directory . ${PROJECT_BINARY_DIR}/examples)
+
+ add_custom_target(examples
+ DEPENDS doxygen copy_examples
Added: trunk/dports/textproc/doxygen/files/patch-src-portable_c.c.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-src-portable_c.c.diff (rev 0)
+++ trunk/dports/textproc/doxygen/files/patch-src-portable_c.c.diff 2015-12-14 22:14:18 UTC (rev 143539)
@@ -0,0 +1,16 @@
+Upstream-Status: Inappropriate [configuration]
+--- src/portable_c.c.orig 2014-10-19 09:39:17.000000000 -0500
++++ src/portable_c.c 2015-07-03 20:24:33.000000000 -0500
+@@ -1,9 +1,9 @@
+-#if (defined(__APPLE__) || defined(macintosh)) && !defined(DMG_BUILD)
++//#if (defined(__APPLE__) || defined(macintosh)) && !defined(DMG_BUILD)
+ // define this before including iconv.h to avoid a mapping of
+ // iconv_open and friends to libicon_open (done by mac ports),
+ // while the symbols without 'lib' are linked from /usr/lib/libiconv
+-#define LIBICONV_PLUG
+-#endif
++//#define LIBICONV_PLUG
++//#endif
+ #include <iconv.h>
+
+ // These functions are implemented in a C file, because there are different
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151214/89a069ba/attachment-0001.html>
More information about the macports-changes
mailing list