svn commit: r326495 - in head/databases/pyspatialite: . files
Guido Falsi
madpilot at FreeBSD.org
Fri Sep 6 13:07:08 UTC 2013
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 = []
More information about the svn-ports-all
mailing list