Modified: trunk/dports/textproc/doxygen/Portfile (72874 => 72875)

--- trunk/dports/textproc/doxygen/Portfile	2010-10-29 13:48:40 UTC (rev 72874)
+++ trunk/dports/textproc/doxygen/Portfile	2010-10-29 13:52:43 UTC (rev 72875)
@@ -71,29 +71,40 @@
 }
 
 variant wizard description {Include the GUI wizard based on Qt4} {
-	PortGroup qt4 1.0
-	configure.args-append	--with-doxywizard
+    # use the Qt4 PortGroup, which provides a bunch of variables
+    # and defines for how Qt4 was installed
+    PortGroup qt4 1.0
 
-	# on Macs, qmake builds .app directories
-	patchfiles-append	patch-Makfile.in.diff
+    # tell configure to make the wizard app
+    configure.args-append	--with-doxywizard
 
-	post-patch {
-	  reinplace "s|/Developer/qt-4.4.3|${qt_dir}|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
-    reinplace "s|/Developer/qt/bin/moc|${qt_moc_cmd}|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard
-    reinplace "s|/Developer/qt/bin/qmake|${qt_qmake_cmd}|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 "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=${qt_qmake_cmd}|g" ${worksrcpath}/addon/doxywizard/Makefile.in
+	# 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
 
-		if { ![variant_isset universal] } {
-			reinplace "s|x86 ppc|[string map {i386 x86} ${build_arch}]|g" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in
-		} else {
-			reinplace "s|x86 ppc|[string map {i386 x86} ${universal_archs}]|g" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in
-		}
-	}
+    post-patch {
+        # allow for universal building, if desired
+        reinplace "/CONFIG/s@x86 ppc@${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
+
+        # allow DESTROOT to work
+        reinplace "s|\$(INSTALL)|\$(DESTDIR)\$(INSTALL)|g" \
+            ${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