- Update to 0.8.1

5 files changed, 56 insertions, 27 deletions

diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 71b0704ca940..b035a649ac07 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	hk_classes
-PORTVERSION=	0.8
-PORTREVISION=	1
+PORTVERSION=	0.8.1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hk-classes
@@ -15,17 +14,22 @@ MAINTAINER=	sem@FreeBSD.org
 COMMENT=	C++ Library for rapid development of database applications
 
 BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
+LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_GNOME=	pkgconfig
+USE_GETTEXT=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=--with-pythondir=${PYTHONBASE}
+CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \
+		--with-python-incdir=${PYTHON_INCLUDEDIR} \
+		--with-fontconfig-incdir=${X11BASE}/include/fontconfig \
+		--with-fontconfig-libdir=${X11BASE}/lib
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	${PREFIX}/lib/hk_classes/
 
@@ -46,6 +50,10 @@ MAN1=		hk_report.1man hk_actionquery.1man hk_exportxml.1man \
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+IGNORE=		there is no wchar support
+.endif
+
 .if !defined(WITHOUT_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-dir=${LOCALBASE} \
diff --git a/databases/hk_classes/distinfo b/databases/hk_classes/distinfo
index 961df6d7a8e3..63cfaedae953 100644
--- a/databases/hk_classes/distinfo
+++ b/databases/hk_classes/distinfo
@@ -1,3 +1,3 @@
-MD5 (hk_classes-0.8.tar.bz2) = f28a87596f4a46a19db3e769d1c9c7e2
-SHA256 (hk_classes-0.8.tar.bz2) = ca4ffb42d01f555b2d35b25fbacb1cbb8c484722992e59c4a3e61fd64986c3d3
-SIZE (hk_classes-0.8.tar.bz2) = 739952
+MD5 (hk_classes-0.8.1.tar.bz2) = 5fe19945c746854776266f7e96de0a2e
+SHA256 (hk_classes-0.8.1.tar.bz2) = 9e403fe153962770676099c2346a74b96953eba790a289303c49fe448c958603
+SIZE (hk_classes-0.8.1.tar.bz2) = 1413828
diff --git a/databases/hk_classes/files/patch-configure b/databases/hk_classes/files/patch-configure
new file mode 100644
index 000000000000..65d24c0fc8eb
--- /dev/null
+++ b/databases/hk_classes/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Sat Jul 22 12:08:15 2006
++++ configure	Sat Jul 22 12:08:43 2006
+@@ -20549,7 +20549,7 @@
+ 		py_version=`$PYTHON -c "from distutils.sysconfig import *; \
+ 			from string import join; \
+ 			print join(get_config_vars('VERSION'))"`
+-		if test "$py_version" == "None"; then
++		if test "$py_version" = "None"; then
+ 			if test -n "$PYTHON_VERSION"; then
+ 				py_version=$PYTHON_VERSION
+ 			else
+@@ -20815,7 +20815,7 @@
+ fi
+ 
+ if test "x$with_fontconfig_libdir" != "x"; then
+- FONTCONFIGLIBDIR=$with_fontconifg_libdir
++ FONTCONFIGLIBDIR=$with_fontconfig_libdir
+ fi
+ 
+ ac_save_LIBS="$LIBS"
diff --git a/databases/hk_classes/files/patch-utilities::Makefile.in b/databases/hk_classes/files/patch-utilities::Makefile.in
index d67796ebb0a0..b631f7705da1 100644
--- a/databases/hk_classes/files/patch-utilities::Makefile.in
+++ b/databases/hk_classes/files/patch-utilities::Makefile.in
@@ -1,33 +1,33 @@
---- 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@
+--- utilities/Makefile.in.orig	Sat Jul 22 12:09:44 2006
++++ utilities/Makefile.in	Sat Jul 22 12:11:59 2006
+@@ -237,22 +237,22 @@
  target_alias = @target_alias@
  INCLUDES = -I../hk_classes
--hk_report_LDFLAGS = -lhk_classes -ldl -L../hk_classes
-+hk_report_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
+ AM_CXXFLAGS = -Wall   -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
+-hk_report_LDADD = ../hk_classes/libhk_classes.la -ldl
++hk_report_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
  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_LDADD = ../hk_classes/libhk_classes.la -ldl
++#hk_webform_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
  #hk_webform_SOURCES = hk_webformutility.cpp
--hk_actionquery_LDFLAGS = -lhk_classes -ldl -L../hk_classes
-+hk_actionquery_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
+-hk_actionquery_LDADD = ../hk_classes/libhk_classes.la -ldl
++hk_actionquery_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
  hk_actionquery_SOURCES = hk_actionqueryutility.cpp
--hk_exportxml_LDFLAGS = -lhk_classes -ldl -L../hk_classes
-+hk_exportxml_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
+-hk_exportxml_LDADD = ../hk_classes/libhk_classes.la -ldl
++hk_exportxml_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
  hk_exportxml_SOURCES = hk_exportxmlutility.cpp
--hk_exportcsv_LDFLAGS = -lhk_classes -ldl -L../hk_classes
-+hk_exportcsv_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
+-hk_exportcsv_LDADD = ../hk_classes/libhk_classes.la -ldl
++hk_exportcsv_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
  hk_exportcsv_SOURCES = hk_exportcsvutility.cpp
--hk_exporthtml_LDFLAGS = -lhk_classes -ldl -L../hk_classes
-+hk_exporthtml_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
+-hk_exporthtml_LDADD = ../hk_classes/libhk_classes.la -ldl
++hk_exporthtml_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
  hk_exporthtml_SOURCES = hk_exporthtmlutility.cpp
--hk_importcsv_LDFLAGS = -lhk_classes -ldl -L../hk_classes
-+hk_importcsv_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
+-hk_importcsv_LDADD = ../hk_classes/libhk_classes.la -ldl
++hk_importcsv_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
  hk_importcsv_SOURCES = hk_importcsvutility.cpp
 -hk_dbcopy_LDFLAGS = -lhk_classes -ldl -L../hk_classes
-+hk_dbcopy_LDFLAGS = -lhk_classes -L../hk_classes -largp ${LIBPTHREAD}
++hk_dbcopy_LDFLAGS = -lhk_classes -largp ${LIBPTHREAD} -L../hk_classes
  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 c79c85db4c06..dda43e54ec37 100644
--- a/databases/hk_classes/pkg-plist
+++ b/databases/hk_classes/pkg-plist
@@ -40,6 +40,7 @@ include/hk_classes/hk_importcsv.h
 include/hk_classes/hk_interpreter.h
 include/hk_classes/hk_key.h
 include/hk_classes/hk_label.h
+include/hk_classes/hk_mimetype.h
 include/hk_classes/hk_presentation.h
 include/hk_classes/hk_qbe.h
 include/hk_classes/hk_referentialintegrity.h
@@ -89,7 +90,7 @@ include/hk_classes/hk_visible.h
 lib/hk_classes/libhk_classes.a
 lib/hk_classes/libhk_classes.la
 lib/hk_classes/libhk_classes.so
-lib/hk_classes/libhk_classes.so.9
+lib/hk_classes/libhk_classes.so.13
 @dirrm lib/hk_classes/drivers
 @dirrm lib/hk_classes
 @dirrm include/hk_classes