[66262] trunk/dports/java/javasqlite

ryandesign at macports.org ryandesign at macports.org
Wed Apr 7 21:23:40 PDT 2010 

Revision: 66262
          http://trac.macports.org/changeset/66262
Author:   ryandesign at macports.org
Date:     2010-04-07 21:23:39 -0700 (Wed, 07 Apr 2010)
Log Message:
-----------
javasqlite: update to 20100131 (see #19945) and turn off universal variant which doesn't produce universal software

Modified Paths:
--------------
    trunk/dports/java/javasqlite/Portfile
    trunk/dports/java/javasqlite/files/patch-Makefile.in-jnilib
    trunk/dports/java/javasqlite/files/patch-configure

Removed Paths:
-------------
    trunk/dports/java/javasqlite/files/patch-Makefile.in

Modified: trunk/dports/java/javasqlite/Portfile
===================================================================
--- trunk/dports/java/javasqlite/Portfile	2010-04-08 04:19:32 UTC (rev 66261)
+++ trunk/dports/java/javasqlite/Portfile	2010-04-08 04:23:39 UTC (rev 66262)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name				javasqlite
-version				20060714
+version				20100131
 categories			java databases
 platforms			darwin
 
@@ -14,15 +14,18 @@
 					interface to the SQLite API. 
 homepage			http://www.ch-werner.de/javasqlite/
 master_sites		${homepage}
-checksums			md5 ac9b2a256a657b2717659acea7f2e41a \
-					sha1 f9d74f6c891b27713ecaa1444b4bee1bb6841cf0 \
-					rmd160 725b2455208ca40b9c0edd9769431c637f0b8d3b
-patchfiles			patch-configure \
-					patch-Makefile.in
 
+checksums			md5     aa0c89534045f08e72f7b2d9538bb164 \
+					sha1    7aade6951dfb0b94368e8e5d6ac4e12d1a904899 \
+					rmd160  447252c09af76968bf76bf086eb58a946e855199
+
+patchfiles			patch-configure
+
 depends_lib			port:sqlite2 \
 					port:sqlite3
 
+universal_variant	no
+
 configure.args-append	--with-jardir=${prefix}/share/java/ \
 						--with-sqlite=${prefix} \
 						--with-sqlite3=${prefix}

Deleted: trunk/dports/java/javasqlite/files/patch-Makefile.in
===================================================================
--- trunk/dports/java/javasqlite/files/patch-Makefile.in	2010-04-08 04:19:32 UTC (rev 66261)
+++ trunk/dports/java/javasqlite/files/patch-Makefile.in	2010-04-08 04:23:39 UTC (rev 66262)
@@ -1,14 +0,0 @@
---- Makefile.in.orig	2007-04-22 10:34:07.000000000 +0900
-+++ Makefile.in	2007-04-22 10:34:26.000000000 +0900
-@@ -126,7 +126,7 @@
- 	$(INSTALL) -m 644 test.java doc/test.java
- 
- install:
--	$(INSTALL) -d -m 755 $(JAR_DIR)
--	$(INSTALL) -m 644 sqlite.jar $(JAR_DIR)
--	$(INSTALL) -d -m 755 $(NATIVE_LIB_DIR)
--	$(LIBTOOL) $(INSTALL) libsqlite_jni.la $(NATIVE_LIB_DIR)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(JAR_DIR)
-+	$(INSTALL) -m 644 sqlite.jar $(DESTDIR)$(JAR_DIR)
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(NATIVE_LIB_DIR)
-+	$(LIBTOOL) $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR)

Modified: trunk/dports/java/javasqlite/files/patch-Makefile.in-jnilib
===================================================================
--- trunk/dports/java/javasqlite/files/patch-Makefile.in-jnilib	2010-04-08 04:19:32 UTC (rev 66261)
+++ trunk/dports/java/javasqlite/files/patch-Makefile.in-jnilib	2010-04-08 04:23:39 UTC (rev 66262)
@@ -1,28 +1,36 @@
---- Makefile.in	2007-04-22 10:59:59.000000000 +0900
-+++ Makefile.in	2007-04-22 11:06:25.000000000 +0900
-@@ -78,7 +78,7 @@
+--- Makefile.in.orig	2009-04-21 00:34:35.000000000 -0700
++++ Makefile.in	2009-09-10 17:08:10.000000000 -0700
+@@ -110,7 +110,7 @@
  	SQLite/ProgressHandler.java \
  	SQLite/StringEncoder.java
  
 -all:	sqlite.jar libsqlite_jni.la
 +all:	sqlite.jar libsqlite_jni.jnilib
  
- SQLite/Constants.java:	native/mkconst
+ SQLite/Constants.java:	native/mkconst VERSION
  	native/mkconst > SQLite/Constants.java
