Hi,

below an easy update of the GNUstep SQLClient library to 1.6.0. Changes:

 * Change execute methods to return a count of the rows to which the
   executed operation applies, or -1 if not supported.
   Implement for postgresql and mysql.
 * Add support for asynchronous notifications

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/sqlclient/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile    22 Aug 2012 07:15:52 -0000      1.5
+++ Makefile    10 Nov 2012 15:32:14 -0000
@@ -2,12 +2,11 @@
 
 COMMENT =      GNUstep database abstraction layer
 
-VERSION =      1.5.3
+VERSION =      1.6.0
 DISTNAME =     SQLClient-${VERSION}
 PKGNAME =      gnustep-sqlclient-${VERSION}
-REVISION =     2
 
-SHARED_LIBS +=  SQLClient      0.0
+SHARED_LIBS +=  SQLClient      1.0
 
 CATEGORIES =   databases
 
@@ -18,7 +17,7 @@
 MODULES =              x11/gnustep
 MODGNUSTEP_NEEDS_GUI =         No
 WANTLIB +=             Performance pq ecpg mysqlclient sqlite3
-WANTLIB +=             gnustep-base m objc2
+WANTLIB +=             gnustep-base m objc2 pthread
 LIB_DEPENDS +=         x11/gnustep/performance \
                        databases/mysql \
                        databases/postgresql
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gnustep/sqlclient/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo    15 Oct 2011 08:02:23 -0000      1.2
+++ distinfo    10 Nov 2012 15:32:14 -0000
@@ -1,5 +1,2 @@
-MD5 (gnustep/SQLClient-1.5.3.tar.gz) = RsQynJIlaQVvFlEnM/SPwg==
-RMD160 (gnustep/SQLClient-1.5.3.tar.gz) = 2kDwgrZTECfoJVv5h+XwQk3kBWQ=
-SHA1 (gnustep/SQLClient-1.5.3.tar.gz) = 1Bv4XWzv+vxL6+xpL5Zg/IPSFEo=
-SHA256 (gnustep/SQLClient-1.5.3.tar.gz) = 
SNnfsQU7KKOwa6vSVlOprvT739U8E7pYgZ3E0pR55rU=
-SIZE (gnustep/SQLClient-1.5.3.tar.gz) = 157196
+SHA256 (gnustep/SQLClient-1.6.0.tar.gz) = 
lLjH5qS4fPnD8LcuBXS6egyV1nm4h/t/O/tDlDia+/k=
+SIZE (gnustep/SQLClient-1.6.0.tar.gz) = 161099
Index: patches/patch-GNUmakefile
===================================================================
RCS file: patches/patch-GNUmakefile
diff -N patches/patch-GNUmakefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-GNUmakefile   10 Nov 2012 15:32:14 -0000
@@ -0,0 +1,62 @@
+$OpenBSD$
+
+Do not hardcode the base and objc library which
+gets linked against, fix from upstream:
+http://svn.gna.org/viewcvs/gnustep?view=revision&revision=35788
+
+--- GNUmakefile.orig   Sat Nov 10 16:14:47 2012
++++ GNUmakefile        Sat Nov 10 16:14:54 2012
+@@ -81,7 +81,7 @@ BUNDLE_NAME += ECPG_libs
+ ECPG_libs_OBJC_FILES = ECPG.m
+ ECPG_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
+ ECPG_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
+--lgnustep-base -lobjc -lecpg
++$(FND_LIBS) $(OBJC_LIBS) -lecpg
+ ECPG_libs_PRINCIPAL_CLASS = SQLClientECPG_libs
+ endif
+ TEST_TOOL_NAME += testECPG
+@@ -107,7 +107,7 @@ BUNDLE_NAME += Postgres_libs
+ Postgres_libs_OBJC_FILES = Postgres.m
+ Postgres_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
+ Postgres_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
+--lgnustep-base -lobjc -lpq
++$(FND_LIBS) $(OBJC_LIBS) -lpq
+ Postgres_libs_PRINCIPAL_CLASS = SQLClientPostgres_libs
+ endif
+ TEST_TOOL_NAME += testPostgres
+@@ -133,7 +133,7 @@ BUNDLE_NAME += JDBC_libs
+ JDBC_libs_OBJC_FILES = JDBC.m
+ JDBC_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR) $(JDBC_VM_LIBDIRS)
+ JDBC_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
+--lgnustep-base -lobjc $(JDBC_VM_LIBS)
++$(FND_LIBS) $(OBJC_LIBS) $(JDBC_VM_LIBS)
+ JDBC_libs_PRINCIPAL_CLASS = SQLClientJDBC_libs
+ endif
+ TEST_TOOL_NAME += testJDBC
+@@ -159,7 +159,7 @@ BUNDLE_NAME += MySQL_libs
+ MySQL_libs_OBJC_FILES = MySQL.m
+ MySQL_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
+ MySQL_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
+--lgnustep-base -lobjc -lmysqlclient
++$(FND_LIBS) $(OBJC_LIBS) -lmysqlclient
+ MySQL_libs_PRINCIPAL_CLASS = SQLClientMySQL_libs
+ endif
+ TEST_TOOL_NAME += testMySQL
+@@ -185,7 +185,7 @@ BUNDLE_NAME += SQLite_libs
+ SQLite_libs_OBJC_FILES = SQLite.m
+ SQLite_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
+ SQLite_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
+--lgnustep-base -lobjc -lsqlite3
++$(FND_LIBS) $(OBJC_LIBS) -lsqlite3
+ SQLite_libs_PRINCIPAL_CLASS = SQLClientSQLite_libs
+ endif
+ TEST_TOOL_NAME += testSQLite
+@@ -208,7 +208,7 @@ Oracle_libs_OBJC_FILES = Oracle.m
+ Oracle_libs_LIB_DIRS = -L$(ORACLE_HOME)/lib -L./$(GNUSTEP_OBJ_DIR) \
+                       $(shell cat $(ORACLE_HOME)/lib/ldflags)
+ Oracle_libs_BUNDLE_LIBS += -lclntsh \
+-                    -lSQLClient -lPerformance -lgnustep-base -lobjc \
++                    -lSQLClient -lPerformance $(FND_LIBS) $(OBJC_LIBS) \
+                       $(shell cat $(ORACLE_HOME)/lib/sysliblist) \
+                       -ldl -lm
+ Oracle_libs_PRINCIPAL_CLASS = SQLClientOracle_libs

Reply via email to