Changeset 87926


Ignore:
Timestamp:
Dec 13, 2011, 12:36:02 AM (8 years ago)
Author:
ryandesign@…
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)

Location:
trunk/dports/editors/scite
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/editors/scite/Portfile

    r80157 r87926  
    55
    66name            scite
    7 version         2.27
     7version         3.0.2
    88categories      editors
    99platforms       darwin
    1010maintainers     nomaintainer
     11license         MIT
     12
    1113description     SciTE is a SCIntilla based Text Editor.
    1214
     
    1719
    1820homepage        http://scintilla.sourceforge.net/SciTE.html
    19 master_sites    sourceforge:scintilla
     21master_sites    sourceforge:project/scintilla/SciTE/${version}
    2022distname        ${name}[strsed ${version} {g/\.//}]
    2123extract.suffix  .tgz
     
    2426depends_lib     port:gtk2
    2527
    26 checksums       sha1    d248394fe09dc1d111d1afe5c89320b67c01e9f0 \
    27                 rmd160  f61251b8d451ef05bedef55836b483bbf188c761
     28checksums       rmd160  58deba8cc61299ce3e827dc01dde12a39f394789 \
     29                sha256  a5687faaa201c39a4ec9608e8a77e418e259f525b21871a5c9f1282c62e58eaa
    2830
    2931worksrcdir      ${name}
     
    3537use_configure   no
    3638
     39variant universal {}
     40
     41set sysrootflags ""
     42if {${configure.sdkroot} != ""} {
     43    set sysrootflags "-isysroot ${configure.sdkroot}"
     44}
     45
    3746build.dir       ${worksrcpath}/gtk
    3847
    39 build.args      prefix=${prefix} GTK2=yes
     48build.args      CCOMP="${configure.cc} ${sysrootflags} [get_canonical_archflags cc]" \
     49                CC="${configure.cxx} ${sysrootflags} [get_canonical_archflags cxx]" \
     50                prefix=${prefix}
    4051
    4152use_parallel_build  yes
     
    5061        }
    5162    }
    52 
    53     if {[variant_isset universal]} {
    54         set lipo_args {}
    55         set sysrootflags ""
    56         if {${configure.sdkroot} != ""} {
    57             set sysrootflags "-isysroot ${configure.sdkroot} "
    58         }
    59 
    60         foreach arch ${configure.universal_archs} {
    61             system "make -C ${workpath}/scintilla/gtk \
    62                 GTK2=yes UNIVERSAL_CFLAGS=\"${sysrootflags}-arch ${arch}\""
    63 
    64             file mkdir ${workpath}/scintilla/bin/${arch}
    65             move ${workpath}/scintilla/bin/scintilla.a ${workpath}/scintilla/bin/${arch}/scintilla.a
    66 
    67             system "make -C ${workpath}/scintilla/gtk \
    68                 clean"
    69 
    70             lappend lipo_args -arch ${arch} ${workpath}/scintilla/bin/${arch}/scintilla.a
    71         }
    72 
    73         system "lipo -create [join ${lipo_args}] -output ${workpath}/scintilla/bin/scintilla.a"
    74     } else {
    75         system "make -C ${workpath}/scintilla/gtk \
    76             GTK2=yes"
    77     }
     63   
     64    ui_debug "Building scintilla"
     65    set cmd "make [join ${build.args}] [portbuild::build_getjobsarg]"
     66    ui_debug "Assembled command: '${cmd}'"
     67    system -W ${workpath}/scintilla/gtk ${cmd}
    7868}
    7969
     
    8777}
    8878
    89 variant universal {
    90     post-patch {
    91         reinplace -E "/^CXXBASEFLAGS/s|\$| \$(UNIVERSAL_CFLAGS)|" \
    92             ${workpath}/scintilla/gtk/makefile
    93         reinplace -E "/^CXXBASEFLAGS/s|\$| ${configure.universal_cflags}|" \
    94             ${build.dir}/makefile
    95     }
    96 
    97     build.args-append   "UNIVERSAL_LDFLAGS=\"${configure.universal_ldflags}\""
    98 }
    99 
    10079livecheck.distname  SciTE
  • trunk/dports/editors/scite/files/patch-scite-makefile.diff

    r80156 r87926  
    1 --- scintilla/gtk/makefile.orig 2011-05-02 04:11:17.000000000 -0500
    2 +++ scintilla/gtk/makefile      2011-07-05 11:42:14.000000000 -0500
     1--- scintilla/gtk/makefile.orig 2011-07-31 21:49:04.000000000 -0500
     2+++ scintilla/gtk/makefile      2011-12-12 17:54:13.000000000 -0600
    33@@ -46,7 +46,7 @@
    44 ifdef CHECK_DEPRECATED
     
    1010 ifdef NOTHREADS
    1111 THREADFLAGS=-DG_THREADS_IMPL_NONE
    12 --- scite/gtk/makefile.orig     2011-06-13 19:55:05.000000000 -0500
    13 +++ scite/gtk/makefile  2011-07-05 11:43:55.000000000 -0500
     12--- scite/gtk/makefile.orig     2011-12-08 16:16:52.000000000 -0600
     13+++ scite/gtk/makefile  2011-12-12 17:50:36.000000000 -0600
    1414@@ -50,7 +50,7 @@
    1515 ifdef CHECK_DEPRECATED
     
    2121 ifdef DEBUG
    2222 CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
    23 @@ -100,7 +100,7 @@
    24  FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
     23@@ -105,7 +105,7 @@
     24 FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
    2525 PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
    2626        JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
    27 -       $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
    28 +       $(CC) `$(CONFIGTHREADS)` -rdynamic -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
     27-       $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
     28+       $(CC) `$(CONFIGTHREADS)` -rdynamic -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
    2929 
    3030 # Automatically generate header dependencies with "make deps"
    3131 include deps.mak
    32 @@ -119,8 +119,10 @@
    33         done
    34  
    35  ifdef gnomeprefix
    36 -       $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
    37 -       $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
    38 +       $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications
    39 +       $(INSTALL) -m 644 SciTE.desktop $(DESTDIR)$(datadir)/applications
    40 +       $(INSTALL) -m 755 -d $(DESTDIR)$(pixmapdir)
    41 +       $(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
    42  endif
    43  
    44  uninstall:
Note: See TracChangeset for help on using the changeset viewer.