- Update to 0.8

- Add Firebird and Paradox support

4 files changed, 74 insertions, 18 deletions

diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 569c16bb3e75..26daeac3aaf9 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	hk_classes
-PORTVERSION=	0.7.4a
+PORTVERSION=	0.8
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hk-classes
@@ -21,8 +21,8 @@ USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_GNOME=	pkgconfig
 CXXFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}" \
-		LDFLAGS="${PTHREAD_LIBS} -largp -L${LOCALBASE}/lib"
+LDFLAGS=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
+CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--with-pythondir=${PYTHONBASE}
 GNU_CONFIGURE=	yes
@@ -30,14 +30,17 @@ INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 LDCONFIG_DIRS+=	${PREFIX}/lib/hk_classes/
 
-OPTIONS=	MYSQL "Build MySQL driver" on \
-		POSTGRESQL "Build PostrgreSQL driver" off \
-		ODBC "Build unixODBC driver" off \
-		SQLITE2 "Build with sqlite2 driver" off \
-		SQLITE3 "Build with sqlite3 driver" off
+OPTIONS=	MYSQL		"Build MySQL driver"		on  \
+		POSTGRESQL	"Build PostrgreSQL driver"	off \
+		ODBC		"Build unixODBC driver"		off \
+		FIREBIRD	"Build Firebird driver"		off \
+		PARADOX		"Build Paradox driver"		off \
+		SQLITE2		"Build with sqlite2 driver"	off \
+		SQLITE3		"Build with sqlite3 driver"	off
 
 MAN1=		hk_report.1man hk_actionquery.1man hk_exportxml.1man \
-		hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man
+		hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man \
+		hk_dbcopy.1man
 
 .include <bsd.port.pre.mk>
 
@@ -75,6 +78,48 @@ CONFIGURE_ARGS+=	--without-odbc
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
+.if defined(WITH_FIREBIRD)
+LIB_DEPENDS+=		gds:${PORTSDIR}/databases/firebird-client
+CONFIGURE_ARGS+=	--with-firebird-incdir=${LOCALBASE}/include/\
+			--with-firebird-libdir=${LOCALBASE}/lib
+PLIST_SUB+=	FIREBIRD=""
+.else
+CONFIGURE_ARGS+=	--without-firebird
+PLIST_SUB+=	FIREBIRD="@comment "
+.endif
+
+.if defined(WITH_PARADOX)
+LIB_DEPENDS+=		px:${PORTSDIR}/databases/pxlib
+CONFIGURE_ARGS+=	--with-paradox-incdir=${LOCALBASE}/include/\
+			--with-paradox-libdir=${LOCALBASE}/lib
+PLIST_SUB+=	PARADOX=""
+.else
+CONFIGURE_ARGS+=	--without-paradox
+PLIST_SUB+=	PARADOX="@comment "
+.endif
+
+# XXX does not work yet
+.if defined(WITH_MSACCESS)
+LIB_DEPENDS+=		mdb:${PORTSDIR}/databases/mdbtools
+CONFIGURE_ARGS+=	--with-mdb-incdir=${LOCALBASE}/include/\
+			--with-mdb-libdir=${LOCALBASE}/lib
+PLIST_SUB+=	MSACCESS=""
+.else
+CONFIGURE_ARGS+=	--without-mdb
+PLIST_SUB+=	MSACCESS="@comment "
+.endif
+
+# XXX does not work yet
+.if defined(WITH_DBASE)
+LIB_DEPENDS+=		xbase:${PORTSDIR}/databases/xbase
+CONFIGURE_ARGS+=	--with-xbase-incdir=${LOCALBASE}/include/xbase \
+			--with-xbase-libdir=${LOCALBASE}/lib
+PLIST_SUB+=	DBASE=""
+.else
+CONFIGURE_ARGS+=	--without-xbase
+PLIST_SUB+=	DBASE="@comment "
+.endif
+
 .if defined(WITH_SQLITE2)
 LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
 CONFIGURE_ARGS+=	--with-sqlite-incdir=${LOCALBASE}/include/\
