Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8592

Modified Files:
        scite.info 
Log Message:
update scite to 3.3.2, build with fink lua51-dev and sync trees

Index: scite.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors/scite.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scite.info  18 Sep 2011 00:54:06 -0000      1.1
+++ scite.info  30 May 2013 23:20:28 -0000      1.2
@@ -1,28 +1,30 @@
 Package: scite
-Version: 2.29
+Version: 3.3.2
 Revision: 1
-Source: mirror:sourceforge:scintilla/%n229.zip
-Source-MD5: 6e3307cd202d5925c15830838ccb3540
+Source: mirror:sourceforge:scintilla/%n332.zip
+Source-MD5: 515539da0a8be4d046340bacd17d7dcb
 NoSourceDirectory: True
-BuildConflicts: lua51-dev
+
+#BuildConflicts: lua51-dev
+
 Suggests: a2ps
+# probably also lua
 GCC: 4.0
 Depends: <<
        atk1-shlibs (>= 1.28.0-2),
        cairo-shlibs (>= 1.8.10-1),
+       dillo,
        fontconfig2-shlibs (>= 2.8.0-7),
        freetype219-shlibs (>= 2.4.4-2),
        glib2-shlibs (>= 2.22.4-5),
-       gtk+2 (>= 2.18.9-7),
-       libgettext8-shlibs,
-       libiconv,
+       gtk+2-shlibs (>= 2.18.9-7),
        pango1-xft2-ft219-shlibs (>= 1.24.5-7),
        x11-shlibs
 <<
 BuildDepends: <<
        atk1 (>= 1.28.0-2),
        cairo (>= 1.8.10-1),
-       expat1,
+       fink (>= 0.24.12),
        fink-package-precedence,
        fontconfig2-dev (>= 2.8.0-7),
        freetype219 (>= 2.4.4-2),
@@ -31,29 +33,40 @@
        glib2-dev (>= 2.22.4-5),
        glitz,
        gtk+2-dev (>= 2.18.9-7),
-       libgettext8-dev,
-       libiconv-dev,
-       libpng14,
        pango1-xft2-ft219-dev (>= 1.24.5-7),
        pixman (>= 0.10.0-1),
        pkgconfig (>= 0.23-1),
        x11-dev,
-       xft2-dev
+       lua51-dev 
 <<
+PatchFile: %n.patch
+PatchFile-MD5: c444207a830bde22a5a865b47e46040f 
 PatchScript: <<
+  patch -p0 < %{PatchFile}
   perl -pi -e 's/-DNDEBUG -Os/-DNDEBUG -D__unix__ -Os/g' scite/gtk/makefile
-  perl -pi -e 's/xdg-open/open/g' scite/src/*.properties
+  perl -pi -e 's/xdg-open/dillo/g' scite/src/*.properties
+
+# does nothing
   perl -pi -e 's/(-m \d+) -D /\1 /g; s/CONFIGLIB\)`$/$& -liconv/' 
scite/gtk/makefile
+
   perl -pi -e 's/-rdynamic -Wl,--as-needed -Wl,--version-script lua.vers//g' 
scite/gtk/makefile
+
+  # --enable-dependency-tracking doesn't work fully b/c not fully libtoolized
+  perl -pi -e 's/(CXXFLAGS\s*=)/\1-MD /' scintilla/gtk/makefile 
scite/gtk/makefile
+
+  mv scite/lua scite/lua_local
 <<
 ConfigureParams: --enable-dependency-tracking
+SetCXXFLAGS: -MD -I%p/include
+SetCFLAGS: -MD -I%p/include
 CompileScript: <<
 #!/bin/sh -ev
 
+  export PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
   cd scintilla/gtk && make OSTYPE=darwin GTK2=1 prefix=%p && cd ../..
-  cd scite/gtk && make GTK2=1 prefix=%p SciTEGTK.o CXXFLAGS='$(CXXTFLAGS) 
-I%p/include' && cd ../..
-  cd scite/gtk && make GTK2=1 prefix=%p
-  fink-package-precedence --depfile-ext='\.mak' .
+  cd scite/gtk && make GTK2=1 prefix=%p SciTEGTK.o && cd ../..
+  cd scite/gtk && make GTK2=1 prefix=%p && cd ../..
+  fink-package-precedence --depfile-ext='\.(mak|d)' .
 <<
 InstallScript: <<
 #!/bin/sh -ev
@@ -64,7 +77,7 @@
 DocFiles: scite/License.txt scite/README
 Description: Small syntax styling source code editor
 DescPort: <<
- Patched to use the default OS X browser to view help files.
+ Patched to use Dillo (lightweight browser) to view help files.
  Patched to remove -D flag from install (so it will work on 10.3+)
  Patched to define __unix__ and not just unix
 <<
@@ -78,3 +91,4 @@
 License: OSI-Approved
 Maintainer: None <fink-de...@lists.sourceforge.net>
 Homepage: http://www.scintilla.org/SciTE.html
+


------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to