[73639] trunk/dports/devel/PlasmaShop

[ryandesign at macports.org]

Revision: 73639
          http://trac.macports.org/changeset/73639
Author:   ryandesign at macports.org
Date:     2010-11-20 02:23:32 -0800 (Sat, 20 Nov 2010)
Log Message:
-----------
PlasmaShop: specify a default monospaced editor font for Mac OS X

Modified Paths:
--------------
    trunk/dports/devel/PlasmaShop/Portfile
    trunk/dports/devel/PlasmaShop/files/patch-prefix.diff

Added Paths:
-----------
    trunk/dports/devel/PlasmaShop/files/patch-config.diff

Removed Paths:
-------------
    trunk/dports/devel/PlasmaShop/files/patch-flags.diff

Modified: trunk/dports/devel/PlasmaShop/Portfile
===================================================================
--- trunk/dports/devel/PlasmaShop/Portfile	2010-11-20 10:23:14 UTC (rev 73638)
+++ trunk/dports/devel/PlasmaShop/Portfile	2010-11-20 10:23:32 UTC (rev 73639)
@@ -6,6 +6,7 @@
 
 name                        PlasmaShop
 version                     3.0-127
+revision                    1
 categories                  devel
 platforms                   darwin
 maintainers                 ryandesign
@@ -44,7 +45,7 @@
     }
 }
 
-patchfiles                  patch-prefix.diff patch-flags.diff
+patchfiles                  patch-prefix.diff patch-config.diff
 
 post-patch {
     foreach file ${files_being_patched} {
@@ -65,6 +66,15 @@
 universal_variant           no
 
 platform darwin {
+    if {${os.major} < 10} {
+        set font Monaco
+    } else {
+        set font Menlo
+    }
+    post-patch {
+        reinplace "s|@FONT@|${font}|g" ${worksrcpath}/config
+    }
+    
     # http://www.ogre3d.org/forums/viewtopic.php?t=9949#p71474
     configure.cflags-append     -DGL_GLEXT_LEGACY
     configure.cxxflags-append   -DGL_GLEXT_LEGACY

Copied: trunk/dports/devel/PlasmaShop/files/patch-config.diff (from rev 73634, trunk/dports/devel/PlasmaShop/files/patch-flags.diff)
===================================================================
--- trunk/dports/devel/PlasmaShop/files/patch-config.diff	                        (rev 0)
+++ trunk/dports/devel/PlasmaShop/files/patch-config.diff	2010-11-20 10:23:32 UTC (rev 73639)
@@ -0,0 +1,24 @@
+--- config.orig	Tue Nov 16 15:07:59 2010 -0800
++++ config	Sat Nov 20 03:53:51 2010 -0600
+@@ -1,10 +1,12 @@
+ # Configure where libHSPlasma is installed
+-PLASMA_PATH=<<EDIT ME>>
++PLASMA_PATH=@PREFIX@
+ PLAT_BITS=
+ 
+ # QScintilla Defaults
+ win32 {
+     DEFINES += PLAT_FONT="\"\\\"Courier New\\\"\""
++} else:macx {
++    DEFINES += PLAT_FONT="\"\\\"@FONT@\\\"\""
+ } else {
+     DEFINES += PLAT_FONT="\"\\\"Droid Sans Mono\\\"\""
+ }
+@@ -21,3 +21,7 @@
+     INCLUDEPATH *= $${PLASMA_PATH}/include/HSPlasmaNet
+     LIBS        *= -L$${PLASMA_PATH}/lib -lHSPlasmaNet
+ }
++
++QMAKE_CFLAGS += @CFLAGS@
++QMAKE_CXXFLAGS += @CXXFLAGS@
++QMAKE_LDFLAGS += @LDFLAGS@

Deleted: trunk/dports/devel/PlasmaShop/files/patch-flags.diff
===================================================================
--- trunk/dports/devel/PlasmaShop/files/patch-flags.diff	2010-11-20 10:23:14 UTC (rev 73638)
+++ trunk/dports/devel/PlasmaShop/files/patch-flags.diff	2010-11-20 10:23:32 UTC (rev 73639)
@@ -1,10 +0,0 @@
---- config.orig	Tue Nov 16 15:07:59 2010 -0800
-+++ config	Sat Nov 20 02:38:59 2010 -0600
-@@ -21,3 +21,7 @@
-     INCLUDEPATH *= $${PLASMA_PATH}/include/HSPlasmaNet
-     LIBS        *= -L$${PLASMA_PATH}/lib -lHSPlasmaNet
- }
-+
-+QMAKE_CFLAGS += @CFLAGS@
-+QMAKE_CXXFLAGS += @CXXFLAGS@
-+QMAKE_LDFLAGS += @LDFLAGS@

Modified: trunk/dports/devel/PlasmaShop/files/patch-prefix.diff
===================================================================
--- trunk/dports/devel/PlasmaShop/files/patch-prefix.diff	2010-11-20 10:23:14 UTC (rev 73638)
+++ trunk/dports/devel/PlasmaShop/files/patch-prefix.diff	2010-11-20 10:23:32 UTC (rev 73639)
@@ -9,15 +9,6 @@
      INSTALLS += target
  }
  
---- config.orig	Tue Nov 16 15:07:59 2010 -0800
-+++ config	Sat Nov 20 01:26:15 2010 -0600
-@@ -1,5 +1,5 @@
- # Configure where libHSPlasma is installed
--PLASMA_PATH=<<EDIT ME>>
-+PLASMA_PATH=@PREFIX@
- PLAT_BITS=
- 
- # QScintilla Defaults
 --- src/3rdParty/qticonloader.cpp.orig	Tue Nov 16 15:07:59 2010 -0800
 +++ src/3rdParty/qticonloader.cpp	Sat Nov 20 01:35:36 2010 -0600
 @@ -170,7 +170,7 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101120/8facce56/attachment.html>