Attachment 122376 Details for Bug 165572 – file.diff

[patch] file.diff

file.diff (text/plain), 15.42 KB, created by Armin Pirkovitsch on 2012-03-01 05:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Armin Pirkovitsch

Created: 2012-03-01 05:40:11 UTC

Size: 15.42 KB

patch

obsolete

>Index: databases/hk_classes/Makefile
>===================================================================
>RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/databases/hk_classes/Makefile,v
>retrieving revision 1.48
>diff -u -r1.48 Makefile
>--- databases/hk_classes/Makefile	6 Feb 2012 12:25:49 -0000	1.48
>+++ databases/hk_classes/Makefile	1 Mar 2012 05:26:17 -0000
>@@ -5,8 +5,7 @@
> # $FreeBSD: ports/databases/hk_classes/Makefile,v 1.48 2012/02/06 12:25:49 miwi Exp $
> 
> PORTNAME=	hk_classes
>-PORTVERSION=	0.8.1
>-PORTREVISION=	6
>+PORTVERSION=	0.8.3
> CATEGORIES=	databases
> MASTER_SITES=	SF/hk-classes/${PORTNAME}/${PORTVERSION}
> 
>@@ -14,7 +13,8 @@
> 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
>+LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
>+		xml2.5:${PORTSDIR}/textproc/libxml2
> 
> USE_BZIP2=	yes
> USE_ICONV=	yes
>@@ -43,11 +43,8 @@
> 		ODBC		"Build unixODBC driver"		off \
> 		PARADOX		"Build Paradox driver"		off \
> 		SQLITE2		"Build with sqlite2 driver"	off \
>-		SQLITE3		"Build with sqlite3 driver"	off
>-
>-MAN1=		hk_report.1man hk_actionquery.1man hk_exportxml.1man \
>-		hk_exporthtml.1man hk_exportcsv.1man hk_importcsv.1man \
>-		hk_dbcopy.1man
>+		SQLITE3		"Build with sqlite3 driver"	off \
>+		DBASE		"Build with dbase driver"	off
> 
> .include <bsd.port.pre.mk>
> 
>@@ -64,6 +61,13 @@
> 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/ \
>@@ -130,6 +134,15 @@
> 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; \
>Index: databases/hk_classes/distinfo
>===================================================================
>RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/databases/hk_classes/distinfo,v
>retrieving revision 1.13
>diff -u -r1.13 distinfo
>--- databases/hk_classes/distinfo	20 Mar 2011 12:47:05 -0000	1.13
>+++ databases/hk_classes/distinfo	19 Feb 2012 18:04:43 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (hk_classes-0.8.1.tar.bz2) = 9e403fe153962770676099c2346a74b96953eba790a289303c49fe448c958603
>-SIZE (hk_classes-0.8.1.tar.bz2) = 1413828
>+SHA256 (hk_classes-0.8.3.tar.bz2) = d57a8a2f3c2fb534e01ee5d7b6c5bb650536f20cb7e88a721ec9da7b5befb593
>+SIZE (hk_classes-0.8.3.tar.bz2) = 1532249
>Index: databases/hk_classes/pkg-plist
>===================================================================
>RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/databases/hk_classes/pkg-plist,v
>retrieving revision 1.16
>diff -u -r1.16 pkg-plist
>--- databases/hk_classes/pkg-plist	13 Jun 2009 15:52:42 -0000	1.16
>+++ databases/hk_classes/pkg-plist	20 Feb 2012 04:39:15 -0000
>@@ -1,11 +1,4 @@
> 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
>@@ -41,6 +34,7 @@
> 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
>@@ -60,6 +54,10 @@
> %%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
>@@ -86,7 +84,7 @@
> lib/hk_classes/libhk_classes.a
> lib/hk_classes/libhk_classes.la
> lib/hk_classes/libhk_classes.so
>-lib/hk_classes/libhk_classes.so.13
>+lib/hk_classes/libhk_classes.so.15
> @dirrm lib/hk_classes/drivers
> @dirrm lib/hk_classes
> @dirrm include/hk_classes
>Index: databases/hk_classes/files/patch-configure
>===================================================================
>RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/databases/hk_classes/files/patch-configure,v
>retrieving revision 1.4
>diff -u -r1.4 patch-configure
>--- databases/hk_classes/files/patch-configure	23 Jul 2006 13:28:50 -0000	1.4
>+++ databases/hk_classes/files/patch-configure	19 Feb 2012 20:44:14 -0000
>@@ -1,6 +1,6 @@
>---- configure.orig	Sat Jul 22 12:08:15 2006
>-+++ configure	Sat Jul 22 12:08:43 2006
>-@@ -20549,7 +20549,7 @@
>+--- 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'))"`
>@@ -9,12 +9,3 @@
>  			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"
>Index: databases/hk_classes/files/patch-hk_classes::hk_database.h
>===================================================================
>RCS file: databases/hk_classes/files/patch-hk_classes::hk_database.h
>diff -N databases/hk_classes/files/patch-hk_classes::hk_database.h
>--- databases/hk_classes/files/patch-hk_classes::hk_database.h	16 Jul 2004 03:19:43 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,10 +0,0 @@
>---- hk_classes/hk_database.h.orig	Thu Jul 15 22:02:22 2004
>-+++ hk_classes/hk_database.h	Thu Jul 15 22:02:36 2004
>-@@ -14,6 +14,7 @@
>- #include <list>
>- #include <vector>
>- #include <algorithm>
>-+#include <sstream>
>- #include "hk_presentation.h"
>- using namespace std;
>- 
>Index: databases/hk_classes/files/patch-hk_classes_hk_database.h
>===================================================================
>RCS file: databases/hk_classes/files/patch-hk_classes_hk_database.h
>diff -N databases/hk_classes/files/patch-hk_classes_hk_database.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ databases/hk_classes/files/patch-hk_classes_hk_database.h	26 Feb 2012 09:22:08 -0000
>@@ -0,0 +1,10 @@
>+--- hk_classes/hk_database.h.orig	Thu Jul 15 22:02:22 2004
>++++ hk_classes/hk_database.h	Thu Jul 15 22:02:36 2004
>+@@ -14,6 +14,7 @@
>+ #include <list>
>+ #include <vector>
>+ #include <algorithm>
>++#include <sstream>
>+ #include "hk_presentation.h"
>+ using namespace std;
>+ 
>Index: databases/hk_classes/files/patch-utilities::Makefile.in
>===================================================================
>RCS file: databases/hk_classes/files/patch-utilities::Makefile.in
>diff -N databases/hk_classes/files/patch-utilities::Makefile.in
>--- databases/hk_classes/files/patch-utilities::Makefile.in	23 Jul 2006 13:28:50 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,33 +0,0 @@
>---- 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
>Index: databases/hk_classes/files/patch-utilities_Makefile.in
>===================================================================
>RCS file: databases/hk_classes/files/patch-utilities_Makefile.in
>diff -N databases/hk_classes/files/patch-utilities_Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ databases/hk_classes/files/patch-utilities_Makefile.in	26 Feb 2012 09:22:34 -0000
>@@ -0,0 +1,33 @@
>+--- 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
>Index: databases/knoda/Makefile
>===================================================================
>RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/databases/knoda/Makefile,v
>retrieving revision 1.38
>diff -u -r1.38 Makefile
>--- databases/knoda/Makefile	4 Dec 2010 07:30:44 -0000	1.38
>+++ databases/knoda/Makefile	20 Feb 2012 05:21:58 -0000
>@@ -5,8 +5,7 @@
> # $FreeBSD: ports/databases/knoda/Makefile,v 1.38 2010/12/04 07:30:44 ade Exp $
> 
> PORTNAME=		knoda
>-PORTVERSION=		0.8.1
>-PORTREVISION=	5
>+PORTVERSION=		0.8.3
> CATEGORIES=		databases
> MASTER_SITES=		SF
> 
>@@ -14,7 +13,7 @@
> COMMENT=		Database frontend for KDE
> 
> BUILD_DEPENDS=		${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone
>-LIB_DEPENDS=		hk_classes.13:${PORTSDIR}/databases/hk_classes
>+LIB_DEPENDS=		hk_classes.15:${PORTSDIR}/databases/hk_classes
> 
> USE_BZIP2=		yes
> USE_KDELIBS_VER=	3
>Index: databases/knoda/distinfo
>===================================================================
>RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/databases/knoda/distinfo,v
>retrieving revision 1.12
>diff -u -r1.12 distinfo
>--- databases/knoda/distinfo	20 Mar 2011 12:47:08 -0000	1.12
>+++ databases/knoda/distinfo	19 Feb 2012 15:41:01 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (knoda-0.8.1.tar.bz2) = 8855374cede5fa5ca6321c80f200f62577efe4f9b0ef416541d8e05292ea3993
>-SIZE (knoda-0.8.1.tar.bz2) = 4463670
>+SHA256 (knoda-0.8.3.tar.bz2) = 0ec5eb90c0efd6c76f3b0e86e1a9af4dd4800dcaff170ad35d86025d8d13eeb4
>+SIZE (knoda-0.8.3.tar.bz2) = 4619446
>Index: databases/knoda/pkg-plist
>===================================================================
>RCS file: /mnt/nfs/oh/usr/home/ncvs/root/ports/ports/databases/knoda/pkg-plist,v
>retrieving revision 1.12
>diff -u -r1.12 pkg-plist
>--- databases/knoda/pkg-plist	23 Jul 2006 13:28:50 -0000	1.12
>+++ databases/knoda/pkg-plist	20 Feb 2012 19:42:50 -0000
>@@ -36,6 +36,9 @@
> include/hk_kdelineedit.h
> include/hk_kdememo.h
> include/hk_kdemessages.h
>+include/hk_kdemodule.h
>+include/hk_kdemodulepart.h
>+include/hk_kdemodulepartfactory.h
> include/hk_kdenewpassworddialog.h
> include/hk_kdenewpassworddialogbase.h
> include/hk_kdepassworddialog.h
>@@ -85,6 +88,9 @@
> lib/kde3/libhk_kdeqbepart.a
> lib/kde3/libhk_kdeqbepart.la
> lib/kde3/libhk_kdeqbepart.so
>+lib/kde3/libhk_kdemodulepart.a
>+lib/kde3/libhk_kdemodulepart.la
>+lib/kde3/libhk_kdemodulepart.so
> lib/kde3/libhk_kdequerypart.a
> lib/kde3/libhk_kdequerypart.la
> lib/kde3/libhk_kdequerypart.so
>@@ -106,6 +112,8 @@
> share/apps/hk_kdeclasses/hk_kdegridpart.rc
> share/apps/hk_kdeclasses/hk_kdeinterpreterdialog.rc
> share/apps/hk_kdeclasses/hk_kdeqbepart.rc
>+share/apps/hk_kdeclasses/hk_kdemodule.rc
>+share/apps/hk_kdeclasses/hk_kdemodulepart.rc
> share/apps/hk_kdeclasses/hk_kdequery.rc
> share/apps/hk_kdeclasses/hk_kdequerypart.rc
> share/apps/hk_kdeclasses/hk_kdequerypartqbe.rc
>@@ -120,6 +128,7 @@
> share/apps/hk_kdeclasses/pics/boolean22x22.png
> share/apps/hk_kdeclasses/pics/button.png
> share/apps/hk_kdeclasses/pics/combobox22x22.png
>+share/apps/hk_kdeclasses/pics/datebutton.png
> share/apps/hk_kdeclasses/pics/dbdesigner.png
> share/apps/hk_kdeclasses/pics/delete.png
> share/apps/hk_kdeclasses/pics/designmode.png
>@@ -172,6 +181,7 @@
> share/doc/HTML/en/knoda/formdesign.png
> share/doc/HTML/en/knoda/formdesign1.png
> share/doc/HTML/en/knoda/formdesign2.png
>+share/doc/HTML/en/knoda/formfilter.png
> share/doc/HTML/en/knoda/formreport.png
> share/doc/HTML/en/knoda/formreportproperty.png
> share/doc/HTML/en/knoda/gridcolumndefinition.png
>@@ -225,6 +235,7 @@
> share/locale/fr/LC_MESSAGES/knoda.mo
> share/locale/hu/LC_MESSAGES/knoda.mo
> share/locale/ru/LC_MESSAGES/knoda.mo
>+share/locale/uk/LC_MESSAGES/knoda.mo
> share/mimelnk/application/x-hk_classes-sqlite2.desktop
> share/mimelnk/application/x-hk_classes-sqlite3.desktop
> share/mimelnk/application/x-hk_connection.desktop
>@@ -234,6 +245,7 @@
> share/services/hk_kdeformpart.desktop
> share/services/hk_kdegridpart.desktop
> share/services/hk_kdeqbepart.desktop
>+share/services/hk_kdemodulepart.desktop
> share/services/hk_kdequerypart.desktop
> share/services/hk_kdereportpart.desktop
> share/services/hk_kdetablepart.desktop

Actions: View | Diff

Attachments on bug 165572: 122376