[46488] trunk/dports/textproc/doxygen
mcalhoun at macports.org
mcalhoun at macports.org
Thu Feb 5 10:09:50 PST 2009
Revision: 46488
http://trac.macports.org/changeset/46488
Author: mcalhoun at macports.org
Date: 2009-02-05 10:09:35 -0800 (Thu, 05 Feb 2009)
Log Message:
-----------
doxygen: Update version 1.5.7.1 --> 1.5.8.
Doxygen now uses Qt4, which is why there are so many changes concerning the wizard variant.
Make coreutils, pdflatex, and gs build dependencies.
Add perl, flex, and bison to build dependencies.
Fixes #18264 (maintainer timeout).
Modified Paths:
--------------
trunk/dports/textproc/doxygen/Portfile
Added Paths:
-----------
trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff
Removed Paths:
-------------
trunk/dports/textproc/doxygen/files/Info.plist
trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.doxywizard
trunk/dports/textproc/doxygen/files/patch-portable.cpp
trunk/dports/textproc/doxygen/files/patch-qfiledefs_p.h
Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile 2009-02-05 17:52:34 UTC (rev 46487)
+++ trunk/dports/textproc/doxygen/Portfile 2009-02-05 18:09:35 UTC (rev 46488)
@@ -3,7 +3,7 @@
PortSystem 1.0
name doxygen
-version 1.5.7.1
+version 1.5.8
categories textproc devel
maintainers css
description Documentation system for several programming languages
@@ -27,40 +27,30 @@
master_sites ftp://ftp.stack.nl/pub/users/dimitri/
distfiles ${distname}.src${extract.suffix}
-checksums md5 bc35dfd52bdae0247b862e67e0cbe7d7 \
- sha1 aecb0c453f76e900eb2aa8132ad063215005fca3 \
- rmd160 f9614bb076d6531334a212a95dfbb862a7502c69
+checksums md5 7438b7ff875d522f02860eea39261953 \
+ sha1 a55b1c41417be8acb3ac5e1553a711ffa437cba2 \
+ rmd160 e392cd00960c4036661c8cda3ec6bc6ee3fe300c
-depends_lib lib:libpng:libpng bin:dot:graphviz \
- bin:ginstall:coreutils port:libiconv
+# configure script will use either install or ginstall, so depend on bin:install:coreutils even though
+# coreutils might not install install.
+depends_build-append bin:perl:perl5 bin:flex:flex bin:bison:bison bin:install:coreutils
+depends_lib port:libpng port:graphviz port:libiconv
universal_variant no
-# setup to work smoothly with Qt3
-post-patch {
- reinplace "s|\$(QTDIR)/include|\$(QTDIR)/include/qt3|g" \
- ${tmake_conf}
- reinplace "s|@@PREFIX@@|${prefix}|g" \
- ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
- reinplace "s|@@X11PREFIX@@|${x11prefix}|g" \
- ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
-}
-
-# Patch support for Tiger--no longer needed as of 1.5.6?
-#patchfiles patch-qfiledefs_p.h
-
configure.pre_args --prefix ${prefix}
configure.args --docdir ${prefix}/share/doc --dot ${prefix}/bin/dot
-configure.env QTDIR=${prefix}
-post-configure {
+post-patch {
reinplace "/^TMAKE_CC\[\[:space:\]\]/s%=.*%= ${configure.cc}%" ${tmake_conf}
reinplace "/^TMAKE_CXX\[\[:space:\]\]/s%=.*%= ${configure.cxx}%" ${tmake_conf}
reinplace "/^TMAKE_LINK\[\[:space:\]\]/s%=.*%= ${configure.cxx}%" ${tmake_conf}
reinplace "/^TMAKE_LINK_SHLIB\[\[:space:\]\]/s%=.*%= ${configure.cxx}%" ${tmake_conf}
+
+ # may not be strictly necessary, but remove trailing '/' from DESTDIR
+ reinplace "s|\$(DESTDIR)/|\$(DESTDIR)|g" ${worksrcpath}/Makefile.in
}
-build.env QTDIR=${prefix}
build.target all
destroot.target install
@@ -71,13 +61,31 @@
variant docs description {Include the doxygen PDF documentation and LaTeX} {
build.target-append pdf
destroot.target-append install_docs
- depends_lib-append bin:pdflatex:texlive \
+ depends_build-append bin:pdflatex:texlive \
bin:gs:ghostscript
}
variant wizard description {Include the GUI wizard based on Qt} {
- depends_lib-append lib:libqt-mt:qt3
+ configure.env-append QTDIR=${prefix}/libexec/qt4-mac
+ build.env-append QTDIR=${prefix}/libexec/qt4-mac
+ depends_lib-append port:qt4-mac
configure.args-append --with-doxywizard
+
+ # on Macs, qmake builds .app directories
+ patchfiles-append patch-Makfile.in.diff
+
+ post-patch {
+ # give doxywizard the more mac-like name of DoxyWizard
+ reinplace "/^TARGET\[\[:space:\]\]/s%=.*%= DoxyWizard%" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in
+
+ reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|" ${worksrcpath}/addon/doxywizard/Makefile.in
+ reinplace "s|\$(INSTALL)|\$(DESTDIR)\$(INSTALL)|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
+ }
}
platform darwin {
@@ -85,14 +93,4 @@
global tmake_conf
set tmake_conf ${worksrcpath}/tmake/lib/macosx-c++/tmake.conf
configure.args-append --platform macosx-c++
- if {[variant_isset wizard]} {
- post-destroot {
- set dpappdir ${destroot}/Applications/MacPorts
- xinstall -m 755 -d ${dpappdir}/doxywizard.app/Contents/MacOS
- file rename ${destroot}${prefix}/bin/doxywizard \
- ${dpappdir}/doxywizard.app/Contents/MacOS/
- xinstall -m 644 ${filespath}/Info.plist \
- ${dpappdir}/doxywizard.app/Contents/
- }
- }
}
Deleted: trunk/dports/textproc/doxygen/files/Info.plist
===================================================================
--- trunk/dports/textproc/doxygen/files/Info.plist 2009-02-05 17:52:34 UTC (rev 46487)
+++ trunk/dports/textproc/doxygen/files/Info.plist 2009-02-05 18:09:35 UTC (rev 46488)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleGetInfoString</key>
- <string>Built with Qt</string>
- <key>CFBundleName</key>
- <string>doxywizard</string>
- <key>CFBundleGetInfoString</key>
- <string>doxywizard 1.4.4</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleExecutable</key>
- <string>doxywizard</string>
-</dict>
-</plist>
Added: trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff (rev 0)
+++ trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff 2009-02-05 18:09:35 UTC (rev 46488)
@@ -0,0 +1,12 @@
+--- 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-addon_doxywizard_Makefile.doxywizard
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.doxywizard 2009-02-05 17:52:34 UTC (rev 46487)
+++ trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.doxywizard 2009-02-05 18:09:35 UTC (rev 46488)
@@ -1,13 +0,0 @@
---- addon/doxywizard/Makefile.doxywizard.orig Mon Mar 28 01:38:39 2005
-+++ addon/doxywizard/Makefile.doxywizard Mon Mar 28 21:04:22 2005
-@@ -24,8 +24,8 @@
- INCPATH = -I../../src -I$(QTDIR)/include
- LINK = g++
- LFLAGS = -g
--LIBS = -L$(QTDIR)/lib -lqt-mt -L/usr/X11R6/lib -lXext -lX11 -lm
--MOC = /usr/qt/3/bin/moc
-+LIBS = -L$(QTDIR)/lib -lqt-mt -L@@X11PREFIX@@/lib -lXext -lX11 -lm
-+MOC = @@PREFIX@@/bin/moc
-
- TAR = tar -cf
- GZIP = gzip -9f
Deleted: trunk/dports/textproc/doxygen/files/patch-portable.cpp
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-portable.cpp 2009-02-05 17:52:34 UTC (rev 46487)
+++ trunk/dports/textproc/doxygen/files/patch-portable.cpp 2009-02-05 18:09:35 UTC (rev 46488)
@@ -1,11 +0,0 @@
---- ./src/portable.cpp.orig 2007-07-17 11:38:43.000000000 +0200
-+++ ./src/portable.cpp 2007-10-28 16:46:19.000000000 +0100
-@@ -373,7 +373,7 @@ void * portable_iconv_open(const char* t
- size_t portable_iconv (void *cd, const char** inbuf, size_t *inbytesleft,
- char** outbuf, size_t *outbytesleft)
- {
--#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109)) || defined(_OS_SOLARIS_))
-+#if ((defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION>=0x0109) && !defined(__APPLE__)) || defined(_OS_SOLARIS_))
- #define CASTNEEDED(x) (x)
- #else
- #define CASTNEEDED(x) (char **)(x)
Deleted: trunk/dports/textproc/doxygen/files/patch-qfiledefs_p.h
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-qfiledefs_p.h 2009-02-05 17:52:34 UTC (rev 46487)
+++ trunk/dports/textproc/doxygen/files/patch-qfiledefs_p.h 2009-02-05 18:09:35 UTC (rev 46488)
@@ -1,12 +0,0 @@
-diff -ru doxygen-1.5.5/qtools/qfiledefs_p.h doxygen-dev/qtools/qfiledefs_p.h
---- qtools/qfiledefs_p.h 2007-11-18 08:15:43.000000000 -0500
-+++ qtools/qfiledefs_p.h 2008-02-13 11:16:21.000000000 -0500
-@@ -56,7 +56,7 @@
- # include <sys/types.h>
- # include <sys/stat.h>
- #elif defined(_OS_MAC_) \
-- && (MAC_OS_X_VERSION_MAX_ALLOWED==MAC_OS_X_VERSION_10_5)
-+ && (MAC_OS_X_VERSION_MAX_ALLOWED>=MAC_OS_X_VERSION_10_4)
- # include <sys/types.h>
- # include <sys/stat.h>
- # define _OS_UNIX_
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090205/933cb0f0/attachment-0001.html>
More information about the macports-changes
mailing list