From owner-svn-ports-all@FreeBSD.ORG  Fri Sep  6 13:07:08 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 73F4C58C;
 Fri,  6 Sep 2013 13:07:08 +0000 (UTC)
 (envelope-from madpilot@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6170228C9;
 Fri,  6 Sep 2013 13:07:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r86D78Tb085186;
 Fri, 6 Sep 2013 13:07:08 GMT (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r86D78ao085172;
 Fri, 6 Sep 2013 13:07:08 GMT (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201309061307.r86D78ao085172@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Fri, 6 Sep 2013 13:07:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326495 - in head/databases/pyspatialite: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Sep 2013 13:07:08 -0000

Author: madpilot
Date: Fri Sep  6 13:07:07 2013
New Revision: 326495
URL: http://svnweb.freebsd.org/changeset/ports/326495

Log:
  Fix build after iconv conversion on head.
  
  Approved by:	portmgr (bapt, implicit)

Modified:
  head/databases/pyspatialite/Makefile   (contents, props changed)
  head/databases/pyspatialite/files/patch-setup.py   (contents, props changed)

Modified: head/databases/pyspatialite/Makefile
==============================================================================
--- head/databases/pyspatialite/Makefile	Fri Sep  6 13:01:53 2013	(r326494)
+++ head/databases/pyspatialite/Makefile	Fri Sep  6 13:07:07 2013	(r326495)
@@ -15,15 +15,25 @@ COMMENT=	DB-API 2.0 interface for SQLite
 
 LIB_DEPENDS=	spatialite:${PORTSDIR}/databases/spatialite
 
+USES=		iconv
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	pyspatialite
 
 AMALGAMATION_NAME=	libspatialite-amalgamation-${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+ICONV_APPEND=
+.else
+ICONV_APPEND=	,'iconv'
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|pyspatialite-doc|${DOCSDIR}|g" \
-		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/setup.py
+		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+		-e "s|%%ICONV%%|${ICONV_APPEND}|" ${WRKSRC}/setup.py
 	@${MV} ${WRKDIR}/${AMALGAMATION_NAME} ${WRKSRC}/amalgamation
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/databases/pyspatialite/files/patch-setup.py
==============================================================================
--- head/databases/pyspatialite/files/patch-setup.py	Fri Sep  6 13:01:53 2013	(r326494)
+++ head/databases/pyspatialite/files/patch-setup.py	Fri Sep  6 13:07:07 2013	(r326495)
@@ -5,7 +5,7 @@
  include_dirs = []
  library_dirs = []
 -libraries = ['geos','geos_c','proj']
-+libraries = ['geos','geos_c','proj','iconv']
++libraries = ['geos','geos_c','proj'%%ICONV%%]
  runtime_library_dirs = []
  extra_objects = []
  define_macros = []