Attachment #41688 for bug #65166

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

Lines 5-11 Link Here

(-)/usr/ports/databases/hk_classes/Makefile (-2 / +8 lines)
5	# $FreeBSD: ports/databases/hk_classes/Makefile,v 1.8 2004/03/30 19:20:16 krion Exp $	5	# $FreeBSD: ports/databases/hk_classes/Makefile,v 1.8 2004/03/30 19:20:16 krion Exp $
6		6
7	PORTNAME= hk_classes	7	PORTNAME= hk_classes
8	PORTVERSION= 0.6.2	8	PORTVERSION= 0.6.3
9	CATEGORIES= databases	9	CATEGORIES= databases
10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
11	MASTER_SITE_SUBDIR= hk-classes	11	MASTER_SITE_SUBDIR= hk-classes
Lines 13-21 Link Here
13	MAINTAINER= sem@ciam.ru	13	MAINTAINER= sem@ciam.ru
14	COMMENT= C++ Library for rapid development of database applications	14	COMMENT= C++ Library for rapid development of database applications
15		15
		16	BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
		17
		18	USE_REINPLACE= yes
		19	USE_BZIP2= yes
16	USE_ICONV= yes	20	USE_ICONV= yes
17	USE_PYTHON= yes	21	USE_PYTHON= yes
18	CONFIGURE_ENV+= LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"	22	CXXFLAGS+= ${PTHREAD_CFLAGS}
		23	CONFIGURE_ENV+= LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}" \
		24	LDFLAGS="${PTHREAD_LIBS} -largp -L${LOCALBASE}/lib"
19	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	25	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
20	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
21	INSTALLS_SHLIB= yes	27	INSTALLS_SHLIB= yes

Lines 1-2 Link Here

(-)/usr/ports/databases/hk_classes/distinfo (-2 / +2 lines)
1	MD5 (hk_classes-0.6.2.tar.gz) = 2f5fb56ecf05018c080de9bdd7914892	1	MD5 (hk_classes-0.6.3.tar.bz2) = c842b4ed39eb3322a0b83bb84ebfc1e1
2	SIZE (hk_classes-0.6.2.tar.gz) = 578222	2	SIZE (hk_classes-0.6.3.tar.bz2) = 449665




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

Lines 1-11 Link Here

