[107337] trunk/dports/devel/qscintilla

25 Jun 2013

Revision: 107337
          https://trac.macports.org/changeset/107337
Author:   michaelld@macports.org
Date:     2013-06-25 11:53:17 -0700 (Tue, 25 Jun 2013)
Log Message:
-----------
qscintilla:
* update to latest release (2.7.2);
* update master_sites to use sourceforge only;
* update livecheck;
* add myself as maintainer.

Modified Paths:
--------------
    trunk/dports/devel/qscintilla/Portfile
    trunk/dports/devel/qscintilla/files/Qsci.pro
    trunk/dports/devel/qscintilla/files/patch-add_debug.diff

Modified: trunk/dports/devel/qscintilla/Portfile
===================================================================

--- trunk/dports/devel/qscintilla/Portfile	2013-06-25 18:52:24 UTC (rev 107336)
+++ trunk/dports/devel/qscintilla/Portfile	2013-06-25 18:53:17 UTC (rev 107337)
@@ -5,11 +5,10 @@
 PortGroup           qt4 1.0
 
 name                qscintilla
-version             2.4.6
-revision            0
+version             2.7.2
 categories          devel
 license             {GPL-2 GPL-3 OpenSSLException}
-maintainers         nomaintainer
+maintainers         michaelld openmaintainer
 description         QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control.
 homepage            http://www.riverbankcomputing.com/software/qscintilla/
 platforms           darwin
@@ -31,17 +30,12 @@
 #
 
 distname            QScintilla-gpl-${version}
-master_sites        http://www.riverbankcomputing.com/static/Downloads/QScintilla2/ \
-                    http://gentoo.mirrors.easynews.com/linux/gentoo/distfiles/ \
-                    http://www.gtlib.gatech.edu/pub/gentoo/distfiles/ \
-                    http://gentoo.osuosl.org/distfiles/
+master_sites        sourceforge:pyqt
 
-checksums           md5     424a89736b900e6ca5bc6d929cdafaf8 \
-                    sha1    0527feedf74186a02ca0757d71be0c790149f674 \
-                    rmd160  b48880e3e0fa0d285f04bf7ceb509f509d684929
+checksums           md5     0fbfb06078f206a241a62c94861cce21 \
+                    sha1    2a11fb6be2c3005bc6502f929a0a339d4303af9b \
+                    rmd160  09552e7c41695822e7eebf86781901c7de90e521
 
-universal_variant   yes
-
 # fix up QMake .pro files for +debug, if selected; also fixed up the
 # library and header paths to include .. and ../Qt4 before others.
 patchfiles-append   patch-add_debug.diff
@@ -50,9 +44,9 @@
     # allow for universal and non-native building, if desired, by
     # fixing up the QMake .pro files.
     reinplace "s/@ARCHES@/${qt_arch_types}/" \
-        ${worksrcpath}/Qt4/qscintilla.pro
+        ${worksrcpath}/Qt4Qt5/qscintilla.pro
     reinplace "s/@ARCHES@/${qt_arch_types}/" \
-        ${worksrcpath}/designer-Qt4/designer.pro
+        ${worksrcpath}/designer-Qt4Qt5/designer.pro
 
     # fix up 'Platform.h's, to avoid a conflict with the port 'tidy's
     # 'platform.h'.
@@ -66,18 +60,18 @@
         set build_type "debug_and_release build_all"
     }
     reinplace "s/@BUILD_TYPE@/${build_type}/" \
-        ${worksrcpath}/designer-Qt4/designer.pro
+        ${worksrcpath}/designer-Qt4Qt5/designer.pro
     reinplace "s/@BUILD_TYPE@/${build_type}/" \
-        ${worksrcpath}/Qt4/qscintilla.pro
+        ${worksrcpath}/Qt4Qt5/qscintilla.pro
 
     # drop in a simple QMake file, for easy building
     copy ${filespath}/Qsci.pro ${worksrcpath}
 
     # rename QMake .pro files in subdirs to work with top-level file
-    move ${worksrcpath}/Qt4/qscintilla.pro \
-        ${worksrcpath}/Qt4/Qt4.pro
-    move ${worksrcpath}/designer-Qt4/designer.pro \
-        ${worksrcpath}/designer-Qt4/designer-Qt4.pro
+    move ${worksrcpath}/Qt4Qt5/qscintilla.pro \
+        ${worksrcpath}/Qt4Qt5/Qt4Qt5.pro
+    move ${worksrcpath}/designer-Qt4Qt5/designer.pro \
+        ${worksrcpath}/designer-Qt4Qt5/designer-Qt4Qt5.pro
 }
 
 # QMake does not handle this flag.
@@ -98,5 +92,5 @@
 description {Produce both release and debug library and plugin} {}
 
 livecheck.type      regex
