Attachment #122376 for bug #165572

View | Details | Raw Unified | Return to bug 165572
Collapse All | Expand All




# $FreeBSD: ports/databases/hk_classes/Makefile,v 1.48 2012/02/06 12:25:49 miwi Exp $

PORTNAME=	hk_classes
PORTVERSION=	0.8.3
PORTREVISION=	6
CATEGORIES=	databases
MASTER_SITES=	SF/hk-classes/${PORTNAME}/${PORTVERSION}


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 \
		xml2.5:${PORTSDIR}/textproc/libxml2

USE_BZIP2=	yes
USE_ICONV=	yes

		ODBC		"Build unixODBC driver"		off \
		PARADOX		"Build Paradox driver"		off \
		SQLITE2		"Build with sqlite2 driver"	off \
		SQLITE3		"Build with sqlite3 driver"	off \
		DBASE		"Build with dbase driver"	off
MAN1=		hk_report.1man hk_actionquery.1man hk_exportxml.1man \
		hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man \
		hk_dbcopy.1man

.include <bsd.port.pre.mk>


PLIST_SUB+=	MYSQL="@comment "
.endif

.if !defined(WITH_DBASE)
CONFIGURE_ARGS+=	--without-dbase
PLIST_SUB+=	DBASE="@comment "
.else
PLIST_SUB+=	DBASE=""
.endif

.if defined(WITH_POSTGRESQL)
USE_PGSQL=	yes
CONFIGURE_ARGS+=	--with-postgres-incdir=${LOCALBASE}/include/ \

PLIST_SUB+=	SQLITE3="@comment "
.endif

post-patch:
	${REINPLACE_CMD} -e "s|INCLUDES = -I../hk_classes \
		-I./pxlib|INCLUDES = -I../hk_classes -I./pxlib \
		-I${LOCALBASE}/include|g" \
		${WRKSRC}/hk_paradoxclasses/Makefile.in

post-configure:
	${REINPLACE_CMD} -e "s| -I|','|g" ${WRKSRC}/python/setup.py