(-)/usr/ports/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp (-11 lines)
1	--- hk_classes/hk_actionquery.cpp.orig Wed Mar 10 22:55:49 2004
2	+++ hk_classes/hk_actionquery.cpp Wed Mar 10 22:56:40 2004
3	@@ -12,6 +12,8 @@
4	#include "hk_actionquery.h"
5	#include "hk_database.h"
6
7	+#include <time.h>
8	+
9	class hk_actionqueryprivate
10	{
11	public:

Lines 1-11 Link Here

(-)/usr/ports/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp (-11 lines)
1	--- hk_classes/hk_datasource.cpp.orig Wed Mar 10 22:57:45 2004
2	+++ hk_classes/hk_datasource.cpp Wed Mar 10 22:58:01 2004
3	@@ -19,7 +19,7 @@
4	#include <algorithm>
5	#include <list>
6	#include <stdlib.h>
7	-
8	+#include <time.h>
9
10	class hk_datasourceprivate
11	{




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

Lines 1-3 Link Here

(-)/usr/ports/databases/hk_classes/pkg-plist (+6 lines)
		1	bin/hk_actionquery
		2	bin/hk_exportcsv
		3	bin/hk_exporthtml
		4	bin/hk_exportxml
		5	bin/hk_importcsv
		6	bin/hk_report
1	include/hk_classes/hk_string.h	7	include/hk_classes/hk_string.h
2	include/hk_classes/hk_database.h	8	include/hk_classes/hk_database.h
3	include/hk_classes/hk_connection.h	9	include/hk_classes/hk_connection.h

Return to bug 65166

Lines 1-50 Link Here

(-)/usr/ports/databases/hk_classes/files/patch-configure (-50 lines)
1	--- configure.orig Sat Nov 15 19:04:37 2003
2	+++ configure Thu Mar 11 00:21:00 2004
3	@@ -7855,7 +7855,7 @@
4
5
6	# This can be used to rebuild libtool when needed
7	-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
8	+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
9
10	# Always use our own libtool.
11	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
12	@@ -8541,9 +8541,8 @@
13	NODRIVER=true
14	POSSIBLE_DRIVERS="MYSQL,ODBC, POSTGRESQL"
15
16	-cat >>confdefs.h <<_ACEOF
17	-#define HKCLASSES "$HK_CLASSESDIR"
18	-_ACEOF
19	+echo -n "#define HKCLASSES " >>confdefs.h
20	+echo \"$prefix/lib/hk_classes\" >>confdefs.h
21
22	echo "$as_me:$LINENO: result: OK" >&5
23	echo "${ECHO_T}OK" >&6
24	@@ -15667,7 +15666,7 @@
25
26	echo "$as_me:$LINENO: result: $mysql_lib" >&5
27	echo "${ECHO_T}$mysql_lib" >&6
28	-if test $mysql_lib = yes ; then
29	+if test $mysql_lib = yes -a "x$with_mysql" != "xno"; then
30	NODRIVER=false
31	DRIVERSDIR="$DRIVERSDIR hk_mysqlclasses"
32
33	@@ -15807,7 +15806,7 @@
34
35	echo "$as_me:$LINENO: result: $postgres_lib" >&5
36	echo "${ECHO_T}$postgres_lib" >&6
37	-if test $postgres_lib = yes ; then
38	+if test $postgres_lib = yes -a "x$with_postgres" != "xno"; then
39	NODRIVER=false
40	DRIVERSDIR="$DRIVERSDIR hk_postgresclasses"
41
42	@@ -15966,7 +15965,7 @@
43
44	echo "$as_me:$LINENO: result: $odbc_lib" >&5
45	echo "${ECHO_T}$odbc_lib" >&6
46	-if test x$odbc_lib = xyes ; then
47	+if test x$odbc_lib = xyes -a "x$with_odbc" != "xno"; then
48	NODRIVER=false
49	DRIVERSDIR="$DRIVERSDIR hk_odbcclasses"
50

Line 0 Link Here

(-)/usr/ports/databases/hk_classes/files/patch-utilities::Makefile.in (+35 lines)
	1	--- utilities/Makefile.in.orig Sun Mar 14 20:49:52 2004
	2	+++ utilities/Makefile.in Sun Apr 4 01:58:38 2004
	3	@@ -150,25 +150,25 @@
	4	hk_importcsv hk_report
	5
	6
	7	-hk_report_LDFLAGS = -lhk_classes -ldl -L../hk_classes
	8	+hk_report_LDFLAGS = -lhk_classes -L../hk_classes
	9	hk_report_SOURCES = hk_reportutility.cpp
	10
	11
	12	-#hk_webform_LDFLAGS = -lhk_classes -ldl -L../hk_classes
	13	+#hk_webform_LDFLAGS = -lhk_classes -L../hk_classes
	14	#hk_webform_SOURCES = hk_webformutility.cpp
	15	-hk_actionquery_LDFLAGS = -lhk_classes -ldl -L../hk_classes
	16	+hk_actionquery_LDFLAGS = -lhk_classes -L../hk_classes
	17	hk_actionquery_SOURCES = hk_actionqueryutility.cpp
	18
	19	-hk_exportxml_LDFLAGS = -lhk_classes -ldl -L../hk_classes
	20	+hk_exportxml_LDFLAGS = -lhk_classes -L../hk_classes
	21	hk_exportxml_SOURCES = hk_exportxmlutility.cpp
	22
	23	-hk_exportcsv_LDFLAGS = -lhk_classes -ldl -L../hk_classes
	24	+hk_exportcsv_LDFLAGS = -lhk_classes -L../hk_classes
	25	hk_exportcsv_SOURCES = hk_exportcsvutility.cpp
	26
	27	-hk_exporthtml_LDFLAGS = -lhk_classes -ldl -L../hk_classes
	28	+hk_exporthtml_LDFLAGS = -lhk_classes -L../hk_classes
	29	hk_exporthtml_SOURCES = hk_exporthtmlutility.cpp
	30
	31	-hk_importcsv_LDFLAGS = -lhk_classes -ldl -L../hk_classes
	32	+hk_importcsv_LDFLAGS = -lhk_classes -L../hk_classes
	33	hk_importcsv_SOURCES = hk_importcsvutility.cpp
	34
	35	man_MANS = hk_report.1man hk_actionquery.1man hk_exportxml.1man hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man