[72875] trunk/dports/textproc/doxygen

[michaelld at macports.org]

Revision: 72875
          http://trac.macports.org/changeset/72875
Author:   michaelld at macports.org
Date:     2010-10-29 06:52:43 -0700 (Fri, 29 Oct 2010)
Log Message:
-----------
doxygen +wizard: fixed ticket #27057.
Rename doxywizard patch file to fix typo in name and add path.
Fix wizard variant to use new qt4 portgroup variables.
Added comments to better describe what is going on.

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

Added Paths:
-----------
    trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff

Removed Paths:
-------------
    trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff

Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- 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 at 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

Deleted: trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff	2010-10-29 13:48:40 UTC (rev 72874)
+++ trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff	2010-10-29 13:52:43 UTC (rev 72875)
@@ -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

Copied: trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff (from rev 72854, trunk/dports/textproc/doxygen/files/patch-Makfile.in.diff)
===================================================================
--- trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff	                        (rev 0)
+++ trunk/dports/textproc/doxygen/files/patch-addon_doxywizard_Makefile.in.diff	2010-10-29 13:52:43 UTC (rev 72875)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101029/4fb8fc0d/attachment-0001.html>