post-install:
	@${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${FILESDIR}/hk_classes.sh > \
		${PREFIX}/etc/rc.d/hk_classes.sh; \

Lines 1-2 Link Here

(-)databases/hk_classes/distinfo (-2 / +2 lines)
1	SHA256 (hk_classes-0.8.1.tar.bz2) = 9e403fe153962770676099c2346a74b96953eba790a289303c49fe448c958603	1	SHA256 (hk_classes-0.8.3.tar.bz2) = d57a8a2f3c2fb534e01ee5d7b6c5bb650536f20cb7e88a721ec9da7b5befb593
2	SIZE (hk_classes-0.8.1.tar.bz2) = 1413828	2	SIZE (hk_classes-0.8.3.tar.bz2) = 1532249




etc/rc.d/hk_classes.sh
bin/hk_actionquery
bin/hk_dbcopy
bin/hk_exportcsv
bin/hk_exporthtml
bin/hk_exportxml
bin/hk_importcsv
bin/hk_report
include/hk_classes/hk_actionquery.h
include/hk_classes/hk_button.h
include/hk_classes/hk_class.h

include/hk_classes/hk_key.h
include/hk_classes/hk_label.h
include/hk_classes/hk_mimetype.h
include/hk_classes/hk_module.h
include/hk_classes/hk_presentation.h
include/hk_classes/hk_qbe.h
include/hk_classes/hk_referentialintegrity.h

%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.la
%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so
%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so.3
%%DBASE%%lib/hk_classes/drivers/libhk_dbasedriver.a
%%DBASE%%lib/hk_classes/drivers/libhk_dbasedriver.la
%%DBASE%%lib/hk_classes/drivers/libhk_dbasedriver.so
%%DBASE%%lib/hk_classes/drivers/libhk_dbasedriver.so.0
%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.a
%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.la
%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so

lib/hk_classes/libhk_classes.a
lib/hk_classes/libhk_classes.la
lib/hk_classes/libhk_classes.so
lib/hk_classes/libhk_classes.so.15
@dirrm lib/hk_classes/drivers
@dirrm lib/hk_classes
@dirrm include/hk_classes




--- configure.orig	2006-12-17 15:27:45.000000000 +0100
+++ configure	2012-02-19 20:23:04.014494956 +0100
@@ -20681,7 +20681,7 @@
 		py_version=`$PYTHON -c "from distutils.sysconfig import *; \
 			from string import join; \
 			print join(get_config_vars('VERSION'))"`

 			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"

Removed Link Here

(-)databases/hk_classes/files/patch-hk_classes::hk_database.h (-10 lines)
1	--- hk_classes/hk_database.h.orig Thu Jul 15 22:02:22 2004
2	+++ hk_classes/hk_database.h Thu Jul 15 22:02:36 2004
3	@@ -14,6 +14,7 @@
4	#include <list>
5	#include <vector>
6	#include <algorithm>
7	+#include <sstream>
8	#include "hk_presentation.h"
9	using namespace std;
10

Added Link Here

(-)databases/hk_classes/files/patch-hk_classes_hk_database.h (+10 lines)
1	--- hk_classes/hk_database.h.orig Thu Jul 15 22:02:22 2004
2	+++ hk_classes/hk_database.h Thu Jul 15 22:02:36 2004
3	@@ -14,6 +14,7 @@
4	#include <list>
5	#include <vector>
6	#include <algorithm>
7	+#include <sstream>
8	#include "hk_presentation.h"
9	using namespace std;
10




--- 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
 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_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_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_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_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_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_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 -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




--- utilities/Makefile.in.orig	2006-12-17 15:27:52.000000000 +0100
+++ utilities/Makefile.in	2012-02-19 19:21:04.761495232 +0100
@@ -248,22 +248,22 @@
 target_alias = @target_alias@
 INCLUDES = -I../hk_classes
 AM_CXXFLAGS = -Wall   -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@
-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_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_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_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_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_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_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 -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

Lines 5-12 Link Here

(-)databases/knoda/Makefile (-3 / +2 lines)
5	# $FreeBSD: ports/databases/knoda/Makefile,v 1.38 2010/12/04 07:30:44 ade Exp $	5	# $FreeBSD: ports/databases/knoda/Makefile,v 1.38 2010/12/04 07:30:44 ade Exp $
6		6
7	PORTNAME= knoda	7	PORTNAME= knoda
8	PORTVERSION= 0.8.1	8	PORTVERSION= 0.8.3
9	PORTREVISION= 5
10	CATEGORIES= databases	9	CATEGORIES= databases
11	MASTER_SITES= SF	10	MASTER_SITES= SF
12		11
Lines 14-20 Link Here
14	COMMENT= Database frontend for KDE	13	COMMENT= Database frontend for KDE
15		14
16	BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone	15	BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
17	LIB_DEPENDS= hk_classes.13:${PORTSDIR}/databases/hk_classes	16	LIB_DEPENDS= hk_classes.15:${PORTSDIR}/databases/hk_classes
18		17
19	USE_BZIP2= yes	18	USE_BZIP2= yes
20	USE_KDELIBS_VER= 3	19	USE_KDELIBS_VER= 3

Lines 1-2 Link Here

(-)databases/knoda/distinfo (-2 / +2 lines)
1	SHA256 (knoda-0.8.1.tar.bz2) = 8855374cede5fa5ca6321c80f200f62577efe4f9b0ef416541d8e05292ea3993	1	SHA256 (knoda-0.8.3.tar.bz2) = 0ec5eb90c0efd6c76f3b0e86e1a9af4dd4800dcaff170ad35d86025d8d13eeb4
2	SIZE (knoda-0.8.1.tar.bz2) = 4463670	2	SIZE (knoda-0.8.3.tar.bz2) = 4619446

Lines 36-41 Link Here

(-)databases/knoda/pkg-plist (+12 lines)
36	include/hk_kdelineedit.h	36	include/hk_kdelineedit.h
37	include/hk_kdememo.h	37	include/hk_kdememo.h
38	include/hk_kdemessages.h	38	include/hk_kdemessages.h
		39	include/hk_kdemodule.h
		40	include/hk_kdemodulepart.h
		41	include/hk_kdemodulepartfactory.h
39	include/hk_kdenewpassworddialog.h	42	include/hk_kdenewpassworddialog.h
40	include/hk_kdenewpassworddialogbase.h	43	include/hk_kdenewpassworddialogbase.h
41	include/hk_kdepassworddialog.h	44	include/hk_kdepassworddialog.h
Lines 85-90 Link Here
85	lib/kde3/libhk_kdeqbepart.a	88	lib/kde3/libhk_kdeqbepart.a
86	lib/kde3/libhk_kdeqbepart.la	89	lib/kde3/libhk_kdeqbepart.la
87	lib/kde3/libhk_kdeqbepart.so	90	lib/kde3/libhk_kdeqbepart.so
		91	lib/kde3/libhk_kdemodulepart.a
		92	lib/kde3/libhk_kdemodulepart.la
		93	lib/kde3/libhk_kdemodulepart.so
88	lib/kde3/libhk_kdequerypart.a	94	lib/kde3/libhk_kdequerypart.a
89	lib/kde3/libhk_kdequerypart.la	95	lib/kde3/libhk_kdequerypart.la
90	lib/kde3/libhk_kdequerypart.so	96	lib/kde3/libhk_kdequerypart.so
Lines 106-111 Link Here
106	share/apps/hk_kdeclasses/hk_kdegridpart.rc	112	share/apps/hk_kdeclasses/hk_kdegridpart.rc
107	share/apps/hk_kdeclasses/hk_kdeinterpreterdialog.rc	113	share/apps/hk_kdeclasses/hk_kdeinterpreterdialog.rc
108	share/apps/hk_kdeclasses/hk_kdeqbepart.rc	114	share/apps/hk_kdeclasses/hk_kdeqbepart.rc
		115	share/apps/hk_kdeclasses/hk_kdemodule.rc
		116	share/apps/hk_kdeclasses/hk_kdemodulepart.rc
109	share/apps/hk_kdeclasses/hk_kdequery.rc	117	share/apps/hk_kdeclasses/hk_kdequery.rc
110	share/apps/hk_kdeclasses/hk_kdequerypart.rc	118	share/apps/hk_kdeclasses/hk_kdequerypart.rc
111	share/apps/hk_kdeclasses/hk_kdequerypartqbe.rc	119	share/apps/hk_kdeclasses/hk_kdequerypartqbe.rc
Lines 120-125 Link Here
120	share/apps/hk_kdeclasses/pics/boolean22x22.png	128	share/apps/hk_kdeclasses/pics/boolean22x22.png
121	share/apps/hk_kdeclasses/pics/button.png	129	share/apps/hk_kdeclasses/pics/button.png
122	share/apps/hk_kdeclasses/pics/combobox22x22.png	130	share/apps/hk_kdeclasses/pics/combobox22x22.png
		131	share/apps/hk_kdeclasses/pics/datebutton.png
123	share/apps/hk_kdeclasses/pics/dbdesigner.png	132	share/apps/hk_kdeclasses/pics/dbdesigner.png
124	share/apps/hk_kdeclasses/pics/delete.png	133	share/apps/hk_kdeclasses/pics/delete.png
125	share/apps/hk_kdeclasses/pics/designmode.png	134	share/apps/hk_kdeclasses/pics/designmode.png
Lines 172-177 Link Here
172	share/doc/HTML/en/knoda/formdesign.png	181	share/doc/HTML/en/knoda/formdesign.png
173	share/doc/HTML/en/knoda/formdesign1.png	182	share/doc/HTML/en/knoda/formdesign1.png
174	share/doc/HTML/en/knoda/formdesign2.png	183	share/doc/HTML/en/knoda/formdesign2.png
		184	share/doc/HTML/en/knoda/formfilter.png
175	share/doc/HTML/en/knoda/formreport.png	185	share/doc/HTML/en/knoda/formreport.png
176	share/doc/HTML/en/knoda/formreportproperty.png	186	share/doc/HTML/en/knoda/formreportproperty.png
177	share/doc/HTML/en/knoda/gridcolumndefinition.png	187	share/doc/HTML/en/knoda/gridcolumndefinition.png
Lines 225-230 Link Here
225	share/locale/fr/LC_MESSAGES/knoda.mo	235	share/locale/fr/LC_MESSAGES/knoda.mo
226	share/locale/hu/LC_MESSAGES/knoda.mo	236	share/locale/hu/LC_MESSAGES/knoda.mo
227	share/locale/ru/LC_MESSAGES/knoda.mo	237	share/locale/ru/LC_MESSAGES/knoda.mo
		238	share/locale/uk/LC_MESSAGES/knoda.mo
228	share/mimelnk/application/x-hk_classes-sqlite2.desktop	239	share/mimelnk/application/x-hk_classes-sqlite2.desktop
229	share/mimelnk/application/x-hk_classes-sqlite3.desktop	240	share/mimelnk/application/x-hk_classes-sqlite3.desktop
230	share/mimelnk/application/x-hk_connection.desktop	241	share/mimelnk/application/x-hk_connection.desktop
Lines 234-239 Link Here
234	share/services/hk_kdeformpart.desktop	245	share/services/hk_kdeformpart.desktop
235	share/services/hk_kdegridpart.desktop	246	share/services/hk_kdegridpart.desktop
236	share/services/hk_kdeqbepart.desktop	247	share/services/hk_kdeqbepart.desktop
		248	share/services/hk_kdemodulepart.desktop
237	share/services/hk_kdequerypart.desktop	249	share/services/hk_kdequerypart.desktop
238	share/services/hk_kdereportpart.desktop	250	share/services/hk_kdereportpart.desktop
239	share/services/hk_kdetablepart.desktop	251	share/services/hk_kdetablepart.desktop

Return to bug 165572

Lines 5-12 Link Here

(-)databases/hk_classes/Makefile (-8 / +21 lines)
5	# $FreeBSD: ports/databases/hk_classes/Makefile,v 1.48 2012/02/06 12:25:49 miwi Exp $	5	# $FreeBSD: ports/databases/hk_classes/Makefile,v 1.48 2012/02/06 12:25:49 miwi Exp $
6		6
7	PORTNAME= hk_classes	7	PORTNAME= hk_classes
8	PORTVERSION= 0.8.1	8	PORTVERSION= 0.8.3
9	PORTREVISION= 6
10	CATEGORIES= databases	9	CATEGORIES= databases
11	MASTER_SITES= SF/hk-classes/${PORTNAME}/${PORTVERSION}	10	MASTER_SITES= SF/hk-classes/${PORTNAME}/${PORTVERSION}
12		11
Lines 14-20 Link Here
14	COMMENT= C++ Library for rapid development of database applications	13	COMMENT= C++ Library for rapid development of database applications
15		14
16	BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone	15	BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
17	LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig	16	LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
		17	xml2.5:${PORTSDIR}/textproc/libxml2
18		18
19	USE_BZIP2= yes	19	USE_BZIP2= yes
20	USE_ICONV= yes	20	USE_ICONV= yes
Lines 43-53 Link Here
43	ODBC "Build unixODBC driver" off \	43	ODBC "Build unixODBC driver" off \
44	PARADOX "Build Paradox driver" off \	44	PARADOX "Build Paradox driver" off \
45	SQLITE2 "Build with sqlite2 driver" off \	45	SQLITE2 "Build with sqlite2 driver" off \
46	SQLITE3 "Build with sqlite3 driver" off	46	SQLITE3 "Build with sqlite3 driver" off \
47		47	DBASE "Build with dbase driver" off
48	MAN1= hk_report.1man hk_actionquery.1man hk_exportxml.1man \
49	hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man \
50	hk_dbcopy.1man
51		48
52	.include <bsd.port.pre.mk>	49	.include <bsd.port.pre.mk>
53		50
Lines 64-69 Link Here
64	PLIST_SUB+= MYSQL="@comment "	61	PLIST_SUB+= MYSQL="@comment "
65	.endif	62	.endif
66		63
		64	.if !defined(WITH_DBASE)
		65	CONFIGURE_ARGS+= --without-dbase
		66	PLIST_SUB+= DBASE="@comment "
		67	.else
		68	PLIST_SUB+= DBASE=""
		69	.endif
		70
67	.if defined(WITH_POSTGRESQL)	71	.if defined(WITH_POSTGRESQL)
68	USE_PGSQL= yes	72	USE_PGSQL= yes
69	CONFIGURE_ARGS+= --with-postgres-incdir=${LOCALBASE}/include/ \	73	CONFIGURE_ARGS+= --with-postgres-incdir=${LOCALBASE}/include/ \
Lines 130-135 Link Here
130	PLIST_SUB+= SQLITE3="@comment "	134	PLIST_SUB+= SQLITE3="@comment "
131	.endif	135	.endif
132		136
		137	post-patch:
		138	${REINPLACE_CMD} -e "s\|INCLUDES = -I../hk_classes \
		139	-I./pxlib\|INCLUDES = -I../hk_classes -I./pxlib \
		140	-I${LOCALBASE}/include\|g" \
		141	${WRKSRC}/hk_paradoxclasses/Makefile.in
		142
		143	post-configure:
		144	${REINPLACE_CMD} -e "s\| -I\|','\|g" ${WRKSRC}/python/setup.py
		145
133	post-install:	146	post-install:
134	@${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${FILESDIR}/hk_classes.sh > \	147	@${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${FILESDIR}/hk_classes.sh > \
135	${PREFIX}/etc/rc.d/hk_classes.sh; \	148	${PREFIX}/etc/rc.d/hk_classes.sh; \

Lines 1-11 Link Here

(-)databases/hk_classes/pkg-plist (-8 / +6 lines)
1	etc/rc.d/hk_classes.sh	1	etc/rc.d/hk_classes.sh
2	bin/hk_actionquery
3	bin/hk_dbcopy
4	bin/hk_exportcsv
5	bin/hk_exporthtml
6	bin/hk_exportxml
7	bin/hk_importcsv
8	bin/hk_report
9	include/hk_classes/hk_actionquery.h	2	include/hk_classes/hk_actionquery.h
10	include/hk_classes/hk_button.h	3	include/hk_classes/hk_button.h
11	include/hk_classes/hk_class.h	4	include/hk_classes/hk_class.h
Lines 41-46 Link Here
41	include/hk_classes/hk_key.h	34	include/hk_classes/hk_key.h
42	include/hk_classes/hk_label.h	35	include/hk_classes/hk_label.h
43	include/hk_classes/hk_mimetype.h	36	include/hk_classes/hk_mimetype.h
		37	include/hk_classes/hk_module.h
44	include/hk_classes/hk_presentation.h	38	include/hk_classes/hk_presentation.h
45	include/hk_classes/hk_qbe.h	39	include/hk_classes/hk_qbe.h
46	include/hk_classes/hk_referentialintegrity.h	40	include/hk_classes/hk_referentialintegrity.h
Lines 60-65 Link Here
60	%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.la	54	%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.la
61	%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so	55	%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so
62	%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so.3	56	%%MYSQL%%lib/hk_classes/drivers/libhk_mysqldriver.so.3
		57	%%DBASE%%lib/hk_classes/drivers/libhk_dbasedriver.a
		58	%%DBASE%%lib/hk_classes/drivers/libhk_dbasedriver.la
		59	%%DBASE%%lib/hk_classes/drivers/libhk_dbasedriver.so
		60	%%DBASE%%lib/hk_classes/drivers/libhk_dbasedriver.so.0
63	%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.a	61	%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.a
64	%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.la	62	%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.la
65	%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so	63	%%ODBC%%lib/hk_classes/drivers/libhk_odbcdriver.so
Lines 86-92 Link Here
86	lib/hk_classes/libhk_classes.a	84	lib/hk_classes/libhk_classes.a
87	lib/hk_classes/libhk_classes.la	85	lib/hk_classes/libhk_classes.la
88	lib/hk_classes/libhk_classes.so	86	lib/hk_classes/libhk_classes.so
89	lib/hk_classes/libhk_classes.so.13	87	lib/hk_classes/libhk_classes.so.15
90	@dirrm lib/hk_classes/drivers	88	@dirrm lib/hk_classes/drivers
91	@dirrm lib/hk_classes	89	@dirrm lib/hk_classes
92	@dirrm include/hk_classes	90	@dirrm include/hk_classes

Lines 1-6 Link Here

(-)databases/hk_classes/files/patch-configure (-12 / +3 lines)
1	--- configure.orig Sat Jul 22 12:08:15 2006	1	--- configure.orig 2006-12-17 15:27:45.000000000 +0100
2	+++ configure Sat Jul 22 12:08:43 2006	2	+++ configure 2012-02-19 20:23:04.014494956 +0100
3	@@ -20549,7 +20549,7 @@	3	@@ -20681,7 +20681,7 @@
4	py_version=`$PYTHON -c "from distutils.sysconfig import *; \	4	py_version=`$PYTHON -c "from distutils.sysconfig import *; \
5	from string import join; \	5	from string import join; \
6	print join(get_config_vars('VERSION'))"`	6	print join(get_config_vars('VERSION'))"`
Lines 9-20 Link Here
9	if test -n "$PYTHON_VERSION"; then	9	if test -n "$PYTHON_VERSION"; then
10	py_version=$PYTHON_VERSION	10	py_version=$PYTHON_VERSION
11	else	11	else
12	@@ -20815,7 +20815,7 @@
13	fi
14
15	if test "x$with_fontconfig_libdir" != "x"; then
16	- FONTCONFIGLIBDIR=$with_fontconifg_libdir
17	+ FONTCONFIGLIBDIR=$with_fontconfig_libdir
18	fi
19
20	ac_save_LIBS="$LIBS"

Removed Link Here

(-)databases/hk_classes/files/patch-utilities::Makefile.in (-33 lines)
1	--- utilities/Makefile.in.orig Sat Jul 22 12:09:44 2006
2	+++ utilities/Makefile.in Sat Jul 22 12:11:59 2006
3	@@ -237,22 +237,22 @@
4	target_alias = @target_alias@
5	INCLUDES = -I../hk_classes
6	AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings
7	-hk_report_LDADD = ../hk_classes/libhk_classes.la -ldl
8	+hk_report_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
9	hk_report_SOURCES = hk_reportutility.cpp
10
11	-#hk_webform_LDADD = ../hk_classes/libhk_classes.la -ldl
12	+#hk_webform_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
13	#hk_webform_SOURCES = hk_webformutility.cpp
14	-hk_actionquery_LDADD = ../hk_classes/libhk_classes.la -ldl
15	+hk_actionquery_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
16	hk_actionquery_SOURCES = hk_actionqueryutility.cpp
17	-hk_exportxml_LDADD = ../hk_classes/libhk_classes.la -ldl
18	+hk_exportxml_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
19	hk_exportxml_SOURCES = hk_exportxmlutility.cpp
20	-hk_exportcsv_LDADD = ../hk_classes/libhk_classes.la -ldl
21	+hk_exportcsv_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
22	hk_exportcsv_SOURCES = hk_exportcsvutility.cpp
23	-hk_exporthtml_LDADD = ../hk_classes/libhk_classes.la -ldl
24	+hk_exporthtml_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
25	hk_exporthtml_SOURCES = hk_exporthtmlutility.cpp
26	-hk_importcsv_LDADD = ../hk_classes/libhk_classes.la -ldl
27	+hk_importcsv_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
28	hk_importcsv_SOURCES = hk_importcsvutility.cpp
29	-hk_dbcopy_LDFLAGS = -lhk_classes -ldl -L../hk_classes
30	+hk_dbcopy_LDFLAGS = -lhk_classes -largp ${LIBPTHREAD} -L../hk_classes
31	hk_dbcopy_SOURCES = hk_dbcopyutility.cpp
32	man_MANS = hk_report.1man hk_actionquery.1man hk_dbcopy.1man hk_exportxml.1man \
33	hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man

Added Link Here

(-)databases/hk_classes/files/patch-utilities_Makefile.in (+33 lines)
1	--- utilities/Makefile.in.orig 2006-12-17 15:27:52.000000000 +0100
2	+++ utilities/Makefile.in 2012-02-19 19:21:04.761495232 +0100
3	@@ -248,22 +248,22 @@
4	target_alias = @target_alias@
5	INCLUDES = -I../hk_classes
6	AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@
7	-hk_report_LDADD = ../hk_classes/libhk_classes.la -ldl
8	+hk_report_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
9	hk_report_SOURCES = hk_reportutility.cpp
10
11	-#hk_webform_LDADD = ../hk_classes/libhk_classes.la -ldl
12	+#hk_webform_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
13	#hk_webform_SOURCES = hk_webformutility.cpp
14	-hk_actionquery_LDADD = ../hk_classes/libhk_classes.la -ldl
15	+hk_actionquery_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
16	hk_actionquery_SOURCES = hk_actionqueryutility.cpp
17	-hk_exportxml_LDADD = ../hk_classes/libhk_classes.la -ldl
18	+hk_exportxml_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
19	hk_exportxml_SOURCES = hk_exportxmlutility.cpp
20	-hk_exportcsv_LDADD = ../hk_classes/libhk_classes.la -ldl
21	+hk_exportcsv_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
22	hk_exportcsv_SOURCES = hk_exportcsvutility.cpp
23	-hk_exporthtml_LDADD = ../hk_classes/libhk_classes.la -ldl
24	+hk_exporthtml_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
25	hk_exporthtml_SOURCES = hk_exporthtmlutility.cpp
26	-hk_importcsv_LDADD = ../hk_classes/libhk_classes.la -ldl
27	+hk_importcsv_LDADD = ../hk_classes/libhk_classes.la -largp ${LIBPTHREAD}
28	hk_importcsv_SOURCES = hk_importcsvutility.cpp
29	-hk_dbcopy_LDFLAGS = -lhk_classes -ldl -L../hk_classes
30	+hk_dbcopy_LDFLAGS = -lhk_classes -largp ${LIBPTHREAD} -L../hk_classes
31	hk_dbcopy_SOURCES = hk_dbcopyutility.cpp
32	man_MANS = hk_report.1man hk_actionquery.1man hk_dbcopy.1man hk_exportxml.1man \
33	hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man