7 files changed, 51 insertions, 76 deletions

diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 6e50d6ec01f7..fb08ffb9dd6b 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	hk_classes
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hk-classes
@@ -13,9 +13,15 @@ MASTER_SITE_SUBDIR=	hk-classes
 MAINTAINER=	sem@ciam.ru
 COMMENT=	C++ Library for rapid development of database applications
 
+BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
+
+USE_REINPLACE=	yes
+USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_PYTHON=	yes
-CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"
+CXXFLAGS+=	${PTHREAD_CFLAGS}
+CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}" \
+		LDFLAGS="${PTHREAD_LIBS} -largp -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/databases/hk_classes/distinfo b/databases/hk_classes/distinfo
index 5225899ad77a..cc6003b11d81 100644
--- a/databases/hk_classes/distinfo
+++ b/databases/hk_classes/distinfo
@@ -1,2 +1,2 @@
-MD5 (hk_classes-0.6.2.tar.gz) = 2f5fb56ecf05018c080de9bdd7914892
-SIZE (hk_classes-0.6.2.tar.gz) = 578222
+MD5 (hk_classes-0.6.3.tar.bz2) = c842b4ed39eb3322a0b83bb84ebfc1e1
+SIZE (hk_classes-0.6.3.tar.bz2) = 449665
diff --git a/databases/hk_classes/files/patch-configure b/databases/hk_classes/files/patch-configure
deleted file mode 100644
index a3543560018f..000000000000
--- a/databases/hk_classes/files/patch-configure
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.orig	Sat Nov 15 19:04:37 2003
-+++ configure	Thu Mar 11 00:21:00 2004
-@@ -7855,7 +7855,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8541,9 +8541,8 @@
- NODRIVER=true
- POSSIBLE_DRIVERS="MYSQL,ODBC, POSTGRESQL"
- 
--cat >>confdefs.h <<_ACEOF
--#define HKCLASSES "$HK_CLASSESDIR"
--_ACEOF
-+echo -n "#define HKCLASSES " >>confdefs.h
-+echo \"$prefix/lib/hk_classes\" >>confdefs.h
- 
- echo "$as_me:$LINENO: result: OK" >&5
- echo "${ECHO_T}OK" >&6
-@@ -15667,7 +15666,7 @@
- 
- echo "$as_me:$LINENO: result: $mysql_lib" >&5
- echo "${ECHO_T}$mysql_lib" >&6
--if test $mysql_lib = yes ; then
-+if test $mysql_lib = yes -a "x$with_mysql" != "xno"; then
- NODRIVER=false
- DRIVERSDIR="$DRIVERSDIR hk_mysqlclasses"
- 
-@@ -15807,7 +15806,7 @@
- 
- echo "$as_me:$LINENO: result: $postgres_lib" >&5
- echo "${ECHO_T}$postgres_lib" >&6
--if test $postgres_lib = yes ; then
-+if test $postgres_lib = yes -a "x$with_postgres" != "xno"; then
- NODRIVER=false
- DRIVERSDIR="$DRIVERSDIR hk_postgresclasses"
- 
-@@ -15966,7 +15965,7 @@
- 
- echo "$as_me:$LINENO: result: $odbc_lib" >&5
- echo "${ECHO_T}$odbc_lib" >&6
--if test x$odbc_lib = xyes ; then
-+if test x$odbc_lib = xyes -a "x$with_odbc" != "xno"; then
- NODRIVER=false
- DRIVERSDIR="$DRIVERSDIR hk_odbcclasses"
- 
diff --git a/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp b/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp
deleted file mode 100644
index 9889f7cbf73a..000000000000
--- a/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- hk_classes/hk_actionquery.cpp.orig	Wed Mar 10 22:55:49 2004
-+++ hk_classes/hk_actionquery.cpp	Wed Mar 10 22:56:40 2004
-@@ -12,6 +12,8 @@
- #include "hk_actionquery.h"
- #include "hk_database.h"
- 
-+#include <time.h>
-+
- class hk_actionqueryprivate
- {
- public:
diff --git a/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp b/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp
deleted file mode 100644
index baa57b1973c7..000000000000
--- a/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- hk_classes/hk_datasource.cpp.orig	Wed Mar 10 22:57:45 2004
-+++ hk_classes/hk_datasource.cpp	Wed Mar 10 22:58:01 2004
-@@ -19,7 +19,7 @@
- #include <algorithm>
- #include <list>
- #include <stdlib.h>
--
-+#include <time.h>
- 
- class hk_datasourceprivate
- {
diff --git a/databases/hk_classes/files/patch-utilities::Makefile.in b/databases/hk_classes/files/patch-utilities::Makefile.in
new file mode 100644
index 000000000000..50fd0539519a
--- /dev/null
+++ b/databases/hk_classes/files/patch-utilities::Makefile.in
@@ -0,0 +1,35 @@
+--- utilities/Makefile.in.orig	Sun Mar 14 20:49:52 2004
++++ utilities/Makefile.in	Sun Apr  4 01:58:38 2004
+@@ -150,25 +150,25 @@
+ 		hk_importcsv hk_report 
+ 
+ 
+-hk_report_LDFLAGS = -lhk_classes -ldl -L../hk_classes
++hk_report_LDFLAGS = -lhk_classes -L../hk_classes
+ hk_report_SOURCES = hk_reportutility.cpp
+ 
+ 
+-#hk_webform_LDFLAGS = -lhk_classes -ldl -L../hk_classes
++#hk_webform_LDFLAGS = -lhk_classes -L../hk_classes
+ #hk_webform_SOURCES = hk_webformutility.cpp
+-hk_actionquery_LDFLAGS = -lhk_classes -ldl -L../hk_classes
++hk_actionquery_LDFLAGS = -lhk_classes -L../hk_classes
+ hk_actionquery_SOURCES = hk_actionqueryutility.cpp
+ 
+-hk_exportxml_LDFLAGS = -lhk_classes -ldl -L../hk_classes
++hk_exportxml_LDFLAGS = -lhk_classes -L../hk_classes
+ hk_exportxml_SOURCES = hk_exportxmlutility.cpp
+ 
+-hk_exportcsv_LDFLAGS = -lhk_classes -ldl -L../hk_classes
++hk_exportcsv_LDFLAGS = -lhk_classes -L../hk_classes
+ hk_exportcsv_SOURCES = hk_exportcsvutility.cpp
+ 
+-hk_exporthtml_LDFLAGS = -lhk_classes -ldl -L../hk_classes
++hk_exporthtml_LDFLAGS = -lhk_classes -L../hk_classes
+ hk_exporthtml_SOURCES = hk_exporthtmlutility.cpp
+ 
+-hk_importcsv_LDFLAGS = -lhk_classes -ldl -L../hk_classes
++hk_importcsv_LDFLAGS = -lhk_classes -L../hk_classes
+ 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
diff --git a/databases/hk_classes/pkg-plist b/databases/hk_classes/pkg-plist
index f0e7d20f7145..8eb5d3ace92d 100644
--- a/databases/hk_classes/pkg-plist
+++ b/databases/hk_classes/pkg-plist
@@ -1,3 +1,9 @@
+bin/hk_actionquery
+bin/hk_exportcsv
+bin/hk_exporthtml
+bin/hk_exportxml
+bin/hk_importcsv
+bin/hk_report
 include/hk_classes/hk_string.h
 include/hk_classes/hk_database.h
 include/hk_classes/hk_connection.h