Attachment 161245 Details for Bug 203243 – databases_unixODBC.diff

[patch] databases_unixODBC.diff

databases_unixODBC.diff (text/plain), 2.93 KB, created by tkato432 on 2015-09-21 18:32:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-09-21 18:32:34 UTC

Size: 2.93 KB

patch

obsolete

>diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile
>--- /usr/ports/databases/unixODBC/Makefile	2015-08-24 04:05:29.744551000 +0900
>+++ databases/unixODBC/Makefile	2015-09-22 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/databases/unixODBC/Makefile 393429 2015-08-02 15:03:19Z tijl $
> 
> PORTNAME=	unixODBC
>-PORTVERSION=	2.3.2
>-PORTREVISION=	2
>+PORTVERSION=	2.3.3
> CATEGORIES=	databases
> MASTER_SITES=	http://www.unixodbc.org/
> 
>@@ -13,26 +12,27 @@
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-OPTIONS_DEFINE=	DOCS
>-
>+# :keepla because port uses lt_dlopen
>+USES=		iconv libtool:keepla
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	ac_cv_header_msql_h=no
> CONFIGURE_ARGS=	--enable-static --enable-shared \
> 		${ICONV_CONFIGURE_ARG}
> INSTALL_TARGET=	install-strip
>-# :keepla because port uses lt_dlopen
>-USES=		iconv libtool:keepla
> USE_LDCONFIG=	yes
> 
> PORTDOCS=	*
> 
>+OPTIONS_DEFINE=	DOCS
>+
> post-patch:
> 	@${REINPLACE_CMD} -e \
>-		'/\.ini/s|^|#|' ${WRKSRC}/Makefile.in
>+		's|\.ini$$|.ini.sample|' ${WRKSRC}/Makefile.in
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
>-	@${FIND} ${STAGEDIR}${DOCSDIR} -type f -name "*Makefile*" -delete
>+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
>+		"! -name Makefile.am -and ! -name Makefile.in -and \
>+		! -name Makefile")
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/databases/unixODBC/distinfo databases/unixODBC/distinfo
>--- /usr/ports/databases/unixODBC/distinfo	2015-08-24 04:05:29.754302000 +0900
>+++ databases/unixODBC/distinfo	2015-09-22 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (unixODBC-2.3.2.tar.gz) = 9c3459742f25df5aa3c10a61429bde51a6d4f11552c03095f1d33d7eb02b5c9a
>-SIZE (unixODBC-2.3.2.tar.gz) = 1849173
>+SHA256 (unixODBC-2.3.3.tar.gz) = 90a4d04962050113ffc6507094cce3d1770f84926f4c032f23892ce57df5d788
>+SIZE (unixODBC-2.3.3.tar.gz) = 1824430
>diff -urN /usr/ports/databases/unixODBC/pkg-plist databases/unixODBC/pkg-plist
>--- /usr/ports/databases/unixODBC/pkg-plist	2015-08-24 04:05:29.739971000 +0900
>+++ databases/unixODBC/pkg-plist	2015-09-22 00:00:00.000000000 +0900
>@@ -4,11 +4,14 @@
> bin/odbc_config
> bin/odbcinst
> bin/slencheck
>+@sample etc/odbc.ini.sample
>+@sample etc/odbcinst.ini.sample
> include/autotest.h
> include/odbcinst.h
> include/odbcinstext.h
> include/sql.h
> include/sqlext.h
>+include/sqlspi.h
> include/sqltypes.h
> include/sqlucode.h
> include/unixodbc_conf.h
>@@ -29,12 +32,12 @@
> lib/libodbcinst.so
> lib/libodbcinst.so.2
> lib/libodbcinst.so.2.0.0
>+man/man1/dltest.1.gz
> man/man1/isql.1.gz
>+man/man1/iusql.1.gz
>+man/man1/odbc_config.1.gz
> man/man1/odbcinst.1.gz
> man/man5/odbc.ini.5.gz
> man/man5/odbcinst.ini.5.gz
>-@unexec test -s %D/etc/odbcinst.ini || rm -f %D/etc/odbcinst.ini
>-@unexec test -s %D/etc/odbc.ini || rm -f %D/etc/odbc.ini
>+man/man7/unixODBC.7.gz
> @dir etc/ODBCDataSources
>-@exec test -e %D/etc/odbc.ini || touch %D/etc/odbc.ini
>-@exec test -e %D/etc/odbcinst.ini || touch %D/etc/odbcinst.ini

Actions: View | Diff

Attachments on bug 203243: 161245