[87926] trunk/dports/editors/scite

ryandesign at macports.org ryandesign at macports.org
Mon Dec 12 16:36:05 PST 2011 

Revision: 87926
          http://trac.macports.org/changeset/87926
Author:   ryandesign at macports.org
Date:     2011-12-12 16:36:02 -0800 (Mon, 12 Dec 2011)
Log Message:
-----------
scite: update to 3.0.2; MIT license; rewrite master_sites to avoid redirects; ensure we're UsingTheRightCompiler (#28229); fix building universal (#28243) and for non-default build_arch (#32510)

Modified Paths:
--------------
    trunk/dports/editors/scite/Portfile
    trunk/dports/editors/scite/files/patch-scite-makefile.diff

Modified: trunk/dports/editors/scite/Portfile
===================================================================
--- trunk/dports/editors/scite/Portfile	2011-12-12 23:48:37 UTC (rev 87925)
+++ trunk/dports/editors/scite/Portfile	2011-12-13 00:36:02 UTC (rev 87926)
@@ -4,10 +4,12 @@
 PortSystem      1.0
 
 name            scite
-version         2.27
+version         3.0.2
 categories      editors
 platforms       darwin
 maintainers     nomaintainer
+license         MIT
+
 description     SciTE is a SCIntilla based Text Editor.
 
 long_description \
@@ -16,15 +18,15 @@
     used for jobs with simple configurations.
 
 homepage        http://scintilla.sourceforge.net/SciTE.html
-master_sites    sourceforge:scintilla
+master_sites    sourceforge:project/scintilla/SciTE/${version}
 distname        ${name}[strsed ${version} {g/\.//}]
 extract.suffix  .tgz
 
 depends_build   port:pkgconfig
 depends_lib     port:gtk2
 
-checksums       sha1    d248394fe09dc1d111d1afe5c89320b67c01e9f0 \
-                rmd160  f61251b8d451ef05bedef55836b483bbf188c761
+checksums       rmd160  58deba8cc61299ce3e827dc01dde12a39f394789 \
+                sha256  a5687faaa201c39a4ec9608e8a77e418e259f525b21871a5c9f1282c62e58eaa
 
 worksrcdir      ${name}
 
@@ -34,9 +36,18 @@
 
 use_configure   no
 
+variant universal {}
+
+set sysrootflags ""
+if {${configure.sdkroot} != ""} {
+    set sysrootflags "-isysroot ${configure.sdkroot}"
+}
+
 build.dir       ${worksrcpath}/gtk
 
-build.args      prefix=${prefix} GTK2=yes
+build.args      CCOMP="${configure.cc} ${sysrootflags} [get_canonical_archflags cc]" \
+                CC="${configure.cxx} ${sysrootflags} [get_canonical_archflags cxx]" \
+                prefix=${prefix}
 
 use_parallel_build  yes
 
@@ -49,32 +60,11 @@
             return -code error "${badport} is installed"
         }
     }
-
-    if {[variant_isset universal]} {
-        set lipo_args {}
-        set sysrootflags ""
-        if {${configure.sdkroot} != ""} {
-            set sysrootflags "-isysroot ${configure.sdkroot} "
-        }
-
-        foreach arch ${configure.universal_archs} {
-            system "make -C ${workpath}/scintilla/gtk \
-                GTK2=yes UNIVERSAL_CFLAGS=\"${sysrootflags}-arch ${arch}\""
-
-            file mkdir ${workpath}/scintilla/bin/${arch}
-            move ${workpath}/scintilla/bin/scintilla.a ${workpath}/scintilla/bin/${arch}/scintilla.a
-
-            system "make -C ${workpath}/scintilla/gtk \
-                clean"
-
-            lappend lipo_args -arch ${arch} ${workpath}/scintilla/bin/${arch}/scintilla.a
-        }
-
-        system "lipo -create [join ${lipo_args}] -output ${workpath}/scintilla/bin/scintilla.a"
-    } else {
-        system "make -C ${workpath}/scintilla/gtk \
-            GTK2=yes"
-    }
+    
+    ui_debug "Building scintilla"
+    set cmd "make [join ${build.args}] [portbuild::build_getjobsarg]"
+    ui_debug "Assembled command: '${cmd}'"
+    system -W ${workpath}/scintilla/gtk ${cmd}
 }
 
 destroot.destdir    prefix=${destroot}${prefix}
@@ -86,15 +76,4 @@
     xinstall -m 644 -W ${workpath}/scite License.txt README ${destroot}${docdir}
 }
 
-variant universal {
-    post-patch {
-        reinplace -E "/^CXXBASEFLAGS/s|\$| \$(UNIVERSAL_CFLAGS)|" \
-            ${workpath}/scintilla/gtk/makefile
-        reinplace -E "/^CXXBASEFLAGS/s|\$| ${configure.universal_cflags}|" \
-            ${build.dir}/makefile
-    }
-
-    build.args-append   "UNIVERSAL_LDFLAGS=\"${configure.universal_ldflags}\""
-}
-
 livecheck.distname  SciTE

Modified: trunk/dports/editors/scite/files/patch-scite-makefile.diff
===================================================================
--- trunk/dports/editors/scite/files/patch-scite-makefile.diff	2011-12-12 23:48:37 UTC (rev 87925)
+++ trunk/dports/editors/scite/files/patch-scite-makefile.diff	2011-12-13 00:36:02 UTC (rev 87926)
@@ -1,5 +1,5 @@
---- scintilla/gtk/makefile.orig	2011-05-02 04:11:17.000000000 -0500
-+++ scintilla/gtk/makefile	2011-07-05 11:42:14.000000000 -0500
+--- scintilla/gtk/makefile.orig	2011-07-31 21:49:04.000000000 -0500
++++ scintilla/gtk/makefile	2011-12-12 17:54:13.000000000 -0600
 @@ -46,7 +46,7 @@
  ifdef CHECK_DEPRECATED
  DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
@@ -9,8 +9,8 @@
  
  ifdef NOTHREADS
  THREADFLAGS=-DG_THREADS_IMPL_NONE
---- scite/gtk/makefile.orig	2011-06-13 19:55:05.000000000 -0500
-+++ scite/gtk/makefile	2011-07-05 11:43:55.000000000 -0500
+--- scite/gtk/makefile.orig	2011-12-08 16:16:52.000000000 -0600
++++ scite/gtk/makefile	2011-12-12 17:50:36.000000000 -0600
 @@ -50,7 +50,7 @@
  ifdef CHECK_DEPRECATED
  DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
@@ -20,25 +20,12 @@
  
  ifdef DEBUG
  CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
-@@ -100,7 +100,7 @@
- FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
+@@ -105,7 +105,7 @@
+ FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
  PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
  	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
--	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
-+	$(CC) `$(CONFIGTHREADS)` -rdynamic -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
+-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
++	$(CC) `$(CONFIGTHREADS)` -rdynamic -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
-@@ -119,8 +119,10 @@
- 	done
- 
- ifdef gnomeprefix
--	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
--	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications
-+	$(INSTALL) -m 644 SciTE.desktop $(DESTDIR)$(datadir)/applications
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(pixmapdir)
-+	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
- endif
- 
- uninstall:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111212/6000a4ab/attachment.html>

More information about the macports-changes mailing list