[27705] trunk/dports/x11/gtk2/Portfile

[source_changes at macosforge.org]

Revision: 27705
          http://trac.macosforge.org/projects/macports/changeset/27705
Author:   rhwood at macports.org
Date:     2007-08-12 06:50:02 -0700 (Sun, 12 Aug 2007)

Log Message:
-----------
configure.env -> configure.*flags-append statements
redo dependencies based on trace output
replace ui_msg blah ; exit 1 statements with return 1 blah statements

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2007-08-12 12:03:22 UTC (rev 27704)
+++ trunk/dports/x11/gtk2/Portfile	2007-08-12 13:50:02 UTC (rev 27705)
@@ -26,26 +26,44 @@
 		
 use_bzip2	yes
 
-depends_lib	port:glib2 port:tiff port:libpng port:atk port:pango \
-		port:gettext lib:libX11.6:XFree86
+depends_build	\
+	port:perl5.8 \
+	port:pkgconfig \
+	port:gzip
+depends_lib	\
+	port:cairo \
+	port:fontconfig \
+	port:freetype \
+	port:glib2 \
+	port:jpeg \
+	port:tiff \
+	port:libiconv \
+	port:libpng \
+	port:atk \
+	port:pango \
+	port:gettext \
+	port:render \
+	port:xrender \
+	port:zlib \
+	lib:libX11.6:xorg
 
 pre-configure {
 	if {[variant_isset quartz]} {
 		if { ![file exists ${prefix}/include/cairo/cairo-quartz.h] } {
-			ui_msg "\nYou must first build cairo with the quartz variant enabled.  Please\nuninstall (or deactivate) the cairo port and reinstall by running:\n\n\"port install cairo +quartz\"\n"
-			exit 1
+			return 1 "\nYou must first build cairo with the quartz variant enabled.  Please\nuninstall (or deactivate) the cairo port and reinstall by running:\n\n\"port install cairo +quartz\"\n"
 		}
 	}
 	if {[file exists ${prefix}/bin/cups-config]} {
-		ui_msg "\nThe cups-headers port may prevent building this port.  Please uninstall\n(or deactivate) cups-headers and restart the build.\n"
-		exit 1
+		return 1 "\nThe cups-headers port may prevent building this port.  Please uninstall\n(or deactivate) cups-headers and restart the build.\n"
 	}
 }
+# older CFLAGS declaration - if the default optimization still causes problems
+# we will revert to this
+#	CFLAGS="-O3 -funroll-loops -fstrict-aliasing"
+configure.ldflags-append	-lpango-1.0
+configure.cppflags-append	-no-cpp-precomp -DX_LOCALE
+configure.cflags-append	-funroll-loops -fstrict-aliasing
 
-configure.env	LDFLAGS="-L${prefix}/lib -lpango-1.0" \
-		CPPFLAGS="-I${prefix}/include -no-cpp-precomp -DX_LOCALE" \
-		CFLAGS="-O3 -funroll-loops -fstrict-aliasing"
-
 configure.args	--disable-shm --disable-gtk-doc --with-included-loaders \
 		--mandir=${prefix}/share/man
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070812/77fafd5e/attachment.html