[75612] trunk/dports/editors/scite

1 Feb 2011

Revision: 75612
          http://trac.macports.org/changeset/75612
Author:   ryandesign@macports.org
Date:     2011-01-31 22:32:30 -0800 (Mon, 31 Jan 2011)
Log Message:
-----------
scite: update to 2.23 (#28205); use unversioned doc dir

Modified Paths:
--------------
    trunk/dports/editors/scite/Portfile

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

Removed Paths:
-------------
    trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile.diff
    trunk/dports/editors/scite/files/patch-scite-gtk-makefile.diff

Modified: trunk/dports/editors/scite/Portfile
===================================================================

--- trunk/dports/editors/scite/Portfile	2011-02-01 06:30:45 UTC (rev 75611)
+++ trunk/dports/editors/scite/Portfile	2011-02-01 06:32:30 UTC (rev 75612)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            scite
-version         1.79
+version         2.23
 categories      editors
 platforms       darwin
 maintainers     nomaintainer
@@ -23,24 +23,13 @@
 depends_build   port:pkgconfig
 depends_lib     port:gtk2
 
-checksums       md5     02a0d68f0c33c01c9a2c9d69c295acea \
-                sha1    43f343b75785b077b6a93b5be8f5fc7544a1a005 \
-                rmd160  e36f0e394d1afea007840ea1bb4fc660b0a59f1b
+checksums       sha1    8ffaee5a9eb5a0d7aec3a24ffce84bfbdb78cbe0 \
+                rmd160  8b7cf23e500750ea33ca296ae81f85baa8204c30
 
 worksrcdir      ${name}/gtk
 
-patchfiles      patch-scintilla-gtk-makefile.diff \
-                patch-scite-gtk-makefile.diff
+patchfiles      patch-scite-makefile.diff
 
-post-patch {
-    reinplace -E "s/#ifdef (PLAT_MACOSX|__APPLE__)/#if PLAT_MACOSX/" \
-        ${workpath}/scintilla/include/Platform.h \
-        ${workpath}/scintilla/src/Editor.cxx
-    reinplace s/-pedantic//g ${worksrcpath}/makefile \
-                             ${workpath}/${name}/src/cpp.properties \
-                             ${workpath}/scintilla/gtk/makefile
-}
-
 use_configure   no
 
 build.args      prefix=${prefix} GTK2=yes
@@ -77,9 +66,13 @@
 
 destroot.destdir    prefix=${destroot}${prefix}
 
+pre-destroot {
+    xinstall -d ${destroot}${prefix}/share/applications
+}
+
 post-destroot {
     xinstall -m 444 ${worksrcpath}/../doc/scite.1 ${destroot}${prefix}/share/man/man1
-    set docdir ${prefix}/share/doc/${name}-${version}
+    set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}
     xinstall -m 644 -W ${workpath}/scite License.txt README ${destroot}${docdir}
 }

Deleted: trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile.diff
===================================================================
--- trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile.diff	2011-02-01 06:30:45 UTC (rev 75611)
+++ trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile.diff	2011-02-01 06:32:30 UTC (rev 75612)
@@ -1,14 +0,0 @@
---- ../../scintilla/gtk/makefile.orig	2007-09-06 02:46:18.000000000 +0200
-+++ ../../scintilla/gtk/makefile	2007-09-06 02:43:53.000000000 +0200
-@@ -56,9 +56,9 @@
- endif
- 
- .cxx.o:
--	$(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
-+	$(CC) $(CXXFLAGS) $(CONFIGFLAGS) -c $<
- .c.o:
--	$(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
-+	$(CCOMP) $(CXXFLAGS) $(CONFIGFLAGS) -w -c $<
- 
- #++Autogenerated -- run src/LexGen.py to regenerate
- #**LEXOBJS=\\\n\(\*.o \)

Deleted: trunk/dports/editors/scite/files/patch-scite-gtk-makefile.diff
===================================================================
--- trunk/dports/editors/scite/files/patch-scite-gtk-makefile.diff	2011-02-01 06:30:45 UTC (rev 75611)
+++ trunk/dports/editors/scite/files/patch-scite-gtk-makefile.diff	2011-02-01 06:32:30 UTC (rev 75612)
@@ -1,27 +0,0 @@
---- makefile.orig	2007-09-06 13:10:24.000000000 +0200
-+++ makefile	2007-09-06 13:11:55.000000000 +0200
-@@ -89,13 +89,13 @@
- endif
- 
- .cxx.o:
--	$(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< -o $@
-+	$(CC) $(CXXFLAGS) $(CONFIGFLAGS) -c $< -o $@
- 
- clean:
- 	rm -f *.o $(PROG)
- 
- deps:
--	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-+	$(CC) -MM $(CXXFLAGS) $(CONFIGFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak 
- 
- # make should be run in ../../scintilla/gtk to compile all the lexers.
- COMPLIB=../../scintilla/bin/scintilla.a
-@@ -103,7 +103,7 @@
- $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \
- PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
- 	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
--	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB)
-+	$(CC) `$(CONFIGTHREADS)` $(UNIVERSAL_LDFLAGS) -DGTK $^ -o $@ $(CONFIGLIB)
- 
- # Automatically generate header dependencies with "make deps"
- include deps.mak

Added: trunk/dports/editors/scite/files/patch-scite-makefile.diff
===================================================================
--- trunk/dports/editors/scite/files/patch-scite-makefile.diff	                        (rev 0)
+++ trunk/dports/editors/scite/files/patch-scite-makefile.diff	2011-02-01 06:32:30 UTC (rev 75612)
@@ -0,0 +1,46 @@
+diff -urN ../../scintilla/gtk/makefile.orig ./../scintilla/gtk/makefile
+--- ../../scintilla/gtk/makefile.orig	2010-10-27 17:15:45.000000000 -0400
++++ ../../scintilla/gtk/makefile	2011-01-27 17:14:07.000000000 -0500
+@@ -30,7 +30,7 @@
+ 
+ INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
+ #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
+-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
++CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -Wno-long-long -pedantic -D__unix__ -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
+ 
+ ifdef NOTHREADS
+ THREADFLAGS=-DG_THREADS_IMPL_NONE
+diff -urN scite/gtk/makefile.orig scite/gtk/makefile
+--- makefile.orig	2010-10-27 17:16:07.000000000 -0400
++++ makefile	2011-01-27 17:23:27.000000000 -0500
+@@ -42,7 +42,7 @@
+ 
+ INCLUDEDIRS=-I ../../scintilla/include -I ../src
+ #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+-CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
++CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -D__unix__ -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
+ 
+ ifdef DEBUG
+ CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
+@@ -90,7 +90,7 @@
+ FilePath.o SciTEBase.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++
+ 
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak
+@@ -109,8 +109,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)/application
++	$(INSTALL) -m 644 SciTE.desktop $(DESTDIR)$(datadir)/applications
++	$(INSTALL) -m 644 -d $(DESTDIR)$(pixmapdir)
++	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ endif
+ 
+ uninstall:

    

ryandesign＠macports.org

tags

participants (1)