- update to 08.04.0200 [1]

- cleanup the Makefile

PR:		ports/144993 [1]
Submitted by:	Berend de Boer <berend _at_ pobox.com>

5 files changed, 7 insertions, 60 deletions

diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile
index 03e435c1783b..569e2fe742f6 100644
--- a/databases/postgresql-odbc/Makefile
+++ b/databases/postgresql-odbc/Makefile
@@ -1,43 +1,15 @@
-# New ports collection makefile for:  PostgreSQL ODBC
 # Date created:		January 14, 2002
 # Whom:			Palle Girgensohn <girgen@partitur.se>
 # Completely rewritten by Alex Goncharov <alex-goncharov@comcast.net> on 2008-08-30.
 
-#
 # $FreeBSD$
 #
 
-# -- 2009-07-23 -- Alex Goncharov -->
-
-# The driver has to be built against a driver manager; there is no
-# reason to expect that it can be built against *any* driver manager.
-# In days old, iODBC was the common choice of a driver manager on
-# Unix.  Today, everybody builds and tests against another driver
-# manager, unixODBC.
-
-# When I took over this port, I made the build against unixODBC to be
-# the default, and introduced the WITH_IODBC variable to build against
-# iODBC.  At that point (2008-08-30), the i0DBC build worked and
-# produced a workable driver.
-
-# Starting from the new driver release, 08.04.0100, I am no longer
-# trying to build the WITH_IODBC=yes case.  I keep this switch here,
-# but you should really never use it -- iODBC has long been
-# unmaintained and ODBC driver developers use unixODBC for builds and
-# tests.
-
-# -- 2008-08-30 -- Alex Goncharov ->
-
-# Following the existing convention, and other postgresql-* pieces,
-# this is considered to be a part of the `postgresql' port.
-
 PORTNAME=		postgresql
-PORTVERSION=		08.04.0100
-PORTREVISION=		0
+PORTVERSION=		08.04.0200
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	odbc/versions/src
-# PKGNAMESUFFIX will be changed for the driver used with iODBC
 PKGNAMESUFFIX=		-odbc
 DISTNAME=		psqlodbc-${PORTVERSION}
 DIST_SUBDIR=		postgresql
@@ -45,12 +17,12 @@ DIST_SUBDIR=		postgresql
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		PostgreSQL ODBC driver
 
-BUILD_DEPENDS=		pg_config:${PORTSDIR}/databases/postgresql83-client
+USE_OPENSSL=	yes
+USE_PGSQL=	yes
+USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=		YES
 
-IGNORE=			does not work properly (see ports/144993)
-
 .if !defined(WITH_IODBC)
 WITH_UNIXODBC=	yes
 .endif
diff --git a/databases/postgresql-odbc/distinfo b/databases/postgresql-odbc/distinfo
index 77c4d3553b05..b56ffd2bce09 100644
--- a/databases/postgresql-odbc/distinfo
+++ b/databases/postgresql-odbc/distinfo
@@ -1,3 +1,2 @@
-MD5 (postgresql/psqlodbc-08.04.0100.tar.gz) = 2328c3e97e6a376620a5d317137515ff
-SHA256 (postgresql/psqlodbc-08.04.0100.tar.gz) = 57bb143d5d20804c5ce96214227e6e65dc16520efce7ac25ddb7cc4c8aa0db0a
-SIZE (postgresql/psqlodbc-08.04.0100.tar.gz) = 736714
+SHA256 (postgresql/psqlodbc-08.04.0200.tar.gz) = 6e745e9083d605b1cdeaacdd3bea8f83246da302f2df7ebbd72adca06460cb3f
+SIZE (postgresql/psqlodbc-08.04.0200.tar.gz) = 725393
diff --git a/databases/postgresql-odbc/files/patch-odbcapi30.c b/databases/postgresql-odbc/files/patch-odbcapi30.c
deleted file mode 100644
index 58d277bdffd6..000000000000
--- a/databases/postgresql-odbc/files/patch-odbcapi30.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- odbcapi30.c.orig	2009-01-26 23:20:59.000000000 +0600
-+++ odbcapi30.c	2009-01-26 23:21:47.000000000 +0600
-@@ -118,9 +118,7 @@
- 			SQLPOINTER CharacterAttribute,
- 			SQLSMALLINT BufferLength,
- 			SQLSMALLINT *StringLength,
--#if defined(_WIN64)
--			SQLLEN *NumericAttribute
--#elif defined(WITH_UNIXODBC) || defined(WIN32)
-+#if defined(WIN32)
- 			SQLPOINTER NumericAttribute
- #else
- 			SQLLEN *NumericAttribute
diff --git a/databases/postgresql-odbc/files/patch-odbcapi30w.c b/databases/postgresql-odbc/files/patch-odbcapi30w.c
deleted file mode 100644
index 65e83482a4b5..000000000000
--- a/databases/postgresql-odbc/files/patch-odbcapi30w.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- odbcapi30w.c.orig	2009-01-26 23:23:19.000000000 +0600
-+++ odbcapi30w.c	2009-01-26 23:24:07.000000000 +0600
-@@ -255,7 +255,7 @@
- 	SQLPOINTER	pCharAttr,
- 	SQLSMALLINT	cbCharAttrMax,	
- 	SQLSMALLINT	*pcbCharAttr,
--#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64))
-+#if defined(WIN32)
- 	SQLPOINTER	pNumAttr
- #else
- 	SQLLEN		*pNumAttr
diff --git a/databases/postgresql-odbc/pkg-plist b/databases/postgresql-odbc/pkg-plist
index cadd32eca573..432f49ff235d 100644
--- a/databases/postgresql-odbc/pkg-plist
+++ b/databases/postgresql-odbc/pkg-plist
@@ -1,5 +1,5 @@
 lib/psqlodbcw.la
-lib/psqlodbcw.so
+lib/libpsqlodbcw.so.0.0
 %%PORTDOCS%%%%DOCSDIR%%/odbc/config-opt.html
 %%PORTDOCS%%%%DOCSDIR%%/odbc/config.html
 %%PORTDOCS%%%%DOCSDIR%%/odbc/faq.html