[110248] trunk/dports/emulators/lisaem

[mojca at macports.org]

Revision: 110248
          https://trac.macports.org/changeset/110248
Author:   mojca at macports.org
Date:     2013-08-29 01:23:46 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
lisaem: use wxWidgets-2.8 or wxgtk-2.8 (#38375)

Modified Paths:
--------------
    trunk/dports/emulators/lisaem/Portfile
    trunk/dports/emulators/lisaem/files/patch-build.sh.diff

Modified: trunk/dports/emulators/lisaem/Portfile
===================================================================
--- trunk/dports/emulators/lisaem/Portfile	2013-08-29 08:20:34 UTC (rev 110247)
+++ trunk/dports/emulators/lisaem/Portfile	2013-08-29 08:23:46 UTC (rev 110248)
@@ -2,10 +2,11 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               wxWidgets 1.0
 
 name                    lisaem
 version                 1.2.6
-revision                1
+revision                2
 maintainers             ryandesign
 platforms               darwin
 categories              emulators
@@ -26,14 +27,10 @@
     sha1 c3552eb2fc89ff6e47994767aa4e524de7000dc7 \
     rmd160 bc541ef181b417ee369ed960f29637f87cc1308a
 
-depends_lib \
-    port:wxWidgets
-
 patchfiles \
     patch-build.sh.diff
 
 use_configure           no
-universal_variant       no
 
 build.cmd               ./build.sh
 build.target            build
@@ -55,6 +52,29 @@
     }
 }
 
+# the two wxWidgets variants can go away if lisaem gets ported to wxWidgets-3.0
+variant wxwidgets28 conflicts wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
+    wxWidgets.use       wxWidgets-2.8
+    depends_lib         port:${wxWidgets.port}
+    build.env           WX_CONFIG=${wxWidgets.wxconfig}
+    destroot.env-append WX_CONFIG=${wxWidgets.wxconfig}
+}
+
+variant wxgtk28 conflicts wxwidgets28 description {Use wxWidgets 2.8 with GTK} {
+    wxWidgets.use       wxGTK-2.8
+    depends_lib         port:${wxWidgets.port}
+    build.env           WX_CONFIG=${wxWidgets.wxconfig}
+    destroot.env-append WX_CONFIG=${wxWidgets.wxconfig}
+}
+
+if {![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
+    if {[vercmp $xcodeversion 4.4] >= 0} {
+        default_variants +wxgtk28
+    } else {
+        default_variants +wxwidgets28
+    }
+}
+
 livecheck.type          regex
 livecheck.url           ${homepage}downloads.html
 livecheck.regex         ${name}-(\[0-9.\]+)\\.tar

Modified: trunk/dports/emulators/lisaem/files/patch-build.sh.diff
===================================================================
--- trunk/dports/emulators/lisaem/files/patch-build.sh.diff	2013-08-29 08:20:34 UTC (rev 110247)
+++ trunk/dports/emulators/lisaem/files/patch-build.sh.diff	2013-08-29 08:23:46 UTC (rev 110248)
@@ -1,6 +1,37 @@
---- build.sh 2007-12-11 08:26:12.000000000 -0600
-+++ build.sh 2008-07-25 18:35:33.000000000 -0500
-@@ -293,7 +293,6 @@
+--- build.sh
++++ build.sh
+@@ -15,6 +15,10 @@ WITHUNICODE="--unicode=no"
+ 
+ #WXDEV=""
+ 
++if [ -z "$WX_CONFIG" ]
++then
++    WX_CONFIG="wx-config"
++fi
+ 
+ ########################################################################
+  VERSION="1.2.6-RELEASE_2007.12.12"
+@@ -154,7 +158,7 @@ WITHBLITS="-DUSE_RAW_BITMAP_ACCESS"
+ else
+ 
+ WXVER=0
+-case "`wx-config --version`" in
++case "`$WX_CONFIG --version`" in
+   2.9*|3*)
+         echo WARNING: wxWidgets versions higher than 2.8 have not been tested.
+         echo It might work if they are compiled with backwards compatibility.
+@@ -190,8 +194,8 @@ fi
+ # purpose of this is to avoid errors on systems that have only unicode.
+ if [ -z "$CYGWIN" ]
+ then
+-  WXREL="`wx-config --release`"
+-  if [ -n "`wx-config --list | grep $WXREL | grep unicode`" ]
++  WXREL="`$WX_CONFIG --release`"
++  if [ -n "`$WX_CONFIG --list | grep $WXREL | grep unicode`" ]
+   then
+     WITHUNICODE="--unicode=yes"
+   fi
+@@ -293,7 +297,6 @@ do
    ;;
   build*)    echo ;;    #default - nothing to do here, this is the default.
   install)   
@@ -8,7 +39,25 @@
              INSTALL=1;
              ;;
  
-@@ -849,15 +848,6 @@
+@@ -462,7 +465,7 @@ if [ -z "$CYGWIN" ]
+ then
+  # many thanks to David Cecchin for finding the unicode issues fixed below.
+ 
+- WXCONFIGFLAGS=`wx-config  --cppflags $WITHUNICODE `
++ WXCONFIGFLAGS=`$WX_CONFIG  --cppflags $WITHUNICODE `
+  if [ -z "$WXCONFIGFLAGS" ]
+  then
+     echo wx-config has failed, or returned an error.  Ensure that it exists in your path.
+@@ -471,7 +474,7 @@ then
+  fi
+  CFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG"
+  CXXFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG"
+- LINKOPTS="`wx-config $STATIC  $WITHUNICODE  --libs --linkdeps --cppflags`"
++ LINKOPTS="`$WX_CONFIG $STATIC  $WITHUNICODE  --libs --linkdeps --cppflags`"
+  if [ -z "$LINKOPTS" ]
+  then
+     echo wx-config has failed, or returned an error.  Ensure that it exists in your path.
+@@ -849,15 +852,6 @@ then
  cd ../bin
  echo -n " "
  
@@ -24,7 +73,7 @@
  
  if [ -n "$DARWIN" ]
  then
-@@ -895,15 +885,25 @@
+@@ -895,15 +889,25 @@ then
      then
        cd ../bin/
        echo Installing LisaEm.app
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/b73d48b0/attachment-0001.html>