Date: Sun, 13 Jan 2013 22:46:28 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310348 - in head/databases/postgresql-odbc: . files Message-ID: <201301132246.r0DMkSGO023157@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Jan 13 22:46:27 2013 New Revision: 310348 URL: http://svnweb.freebsd.org/changeset/ports/310348 Log: - 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> Deleted: head/databases/postgresql-odbc/pkg-plist Modified: head/databases/postgresql-odbc/Makefile (contents, props changed) head/databases/postgresql-odbc/distinfo (contents, props changed) head/databases/postgresql-odbc/files/patch-odbcapi.c (contents, props changed) head/databases/postgresql-odbc/files/patch-psqlodbc.h (contents, props changed) Modified: head/databases/postgresql-odbc/Makefile ============================================================================== --- head/databases/postgresql-odbc/Makefile Sun Jan 13 22:44:20 2013 (r310347) +++ head/databases/postgresql-odbc/Makefile Sun Jan 13 22:46:27 2013 (r310348) @@ -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 Modified: head/databases/postgresql-odbc/distinfo ============================================================================== --- head/databases/postgresql-odbc/distinfo Sun Jan 13 22:44:20 2013 (r310347) +++ head/databases/postgresql-odbc/distinfo Sun Jan 13 22:46:27 2013 (r310348) @@ -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 Modified: head/databases/postgresql-odbc/files/patch-odbcapi.c ============================================================================== --- head/databases/postgresql-odbc/files/patch-odbcapi.c Sun Jan 13 22:44:20 2013 (r310347) +++ head/databases/postgresql-odbc/files/patch-odbcapi.c Sun Jan 13 22:46:27 2013 (r310348) @@ -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); Modified: head/databases/postgresql-odbc/files/patch-psqlodbc.h ============================================================================== --- head/databases/postgresql-odbc/files/patch-psqlodbc.h Sun Jan 13 22:44:20 2013 (r310347) +++ head/databases/postgresql-odbc/files/patch-psqlodbc.h Sun Jan 13 22:46:27 2013 (r310348) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301132246.r0DMkSGO023157>