-@@ -94,8 +94,8 @@
- sqlite_jni.lo:	native/sqlite_jni.h native/sqlite_jni.c
- 	$(LIBTOOL) $(CC) -c $(CFLAGS) native/sqlite_jni.c
+@@ -141,8 +141,8 @@
+ $(SQLITE3_A10N_O):	$(SQLITE3_A10N_C)
+ 	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(SQLITE3_A10N_C)
  
--libsqlite_jni.la:	sqlite_jni.lo
--	$(LIBTOOL) $(CC) -o libsqlite_jni.la sqlite_jni.lo \
-+libsqlite_jni.jnilib:	sqlite_jni.lo
-+	$(LIBTOOL) $(CC) -bundle -o libsqlite_jni.jnilib sqlite_jni.lo \
- 	    -rpath $(NATIVE_LIB_DIR) $(LIBS)
+-libsqlite_jni.la:	sqlite_jni.lo $(SQLITE3_A10N_O)
+-	$(LIBTOOL) --mode=link $(CC) -o libsqlite_jni.la sqlite_jni.lo \
++libsqlite_jni.jnilib:	sqlite_jni.lo $(SQLITE3_A10N_O)
++	$(LIBTOOL) --mode=link $(CC) -bundle -o libsqlite_jni.jnilib sqlite_jni.lo \
+ 	    $(SQLITE3_A10N_O) -rpath $(NATIVE_LIB_DIR) \
+ 	    -module -avoid-version $(LIBS)
  
- native/mkconst:	native/mkconst.c
-@@ -129,4 +129,4 @@
+@@ -200,11 +200,11 @@
  	$(INSTALL) -d -m 755 $(DESTDIR)$(JAR_DIR)
  	$(INSTALL) -m 644 sqlite.jar $(DESTDIR)$(JAR_DIR)
  	$(INSTALL) -d -m 755 $(DESTDIR)$(NATIVE_LIB_DIR)
--	$(LIBTOOL) $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR)
-+	$(LIBTOOL) $(INSTALL) libsqlite_jni.jnilib $(DESTDIR)$(NATIVE_LIB_DIR)
+-	$(LIBTOOL) --mode=install $(INSTALL) libsqlite_jni.la \
++	$(LIBTOOL) --mode=install $(INSTALL) libsqlite_jni.jnilib \
+ 	    $(DESTDIR)$(NATIVE_LIB_DIR)
+ 
+ uninstall:
+ 	$(RM) $(DESTDIR)$(JAR_DIR)/sqlite.jar
+ 	$(LIBTOOL) --mode=uninstall $(RM) \
+-	    $(DESTDIR)$(NATIVE_LIB_DIR)/libsqlite_jni.la
++	    $(DESTDIR)$(NATIVE_LIB_DIR)/libsqlite_jni.jnilib
+ 

Modified: trunk/dports/java/javasqlite/files/patch-configure
===================================================================
--- trunk/dports/java/javasqlite/files/patch-configure	2010-04-08 04:19:32 UTC (rev 66261)
+++ trunk/dports/java/javasqlite/files/patch-configure	2010-04-08 04:23:39 UTC (rev 66262)
@@ -1,12 +1,29 @@
---- configure	2005-05-16 19:03:35.000000000 +0900
-+++ configure	2007-04-22 10:26:45.000000000 +0900
-@@ -7485,6 +7485,9 @@
-     linux* )
-         JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
-         ;;
-+    darwin* )
-+        JNIINCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -framework JavaVM"
-+        ;;
-     *)
-         JNIINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${build_os}"
-         { echo "$as_me:$LINENO: WARNING: setting generic JNI include file directives!" >&5
+--- configure.orig	2009-04-30 04:10:00.000000000 -0700
++++ configure	2009-09-10 17:27:23.000000000 -0700
+@@ -9021,11 +9021,11 @@
+ fi
+ 
+ if test -n "$JAVA_HOME" ; then
+-  JAVA_RUN=$JAVA_HOME/bin/java
+-  JAVAC=$JAVA_HOME/bin/javac
+-  JAVAH="$JAVA_HOME/bin/javah -jni"
+-  JAR=$JAVA_HOME/bin/jar
+-  JAVADOC=$JAVA_HOME/bin/javadoc
++  JAVA_RUN=$JAVA_HOME/Commands/java
++  JAVAC=$JAVA_HOME/Commands/javac
++  JAVAH="$JAVA_HOME/Commands/javah -jni"
++  JAR=$JAVA_HOME/Commands/jar
++  JAVADOC=$JAVA_HOME/Commands/javadoc
+ else
+   JAVA_RUN=`which java`
+   JAVAC=`which javac`
+@@ -9050,6 +9050,9 @@
+   linux*)
+     JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+     ;;
++  darwin* )
++    JNIINCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -framework JavaVM"
++    ;;
+   freebsd*)
+     JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/freebsd"
+     ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100407/bc03822b/attachment.html>

More information about the macports-changes mailing list