[31232] trunk/dports/editors/scite
nox at macports.org
nox at macports.org
Sun Nov 18 11:14:35 PST 2007
Revision: 31232
http://trac.macosforge.org/projects/macports/changeset/31232
Author: nox at macports.org
Date: 2007-11-18 11:14:34 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
scite:
* Linted.
* Removed {{{cd}}} calls.
Modified Paths:
--------------
trunk/dports/editors/scite/Portfile
Added Paths:
-----------
trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile.diff
trunk/dports/editors/scite/files/patch-scite-gtk-makefile.diff
Removed Paths:
-------------
trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile
trunk/dports/editors/scite/files/patch-scite-gtk-makefile
Modified: trunk/dports/editors/scite/Portfile
===================================================================
--- trunk/dports/editors/scite/Portfile 2007-11-18 19:13:39 UTC (rev 31231)
+++ trunk/dports/editors/scite/Portfile 2007-11-18 19:14:34 UTC (rev 31232)
@@ -28,12 +28,13 @@
worksrcdir ${name}/gtk
-patchfiles patch-scintilla-gtk-makefile \
- patch-scite-gtk-makefile
+patchfiles patch-scintilla-gtk-makefile.diff \
+ patch-scite-gtk-makefile.diff
post-patch {
- cd ${workpath}/scintilla
- reinplace -E "s/#ifdef (PLAT_MACOSX|__APPLE__)/#if PLAT_MACOSX/" include/Platform.h src/Editor.cxx
+ reinplace -E "s/#ifdef (PLAT_MACOSX|__APPLE__)/#if PLAT_MACOSX/" \
+ ${workpath}/scintilla/include/Platform.h \
+ ${workpath}/scintilla/src/Editor.cxx
}
use_configure no
@@ -41,22 +42,26 @@
build.args prefix=${prefix} GTK2=yes
pre-build {
- cd ${workpath}/scintilla/gtk
-
if {[variant_isset universal]} {
+ set lipo_args {}
+
foreach {arch} {i386 ppc} {
- system "make GTK2=yes UNIVERSAL_CFLAGS=\"-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ${arch}\""
+ system "make -C ${workpath}/scintilla/gtk \
+ GTK2=yes UNIVERSAL_CFLAGS=\"-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ${arch}\""
- file mkdir ../bin/${arch}
- move ../bin/scintilla.a ../bin/${arch}/scintilla.a
+ file mkdir ${workpath}/scintilla/bin/${arch}
+ move ${workpath}/scintilla/bin/scintilla.a ${workpath}/scintilla/bin/${arch}/scintilla.a
- system "make clean"
+ system "make -C ${workpath}/scintilla/gtk \
+ clean"
+
+ lappend lipo_args -arch ${arch} ${workpath}/scintilla/bin/${arch}/scintilla.a
}
- cd ../bin
- system "lipo -create -arch i386 i386/scintilla.a -arch ppc ppc/scintilla.a -output scintilla.a"
+ system "lipo -create [join ${lipo_args}] -output ${workpath}/scintilla/bin/scintilla.a"
} else {
- system "make GTK2=yes"
+ system "make -C ${workpath}/scintilla/gtk \
+ GTK2=yes"
}
}
@@ -68,11 +73,10 @@
variant universal {
post-patch {
- cd ${workpath}
-
- reinplace -E "/^CXXBASEFLAGS/s|\$| \$(UNIVERSAL_CFLAGS)|" scintilla/gtk/makefile
+ reinplace -E "/^CXXBASEFLAGS/s|\$| \$(UNIVERSAL_CFLAGS)|" \
+ ${workpath}/scintilla/gtk/makefile
reinplace -E "/^CXXBASEFLAGS/s|\$| ${configure.universal_cflags}|" \
- scite/gtk/makefile
+ ${worksrcpath}/makefile
}
build.args-append "UNIVERSAL_LDFLAGS=\"${configure.universal_ldflags}\""
Deleted: trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile
===================================================================
--- trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile 2007-11-18 19:13:39 UTC (rev 31231)
+++ trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile 2007-11-18 19:14:34 UTC (rev 31232)
@@ -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 \)
Copied: trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile.diff (from rev 31212, trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile)
===================================================================
--- trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile.diff (rev 0)
+++ trunk/dports/editors/scite/files/patch-scintilla-gtk-makefile.diff 2007-11-18 19:14:34 UTC (rev 31232)
@@ -0,0 +1,14 @@
+--- ../../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
===================================================================
--- trunk/dports/editors/scite/files/patch-scite-gtk-makefile 2007-11-18 19:13:39 UTC (rev 31231)
+++ trunk/dports/editors/scite/files/patch-scite-gtk-makefile 2007-11-18 19:14:34 UTC (rev 31232)
@@ -1,36 +0,0 @@
---- makefile.orig 2007-09-06 13:10:24.000000000 +0200
-+++ makefile 2007-09-06 13:11:55.000000000 +0200
-@@ -45,7 +45,7 @@
- bindir=$(prefix)/bin
- SYSCONF_PATH=$(prefix)/share/scite
-
--INSTALL=install -o root -g root
-+INSTALL=install
-
- PROG = ../bin/SciTE
-
-@@ -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 Exporters.o \
- MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
- $(COMPLIB) $(LUA_OBJS)
-- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB)
-+ $(CC) `$(CONFIGTHREADS)` $(UNIVERSAL_LDFLAGS) -DGTK $^ -o $@ $(CONFIGLIB)
-
- # Automatically generate header dependencies with "make deps"
- include deps.mak
Copied: trunk/dports/editors/scite/files/patch-scite-gtk-makefile.diff (from rev 31212, trunk/dports/editors/scite/files/patch-scite-gtk-makefile)
===================================================================
--- trunk/dports/editors/scite/files/patch-scite-gtk-makefile.diff (rev 0)
+++ trunk/dports/editors/scite/files/patch-scite-gtk-makefile.diff 2007-11-18 19:14:34 UTC (rev 31232)
@@ -0,0 +1,36 @@
+--- makefile.orig 2007-09-06 13:10:24.000000000 +0200
++++ makefile 2007-09-06 13:11:55.000000000 +0200
+@@ -45,7 +45,7 @@
+ bindir=$(prefix)/bin
+ SYSCONF_PATH=$(prefix)/share/scite
+
+-INSTALL=install -o root -g root
++INSTALL=install
+
+ PROG = ../bin/SciTE
+
+@@ -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 Exporters.o \
+ MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
+ $(COMPLIB) $(LUA_OBJS)
+- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ $(CONFIGLIB)
++ $(CC) `$(CONFIGTHREADS)` $(UNIVERSAL_LDFLAGS) -DGTK $^ -o $@ $(CONFIGLIB)
+
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/bae98087/attachment.html
More information about the macports-changes
mailing list