Attachment 219052 Details for Bug 250515 – Update to 0.9.0 beta3

[patch] Update to 0.9.0 beta3

patch-mdbtools_0.8.2-0.9.0-beta3.diff (text/plain), 7.42 KB, created by Rainer Hurling on 2020-10-25 06:37:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2020-10-25 06:37:09 UTC

Size: 7.42 KB

patch

obsolete

>diff -urN databases/mdbtools.orig/Makefile databases/mdbtools/Makefile
>--- databases/mdbtools.orig/Makefile	2020-09-10 21:53:20.317537000 +0200
>+++ databases/mdbtools/Makefile	2020-10-24 19:42:45.574253000 +0200
>@@ -1,8 +1,8 @@
>-# Created by: Anders Nordby <anders@fix.no>
>-# $FreeBSD: head/databases/mdbtools/Makefile 548221 2020-09-10 19:17:38Z rhurlin $
>+# $FreeBSD$
> 
> PORTNAME=	mdbtools
>-DISTVERSION=	0.8.2
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	0.9.0-beta3
> CATEGORIES=	databases
> 
> MAINTAINER=	rhurlin@FreeBSD.org
>@@ -10,14 +10,12 @@
> 
> LICENSE=	GPLv2
> 
>-# To build man-pages
>-BUILD_DEPENDS=	gawk:lang/gawk \
>+BUILD_DEPENDS+=	gawk:lang/gawk \
> 		txt2man:textproc/txt2man
>-LIB_DEPENDS=	libodbc.so:databases/unixODBC
>-# TODO  libmswstr: https://github.com/leecher1337/libmswstr
>-#LIB_DEPENDS+=	libmswstr.so:databases/libmswstr
>+LIB_DEPENDS+=	libmswstr.so:databases/libmswstr \
>+		libodbc.so:databases/unixODBC
> 
>-USES=		autoreconf bison gettext-runtime gnome iconv libtool pathfix \
>+USES+=		autoreconf bison gettext-runtime gnome iconv libtool pathfix \
> 		pkgconfig readline
> USE_LDCONFIG=	yes
> USE_GNOME=	glib20
>@@ -27,21 +25,14 @@
> 		--with-unixodbc=${LOCALBASE}
> 
> USE_GITHUB=	yes
>-GH_ACCOUNT=	cyberemissary
>+GH_ACCOUNT=	mdbtools
> 
>-OPTIONS_DEFINE=	DOCS GNOME
>+OPTIONS_DEFINE=	DOCS
> OPTIONS_SUB=	yes
> 
> INSTALL_TARGET=	install-strip
> 
> DOCS=		AUTHORS ChangeLog HACKING NEWS README TODO
>-
>-GNOME_CONFIGURE_ENABLE=	gmdb2
>-GNOME_USE=		GNOME=gconf2 \
>-			GNOME=gdkpixbuf2 \
>-			GNOME=gnomeprefix \
>-			GNOME=intltool \
>-			GNOME=libgnomeui
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>diff -urN databases/mdbtools.orig/distinfo databases/mdbtools/distinfo
>--- databases/mdbtools.orig/distinfo	2020-08-06 16:47:37.027390000 +0200
>+++ databases/mdbtools/distinfo	2020-10-24 19:32:05.333424000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1593857855
>-SHA256 (cyberemissary-mdbtools-0.8.2_GH0.tar.gz) = 8f8808b03169cc16e5c97ed5add612d9d2ac9811fb2a35a0aa5fe2bfb2e2a774
>-SIZE (cyberemissary-mdbtools-0.8.2_GH0.tar.gz) = 292958
>+TIMESTAMP = 1603560725
>+SHA256 (mdbtools-mdbtools-v0.9.0-beta3_GH0.tar.gz) = a48ebda189cd45516dfed10872e0fd9adc262f5dfc61f091ed131a46a5e3608f
>+SIZE (mdbtools-mdbtools-v0.9.0-beta3_GH0.tar.gz) = 182443
>diff -urN databases/mdbtools.orig/files/patch-doc_Makefile.am databases/mdbtools/files/patch-doc_Makefile.am
>--- databases/mdbtools.orig/files/patch-doc_Makefile.am	2020-01-05 16:32:05.666228000 +0100
>+++ databases/mdbtools/files/patch-doc_Makefile.am	2020-10-24 19:52:10.495350000 +0200
>@@ -1,8 +1,8 @@
>---- doc/Makefile.am.orig	2015-09-13 13:14:01 UTC
>+--- doc/Makefile.am.orig	2020-10-24 17:46:14 UTC
> +++ doc/Makefile.am
>-@@ -8,9 +8,9 @@ if ENABLE_MAN
>-   dist_man_MANS += mdb-tables.1 mdb-ver.1 mdb-export.1 mdb-schema.1 mdb-sql.1 \
>- 	mdb-array.1 mdb-header.1 mdb-hexdump.1 mdb-parsecsv.1 mdb-prop.1 gmdb2.1
>+@@ -9,9 +9,9 @@ if ENABLE_MAN
>+ 	mdb-array.1 mdb-header.1 mdb-hexdump.1 mdb-parsecsv.1 mdb-prop.1 mdb-import.1 \
>+ 	mdb-count.1 mdb-json.1 mdb-queries.1
>  endif
> -if ENABLE_DOCBOOK
> -  dist_man_MANS += install.tgz
>@@ -12,4 +12,4 @@
> +#endif
>  CLEANFILES = ${dist_man_MANS} install install.tgz
>  EXTRA_DIST	= mdb-tables.txt mdb-ver.txt mdb-export.txt mdb-schema.txt mdb-sql.txt \
>- 	mdb-array.txt mdb-header.txt mdb-hexdump.txt mdb-parsecsv.txt mdb-prop.txt gmdb2.txt \
>+ 	mdb-array.txt mdb-header.txt mdb-hexdump.txt mdb-parsecsv.txt mdb-prop.txt mdb-import.txt \
>diff -urN databases/mdbtools.orig/files/patch-src_libmdb_index.c databases/mdbtools/files/patch-src_libmdb_index.c
>--- databases/mdbtools.orig/files/patch-src_libmdb_index.c	1970-01-01 01:00:00.000000000 +0100
>+++ databases/mdbtools/files/patch-src_libmdb_index.c	2020-10-24 19:52:10.496868000 +0200
>@@ -0,0 +1,11 @@
>+--- src/libmdb/index.c.orig	2020-10-24 11:14:19 UTC
>++++ src/libmdb/index.c
>+@@ -383,7 +383,7 @@ mdb_index_hash_text(MdbHandle *mdb, char *text, char *
>+ 	{
>+ #ifdef __MSWSTR_H__
>+ 		char *out_ptr = alloca((len+1)*2);
>+-		int i;
>++		unsigned int i;
>+ 		// mdb_ascii2unicode doesn't work, we don't want unicode compression!
>+ 		for (i=0; i<len+1; i++) {
>+ 			out_ptr[i*2] = text[i];
>diff -urN databases/mdbtools.orig/pkg-descr databases/mdbtools/pkg-descr
>--- databases/mdbtools.orig/pkg-descr	2020-08-06 16:47:37.027540000 +0200
>+++ databases/mdbtools/pkg-descr	2020-10-25 07:13:09.787638000 +0100
>@@ -10,6 +10,4 @@
> You can list catalog entries. There is some preliminary schema exporting
> utility. And you can export data out to CSV (comma separated value) format.
> 
>-WWW: http://mdbtools.sourceforge.net/
>-WWW: https://github.com/brianb/mdbtools/
>-WWW: https://github.com/cyberemissary/mdbtools/
>+WWW: https://github.com/mdbtools/mdbtools/
>diff -urN databases/mdbtools.orig/pkg-plist databases/mdbtools/pkg-plist
>--- databases/mdbtools.orig/pkg-plist	2020-08-06 16:47:37.027312000 +0200
>+++ databases/mdbtools/pkg-plist	2020-10-24 19:27:22.942395000 +0200
>@@ -1,74 +1,58 @@
>-%%GNOME%%bin/gmdb2
> bin/mdb-array
> bin/mdb-count
> bin/mdb-export
> bin/mdb-header
> bin/mdb-hexdump
>+bin/mdb-json
> bin/mdb-parsecsv
> bin/mdb-prop
>+bin/mdb-queries
> bin/mdb-schema
> bin/mdb-sql
> bin/mdb-tables
> bin/mdb-ver
>-%%GNOME%%include/gmdb.h
> include/mdbsql.h
> include/mdbtools.h
>-include/mdbver.h
> lib/libmdb.a
> lib/libmdb.so
>-lib/libmdb.so.2
>-lib/libmdb.so.2.0.1
>+lib/libmdb.so.3
>+lib/libmdb.so.3.0.0
> lib/libmdbodbc.a
> lib/libmdbodbc.so
> lib/libmdbodbcW.a
> lib/libmdbodbcW.so
> lib/libmdbsql.a
> lib/libmdbsql.so
>-lib/libmdbsql.so.2
>-lib/libmdbsql.so.2.0.0
>+lib/libmdbsql.so.3
>+lib/libmdbsql.so.3.0.0
> libdata/pkgconfig/libmdb.pc
> libdata/pkgconfig/libmdbsql.pc
>-man/man1/gmdb2.1.gz
> man/man1/mdb-array.1.gz
>+man/man1/mdb-count.1.gz
> man/man1/mdb-export.1.gz
> man/man1/mdb-header.1.gz
> man/man1/mdb-hexdump.1.gz
> man/man1/mdb-import.1.gz
>+man/man1/mdb-json.1.gz
> man/man1/mdb-parsecsv.1.gz
> man/man1/mdb-prop.1.gz
>+man/man1/mdb-queries.1.gz
> man/man1/mdb-schema.1.gz
> man/man1/mdb-sql.1.gz
> man/man1/mdb-tables.1.gz
> man/man1/mdb-ver.1.gz
>+share/bash-completion/completions/mdb-export
>+share/bash-completion/completions/mdb-hexdump
>+share/bash-completion/completions/mdb-import
>+share/bash-completion/completions/mdb-parsecsv
>+share/bash-completion/completions/mdb-prop
>+share/bash-completion/completions/mdb-schema
>+share/bash-completion/completions/mdb-sql
>+share/bash-completion/completions/mdb-tables
>+share/bash-completion/completions/mdb-ver
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/HACKING
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%GNOME%%share/gmdb/glade/COPYING
>-%%GNOME%%share/gmdb/glade/code.xpm
>-%%GNOME%%share/gmdb/glade/debug.xpm
>-%%GNOME%%share/gmdb/glade/form_big.xpm
>-%%GNOME%%share/gmdb/glade/forms.xpm
>-%%GNOME%%share/gmdb/glade/gmdb-debug.glade
>-%%GNOME%%share/gmdb/glade/gmdb-export.glade
>-%%GNOME%%share/gmdb/glade/gmdb-prefs.glade
>-%%GNOME%%share/gmdb/glade/gmdb-props.glade
>-%%GNOME%%share/gmdb/glade/gmdb-schema.glade
>-%%GNOME%%share/gmdb/glade/gmdb-sql.glade
>-%%GNOME%%share/gmdb/glade/gmdb-tabledef.glade
>-%%GNOME%%share/gmdb/glade/gmdb.glade
>-%%GNOME%%share/gmdb/glade/logo.xpm
>-%%GNOME%%share/gmdb/glade/macro_big.xpm
>-%%GNOME%%share/gmdb/glade/macros.xpm
>-%%GNOME%%share/gmdb/glade/module_big.xpm
>-%%GNOME%%share/gmdb/glade/pk.xpm
>-%%GNOME%%share/gmdb/glade/query.xpm
>-%%GNOME%%share/gmdb/glade/query_big.xpm
>-%%GNOME%%share/gmdb/glade/report_big.xpm
>-%%GNOME%%share/gmdb/glade/reports.xpm
>-%%GNOME%%share/gmdb/glade/stock_export-16.png
>-%%GNOME%%share/gmdb/glade/stock_export.png
>-%%GNOME%%share/gmdb/glade/table.xpm
>-%%GNOME%%share/gmdb/glade/table_big.xpm

Actions: View | Diff

Attachments on bug 250515: 218959 | 219052