[85606] trunk/dports/devel/PlasmaShop

ryandesign at macports.org ryandesign at macports.org
Fri Oct 14 23:50:25 PDT 2011


Revision: 85606
          http://trac.macports.org/changeset/85606
Author:   ryandesign at macports.org
Date:     2011-10-14 23:50:22 -0700 (Fri, 14 Oct 2011)
Log Message:
-----------
PlasmaShop: update to 3.0 build 158, switch to cmake build system, switch to github hosting, fix livecheck

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

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

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

Modified: trunk/dports/devel/PlasmaShop/Portfile
===================================================================
--- trunk/dports/devel/PlasmaShop/Portfile	2011-10-15 06:27:07 UTC (rev 85605)
+++ trunk/dports/devel/PlasmaShop/Portfile	2011-10-15 06:50:22 UTC (rev 85606)
@@ -2,16 +2,16 @@
 # $Id$
 
 PortSystem                  1.0
+PortGroup                   cmake 1.0
 PortGroup                   qt4 1.0
 
 name                        PlasmaShop
-version                     3.0-127
-revision                    1
+version                     3.0-158
 categories                  devel
 platforms                   darwin
 maintainers                 ryandesign
 license                     GPL-3+
-homepage                    http://alcugs.almlys.org/PlasmaShop
+homepage                    https://github.com/H-uru/PlasmaShop
 
 description                 tool for inspecting and manipulating Plasma game files
 
@@ -23,66 +23,41 @@
                             decompyle/compile Python scripts, sum age files, \
                             etc.
 
-fetch.type                  hg
-hg.url                      http://uru.zrax.net/hg/PlasmaShop/
-hg.tag                      4c278eea53d1
+fetch.type                  git
+git.url                     https://github.com/H-uru/PlasmaShop.git
+git.branch                  c826c6710818e625fea08492b81c952090f3da08
 
 depends_lib-append          port:libhsplasma
 
-set files_being_patched     {
-                            QScintilla/Qt4/qscintilla.pro
-                            config
-                            src/3rdParty/qticonloader.cpp
-                            src/PlasmaShop/PlasmaShop.pro
-                            src/PrpShop/PrpShop.pro
-                            src/VaultShop/VaultShop.pro
-                            }
+patchfiles                  patch-CMakeLists.txt.diff patch-prefix.diff
 
-post-extract {
-    # DOS to UNIX line endings so we can patch properly.
-    foreach file ${files_being_patched} {
-        reinplace "s|\r||g" ${worksrcpath}/${file}
-    }
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" \
+                            ${worksrcpath}/CMakeLists.txt \
+                            ${worksrcpath}/QScintilla/Qt4/qscintilla.pro \
+                            ${worksrcpath}/src/3rdParty/qticonloader.cpp
 }
 
-patchfiles                  patch-prefix.diff patch-config.diff
+configure.pre_args          -DCMAKE_INSTALL_PREFIX=${applications_dir}
 
