Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Mar 2015 03:11:22 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r380472 - head/databases/postgresql-odbc
Message-ID:  <201503050311.t253BMnR059367@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Mar  5 03:11:21 2015
New Revision: 380472
URL: https://svnweb.freebsd.org/changeset/ports/380472
QAT: https://qat.redports.org/buildarchive/r380472/

Log:
  - Simplify MASTER_SITES
  - Add LICENSE_FILE
  - Simplify the port
  - Fix typo which prevented correct examples packaging

Modified:
  head/databases/postgresql-odbc/Makefile

Modified: head/databases/postgresql-odbc/Makefile
==============================================================================
--- head/databases/postgresql-odbc/Makefile	Thu Mar  5 02:59:01 2015	(r380471)
+++ head/databases/postgresql-odbc/Makefile	Thu Mar  5 03:11:21 2015	(r380472)
@@ -2,10 +2,9 @@
 
 PORTNAME=	postgresql
 PORTVERSION=	09.01.0200
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	odbc/versions/src
+MASTER_SITES=	PGSQL/odbc/versions/src
 PKGNAMESUFFIX=	-odbc
 DISTNAME=	psqlodbc-${PORTVERSION}
 DIST_SUBDIR=	postgresql
@@ -14,29 +13,31 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PostgreSQL ODBC driver
 
 LICENSE=	LGPL20
+LICENSE_FILE=	${WRKSRC}/license.txt
 
-USES+=		libtool pgsql
+LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+
+USES=		libtool pgsql
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-unixodbc=${LOCALBASE}
+INSTALL_TARGET=	install-strip
 
-PORTDOCS=	odbc/
-PORTEXAMPELS=	odbc/
-PLIST_FILES=	lib/psqlodbcw.so
+DOCSDIR=	${PREFIX}/share/doc/postgresql/odbc
+EXAMPLESDIR=	${PREFIX}/share/examples/postgresql/odbc
 
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
-BUILD_DEPENDS+=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	lib/psqlodbcw.so
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-DATADIR_1=	${EXAMPLESDIR}/odbc
-DOCSDIR_1=	${DOCSDIR}/odbc
 post-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR_1}
-	${INSTALL_DATA} ${WRKSRC}/*.sql ${STAGEDIR}${DATADIR_1}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR_1}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR_1}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.sql ${STAGEDIR}${EXAMPLESDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503050311.t253BMnR059367>