[84823] trunk/dports/graphics/mtpaint

[ryandesign at macports.org]

Revision: 84823
          http://trac.macports.org/changeset/84823
Author:   ryandesign at macports.org
Date:     2011-10-02 07:09:16 -0700 (Sun, 02 Oct 2011)
Log Message:
-----------
mtpaint: enable universal variant

Modified Paths:
--------------
    trunk/dports/graphics/mtpaint/Portfile
    trunk/dports/graphics/mtpaint/files/patch-configure.diff

Modified: trunk/dports/graphics/mtpaint/Portfile
===================================================================
--- trunk/dports/graphics/mtpaint/Portfile	2011-10-02 14:00:32 UTC (rev 84822)
+++ trunk/dports/graphics/mtpaint/Portfile	2011-10-02 14:09:16 UTC (rev 84823)
@@ -25,10 +25,8 @@
                         patch-png.c.diff
 
 configure.args          --mandir=${prefix}/share/man/man1 \
-                        gtk2 man cflags
+                        gtk2 man cflags ldflags
 
-universal_variant       no
-
 variant gtk1 description "use GTK+1 instead of GTK+2" {
     depends_lib-delete port:gtk2 port:freetype
     depends_lib-append port:gtk1

Modified: trunk/dports/graphics/mtpaint/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/mtpaint/files/patch-configure.diff	2011-10-02 14:00:32 UTC (rev 84822)
+++ trunk/dports/graphics/mtpaint/files/patch-configure.diff	2011-10-02 14:09:16 UTC (rev 84823)
@@ -1,6 +1,31 @@
 --- configure.orig	2009-04-15 13:46:26.000000000 -0500
-+++ configure	2011-10-02 08:46:34.000000000 -0500
-@@ -631,7 +631,7 @@
++++ configure	2011-10-02 08:54:54.000000000 -0500
+@@ -264,6 +264,7 @@
+ 				MT_PO_DEST=$MT_LANG_DEST;;
+ 		"--mandir="* )	MT_MAN_DEST="`echo "$A" | sed -e "s/--mandir=//"`";;
+ 		"cflags" )	CFLAG=${CFLAGS};;
++		"ldflags" )	LDFLAG=${LDFLAGS};;
+ 		"--cpu="* )	MARCH='-march='"`echo "$A" | sed -e "s/--cpu=//"`";;
+ 		"icons"* )	ICON_SET=$A;;
+ 		"386" )		MARCH='-march=i386';;
+@@ -360,6 +361,7 @@
+ noxft ........... Don't use Xft in MTK
+ 
+ cflags .......... Use CFLAGS environment variable
++ldflags ......... Use LDFLAGS environment variable
+ --cpu= .......... Target a specific CPU, e.g. athlon-xp, x86-64
+ 686 ............. Target 686 machines
+ 586 ............. Target 586 machines
+@@ -595,7 +597,7 @@
+ 
+ 	I_EX="$I_EX -DVERSION=\"\\\"$MT_VERSION\"\\\""
+ 	GTK_INCLUDE="$GTK_INCLUDE $I_EX"
+-	echo "LDFLAG = $L_EX $GTK_LIB" >> $GTK_FILE
++	echo "LDFLAG = $LDFLAG $L_EX $GTK_LIB" >> $GTK_FILE
+ 
+ 	if [ "$CFLAG" ]
+ 	then
+@@ -631,7 +633,7 @@
  	echo
  	echo "    Version             $MT_V"
  	echo "    System              $OS"
@@ -9,7 +34,18 @@
  if [ "$MTK_DIR" ]
  then
  	echo "MTK - $MTK_DIR"
-@@ -673,30 +673,30 @@
+@@ -660,6 +662,10 @@
+ 	echo "Compiler"
+ 	echo "--------"
+ 	echo
++if [ "$LDFLAG" ]
++then
++	echo "    LDFLAGS             $LDFLAG"
++fi
+ if [ "$CFLAG" ]
+ then
+ 	echo "    CFLAGS              $CFLAG"
+@@ -673,30 +679,30 @@
  	echo "    Debug info          $DEBUG"
  if [ "$STATIC_PNG" ] || [ "$STATIC_GIF" ] || [ "$STATIC_JPEG" ] || [ "$STATIC_JP2" ] || [ "$STATIC_TIFF" ]
  then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111002/fe42f21f/attachment.html>