Update ruby-swift to 0.9.1. Quite a few bug fixes, and new features include SQLite3 support. This depends on an update to dbic++, included.
The distfile for dbic++ is a little odd as it uses a different directory than the file name would indicate. Blame GitHub. Tested on i386, also builds fine on amd64. Looking for OKs. Jeremy Index: databases/dbic++/Makefile =================================================================== RCS file: /cvs/ports/databases/dbic++/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- databases/dbic++/Makefile 20 Dec 2010 17:39:55 -0000 1.1.1.1 +++ databases/dbic++/Makefile 21 Jan 2011 23:03:55 -0000 @@ -4,13 +4,14 @@ SHARED_ONLY= Yes COMMENT= C++ database API -DISTNAME= deepfryed-dbicpp-74e3352 -PKGNAME= dbic++-0.4.1 +DISTNAME= deepfryed-dbicpp-g466860f +PKGNAME= dbic++-0.5.6 CATEGORIES= databases -HOMEPAGE= http://github.com/deepfryed/dbicpp +HOMEPAGE= https://github.com/deepfryed/dbicpp -SHARED_LIBS += dbdmysql 0.0 # 0.0 -SHARED_LIBS += dbdpg 0.0 # 0.0 +SHARED_LIBS += dbdmysql 1.0 # 0.0 +SHARED_LIBS += dbdpg 1.0 # 0.0 +SHARED_LIBS += dbdsqlite3 0.0 # 0.0 # MIT PERMIT_PACKAGE_CDROM= Yes @@ -21,7 +22,7 @@ PERMIT_DISTFILES_FTP= Yes # port-lib-depends-check says that e2fs-uuid and pcrecpp are # Extra, but they are used in a .a file that doesn't have a # .so shared library equivalent. -WANTLIB = e2fs-uuid m mysqlclient pcrecpp pq stdc++ +WANTLIB = e2fs-uuid m mysqlclient pcrecpp pq stdc++ sqlite3 MASTER_SITES= http://www.bsdfrog.org/OpenBSD/distfiles/ @@ -29,14 +30,15 @@ BUILD_DEPENDS= devel/cmake \ shells/bash LIB_DEPENDS= mysql-client->=5:databases/mysql \ postgresql-client->=8.4:databases/postgresql \ + sqlite3->=3.7:databases/sqlite3 \ devel/pcre \ sysutils/e2fsprogs CONFIGURE_STYLE= none -WRKDIST= ${WRKDIR}/${PKGNAME} +WRKDIST= ${WRKDIR}/deepfryed-dbicpp-4fe45f7 -post-extract: - cd ${WRKDIR} && mv ${DISTNAME} ${PKGNAME} +pre-configure: + ${SUBST_CMD} ${WRKSRC}/{CMakeLists.txt,inc/dbic++.h,src/dbic++.cc,pkgconfig/dbic++.pc} do-build: cd ${WRKSRC} && ${SET_ENV} ${MAKE_ENV} bash build.sh Index: databases/dbic++/distinfo =================================================================== RCS file: /cvs/ports/databases/dbic++/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- databases/dbic++/distinfo 20 Dec 2010 17:39:55 -0000 1.1.1.1 +++ databases/dbic++/distinfo 21 Jan 2011 23:01:54 -0000 @@ -1,5 +1,5 @@ -MD5 (deepfryed-dbicpp-74e3352.tar.gz) = MOrYbkql48TgMbiXqRZi1w== -RMD160 (deepfryed-dbicpp-74e3352.tar.gz) = AEeyOJEsE97/BvyALhpVSES32UY= -SHA1 (deepfryed-dbicpp-74e3352.tar.gz) = FYyvmJW4AYCgkcfzv6oPjLMR6v4= -SHA256 (deepfryed-dbicpp-74e3352.tar.gz) = gyHQgoe1nefuS6kj4GVSWVgoiKA39kqOqq3K1dEp108= -SIZE (deepfryed-dbicpp-74e3352.tar.gz) = 53133 +MD5 (deepfryed-dbicpp-g466860f.tar.gz) = QXv1uOF2+rCF8Dkv6tdc5Q== +RMD160 (deepfryed-dbicpp-g466860f.tar.gz) = POt1CYLnCq2kLPcoEkXJzveX+f4= +SHA1 (deepfryed-dbicpp-g466860f.tar.gz) = 0X1uzAXgzX7JJ5eC3yBUA/zNVqc= +SHA256 (deepfryed-dbicpp-g466860f.tar.gz) = odddcJsbvgq7Ony1pfG+JcjhhjR9FvkXwwF4JWBAPNE= +SIZE (deepfryed-dbicpp-g466860f.tar.gz) = 55945 Index: databases/dbic++/patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/databases/dbic++/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-CMakeLists_txt --- databases/dbic++/patches/patch-CMakeLists_txt 20 Dec 2010 17:39:55 -0000 1.1.1.1 +++ databases/dbic++/patches/patch-CMakeLists_txt 19 Jan 2011 19:08:54 -0000 @@ -1,25 +1,33 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2010/12/20 17:39:55 jeremy Exp $ ---- CMakeLists.txt.orig Sun Oct 17 08:56:31 2010 -+++ CMakeLists.txt Thu Oct 28 16:16:23 2010 +--- CMakeLists.txt.orig Wed Jan 12 18:27:58 2011 ++++ CMakeLists.txt Wed Jan 19 11:05:22 2011 @@ -32,7 +32,7 @@ IF (PQ_FOUND) TARGET_LINK_LIBRARIES(dbdpg ${PQ_LIBRARIES}) ENDIF() - SET_TARGET_PROPERTIES(dbdpg PROPERTIES VERSION ${CMAKE_PG_VERSION} SOVERSION 1) -+ SET_TARGET_PROPERTIES(dbdpg PROPERTIES VERSION "${CMAKE_PG_VERSION}0.0") ++ SET_TARGET_PROPERTIES(dbdpg PROPERTIES VERSION "${CMAKE_PG_VERSION}${LIBdbdpg_VERSION}") INSTALL(TARGETS dbdpg LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++) -@@ -46,7 +46,7 @@ IF (MYSQL_FOUND) +@@ -47,7 +47,7 @@ IF (MYSQL_FOUND) ELSE() TARGET_LINK_LIBRARIES(dbdmysql ${MYSQL_LIBRARIES}) ENDIF() - SET_TARGET_PROPERTIES(dbdmysql PROPERTIES VERSION ${CMAKE_MYSQL_VERSION} SOVERSION 1) -+ SET_TARGET_PROPERTIES(dbdmysql PROPERTIES VERSION "${CMAKE_MYSQL_VERSION}0.0") ++ SET_TARGET_PROPERTIES(dbdmysql PROPERTIES VERSION "${CMAKE_MYSQL_VERSION}${LIBdbdmysql_VERSION}") INSTALL(TARGETS dbdmysql LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++) -@@ -68,12 +68,12 @@ IF (DB2_FOUND) +@@ -62,19 +62,19 @@ IF (SQLITE3_FOUND) + ELSE() + TARGET_LINK_LIBRARIES(dbdsqlite3 ${SQLITE3_LIBRARIES}) + ENDIF() +- SET_TARGET_PROPERTIES(dbdsqlite3 PROPERTIES VERSION ${CMAKE_SQLITE3_VERSION} SOVERSION 1) ++ SET_TARGET_PROPERTIES(dbdsqlite3 PROPERTIES VERSION "${CMAKE_SQLITE3_VERSION}${LIBdbdsqlite3_VERSION}") + INSTALL(TARGETS dbdsqlite3 + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++ + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++) ENDIF() ADD_EXECUTABLE(demo/demo src/examples/demo.cc) Index: databases/dbic++/patches/patch-build_sh =================================================================== RCS file: /cvs/ports/databases/dbic++/patches/patch-build_sh,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-build_sh --- databases/dbic++/patches/patch-build_sh 20 Dec 2010 17:39:55 -0000 1.1.1.1 +++ databases/dbic++/patches/patch-build_sh 18 Jan 2011 23:47:08 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-build_sh,v 1.1.1.1 2010/12/20 17:39:55 jeremy Exp $ ---- build.sh.orig Sun Oct 17 08:56:31 2010 -+++ build.sh Thu Oct 28 16:39:16 2010 +--- build.sh.orig Wed Jan 12 18:27:58 2011 ++++ build.sh Tue Jan 18 15:46:51 2011 @@ -88,12 +88,10 @@ _uninstall() { } @@ -8,7 +8,7 @@ $OpenBSD: patch-build_sh,v 1.1.1.1 2010/ - _uninstall cmake -DCMAKE_PG_VERSION=$PG_VERSION \ -DCMAKE_MYSQL_VERSION=$MYSQL_VERSION \ - -DCMAKE_DB2_VERSION=$DB2_VERSION \ + -DCMAKE_SQLITE3_VERSION=$SQLITE3_VERSION \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr - make + -DCMAKE_INSTALL_PREFIX:PATH=${LOCALBASE} Index: databases/dbic++/patches/patch-inc_dbic++_h =================================================================== RCS file: databases/dbic++/patches/patch-inc_dbic++_h diff -N databases/dbic++/patches/patch-inc_dbic++_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ databases/dbic++/patches/patch-inc_dbic++_h 19 Jan 2011 19:09:09 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- inc/dbic++.h.orig Wed Jan 12 18:27:58 2011 ++++ inc/dbic++.h Wed Jan 19 11:05:22 2011 +@@ -31,7 +31,7 @@ namespace dbi { + #include "dbic++/container.h" + #include "dbic++/cpool.h" + +-#define DEFAULT_DRIVER_PATH "/usr/lib/dbic++" ++#define DEFAULT_DRIVER_PATH "${LOCALBASE}/lib/dbic++" + + #define DBI_TYPE_UNKNOWN 0 + #define DBI_TYPE_INT 1 Index: databases/dbic++/patches/patch-pkgconfig_dbic++_pc =================================================================== RCS file: databases/dbic++/patches/patch-pkgconfig_dbic++_pc diff -N databases/dbic++/patches/patch-pkgconfig_dbic++_pc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ databases/dbic++/patches/patch-pkgconfig_dbic++_pc 19 Jan 2011 19:09:22 -0000 @@ -0,0 +1,9 @@ +$OpenBSD$ +--- pkgconfig/dbic++.pc.orig Wed Jan 12 18:27:58 2011 ++++ pkgconfig/dbic++.pc Wed Jan 19 11:05:22 2011 +@@ -1,4 +1,4 @@ +-prefix=/usr ++prefix=${LOCALBASE} + exec_prefix=${prefix} + libdir=${exec_prefix}/lib + includedir=${prefix}/include Index: databases/dbic++/patches/patch-src_dbic++_cc =================================================================== RCS file: databases/dbic++/patches/patch-src_dbic++_cc diff -N databases/dbic++/patches/patch-src_dbic++_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ databases/dbic++/patches/patch-src_dbic++_cc 19 Jan 2011 19:07:39 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- src/dbic++.cc.orig Wed Jan 12 18:27:58 2011 ++++ src/dbic++.cc Wed Jan 19 11:06:17 2011 +@@ -106,8 +106,7 @@ namespace dbi { + + void initCheck(string driver_name) { + if (!drivers.size()) { +- dbiInitialize("./lib/dbic++"); +- dbiInitialize(); ++ dbiInitialize("${LOCALBASE}/lib/dbic++"); + } + + if (!drivers[driver_name]) Index: databases/dbic++/patches/patch-src_file_io_cc =================================================================== RCS file: databases/dbic++/patches/patch-src_file_io_cc diff -N databases/dbic++/patches/patch-src_file_io_cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ databases/dbic++/patches/patch-src_file_io_cc 19 Jan 2011 01:02:38 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ +--- src/file_io.cc.orig Wed Jan 12 18:27:58 2011 ++++ src/file_io.cc Tue Jan 18 16:59:51 2011 +@@ -44,10 +44,9 @@ namespace dbi { + char *buffer; + size_t size; + +- size = getline(&buffer, &size, fp); +- if (size > 0) { ++ buffer = fgetln(fp, &size); ++ if (buffer != NULL && size > 0) { + line = string(buffer, size); +- free(buffer); + return true; + } + Index: databases/dbic++/pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/dbic++/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- databases/dbic++/pkg/PLIST 20 Dec 2010 17:39:55 -0000 1.1.1.1 +++ databases/dbic++/pkg/PLIST 19 Jan 2011 01:05:32 -0000 @@ -7,19 +7,22 @@ include/dbic++/abstract_statement.h include/dbic++/container.h include/dbic++/cpool.h include/dbic++/error.h +include/dbic++/file_io.h include/dbic++/handle.h include/dbic++/io.h -include/dbic++/io_filestream.h -include/dbic++/io_stream.h include/dbic++/param.h +include/dbic++/query.h include/dbic++/reactor.h +include/dbic++/result.h include/dbic++/result_row.h include/dbic++/result_row_hash.h include/dbic++/socketinfo.h include/dbic++/statement.h +include/dbic++/string_io.h include/dbic++/util.h lib/dbic++/ @lib lib/dbic++/libdbdmysql.so.${LIBdbdmysql_VERSION} @lib lib/dbic++/libdbdpg.so.${LIBdbdpg_VERSION} +@lib lib/dbic++/libdbdsqlite3.so.${LIBdbdsqlite3_VERSION} lib/libdbic++.a lib/pkgconfig/dbic++.pc Index: databases/ruby-swift/Makefile =================================================================== RCS file: /cvs/ports/databases/ruby-swift/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- databases/ruby-swift/Makefile 21 Dec 2010 17:07:06 -0000 1.2 +++ databases/ruby-swift/Makefile 24 Feb 2011 01:27:38 -0000 @@ -2,8 +2,7 @@ COMMENT = fast database API and ORM for ruby 1.9 -DISTNAME = swift-0.7.2 -REVISION = 0 +DISTNAME = swift-0.9.1 CATEGORIES = databases MAINTAINER = Jeremy Evans <jer...@openbsd.org> @@ -19,7 +18,7 @@ FLAVOR = ruby19 WANTLIB = c m stdc++ e2fs-uuid pcrecpp BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = databases/dbic++ +RUN_DEPENDS = databases/dbic++>=0.5.4 CONFIGURE_STYLE = ruby gem ext Index: databases/ruby-swift/distinfo =================================================================== RCS file: /cvs/ports/databases/ruby-swift/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- databases/ruby-swift/distinfo 20 Dec 2010 17:43:58 -0000 1.1.1.1 +++ databases/ruby-swift/distinfo 24 Feb 2011 01:27:56 -0000 @@ -1,5 +1,5 @@ -MD5 (swift-0.7.2.gem) = xFa5wyg0nfOxL8enKWUWbg== -RMD160 (swift-0.7.2.gem) = 6W1QlMrH2ytvmMEDE25e3I++EEg= -SHA1 (swift-0.7.2.gem) = Jjs1ijAjooGpq+DPYOXcaJyFkYU= -SHA256 (swift-0.7.2.gem) = pYBTeOHutcJO35U16kZp/FgsUr9fKwhxe8fTu3QHEYw= -SIZE (swift-0.7.2.gem) = 74240 +MD5 (swift-0.9.1.gem) = 2eZ3H6nzdl1RjjUF+8f1Hg== +RMD160 (swift-0.9.1.gem) = 5zGuWwYb7IOBY6m5B6bGeZ73XNY= +SHA1 (swift-0.9.1.gem) = bfMeKhPeXpFXCDPhDf5Mr/Lfye0= +SHA256 (swift-0.9.1.gem) = RDEu3JHYz16yjCX9E2HTASKc3cL22su/E5qxkP/Cu4U= +SIZE (swift-0.9.1.gem) = 74752 Index: databases/ruby-swift/pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/ruby-swift/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- databases/ruby-swift/pkg/PLIST 20 Dec 2010 17:43:58 -0000 1.1.1.1 +++ databases/ruby-swift/pkg/PLIST 15 Feb 2011 22:52:42 -0000 @@ -15,13 +15,13 @@ ${GEM_LIB}/gems/${DISTNAME}/ext/Makefile ${GEM_LIB}/gems/${DISTNAME}/ext/adapter.cc ${GEM_LIB}/gems/${DISTNAME}/ext/adapter.h ${GEM_LIB}/gems/${DISTNAME}/ext/adapter.o +${GEM_LIB}/gems/${DISTNAME}/ext/adapter_io.cc +${GEM_LIB}/gems/${DISTNAME}/ext/adapter_io.h +${GEM_LIB}/gems/${DISTNAME}/ext/adapter_io.o ${GEM_LIB}/gems/${DISTNAME}/ext/attribute.cc ${GEM_LIB}/gems/${DISTNAME}/ext/attribute.h ${GEM_LIB}/gems/${DISTNAME}/ext/attribute.o ${GEM_LIB}/gems/${DISTNAME}/ext/extconf.rb -${GEM_LIB}/gems/${DISTNAME}/ext/iostream.cc -${GEM_LIB}/gems/${DISTNAME}/ext/iostream.h -${GEM_LIB}/gems/${DISTNAME}/ext/iostream.o ${GEM_LIB}/gems/${DISTNAME}/ext/mkmf.log ${GEM_LIB}/gems/${DISTNAME}/ext/pool.cc ${GEM_LIB}/gems/${DISTNAME}/ext/pool.h