diff --git a/databases/hk_classes/distinfo b/databases/hk_classes/distinfo
index ad23a5213229..961df6d7a8e3 100644
--- a/databases/hk_classes/distinfo
+++ b/databases/hk_classes/distinfo
@@ -1,3 +1,3 @@
-MD5 (hk_classes-0.7.4a.tar.bz2) = 7b4de2d97c05d4a59d54cfab602fc062
-SHA256 (hk_classes-0.7.4a.tar.bz2) = 3f1af081c94a73bbe6028c894880c4b5e3a58a7ad7fef2029c03987862bdb783
-SIZE (hk_classes-0.7.4a.tar.bz2) = 725851
+MD5 (hk_classes-0.8.tar.bz2) = f28a87596f4a46a19db3e769d1c9c7e2
+SHA256 (hk_classes-0.8.tar.bz2) = ca4ffb42d01f555b2d35b25fbacb1cbb8c484722992e59c4a3e61fd64986c3d3
+SIZE (hk_classes-0.8.tar.bz2) = 739952
diff --git a/databases/hk_classes/files/patch-utilities::Makefile.in b/databases/hk_classes/files/patch-utilities::Makefile.in
index 76c765c66982..d67796ebb0a0 100644
--- a/databases/hk_classes/files/patch-utilities::Makefile.in
+++ b/databases/hk_classes/files/patch-utilities::Makefile.in
@@ -1,6 +1,6 @@
---- utilities/Makefile.in.orig	Sun Mar 13 19:46:30 2005
-+++ utilities/Makefile.in	Fri Apr  1 20:52:27 2005
-@@ -221,20 +221,20 @@
+--- utilities/Makefile.in.orig	Sun Oct 23 18:56:09 2005
++++ utilities/Makefile.in	Sat Dec 10 20:00:12 2005
+@@ -238,22 +238,22 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  INCLUDES = -I../hk_classes
@@ -26,5 +26,8 @@
 -hk_importcsv_LDFLAGS = -lhk_classes -ldl -L../hk_classes
 +hk_importcsv_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
  hk_importcsv_SOURCES = hk_importcsvutility.cpp
- man_MANS = hk_report.1man hk_actionquery.1man hk_exportxml.1man hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man
- EXTRA_DIST = $(man_MANS)
+-hk_dbcopy_LDFLAGS = -lhk_classes -ldl -L../hk_classes
++hk_dbcopy_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
+ hk_dbcopy_SOURCES = hk_dbcopyutility.cpp
+ man_MANS = hk_report.1man hk_actionquery.1man hk_dbcopy.1man hk_exportxml.1man \
+ 	hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man
diff --git a/databases/hk_classes/pkg-plist b/databases/hk_classes/pkg-plist
index 8ce997ab8aa8..e4835bc4d913 100644
--- a/databases/hk_classes/pkg-plist
+++ b/databases/hk_classes/pkg-plist
@@ -1,5 +1,6 @@
 etc/rc.d/hk_classes.sh
 bin/hk_actionquery
+bin/hk_dbcopy
 bin/hk_exportcsv
 bin/hk_exporthtml
 bin/hk_exportxml
@@ -41,6 +42,7 @@ include/hk_classes/hk_key.h
 include/hk_classes/hk_label.h
 include/hk_classes/hk_presentation.h
 include/hk_classes/hk_qbe.h
+include/hk_classes/hk_referentialintegrity.h
 include/hk_classes/hk_report.h
 include/hk_classes/hk_reportdata.h
 include/hk_classes/hk_reportsection.h
@@ -53,12 +55,18 @@ include/hk_classes/hk_subform.h
 include/hk_classes/hk_tabvisible.h
 include/hk_classes/hk_url.h
 include/hk_classes/hk_visible.h
+%%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.so.0
+%%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.so
+%%FIREBIRD%%lib/hk_classes/drivers/libhk_firebirddriver.a
 %%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so
 %%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so.3
 %%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.a
 %%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so
 %%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so.0
 %%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.a
+%%PARADOX%%lib/hk_classes/drivers/libhk_paradoxdriver.so.0
+%%PARADOX%%lib/hk_classes/drivers/libhk_paradoxdriver.so
+%%PARADOX%%lib/hk_classes/drivers/libhk_paradoxdriver.a
 %%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.so
 %%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.so.0
 %%POSTGRESQL%%lib/hk_classes/drivers/libhk_postgresdriver.a
@@ -72,7 +80,7 @@ include/hk_classes/hk_visible.h
 %%PYTHON_SITELIBDIR%%/hk_classes.py
 %%PYTHON_SITELIBDIR%%/hk_classes.pyc
 lib/hk_classes/libhk_classes.so
-lib/hk_classes/libhk_classes.so.8
+lib/hk_classes/libhk_classes.so.9
 lib/hk_classes/libhk_classes.a
 @dirrm lib/hk_classes/drivers
 @dirrm lib/hk_classes