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

[css at macports.org]

Revision: 93136
          https://trac.macports.org/changeset/93136
Author:   css at macports.org
Date:     2012-05-15 18:21:24 -0700 (Tue, 15 May 2012)
Log Message:
-----------
doxygen: use `get_canonical_archflags` and bump the revision to pick up recent dependency changes. refs #33836

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

Modified: trunk/dports/textproc/doxygen/Portfile
===================================================================
--- trunk/dports/textproc/doxygen/Portfile	2012-05-16 00:46:56 UTC (rev 93135)
+++ trunk/dports/textproc/doxygen/Portfile	2012-05-16 01:21:24 UTC (rev 93136)
@@ -4,7 +4,7 @@
 
 name			doxygen
 version			1.8.0
-revision		0
+revision		1
 categories		textproc devel
 maintainers		css
 license			GPL-2
@@ -35,7 +35,7 @@
                     sha1    7f4348418dc3efefd357b32a2b5c8010211ab284 \
                     rmd160  b93293f6bbea725382e5ee10f40fd5a84f7df0ec
 
-depends_build-append	bin:perl:perl5 bin:flex:flex bin:bison:bison
+depends_build-append	bin:perl:perl5 port:flex port:bison
 depends_lib		port:libpng path:bin/dot:graphviz port:libiconv
 
 #patchfiles	lion.patch
@@ -75,10 +75,10 @@
 
 post-patch {
 	# ensure correct compilers and compiler options are used
-	reinplace "/^TMAKE_CC\[\[:space:\]\]/s%=.*%= ${configure.cc} ${configure.cppflags} ${arch_flags}%" ${tmake_conf}
-	reinplace "/^TMAKE_CXX\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.cppflags} ${arch_flags}%" ${tmake_conf}
-	reinplace "/^TMAKE_LINK\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.ldflags} ${arch_flags}%" ${tmake_conf}
-	reinplace "/^TMAKE_LINK_SHLIB\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${arch_flags}%" ${tmake_conf}
+	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}
+	reinplace "/^TMAKE_LINK\[\[:space:\]\]/s%=.*%= ${configure.cxx} ${configure.ldflags} [get_canonical_archflags ld]%" ${tmake_conf}
+	reinplace "/^TMAKE_LINK_SHLIB\[\[:space:\]\]/s%=.*%= ${configure.cxx} [get_canonical_archflags ld]%" ${tmake_conf}
 
 	# may not be strictly necessary, but remove trailing '/' from DESTDIR
 	reinplace "s|\$(DESTDIR)/|\$(DESTDIR)|g" ${worksrcpath}/Makefile.in
@@ -161,13 +161,8 @@
 
 platform darwin {
 	# Specify the platform explicitly to avoid a universal build.
-	global tmake_conf arch_flags
+	global tmake_conf
 
 		set tmake_conf	${worksrcpath}/tmake/lib/macosx-c++/tmake.conf
 		configure.args-append	--platform macosx-c++
-	if { ![variant_isset universal] } {
-		set arch_flags ${configure.cc_archflags}
-	} else {
-		set arch_flags ${configure.universal_cflags}
-	}
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120515/599c6e77/attachment-0001.html>