Attachment 41688 Details for Bug 65166 – hk_classes-0.6.3.patch

[patch] hk_classes-0.6.3.patch

hk_classes-0.6.3.patch (text/plain), 6.89 KB, created by Sergey Matveychuk on 2004-04-04 18:10:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Matveychuk

Created: 2004-04-04 18:10:12 UTC

Size: 6.89 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/databases/hk_classes.orig/Makefile /usr/ports/databases/hk_classes/Makefile
>--- /usr/ports/databases/hk_classes.orig/Makefile	Tue Mar 30 23:20:16 2004
>+++ /usr/ports/databases/hk_classes/Makefile	Sun Apr  4 19:34:08 2004
>@@ -5,7 +5,7 @@
> # $FreeBSD: ports/databases/hk_classes/Makefile,v 1.8 2004/03/30 19:20:16 krion Exp $
> 
> 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 @@
> 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 -ruN --exclude=CVS /usr/ports/databases/hk_classes.orig/distinfo /usr/ports/databases/hk_classes/distinfo
>--- /usr/ports/databases/hk_classes.orig/distinfo	Thu Mar 11 22:10:27 2004
>+++ /usr/ports/databases/hk_classes/distinfo	Sun Apr  4 19:35:18 2004
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/hk_classes.orig/files/patch-configure /usr/ports/databases/hk_classes/files/patch-configure
>--- /usr/ports/databases/hk_classes.orig/files/patch-configure	Thu Mar 11 22:10:27 2004
>+++ /usr/ports/databases/hk_classes/files/patch-configure	Thu Jan  1 03:00:00 1970
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/hk_classes.orig/files/patch-hk_classes::hk_actionquery.cpp /usr/ports/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp
>--- /usr/ports/databases/hk_classes.orig/files/patch-hk_classes::hk_actionquery.cpp	Thu Mar 11 22:10:27 2004
>+++ /usr/ports/databases/hk_classes/files/patch-hk_classes::hk_actionquery.cpp	Thu Jan  1 03:00:00 1970
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/hk_classes.orig/files/patch-hk_classes::hk_datasource.cpp /usr/ports/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp
>--- /usr/ports/databases/hk_classes.orig/files/patch-hk_classes::hk_datasource.cpp	Thu Mar 11 22:10:27 2004
>+++ /usr/ports/databases/hk_classes/files/patch-hk_classes::hk_datasource.cpp	Thu Jan  1 03:00:00 1970
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/hk_classes.orig/files/patch-utilities::Makefile.in /usr/ports/databases/hk_classes/files/patch-utilities::Makefile.in
>--- /usr/ports/databases/hk_classes.orig/files/patch-utilities::Makefile.in	Thu Jan  1 03:00:00 1970
>+++ /usr/ports/databases/hk_classes/files/patch-utilities::Makefile.in	Sun Apr  4 01:59:14 2004
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/hk_classes.orig/pkg-plist /usr/ports/databases/hk_classes/pkg-plist
>--- /usr/ports/databases/hk_classes.orig/pkg-plist	Thu Mar 11 22:10:27 2004
>+++ /usr/ports/databases/hk_classes/pkg-plist	Sun Apr  4 02:14:48 2004
>@@ -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

Actions: View | Diff

Attachments on bug 65166: 41688