ports/116066: [patch] Update databases/postgresql-odbc to newest version

[Nick Barkas]

>Number:         116066
>Category:       ports
>Synopsis:       [patch] Update databases/postgresql-odbc to newest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 03 23:40:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Nick Barkas
>Release:        7.0-CURRENT
>Organization:
Three Rings Design
>Environment:
FreeBSD freebsd-current.localdomain 7.0-CURRENT-200706 FreeBSD 7.0-CURRENT-200706 #0: Sun Jun  3 18:41:02 UTC 2007     root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Here is a patch to update the postgresql-odbc port to the latest release. I also made a few other changes to the port, such as moving the parts about detecting which ODBC library to use and setting configure args accordingly to the end of the Makefile. This was necessary to get those configure args set properly such that the port could be built on my system. I also added a USE_PGSQL line so that pg_config will be found during the build process, updated the project home page in pkg-descr, and put the PLIST_FILES right into the Makefile rather than using a separate pkg-plist, since it is now only three files.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN postgresql-odbc.orig/Makefile postgresql-odbc/Makefile
--- postgresql-odbc.orig/Makefile	Fri Aug 31 17:01:11 2007
+++ postgresql-odbc/Makefile	Tue Sep  4 01:25:31 2007
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	postgresql
-PORTVERSION=	7.2.5
-PORTREVISION=	2
+PORTVERSION=	08.02.0400
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	odbc/versions/src
@@ -18,6 +17,21 @@
 MAINTAINER=	girgen at FreeBSD.org
 COMMENT=	PostgreSQL ODBC client support
 
+USE_PGSQL=	yes
+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}"
+
+PLIST_FILES=	lib/psqlodbcw.a \
+		lib/psqlodbcw.la \
+		lib/psqlodbcw.so
+
 # PostgreSQL ODBC support needs an ODBC driver manager to be
 # installed, and it supports both iODBC and unixODBC.
 
@@ -36,21 +50,11 @@
 # the others?
 .if defined(WITH_IODBC)
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
-CONFIGURE_ARGS+=	--with-iodbc --with-odbcinst=${LOCALBASE}/etc/libiodbc
+CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
 .elif defined(WITH_UNIXODBC)
 PKGNAMESUFFIX=		-unixodbc
-CONFIGURE_ARGS+=	--with-unixodbc
 LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
 .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}"
 
 .include <bsd.port.mk>
diff -urN postgresql-odbc.orig/distinfo postgresql-odbc/distinfo
--- postgresql-odbc.orig/distinfo	Fri Aug 31 17:01:11 2007
+++ postgresql-odbc/distinfo	Tue Sep  4 00:34:31 2007
@@ -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.02.0400.tar.gz) = 6f919a240760b8789ada73a5d38120fe
+SHA256 (postgresql/psqlodbc-08.02.0400.tar.gz) = db5def3cd9854ada0976a20754086eda69878fba2a0ea6947aca65a18d94636f
+SIZE (postgresql/psqlodbc-08.02.0400.tar.gz) = 737581
diff -urN postgresql-odbc.orig/pkg-descr postgresql-odbc/pkg-descr
--- postgresql-odbc.orig/pkg-descr	Fri Aug 31 17:01:11 2007
+++ postgresql-odbc/pkg-descr	Mon Sep  3 23:35:39 2007
@@ -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 -urN postgresql-odbc.orig/pkg-plist postgresql-odbc/pkg-plist
--- postgresql-odbc.orig/pkg-plist	Fri Aug 31 17:01:11 2007
+++ postgresql-odbc/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -1,6 +0,0 @@
-lib/psqlodbc.a
-lib/psqlodbc.la
-lib/psqlodbc.so
-share/psqlodbc/odbc-drop.sql
-share/psqlodbc/odbc.sql
- at dirrm share/psqlodbc


>Release-Note:
>Audit-Trail:
>Unformatted: