From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 30 03:00:06 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96E3A106567D for ; Sat, 30 Aug 2008 03:00:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 609EA8FC14 for ; Sat, 30 Aug 2008 03:00:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7U302JB045390 for ; Sat, 30 Aug 2008 03:00:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7U302No045389; Sat, 30 Aug 2008 03:00:02 GMT (envelope-from gnats) Resent-Date: Sat, 30 Aug 2008 03:00:02 GMT Resent-Message-Id: <200808300300.m7U302No045389@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, Alex Goncharov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CC1A106567C for ; Sat, 30 Aug 2008 02:54:25 +0000 (UTC) (envelope-from alex-goncharov@comcast.net) Received: from QMTA07.westchester.pa.mail.comcast.net (qmta07.westchester.pa.mail.comcast.net [76.96.62.64]) by mx1.freebsd.org (Postfix) with ESMTP id C6B768FC17 for ; Sat, 30 Aug 2008 02:54:24 +0000 (UTC) (envelope-from alex-goncharov@comcast.net) Received: from OMTA14.westchester.pa.mail.comcast.net ([76.96.62.60]) by QMTA07.westchester.pa.mail.comcast.net with comcast id 8Ki91a00D1HzFnQ57SeQnJ; Sat, 30 Aug 2008 02:38:24 +0000 Received: from daland.home ([24.61.21.4]) by OMTA14.westchester.pa.mail.comcast.net with comcast id 8SeP1a00B05H7zL3aSeP68; Sat, 30 Aug 2008 02:38:24 +0000 Received: from algo by daland.home with local (Exim 4.69 (FreeBSD)) (envelope-from ) id 1KZGM3-000GhA-Ay; Fri, 29 Aug 2008 22:38:23 -0400 Message-Id: Date: Fri, 29 Aug 2008 22:38:23 -0400 From: Alex Goncharov Sender: Alex Goncharov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/126963: [maintainer update] postgresql-odbc upgrade: 7.2.5 to 8.3.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alex Goncharov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Aug 2008 03:00:06 -0000 >Number: 126963 >Category: ports >Synopsis: [maintainer update] postgresql-odbc upgrade: 7.2.5 to 8.3.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Aug 30 03:00:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Alex Goncharov >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: >Environment: >Description: A first submission from a new port maintainer. Moved from a very old release to the very newest one. Changed the default driver manager from iODBC to unixODBC, as the most meaningful choice these days. Added documentation and .sql files to the destribution. No longer building a static (.a) library, as having it for an ODBC driver doesn't make any sense (and it's big). The enclosed two patches should be run from /usr/ports. --- Mk-bsd.sites.mk.diff begins here --- --- Mk/bsd.sites.mk.orig 2008-08-26 06:53:28.000000000 -0400 +++ Mk/bsd.sites.mk 2008-08-28 00:19:57.000000000 -0400 @@ -971,13 +971,12 @@ # # For the full list, see the following: # -# http://www.postgresql.org/mirrors-ftp.html +# http://wwwmaster.postgresql.org/download/mirrors-ftp # # Before update mirror list please consult with fenner's distfiles survey. # .if !defined(IGNORE_MASTER_SITE_PGSQL) MASTER_SITE_PGSQL+= \ - ftp://ftp8.us.postgresql.org/postgresql/%SUBDIR%/ \ ftp://ftp9.us.postgresql.org/pub/mirrors/postgresql/%SUBDIR%/ \ ftp://ftp10.us.postgresql.org/pub/postgresql/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/db/postgresql/&,} \ --- Mk-bsd.sites.mk.diff ends here --- --- databases-postgresql-odbc.diff begins here --- diff -ruN databases/postgresql-odbc.orig/Makefile databases/postgresql-odbc/Makefile --- databases/postgresql-odbc.orig/Makefile 2008-08-29 20:24:16.000000000 -0400 +++ databases/postgresql-odbc/Makefile 2008-08-29 20:43:31.000000000 -0400 @@ -1,56 +1,73 @@ # New ports collection makefile for: PostgreSQL ODBC # Date created: January 14, 2002 # Whom: Palle Girgensohn + +# Completely rewritten by Alex Goncharov on 2008-08-30. + # # $FreeBSD: ports/databases/postgresql-odbc/Makefile,v 1.12 2008/08/18 07:44:33 girgen Exp $ # -PORTNAME= postgresql -PORTVERSION= 7.2.5 -PORTREVISION= 2 -CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_PGSQL} +# PostgreSQL ODBC driver should work under either unixODBC or iODBC +# driver manager, when compliled against one. (Important: Do not try +# to have both installed -- they have overlapping files). + +# It looks like most people are using unixODBC these days, rather than +# iODBC, so let's make unixODBC the default choice: to select iODBC, +# set WITH_IODBC, without setting WITH_UNIXODBC. When the latter is +# set or when neither is set, we go with WITH_UNIXODBC. + +# Following the existing convention, and other postgresql-* pieces, +# this is considered to be a part of the `postgresql' port. + +PORTNAME= postgresql +PORTVERSION= 08.03.0200 +CATEGORIES= databases +MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= odbc/versions/src -PKGNAMESUFFIX?= -odbc -DISTNAME= psqlodbc-${PORTVERSION} -DIST_SUBDIR= postgresql +# PKGNAMESUFFIX will be changed for the driver used with iODBC +PKGNAMESUFFIX= -odbc +DISTNAME= psqlodbc-${PORTVERSION} +DIST_SUBDIR= postgresql -MAINTAINER= alex-goncharov@comcast.net -COMMENT= PostgreSQL ODBC client support +MAINTAINER= alex-goncharov@comcast.net +COMMENT= PostgreSQL ODBC driver -# PostgreSQL ODBC support needs an ODBC driver manager to be -# installed, and it supports both iODBC and unixODBC. +BUILD_DEPENDS= pg_config:${PORTSDIR}/databases/postgresql83-client -.if defined(WITH_IODBC) && defined(WITH_UNIXODBC) -IGNORE= selected mutually exclusive options: WITH_IODBC and WITH_UNIXODBC -.endif +GNU_CONFIGURE= YES -.if !defined(WITH_IODBC) && !defined(WITH_UNIXODBC) -WITH_IODBC?= yes +.if !defined(WITH_IODBC) +WITH_UNIXODBC= yes .endif -# Note that there is a potential conflict between unixODBC's and -# postgres' libodbcpsql.so. unixODBC installs versions `1' & `2' of -# the named lib, while postgres installs version `0'. The postgres -# folks say their is the best, so you might be better off removing -# the others? -.if defined(WITH_IODBC) -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc -CONFIGURE_ARGS+= --with-iodbc --with-odbcinst=${LOCALBASE}/etc/libiodbc -.elif defined(WITH_UNIXODBC) -PKGNAMESUFFIX= -unixodbc -CONFIGURE_ARGS+= --with-unixodbc +.if defined(WITH_UNIXODBC) +# I.e. even if WITH_IODBC is defined LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +CONFIGURE_ARGS+= --with-unixodbc=${LOCALBASE} +.else +LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc +CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} + +# Modify a suffix in this case +PKGNAMESUFFIX= -iodbc .endif -USE_AUTOTOOLS= libtool:15 -USE_GMAKE= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-libdir=${LOCALBASE}/lib --enable-pthreads \ - --with-includes=${LOCALBASE}/include - -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib -CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +DATADIR_1= ${DATADIR}/odbc +DOCSDIR_1= ${DOCSDIR}/odbc +post-install: + @${MKDIR} ${DATADIR_1} + ${INSTALL_DATA} ${WRKSRC}/odbc.sql ${DATADIR_1} + ${INSTALL_DATA} ${WRKSRC}/odbc-drop.sql ${DATADIR_1} +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR_1} + ${TAR} -C ${WRKSRC}/docs --exclude '*Makefile*' -cf - . \ + | ${TAR} -C ${DOCSDIR_1} --unlink -xf - +.if !defined(INSTALL_AS_USER) + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR_1} + ${FIND} ${DOCSDIR_1} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + ${FIND} ${DOCSDIR_1} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 +.endif +.endif .include diff -ruN databases/postgresql-odbc.orig/distinfo databases/postgresql-odbc/distinfo --- databases/postgresql-odbc.orig/distinfo 2008-08-29 20:25:22.000000000 -0400 +++ databases/postgresql-odbc/distinfo 2008-08-28 20:58:12.000000000 -0400 @@ -1,3 +1,3 @@ -MD5 (postgresql/psqlodbc-7.2.5.tar.gz) = 701c7c55831652d35937c2efaeaab26d -SHA256 (postgresql/psqlodbc-7.2.5.tar.gz) = a3dac8b6a87bf9a6f79a5809e85627dad368a83e38a99716d3adbb58f601293d -SIZE (postgresql/psqlodbc-7.2.5.tar.gz) = 415885 +MD5 (postgresql/psqlodbc-08.03.0200.tar.gz) = 4950e71c215764ff3beeb7a505c1321a +SHA256 (postgresql/psqlodbc-08.03.0200.tar.gz) = 41f9cea3ce13d8959538e97318c9cc32722ebc7bc9ad6545f6a20ebdff830190 +SIZE (postgresql/psqlodbc-08.03.0200.tar.gz) = 757833 diff -ruN postgresql-odbc.orig/pkg-descr postgresql-odbc/pkg-descr --- databases/postgresql-odbc.orig/pkg-descr 2008-08-29 20:25:33.000000000 -0400 +++ databases/postgresql-odbc/pkg-descr 2008-08-28 20:58:12.000000000 -0400 @@ -8,4 +8,4 @@ software is no longer a part thereof. It is still the offical ODBC implementation, though. -WWW: http://odbc.postgresql.org/ +WWW: http://pgfoundry.org/projects/psqlodbc/ diff -ruN databases/postgresql-odbc.orig/pkg-plist databases/postgresql-odbc/pkg-plist --- databases/postgresql-odbc.orig/pkg-plist 2008-08-29 20:26:02.000000000 -0400 +++ databases/postgresql-odbc/pkg-plist 2008-08-29 12:54:27.000000000 -0400 @@ -1,6 +1,18 @@ -lib/psqlodbc.a -lib/psqlodbc.la -lib/psqlodbc.so -share/psqlodbc/odbc-drop.sql -share/psqlodbc/odbc.sql -@dirrm share/psqlodbc +lib/psqlodbcw.la +lib/psqlodbcw.so +share/doc/postgresql/odbc/config-opt.html +share/doc/postgresql/odbc/config.html +share/doc/postgresql/odbc/faq.html +share/doc/postgresql/odbc/howto-accesslo.html +share/doc/postgresql/odbc/howto-accessvba.html +share/doc/postgresql/odbc/howto-bo.html +share/doc/postgresql/odbc/howto-ch.html +share/doc/postgresql/odbc/howto-csharp.html +share/doc/postgresql/odbc/howto-vb.html +share/doc/postgresql/odbc/howto-vblo.html +share/doc/postgresql/odbc/index.html +share/doc/postgresql/odbc/release.html +share/doc/postgresql/odbc/unix-compilation.html +share/doc/postgresql/odbc/win32-compilation.html +share/postgresql/odbc/odbc-drop.sql +share/postgresql/odbc/odbc.sql --- databases-postgresql-odbc.diff ends here --- >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: