From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 22 03:15:02 2004 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6E3416A4CE; Sun, 22 Feb 2004 03:15:02 -0800 (PST) Received: from lupinella.troll.no (lupinella.troll.no [80.232.37.59]) by mx1.FreeBSD.org (Postfix) with ESMTP id D58FC43D1D; Sun, 22 Feb 2004 03:15:01 -0800 (PST) (envelope-from ebakke@trolltech.com) Received: from steinbit.troll.no ([80.232.37.113]:50625 "EHLO steinbit.troll.no" ident: "NO-IDENT-SERVICE[2]") by trolltech.com with ESMTP id ; Sun, 22 Feb 2004 12:14:46 +0100 From: "Erik H. Bakke" Organization: Trolltech AS To: Mark Linimon Date: Sun, 22 Feb 2004 12:16:19 +0100 User-Agent: KMail/1.6 References: <200402210722.i1L7MjSw024746@freefall.freebsd.org> In-Reply-To: <200402210722.i1L7MjSw024746@freefall.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200402221216.19852.ebakke@trolltech.com> cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/62877: Update of port databases/libiodbc to version 3.51.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: ebakke@trolltech.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Feb 2004 11:15:02 -0000 On Saturday 21 February 2004 08:22, you wrote: > Synopsis: Update of port databases/libiodbc to version 3.51.1 > > State-Changed-From-To: open->feedback > State-Changed-By: linimon > State-Changed-When: Fri Feb 20 23:18:01 PST 2004 > State-Changed-Why: > Although this seems to build correctly, nothing in the patch > seems to modify the version of the distfile. Is this what > is intended? > > Also, I had to remove several files from your pkg-plist > changes to get it to deinstall correctly: bin/iodbc-odbctest, > include/iodbcext.h, and include/sqlucode.h. > > http://www.freebsd.org/cgi/query-pr.cgi?pr=62877 Looks like I may have messed up the diff file in a way. Here is the updated diff, I hope this works better :) Sorry for that. *** DIFF STARTS HERE *** diff -ruN libiodbc.old/Makefile libiodbc/Makefile --- libiodbc.old/Makefile Sun Feb 8 14:29:31 2004 +++ libiodbc/Makefile Sun Feb 15 16:49:22 2004 @@ -9,10 +9,9 @@ # databases/unixODBC. PORTNAME= libiodbc -PORTVERSION= 3.0.5 -PORTREVISION= 2 +PORTVERSION= 3.51.1 CATEGORIES= databases -MASTER_SITES= http://www.iodbc.org/dist/ +MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ MAINTAINER= ebakke@trolltech.com COMMENT= An ODBC 3.x driver manager, for universal data source access @@ -35,8 +34,6 @@ .endif post-install: - @ ${MKDIR} ${PREFIX}/bin && ${INSTALL_PROGRAM} \ - ${WRKSRC}/samples/odbctest ${PREFIX}/bin/iodbc-odbctest @ ${MKDIR} ${INIDIR} && \ ${INSTALL_DATA} ${WRKSRC}/etc/odbc*.ini.sample ${INIDIR} .if !defined(NOPORTDOCS) diff -ruN libiodbc.old/distinfo libiodbc/distinfo --- libiodbc.old/distinfo Wed Oct 3 14:54:13 2001 +++ libiodbc/distinfo Sun Feb 15 14:09:25 2004 @@ -1 +1,2 @@ -MD5 (libiodbc-3.0.5.tar.gz) = fea3df52843bec96293ff37a08cf1478 +MD5 (libiodbc-3.51.1.tar.gz) = c63b6f3d7bc459bdf791517c84402160 +SIZE (libiodbc-3.51.1.tar.gz) = 540563 diff -ruN libiodbc.old/files/patch-configure libiodbc/files/patch-configure --- libiodbc.old/files/patch-configure Wed Oct 3 14:54:13 2001 +++ libiodbc/files/patch-configure Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ ---- configure.orig Mon Jun 11 16:30:50 2001 -+++ configure Tue Oct 2 12:25:50 2001 -@@ -6458,8 +6458,8 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+# Always use FreeBSD's libtool port. -+LIBTOOL='libtool' - - # Prevent multiple expansion - diff -ruN libiodbc.old/pkg-plist libiodbc/pkg-plist --- libiodbc.old/pkg-plist Thu Oct 10 09:20:24 2002 +++ libiodbc/pkg-plist Sun Feb 15 17:13:37 2004 @@ -4,10 +4,11 @@ %%PORTDOCS%%share/doc/libiodbc/NEWS %%PORTDOCS%%share/doc/libiodbc/README bin/iodbc-config -bin/iodbc-odbctest +bin/iodbctest %%GUI%%bin/iodbcadm-gtk etc/libiodbc/odbc.ini.sample etc/libiodbc/odbcinst.ini.sample +include/iodbcext.h include/iodbcinst.h include/isql.h include/isqlext.h @@ -15,8 +16,7 @@ include/sql.h include/sqlext.h include/sqltypes.h -%%GUI%%lib/libdrvproxy-gtk.a -%%GUI%%lib/libdrvproxy-gtk.la +include/sqlucode.h %%GUI%%lib/libdrvproxy.a %%GUI%%lib/libdrvproxy.la %%GUI%%lib/libdrvproxy.so @@ -25,8 +25,6 @@ lib/libiodbc.la lib/libiodbc.so lib/libiodbc.so.3 -%%GUI%%lib/libiodbcadm-gtk.a -%%GUI%%lib/libiodbcadm-gtk.la %%GUI%%lib/libiodbcadm.a %%GUI%%lib/libiodbcadm.la %%GUI%%lib/libiodbcadm.so @@ -35,4 +33,7 @@ lib/libiodbcinst.la lib/libiodbcinst.so lib/libiodbcinst.so.3 +share/nls/POSIX +share/nls/en_US.US-ASCII %%PORTDOCS%%@dirrm share/doc/libiodbc +@dirrm etc/libiodbc *** DIFF ENDS HERE *** -- Erik H. Bakke