-livecheck.url       ${master_sites}
-livecheck.regex     QScintilla-gpl-\(\\d+.\\d+.\\d+\).tar.gz
+livecheck.url       ${homepage}download
+livecheck.regex     >QScintilla-gpl-\(\\d+.\\d+.\\d+\).tar.gz<

Modified: trunk/dports/devel/qscintilla/files/Qsci.pro
===================================================================
--- trunk/dports/devel/qscintilla/files/Qsci.pro	2013-06-25 18:52:24 UTC (rev 107336)
+++ trunk/dports/devel/qscintilla/files/Qsci.pro	2013-06-25 18:53:17 UTC (rev 107337)
@@ -4,5 +4,5 @@
 CONFIG   += ordered
 
 SUBDIRS = \
-    Qt4 \
-    designer-Qt4
+    Qt4Qt5 \
+    designer-Qt4Qt5

Modified: trunk/dports/devel/qscintilla/files/patch-add_debug.diff
===================================================================
--- trunk/dports/devel/qscintilla/files/patch-add_debug.diff	2013-06-25 18:52:24 UTC (rev 107336)
+++ trunk/dports/devel/qscintilla/files/patch-add_debug.diff	2013-06-25 18:53:17 UTC (rev 107337)
@@ -1,48 +1,48 @@
---- designer-Qt4/designer.pro.orig	2010-10-29 21:15:42.000000000 -0400
-+++ designer-Qt4/designer.pro	2010-10-29 21:23:32.000000000 -0400
+--- designer-Qt4Qt5/designer.pro.orig	2013-06-25 13:23:02.000000000 -0400
++++ designer-Qt4Qt5/designer.pro	2013-06-25 13:29:15.000000000 -0400
 @@ -4,7 +4,7 @@
  TEMPLATE = lib
  TARGET = qscintillaplugin
  
--CONFIG += designer release plugin
-+CONFIG += @ARCHES@ designer @BUILD_TYPE@ plugin
+-CONFIG += release plugin
++CONFIG += plugin @ARCHES@ @BUILD_TYPE@
  
- HEADERS = qscintillaplugin.h
- SOURCES = qscintillaplugin.cpp
-@@ -12,4 +12,14 @@
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     QT += designer
+@@ -22,4 +22,14 @@
  target.path = $$[QT_INSTALL_PLUGINS]/designer
  INSTALLS += target
  
--LIBS += -lqscintilla2
-+INCLUDEPATH += ../Qt4
+-LIBS += -L$$[QT_INSTALL_LIBS] -lqscintilla2
++INCLUDEPATH += ../Qt4Qt5
 +QSCI_LIB = qscintilla2
 +
 +!debug_and_release|build_pass {
-+	CONFIG(debug, debug|release):mac {
++	CONFIG(debug, debug|release):macx {
 +		TARGET = $$member(TARGET, 0)_debug
 +		QSCI_LIB = $$member(QSCI_LIB, 0)_debug
 +	}
 +}
 +
-+LIBS += -L../Qt4 -l$$QSCI_LIB
---- Qt4/qscintilla.pro.orig	2010-10-29 21:31:39.000000000 -0400
-+++ Qt4/qscintilla.pro	2010-10-29 21:32:50.000000000 -0400
-@@ -33,10 +33,16 @@
++LIBS += -L../Qt4Qt5 -l$$QSCI_LIB
+--- Qt4Qt5/qscintilla.pro.orig	2013-06-25 13:40:06.000000000 -0400
++++ Qt4Qt5/qscintilla.pro	2013-06-25 13:40:35.000000000 -0400
+@@ -29,10 +29,16 @@
  
  TEMPLATE = lib
  TARGET = qscintilla2
 -CONFIG += qt warn_off release dll thread
--INCLUDEPATH = . ../include ../src
-+CONFIG += @ARCHES@ qt warn_off @BUILD_TYPE@ dll thread
-+INCLUDEPATH = . .. ../include ../src
+-INCLUDEPATH = . ../include ../lexlib ../src
++CONFIG += qt warn_off dll thread @ARCHES@ @BUILD_TYPE@
++INCLUDEPATH = . .. ../include ../lexlib ../src
  DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER
  
 +!debug_and_release|build_pass {
 +	CONFIG(debug, debug|release) {
-+		mac:TARGET = $$member(TARGET, 0)_debug
++		macx:TARGET = $$member(TARGET, 0)_debug
 +	}
 +}
 +
- # Handle both Qt v4 and v3.
- target.path = $$[QT_INSTALL_LIBS]
- isEmpty(target.path) {
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ 	QT += widgets
+ 	QT += printsupport

    

[107337] trunk/dports/devel/qscintilla

michaelld＠macports.org