[69242] trunk/dports/textproc/doxygen/Portfile

[michaelld at macports.org]

Revision: 69242
          http://trac.macports.org/changeset/69242
Author:   michaelld at macports.org
Date:     2010-06-28 23:42:14 -0700 (Mon, 28 Jun 2010)
Log Message:
-----------
Correct use of qt4-mac dependency.

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

Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile	2010-06-29 06:41:27 UTC (rev 69241)
+++ trunk/dports/textproc/doxygen/Portfile	2010-06-29 06:42:14 UTC (rev 69242)
@@ -4,7 +4,7 @@
 
 name			doxygen
 version			1.6.3
-revision		1
+revision		2
 categories		textproc devel
 maintainers		css
 description		Documentation system for several programming languages
@@ -71,9 +71,9 @@
 
 variant wizard description {Include the GUI wizard based on Qt} {
 	configure.env-append	QTDIR=${prefix}/libexec/qt4-mac
-	configure.env-append QMAKE=${prefix}/bin/qmake-mac
+	configure.env-append QMAKE=${prefix}/libexec/qt4-mac/bin/qmake
 	build.env-append	QTDIR=${prefix}/libexec/qt4-mac
-	depends_lib-append	path:bin/qmake-mac:qt4-mac
+	depends_lib-append	port:qt4-mac
 	configure.args-append	--with-doxywizard
 
 	# on Macs, qmake builds .app directories
@@ -81,15 +81,15 @@
 
 	post-patch {
 	  reinplace "s|/Developer/qt-4.4.3|${prefix}/libexec/qt4-mac|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
-    reinplace "s|/Developer/qt/bin/moc|${prefix}/bin/moc-mac|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
+    reinplace "s|/Developer/qt/bin/moc|${prefix}/libexec/qt4-mac/bin/moc|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
     reinplace "s|-arch ppc -arch i386|-arch ${build_arch}|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
-    reinplace "s|/Developer/qt/bin/qmake|${prefix}/bin/qmake-mac|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
+    reinplace "s|/Developer/qt/bin/qmake|${prefix}/libexec/qt4-mac/bin/qmake|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
 		# give doxywizard the more mac-like name of DoxyWizard
 		reinplace "/^TARGET\[\[:space:\]\]/s%=.*%= DoxyWizard%" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in
 		reinplace "/^macx-g++\[\[:space:\]\]{/,/}/d" ${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
-		reinplace "s|QMAKE=qmake|QMAKE=${prefix}/bin/qmake-mac|g" ${worksrcpath}/addon/doxywizard/Makefile.in
+		reinplace "s|QMAKE=qmake|QMAKE=${prefix}/libexec/qt4-mac/bin/qmake|g" ${worksrcpath}/addon/doxywizard/Makefile.in
 	}
 
 	post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100628/d4dcfbbf/attachment.html>