Attachment 99677 Details for Bug 138814 – file.diff

[patch] file.diff

file.diff (text/plain), 2.89 KB, created by tkato432 on 2009-09-14 19:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2009-09-14 19:10:00 UTC

Size: 2.89 KB

patch

obsolete

>diff -urN /usr/ports/databases/libiodbc/Makefile databases/libiodbc/Makefile
>--- /usr/ports/databases/libiodbc/Makefile	2009-08-22 16:14:14.000000000 +0900
>+++ databases/libiodbc/Makefile	2009-09-15 01:39:26.000000000 +0900
>@@ -4,34 +4,29 @@
> #
> # $FreeBSD: ports/databases/libiodbc/Makefile,v 1.31 2009/08/22 00:17:33 amdmi3 Exp $
> #
>-# Note:  The location of ${INIDIR} and the installed name of the "odbctest"
>-#        binary were chosen such that this port does not conflict with
>-#        databases/unixODBC.
> 
> PORTNAME=	libiodbc
>-PORTVERSION=	3.52.6
>+PORTVERSION=	3.52.7
> CATEGORIES=	databases
> MASTER_SITES=	http://www.iodbc.org/downloads/iODBC/ \
> 		SF/iodbc/iodbc/${PORTVERSION}
> 
>-
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	An ODBC 3.x driver manager, for universal data source access
> 
> CONFLICTS=	unixODBC-[0-9]*
> 
>-USE_GNOME=	gnomehack gnometarget pkgconfig
>+USE_GNOME=	gnomehack pkgconfig
> USE_GMAKE=	yes
> USE_AUTOTOOLS=	libtool:22
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>-CONFIGURE_ARGS=	--with-iodbc-inidir=${INIDIR}
>+CONFIGURE_ARGS=	--with-iodbc-inidir=${ETCDIR}
> USE_LDCONFIG=	yes
> 
> MAN1=		iodbc-config.1 iodbctest.1 iodbctestw.1
> 
> CPPFLAGS=	${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_
> LDFLAGS=	${PTHREAD_LIBS}
>-INIDIR=		${PREFIX}/etc/${PORTNAME}
> 
> .if defined(WITH_GUI)
> USE_GNOME+=	gtk20
>@@ -51,8 +46,8 @@
> 		's|-ldl||g' ${WRKSRC}/admin/libiodbc.pc.in
> 
> post-install:
>-	@${MKDIR} ${INIDIR}
>-	${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR}
>+	@${MKDIR} ${ETCDIR}
>+	${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${ETCDIR}
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> .for f in AUTHORS ChangeLog NEWS README
>diff -urN /usr/ports/databases/libiodbc/distinfo databases/libiodbc/distinfo
>--- /usr/ports/databases/libiodbc/distinfo	2007-10-24 15:37:17.000000000 +0900
>+++ databases/libiodbc/distinfo	2009-09-15 01:30:33.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (libiodbc-3.52.6.tar.gz) = 761ad547467bd63ac0b2b4f3ee4b5afb
>-SHA256 (libiodbc-3.52.6.tar.gz) = 82e0d6a8c29759570fb92c47fcb98579caaf7951eabb7b65c414bb1209f49f20
>-SIZE (libiodbc-3.52.6.tar.gz) = 757876
>+MD5 (libiodbc-3.52.7.tar.gz) = ddbd274cb31d65be6a78da58fc09079a
>+SHA256 (libiodbc-3.52.7.tar.gz) = d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7
>+SIZE (libiodbc-3.52.7.tar.gz) = 1038710
>diff -urN /usr/ports/databases/libiodbc/pkg-plist databases/libiodbc/pkg-plist
>--- /usr/ports/databases/libiodbc/pkg-plist	2006-01-22 09:26:45.000000000 +0900
>+++ databases/libiodbc/pkg-plist	2009-09-15 01:38:29.000000000 +0900
>@@ -1,7 +1,7 @@
> bin/iodbc-config
> %%GUI%%bin/iodbcadm-gtk
>-etc/libiodbc/odbc.ini.sample
>-etc/libiodbc/odbcinst.ini.sample
>+%%ETCDIR%%/odbc.ini.sample
>+%%ETCDIR%%/odbcinst.ini.sample
> include/iodbcext.h
> include/iodbcinst.h
> include/iodbcunix.h
>@@ -40,4 +40,4 @@
> %%PORTDOCS%%%%EXAMPLESDIR%%/iodbctest.c
> %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrmtry etc/libiodbc
>+@dirrmtry %%ETCDIR%%

Actions: View | Diff

Attachments on bug 138814: 99677