Changeset 110248


Ignore:
Timestamp:
Aug 29, 2013, 8:23:46 AM (6 years ago)
Author:
mojca@…
Message:

lisaem: use wxWidgets-2.8 or wxgtk-2.8 (#38375)

Location:
trunk/dports/emulators/lisaem
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/emulators/lisaem/Portfile

    r102005 r110248  
    33
    44PortSystem              1.0
     5PortGroup               wxWidgets 1.0
    56
    67name                    lisaem
    78version                 1.2.6
    8 revision                1
     9revision                2
    910maintainers             ryandesign
    1011platforms               darwin
     
    2728    rmd160 bc541ef181b417ee369ed960f29637f87cc1308a
    2829
    29 depends_lib \
    30     port:wxWidgets
    31 
    3230patchfiles \
    3331    patch-build.sh.diff
    3432
    3533use_configure           no
    36 universal_variant       no
    3734
    3835build.cmd               ./build.sh
     
    5653}
    5754
     55# the two wxWidgets variants can go away if lisaem gets ported to wxWidgets-3.0
     56variant wxwidgets28 conflicts wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
     57    wxWidgets.use       wxWidgets-2.8
     58    depends_lib         port:${wxWidgets.port}
     59    build.env           WX_CONFIG=${wxWidgets.wxconfig}
     60    destroot.env-append WX_CONFIG=${wxWidgets.wxconfig}
     61}
     62
     63variant wxgtk28 conflicts wxwidgets28 description {Use wxWidgets 2.8 with GTK} {
     64    wxWidgets.use       wxGTK-2.8
     65    depends_lib         port:${wxWidgets.port}
     66    build.env           WX_CONFIG=${wxWidgets.wxconfig}
     67    destroot.env-append WX_CONFIG=${wxWidgets.wxconfig}
     68}
     69
     70if {![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
     71    if {[vercmp $xcodeversion 4.4] >= 0} {
     72        default_variants +wxgtk28
     73    } else {
     74        default_variants +wxwidgets28
     75    }
     76}
     77
    5878livecheck.type          regex
    5979livecheck.url           ${homepage}downloads.html
  • trunk/dports/emulators/lisaem/files/patch-build.sh.diff

    r38627 r110248  
    1 --- build.sh 2007-12-11 08:26:12.000000000 -0600
    2 +++ build.sh 2008-07-25 18:35:33.000000000 -0500
    3 @@ -293,7 +293,6 @@
     1--- build.sh
     2+++ build.sh
     3@@ -15,6 +15,10 @@ WITHUNICODE="--unicode=no"
     4 
     5 #WXDEV=""
     6 
     7+if [ -z "$WX_CONFIG" ]
     8+then
     9+    WX_CONFIG="wx-config"
     10+fi
     11 
     12 ########################################################################
     13  VERSION="1.2.6-RELEASE_2007.12.12"
     14@@ -154,7 +158,7 @@ WITHBLITS="-DUSE_RAW_BITMAP_ACCESS"
     15 else
     16 
     17 WXVER=0
     18-case "`wx-config --version`" in
     19+case "`$WX_CONFIG --version`" in
     20   2.9*|3*)
     21         echo WARNING: wxWidgets versions higher than 2.8 have not been tested.
     22         echo It might work if they are compiled with backwards compatibility.
     23@@ -190,8 +194,8 @@ fi
     24 # purpose of this is to avoid errors on systems that have only unicode.
     25 if [ -z "$CYGWIN" ]
     26 then
     27-  WXREL="`wx-config --release`"
     28-  if [ -n "`wx-config --list | grep $WXREL | grep unicode`" ]
     29+  WXREL="`$WX_CONFIG --release`"
     30+  if [ -n "`$WX_CONFIG --list | grep $WXREL | grep unicode`" ]
     31   then
     32     WITHUNICODE="--unicode=yes"
     33   fi
     34@@ -293,7 +297,6 @@ do
    435   ;;
    536  build*)    echo ;;    #default - nothing to do here, this is the default.
     
    940             ;;
    1041 
    11 @@ -849,15 +848,6 @@
     42@@ -462,7 +465,7 @@ if [ -z "$CYGWIN" ]
     43 then
     44  # many thanks to David Cecchin for finding the unicode issues fixed below.
     45 
     46- WXCONFIGFLAGS=`wx-config  --cppflags $WITHUNICODE `
     47+ WXCONFIGFLAGS=`$WX_CONFIG  --cppflags $WITHUNICODE `
     48  if [ -z "$WXCONFIGFLAGS" ]
     49  then
     50     echo wx-config has failed, or returned an error.  Ensure that it exists in your path.
     51@@ -471,7 +474,7 @@ then
     52  fi
     53  CFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG"
     54  CXXFLAGS="-I. -I../include -I../cpu68k -I../wxui $WXCONFIGFLAGS $WITHOPTIMIZE $WITHDEBUG"
     55- LINKOPTS="`wx-config $STATIC  $WITHUNICODE  --libs --linkdeps --cppflags`"
     56+ LINKOPTS="`$WX_CONFIG $STATIC  $WITHUNICODE  --libs --linkdeps --cppflags`"
     57  if [ -z "$LINKOPTS" ]
     58  then
     59     echo wx-config has failed, or returned an error.  Ensure that it exists in your path.
     60@@ -849,15 +852,6 @@ then
    1261 cd ../bin
    1362 echo -n " "
     
    2574 if [ -n "$DARWIN" ]
    2675 then
    27 @@ -895,15 +885,25 @@
     76@@ -895,15 +889,25 @@ then
    2877     then
    2978       cd ../bin/
Note: See TracChangeset for help on using the changeset viewer.