-variant universal {}
-
-post-patch {
-    foreach file ${files_being_patched} {
-        reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/${file}
-        reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/${file}
+pre-build {
+    foreach {badport badfile} "tidy ${prefix}/include/platform.h" {
+        if {[file exists ${badfile}]} {
+            ui_error "${name} cannot be built while ${badport} is active."
+            ui_error "Please deactivate ${badport} and try again."
+            ui_error "You can reactivate ${badport} again later."
+            return -code error "${badport} is installed"
+        }
     }
-    reinplace "s|@CFLAGS@|${configure.cflags} [get_canonical_archflags]|g" ${worksrcpath}/config
-    reinplace "s|@CXXFLAGS@|${configure.cxxflags} [get_canonical_archflags]|g" ${worksrcpath}/config
-    reinplace "s|@LDFLAGS@|${configure.ldflags} [get_canonical_archflags]|g" ${worksrcpath}/config
 }
 
-configure.cmd               ${qt_qmake_cmd}
-configure.pre_args
-
-configure.universal_args-delete --disable-dependency-tracking
-
-# http://forum.guildofwriters.com/viewtopic.php?f=86&t=4145#p40027
-use_parallel_build          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
 }
 
 livecheck.type              regex
-livecheck.url               ${hg.url}
+livecheck.url               https://raw.github.com/H-uru/PlasmaShop/master/src/PlasmaShop/Main.h
 livecheck.version           [lindex [split ${version} -] 1]
-livecheck.regex             {rev (\d+)}
+livecheck.regex             {\(build (\d+)\)}

Added: trunk/dports/devel/PlasmaShop/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/PlasmaShop/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/devel/PlasmaShop/files/patch-CMakeLists.txt.diff	2011-10-15 06:50:22 UTC (rev 85606)
@@ -0,0 +1,28 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -1,5 +1,5 @@
+ project(PlasmaShop)
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.6.2)
+ 
+ find_package(HSPlasma REQUIRED)
+ 
+@@ -11,8 +11,16 @@ add_subdirectory(QScintilla/Qt4)
+ if(WIN32)
+     add_definitions(-DPLAT_FONT="Courier New")
+ else(WIN32)
+-    add_definitions(-DPLAT_FONT="Monospace")
+-    add_definitions(-DDATA_PATH="/usr/local/share/PlasmaShop")
++    if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
++        if(CMAKE_SYSTEM_VERSION VERSION_LESS 10)
++            add_definitions(-DPLAT_FONT="Monaco")
++        else(CMAKE_SYSTEM_VERSION VERSION_LESS 10)
++            add_definitions(-DPLAT_FONT="Menlo")
++        endif(CMAKE_SYSTEM_VERSION VERSION_LESS 10)
++    else(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
++        add_definitions(-DPLAT_FONT="Monospace")
++    endif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
++    add_definitions(-DDATA_PATH="@PREFIX@/share/PlasmaShop")
+ endif(WIN32)
+ 
+ # do this after QScintilla - it'd generate tons of warnings

Deleted: trunk/dports/devel/PlasmaShop/files/patch-config.diff
===================================================================
--- trunk/dports/devel/PlasmaShop/files/patch-config.diff	2011-10-15 06:27:07 UTC (rev 85605)
+++ trunk/dports/devel/PlasmaShop/files/patch-config.diff	2011-10-15 06:50:22 UTC (rev 85606)
@@ -1,24 +0,0 @@
---- config.orig	Tue Nov 16 15:07:59 2010 -0800
-+++ config	Sat Nov 20 22:36:50 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_LFLAGS += @LDFLAGS@

Modified: trunk/dports/devel/PlasmaShop/files/patch-prefix.diff
===================================================================
--- trunk/dports/devel/PlasmaShop/files/patch-prefix.diff	2011-10-15 06:27:07 UTC (rev 85605)
+++ trunk/dports/devel/PlasmaShop/files/patch-prefix.diff	2011-10-15 06:50:22 UTC (rev 85606)
@@ -29,39 +29,3 @@
      
      dataDirs += QLatin1Char(':') + kdeHome() + QLatin1String("/share");
      dataDirs.prepend(QDir::homePath() + QLatin1String("/:"));
---- src/PlasmaShop/PlasmaShop.pro.orig	Tue Nov 16 15:07:59 2010 -0800
-+++ src/PlasmaShop/PlasmaShop.pro	Sat Nov 20 01:31:07 2010 -0600
-@@ -25,9 +25,9 @@
- }
- 
- !win32 {
--    target.path = /usr/local/bin
-+    target.path = @APPLICATIONS_DIR@
-     INSTALLS += target
--    DEFINES += DATA_PATH="\"\\\"/usr/local/share/PlasmaShop\\\"\""
-+    DEFINES += DATA_PATH="\"\\\"@PREFIX@/share/PlasmaShop\\\"\""
- }
- 
- # PlasmaShop Sources
---- src/PrpShop/PrpShop.pro.orig	Tue Nov 16 15:07:59 2010 -0800
-+++ src/PrpShop/PrpShop.pro	Sat Nov 20 01:31:07 2010 -0600
-@@ -23,7 +23,7 @@
- }
- 
- !win32 {
--    target.path = /usr/local/bin
-+    target.path = @APPLICATIONS_DIR@
-     INSTALLS += target
- }
- 
---- src/VaultShop/VaultShop.pro.orig	Tue Nov 16 15:07:59 2010 -0800
-+++ src/VaultShop/VaultShop.pro	Sat Nov 20 01:31:07 2010 -0600
-@@ -17,7 +17,7 @@
- }
- 
- !win32 {
--    target.path = /usr/local/bin
-+    target.path = @APPLICATIONS_DIR@
-     INSTALLS += target
- }
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111014/bc54951c/attachment.html>


More information about the macports-changes mailing list