From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 13 16:10:18 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C265E16A4CE for ; Sat, 13 Nov 2004 16:10:18 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E3A443D46 for ; Sat, 13 Nov 2004 16:10:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) iADGAIcW085026 for ; Sat, 13 Nov 2004 16:10:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id iADGAIR7085025; Sat, 13 Nov 2004 16:10:18 GMT (envelope-from gnats) Resent-Date: Sat, 13 Nov 2004 16:10:18 GMT Resent-Message-Id: <200411131610.iADGAIR7085025@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 963BD16A4CE for ; Sat, 13 Nov 2004 16:00:56 +0000 (GMT) Received: from hfep07.dion.ne.jp (hfep07.dion.ne.jp [203.181.105.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE73D43D39 for ; Sat, 13 Nov 2004 16:00:54 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([61.204.120.51]) by hfep07.dion.ne.jp with SMTP id <20041113160050063.PMET@hfep07.dion.ne.jp> for ; Sun, 14 Nov 2004 01:00:50 +0900 Message-Id: <20041114010012.668c7bad.tkato432@yahoo.com> Date: Sun, 14 Nov 2004 01:00:12 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/73901: Update port: databases/libiodbc to 3.52.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Nov 2004 16:10:18 -0000 >Number: 73901 >Category: ports >Synopsis: Update port: databases/libiodbc to 3.52.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Nov 13 16:10:18 GMT 2004 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.10-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 3.52.1 >How-To-Repeat: >Fix: diff -urN /usr/ports/databases/libiodbc/Makefile databases/libiodbc/Makefile --- /usr/ports/databases/libiodbc/Makefile Wed Jul 14 03:13:48 2004 +++ databases/libiodbc/Makefile Sat Nov 13 15:22:48 2004 @@ -9,7 +9,7 @@ # databases/unixODBC. PORTNAME= libiodbc -PORTVERSION= 3.51.2 +PORTVERSION= 3.52.1 CATEGORIES= databases MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ \ ${MASTER_SITE_SOURCEFORGE} @@ -20,29 +20,46 @@ CONFLICTS= unixODBC-* -USE_INC_LIBTOOL_VER= 13 +USE_GNOME= gnometarget +USE_REINPLACE= yes USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS= --with-iodbc-inidir=${INIDIR} INSTALLS_SHLIB= yes + +MAN1= iodbc-config.1 iodbctest.1 iodbctestw.1 + +CPPFLAGS= ${PTHREAD_CFLAGS} -D_BSD_WCHAR_T_DEFINED_ +LDFLAGS= ${PTHREAD_LIBS} INIDIR= ${PREFIX}/etc/${PORTNAME} -CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" -CONFIGURE_ARGS= --with-iodbc-inidir=${INIDIR} --with-pthread -CFLAGS += -D_BSD_WCHAR_T_DEFINED_ .if !defined(WITHOUT_GUI) -USE_GNOME= gtk12 +USE_GNOME+= gtk12 +MAN1+= iodbccadm-gtk.1 PLIST_SUB+= GUI="" .else CONFIGURE_ARGS+= --disable-gui PLIST_SUB+= GUI="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e \ + 's|$$CFLAGS -pthread|$$CFLAGS|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/^SUBDIRS/s|samples||' ${WRKSRC}/Makefile.in + post-install: - @ ${MKDIR} ${INIDIR} && \ - ${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR} + @${MKDIR} ${INIDIR} + ${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR} .if !defined(NOPORTDOCS) - @ ${MKDIR} ${DOCSDIR} -.for docfile in AUTHORS COPYING ChangeLog NEWS README - @ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} +.for file in AUTHORS ChangeLog NEWS README + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor + @${MKDIR} ${EXAMPLESDIR} +.for file in Makefile iodbctest.c + ${INSTALL_DATA} ${WRKSRC}/samples/${file} ${EXAMPLESDIR} .endfor .endif diff -urN /usr/ports/databases/libiodbc/distinfo databases/libiodbc/distinfo --- /usr/ports/databases/libiodbc/distinfo Sun Jun 27 10:04:20 2004 +++ databases/libiodbc/distinfo Sat Nov 13 14:41:34 2004 @@ -1,2 +1,2 @@ -MD5 (libiodbc-3.51.2.tar.gz) = bda106d1f0f4d2550d38a8f86540537f -SIZE (libiodbc-3.51.2.tar.gz) = 546518 +MD5 (libiodbc-3.52.1.tar.gz) = e6c3cb680a198922589d06b3161aff30 +SIZE (libiodbc-3.52.1.tar.gz) = 568834 diff -urN /usr/ports/databases/libiodbc/files/patch-include::sqltypes.h databases/libiodbc/files/patch-include::sqltypes.h --- /usr/ports/databases/libiodbc/files/patch-include::sqltypes.h Sat Apr 10 23:02:52 2004 +++ databases/libiodbc/files/patch-include::sqltypes.h Sat Nov 13 15:27:07 2004 @@ -1,10 +1,10 @@ ---- include/sqltypes.h.orig Fri Mar 26 08:33:24 2004 -+++ include/sqltypes.h Fri Mar 26 08:33:37 2004 -@@ -409,6 +409,7 @@ +--- include/sqltypes.h.orig Wed Sep 29 19:14:06 2004 ++++ include/sqltypes.h Sat Nov 13 15:26:42 2004 +@@ -387,6 +387,7 @@ # if defined(_WCHAR_T) || \ defined(_WCHAR_T_DEFINED) || \ - defined(_WCHAR_T_DECLARED) || \ -+ defined(__FreeBSD__) || \ + defined(_WCHAR_T_DECLARED) || \ ++ defined(__FreeBSD__) || \ defined(_BSD_WCHAR_T_DEFINED_) typedef wchar_t SQLWCHAR; # else diff -urN /usr/ports/databases/libiodbc/pkg-plist databases/libiodbc/pkg-plist --- /usr/ports/databases/libiodbc/pkg-plist Sun Jun 27 10:04:20 2004 +++ databases/libiodbc/pkg-plist Sat Nov 13 15:21:44 2004 @@ -1,15 +1,12 @@ -%%PORTDOCS%%share/doc/libiodbc/AUTHORS -%%PORTDOCS%%share/doc/libiodbc/COPYING -%%PORTDOCS%%share/doc/libiodbc/ChangeLog -%%PORTDOCS%%share/doc/libiodbc/NEWS -%%PORTDOCS%%share/doc/libiodbc/README bin/iodbc-config -bin/iodbctest %%GUI%%bin/iodbcadm-gtk +%%GUI%%bin/iodbctest +%%GUI%%bin/iodbctestw etc/libiodbc/odbc.ini.sample etc/libiodbc/odbcinst.ini.sample include/iodbcext.h include/iodbcinst.h +include/iodbcunix.h include/isql.h include/isqlext.h include/isqltypes.h @@ -35,5 +32,12 @@ lib/libiodbcinst.so.3 lib/libodbc.a lib/libodbc.so -%%PORTDOCS%%@dirrm share/doc/libiodbc +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile +%%PORTDOCS%%%%EXAMPLESDIR%%/iodbctest.c +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm etc/libiodbc >Release-Note: >Audit-Trail: >Unformatted: