[28665] trunk/dports/editors/scite

[source_changes at macosforge.org]

Revision: 28665
          http://trac.macosforge.org/projects/macports/changeset/28665
Author:   nox at macports.org
Date:     2007-09-06 05:27:36 -0700 (Thu, 06 Sep 2007)

Log Message:
-----------
scite: Added universal support! Don't worry, be happy!

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

Modified: trunk/dports/editors/scite/Portfile
===================================================================
--- trunk/dports/editors/scite/Portfile	2007-09-06 12:22:19 UTC (rev 28664)
+++ trunk/dports/editors/scite/Portfile	2007-09-06 12:27:36 UTC (rev 28665)
@@ -42,7 +42,22 @@
 
 pre-build {
 	cd ${workpath}/scintilla/gtk
-	system "make GTK2=yes"
+	
+	if {[variant_isset universal]} {
+		foreach {arch} {i386 ppc} {
+			system "make GTK2=yes UNIVERSAL_CFLAGS=\"-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ${arch}\""
+
+			file mkdir ../bin/${arch}
+			move ../bin/scintilla.a ../bin/${arch}/scintilla.a
+
+			system "make clean"
+		}
+	} else {
+		system "make GTK2=yes"
+	}
+
+	cd ../bin
+	system "lipo -create -arch i386 i386/scintilla.a -arch ppc ppc/scintilla.a -output scintilla.a"
 }
 
 destroot.destdir prefix=${destroot}${prefix}
@@ -51,7 +66,17 @@
 	xinstall -m 0444 ${worksrcpath}/../doc/scite.1 ${destroot}${prefix}/share/man/man1
 }
 
+variant universal {
+	post-patch {
+		cd ${workpath}
+
+		reinplace -E "/^CXXBASEFLAGS/s|\$| \$(UNIVERSAL_CFLAGS)|" scintilla/gtk/makefile
+		reinplace -E "/^CXXBASEFLAGS/s|\$| ${configure.universal_cflags}|" \
+			scite/gtk/makefile
+	}
+
+	build.args-append "UNIVERSAL_LDFLAGS=\"${configure.universal_ldflags}\""
+}
+
 livecheck.distname SciTE
 
-universal_variant no
-

Modified: trunk/dports/editors/scite/files/patch-scite-gtk-makefile
===================================================================
--- trunk/dports/editors/scite/files/patch-scite-gtk-makefile	2007-09-06 12:22:19 UTC (rev 28664)
+++ trunk/dports/editors/scite/files/patch-scite-gtk-makefile	2007-09-06 12:27:36 UTC (rev 28665)
@@ -1,5 +1,5 @@
---- makefile.orig	2007-09-06 03:44:52.000000000 +0200
-+++ makefile	2007-09-06 03:46:16.000000000 +0200
+--- 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
@@ -25,3 +25,12 @@
  
  # 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/20070906/ea3d48c5/attachment.html