ports/174885: [PATCH] databases/postgresql-odbc: update to 09.01.0200, take maintainership

[Po-Chien Lin]

>Number:         174885
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql-odbc: update to 09.01.0200, take maintainership
>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:   Tue Jan 01 16:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Po-Chien Lin
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD tbbs2.cs.nctu.edu.tw 10.0-CURRENT FreeBSD 10.0-CURRENT #8 r244889: Mon Dec 31 17:17:30 CST
>Description:
- Update to 09.01.0200
- Take maintainership
- Add LICENSE
- Switch to OptionsNG
- Switch pkg-plist to PORTDOCS, PORTDATA, and PLIST_FILES
- cleanup TABs

Removed file(s):
- pkg-plist

>How-To-Repeat:
>Fix:

--- postgresql-odbc-09.01.0200.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/postgresql-odbc/Makefile ./Makefile
--- /usr/ports/databases/postgresql-odbc/Makefile	2012-11-17 13:55:20.000000000 +0800
+++ ./Makefile	2013-01-02 00:20:05.000000000 +0800
@@ -1,54 +1,54 @@
-# Date created:		January 14, 2002
-# Whom:			Palle Girgensohn <girgen at partitur.se>
-# Completely rewritten by Alex Goncharov <alex-goncharov at comcast.net> on 2008-08-30.
-
+# Created by: Palle Girgensohn <girgen at partitur.se>
 # $FreeBSD: ports/databases/postgresql-odbc/Makefile,v 1.23 2012/11/17 05:55:20 svnexp Exp $
-#
+# Completely rewritten by Alex Goncharov <alex-goncharov at comcast.net> on 2008-08-30.
 
-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=		ports at FreeBSD.org
-COMMENT=		PostgreSQL ODBC driver
+MAINTAINER=	linpc at cs.nctu.edu.tw
+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/
+PORTDATA=	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
+LIB_DEPENDS+=	odbc.2:${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.3:${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 -ruN --exclude=CVS /usr/ports/databases/postgresql-odbc/distinfo ./distinfo
--- /usr/ports/databases/postgresql-odbc/distinfo	2011-03-18 01:07:24.000000000 +0800
+++ ./distinfo	2013-01-01 22:51:21.000000000 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/databases/postgresql-odbc/files/patch-odbcapi.c ./files/patch-odbcapi.c
--- /usr/ports/databases/postgresql-odbc/files/patch-odbcapi.c	2009-01-27 13:13:09.000000000 +0800
+++ ./files/patch-odbcapi.c	2013-01-01 23:00:02.000000000 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/databases/postgresql-odbc/files/patch-psqlodbc.h ./files/patch-psqlodbc.h
--- /usr/ports/databases/postgresql-odbc/files/patch-psqlodbc.h	2009-01-27 13:13:09.000000000 +0800
+++ ./files/patch-psqlodbc.h	2013-01-01 23:00:26.000000000 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/databases/postgresql-odbc/pkg-plist ./pkg-plist
--- /usr/ports/databases/postgresql-odbc/pkg-plist	2011-03-18 01:07:24.000000000 +0800
+++ ./pkg-plist	1970-01-01 08:00:00.000000000 +0800
@@ -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
--- postgresql-odbc-09.01.0200.patch ends here ---

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