- Update to 09.01.0200

- Give maintainership to submitter
- Add LICENSE
- Switch to OptionsNG
- Switch pkg-plist to PORTDOCS and PLIST_FILES

PR:		ports/174885
Submitted by:	Po-Chien Lin <linpc@cs.nctu.edu.tw>

5 files changed, 29 insertions, 51 deletions

diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile
index bcdf6079a2ea..cb42bad1f174 100644
--- a/databases/postgresql-odbc/Makefile
+++ b/databases/postgresql-odbc/Makefile
@@ -1,54 +1,52 @@
-# Date created:		January 14, 2002
-# Whom:			Palle Girgensohn <girgen@partitur.se>
-# Completely rewritten by Alex Goncharov <alex-goncharov@comcast.net> on 2008-08-30.
-
+# Create by: Palle Girgensohn <girgen@partitur.se>
 # $FreeBSD$
-#
 
-PORTNAME=		postgresql
-PORTVERSION=		08.04.0200
-PORTREVISION=	1
-CATEGORIES=		databases
-MASTER_SITES=		${MASTER_SITE_PGSQL}
+PORTNAME=	postgresql
+PORTVERSION=	09.01.0200
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	odbc/versions/src
-PKGNAMESUFFIX=		-odbc
-DISTNAME=		psqlodbc-${PORTVERSION}
-DIST_SUBDIR=		postgresql
+PKGNAMESUFFIX=	-odbc
+DISTNAME=	psqlodbc-${PORTVERSION}
+DIST_SUBDIR=	postgresql
+
+MAINTAINER=	linpc@cs.nctu.edu.tw
+COMMENT=	PostgreSQL ODBC driver
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		PostgreSQL ODBC driver
+LICENSE=	LGPL20
 
 USE_OPENSSL=	yes
 USE_PGSQL=	yes
 USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=	yes
 
-.if !defined(WITH_IODBC)
-WITH_UNIXODBC=	yes
-.endif
+PORTDOCS=	odbc/
+PLIST_FILES=	lib/psqlodbcw.la lib/psqlodbcw.so
 
-.if defined(WITH_UNIXODBC)
+.if !defined(WITH_IODBC) || defined(WITH_UNIXODBC)
 # I.e. even if WITH_IODBC is defined
-LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
-BUILD_DEPENDS+=		unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
+BUILD_DEPENDS+=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
 .else
-LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
 
 # Modify a suffix in this case
 PKGNAMESUFFIX=	-iodbc
 .endif
 
+.include <bsd.port.options.mk>
+
 DATADIR_1=	${DATADIR}/odbc
 DOCSDIR_1=	${DOCSDIR}/odbc
 post-install:
-.if !defined(NOPORTDATA)
+.if ${PORT_OPTIONS:MDATA}
 	@${MKDIR} ${DATADIR_1}
 	${INSTALL_DATA} ${WRKSRC}/*.sql ${DATADIR_1}
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR_1}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR_1}
 .endif
diff --git a/databases/postgresql-odbc/distinfo b/databases/postgresql-odbc/distinfo
index b56ffd2bce09..533fb41a0474 100644
--- a/databases/postgresql-odbc/distinfo
+++ b/databases/postgresql-odbc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (postgresql/psqlodbc-08.04.0200.tar.gz) = 6e745e9083d605b1cdeaacdd3bea8f83246da302f2df7ebbd72adca06460cb3f
-SIZE (postgresql/psqlodbc-08.04.0200.tar.gz) = 725393
+SHA256 (postgresql/psqlodbc-09.01.0200.tar.gz) = 89c230f5068dcd17d5c6dab37d13ed03525040da534cc7f49564dceba00a9c2c
+SIZE (postgresql/psqlodbc-09.01.0200.tar.gz) = 749712
diff --git a/databases/postgresql-odbc/files/patch-odbcapi.c b/databases/postgresql-odbc/files/patch-odbcapi.c
index b7675e5b93bf..5f5e472a9bb5 100644
--- a/databases/postgresql-odbc/files/patch-odbcapi.c
+++ b/databases/postgresql-odbc/files/patch-odbcapi.c
@@ -1,10 +1,10 @@
 --- odbcapi.c.orig	2009-01-26 23:29:21.000000000 +0600
 +++ odbcapi.c	2009-01-26 23:30:15.000000000 +0600
-@@ -1111,11 +1111,7 @@
+@@ -1121,11 +1121,7 @@
  				 HSTMT hstmt,
  				 SQLUSMALLINT fFetchType,
  				 SQLLEN irow,
--#ifdef WITH_UNIXODBC
+-#if defined(WITH_UNIXODBC) && (SIZEOF_VOID_P < 8) 
 -				 SQLROWSETSIZE *pcrow,
 -#else
  				 SQLULEN *pcrow,
@@ -12,7 +12,7 @@
  				 SQLUSMALLINT *rgfRowStatus)
  {
  	RETCODE	ret;
-@@ -1125,17 +1121,7 @@
+@@ -1135,17 +1131,7 @@
  	ENTER_STMT_CS(stmt);
  	SC_clear_error(stmt);
  	StartRollbackState(stmt);
diff --git a/databases/postgresql-odbc/files/patch-psqlodbc.h b/databases/postgresql-odbc/files/patch-psqlodbc.h
index 648746558d9a..fe3ba9bd7cf4 100644
--- a/databases/postgresql-odbc/files/patch-psqlodbc.h
+++ b/databases/postgresql-odbc/files/patch-psqlodbc.h
@@ -1,6 +1,6 @@
 --- psqlodbc.h.orig	2008-09-21 22:35:44.000000000 +0700
 +++ psqlodbc.h	2009-01-26 23:19:02.000000000 +0600
-@@ -140,13 +140,8 @@
+@@ -151,13 +151,8 @@
  #if (SIZEOF_VOID_P == 8)
  #define	FORMAT_INTEGER	"%d"	/* SQLINTEGER */
  #define	FORMAT_UINTEGER	"%u"	/* SQLUINTEGER */
diff --git a/databases/postgresql-odbc/pkg-plist b/databases/postgresql-odbc/pkg-plist
deleted file mode 100644
index 432f49ff235d..000000000000
--- a/databases/postgresql-odbc/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-lib/psqlodbcw.la
-lib/libpsqlodbcw.so.0.0
-%%PORTDOCS%%%%DOCSDIR%%/odbc/config-opt.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/config.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/howto-accesslo.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/howto-accessvba.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/howto-bo.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/howto-ch.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/howto-csharp.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/howto-vb.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/howto-vblo.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/release.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/unix-compilation.html
-%%PORTDOCS%%%%DOCSDIR%%/odbc/win32-compilation.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/odbc
-%%PORTDATA%%%%DATADIR%%/odbc/odbc-drop.sql
-%%PORTDATA%%%%DATADIR%%/odbc/odbc.sql
-%%PORTDATA%%@dirrm %%DATADIR%%/odbc