[104112] trunk/dports/textproc/doxygen
larryv at macports.org
larryv at macports.org
Fri Mar 15 22:20:38 PDT 2013
Revision: 104112
https://trac.macports.org/changeset/104112
Author: larryv at macports.org
Date: 2013-03-15 22:20:38 -0700 (Fri, 15 Mar 2013)
Log Message:
-----------
doxygen: Update to 1.8.3.1, move graphviz dependency to +docs (maintainer timeout, #38217).
Modified Paths:
--------------
trunk/dports/textproc/doxygen/Portfile
trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff
trunk/dports/textproc/doxygen/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/textproc/doxygen/files/patch-doc-Makefile.in.diff
Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile 2013-03-16 04:57:21 UTC (rev 104111)
+++ trunk/dports/textproc/doxygen/Portfile 2013-03-16 05:20:38 UTC (rev 104112)
@@ -4,8 +4,7 @@
PortSystem 1.0
name doxygen
-version 1.8.3
-revision 3
+version 1.8.3.1
categories textproc devel
maintainers css
license GPL-2
@@ -36,27 +35,15 @@
distfiles ${distname}.src${extract.suffix}
checksums ${distname}.src${extract.suffix} \
- md5 54245ba38a30f50fd7ae6e62fc05de15 \
- sha1 e74240f445e08b782fa7a3de5f0b333901307587 \
- rmd160 fa1fa1c38dc1d26104b5c4e9cbb9e118f830378d
+ rmd160 a3221d71eb190820e6352e96d8e94e5869f071d5 \
+ sha256 0c749f68101b6c04ccb0d9696dd37836a6ba62cd8002add275058a975ee72b55
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.pre_args -p1
-configure.universal_args-delete \
- --disable-dependency-tracking
-
-configure.pre_args --prefix ${prefix}
-configure.args --docdir ${prefix}/share/doc \
- --dot ${prefix}/bin/dot
-
post-extract {
# Use our flex
delete ${worksrcpath}/src/ce_lex.cpp
@@ -84,7 +71,10 @@
delete ${worksrcpath}/src/vhdlparser.h
}
+patchfiles patch-configure.diff
post-patch {
+ reinplace "s/echo -n/printf/g" ${worksrcpath}/configure
+
# 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} [get_canonical_archflags cxx]%" ${tmake_conf}
@@ -106,6 +96,13 @@
}
}
+build.type gnu
+
+configure.universal_args-delete \
+ --disable-dependency-tracking
+configure.pre_args --prefix ${prefix}
+configure.args --make ${build.cmd}
+
build.target all
destroot.target install
@@ -114,9 +111,18 @@
MAN1DIR=share/man/man1
variant docs description {Include the doxygen PDF documentation and LaTeX} requires {latex} {
- destroot.target-append install_docs
+ patchfiles-delete patch-configure.diff
+ patchfiles-append patch-doc-Makefile.in.diff
+
+ configure.args-append --docdir ${prefix}/share/doc \
+ --dot ${prefix}/bin/dot
+
+ depends_build-append path:bin/dot:graphviz \
+ bin:python2.7:python27
build.target-append pdf
use_parallel_build no
+
+ destroot.target-append install_docs
}
variant latex description {Support LaTeX/PDF doxygen output} {
Modified: trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff 2013-03-16 04:57:21 UTC (rev 104111)
+++ trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff 2013-03-16 05:20:38 UTC (rev 104112)
@@ -1,5 +1,5 @@
---- 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
+--- 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:
Modified: trunk/dports/textproc/doxygen/files/patch-configure.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-configure.diff 2013-03-16 04:57:21 UTC (rev 104111)
+++ trunk/dports/textproc/doxygen/files/patch-configure.diff 2013-03-16 05:20:38 UTC (rev 104112)
@@ -1,93 +1,30 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=673218
---- a/configure.orig 2012-12-27 05:24:51.000000000 -0600
-+++ b/configure 2013-02-13 16:49:09.000000000 -0600
-@@ -265,7 +265,7 @@
- fi
+--- configure.orig 2012-12-27 06:24:51.000000000 -0500
++++ configure 2013-03-07 16:41:38.000000000 -0500
+@@ -379,27 +379,6 @@
+ echo "using $f_insttool";
- if test "$f_plf_auto" = NO; then
-- echo -n " Checking for platform $f_platform... "
-+ printf " Checking for platform $f_platform... "
- if test '!' -d tmake/lib/$f_platform; then
- echo "not supported!"
- echo
-@@ -279,7 +279,7 @@
- if test "$f_wizard" = YES; then
- if test -z "$QTDIR"; then
- echo " QTDIR environment variable not set!"
-- echo -n " Checking for Qt..."
-+ printf " Checking for Qt..."
- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do
- if test -x "$d/bin/qmake"; then
- QTDIR=$d
-@@ -287,7 +287,7 @@
- done
- else
- echo " Detected Qt via the QTDIR environment variable..."
-- echo -n " "
-+ printf " "
- fi
- if test -z "$QTDIR"; then
- echo "QTDIR not set and Qt not found at standard locations!"
-@@ -317,7 +317,7 @@
-
- # - check for make ------------------------------------------------------------
--echo -n " Checking for GNU make tool... "
-+printf " Checking for GNU make tool... "
- if test "$f_make" = NO; then
- make_names="gmake make"
- make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-@@ -344,7 +344,7 @@
-
- # - check for install ------------------------------------------------------------
-
--echo -n " Checking for GNU install tool... "
-+printf " Checking for GNU install tool... "
- if test "$f_insttool" = NO; then
- install_names="ginstall install"
- install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb"
-@@ -381,7 +381,7 @@
-
- # - check for dot ------------------------------------------------------------
-
+-# - check for dot ------------------------------------------------------------
+-
-echo -n " Checking for dot (part of GraphViz)... "
-+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
-@@ -402,7 +402,7 @@
-
+-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 perl ------------------------------------------------------------
--echo -n " Checking for perl... "
-+printf " Checking for perl... "
- if test "$f_perl" = NO; then
- perl_names="perl perl5"
- perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
-@@ -435,7 +435,7 @@
-
- # - check for flex ------------------------------------------------------------
-
--echo -n " Checking for flex... "
-+printf " Checking for flex... "
- if test "$f_flex" = NO; then
- flex_dirs="$bin_dirs /usr/bin /usr/local/bin /bin"
- flex_prog=NO
-@@ -459,7 +459,7 @@
-
- # - check for bison ------------------------------------------------------------
-
--echo -n " Checking for bison... "
-+printf " Checking for bison... "
- if test "$f_bison" = NO; then
- bison_dirs="$bin_dirs /usr/bin /usr/local/bin /bin"
- bison_prog=NO
-@@ -707,7 +707,7 @@
- if test -f "src/lang_cfg.h"; then
- chmod u+w src/lang_cfg.h # make sure file can be overwritten
- fi
--echo -n " Generating src/lang_cfg.h..."
-+printf " Generating src/lang_cfg.h..."
- echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>);
- chomp @l;
- @allowed=(split(/,/,"NL,SV,CZ,FR,ID,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,MK,BR,DK,SK,UA,GR,TW,SR,CA,LT,ZA,AR,FA,SC,VI,TR,EO,AM"));
+ echo -n " Checking for perl... "
Added: trunk/dports/textproc/doxygen/files/patch-doc-Makefile.in.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-doc-Makefile.in.diff (rev 0)
+++ trunk/dports/textproc/doxygen/files/patch-doc-Makefile.in.diff 2013-03-16 05:20:38 UTC (rev 104112)
@@ -0,0 +1,10 @@
+--- doc/Makefile.in.orig 2012-01-29 10:11:54.000000000 -0500
++++ doc/Makefile.in 2013-03-08 00:12:58.000000000 -0500
+@@ -31,6 +31,6 @@
+ language: language.doc
+
+ language.doc: $(wildcard ../src/translator*.h) maintainers.txt language.tpl translator.py
+- python translator.py
++ python2.7 translator.py
+
+ FORCE:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130315/039ffa82/attachment.html>
More information about the macports-changes
mailing list