summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2014-07-28 18:35:53 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2014-07-28 18:35:53 +0000
commitd50a8cb72999b2dba7ed7e91e6bc08c4b0847d86 (patch)
tree9427b41db6565c63ba8dbeb6c8846d5677ed0a58
parentUse OPTIONS instead of WITH_* and checking whether dependencies are already i... (diff)
- Update to 2.0.6
- Remove configure patch - Remove post-patch: which is replaced by USES=shebangfix in previous commit - Simplify COPYTREE_SHARE Changes: http://trac.osgeo.org/postgis/browser/tags/2.0.6/NEWS
-rw-r--r--databases/postgis20/Makefile18
-rw-r--r--databases/postgis20/distinfo4
-rw-r--r--databases/postgis20/files/patch-configure19
3 files changed, 8 insertions, 33 deletions
diff --git a/databases/postgis20/Makefile b/databases/postgis20/Makefile
index bd9aad4b17b2..240acbffe925 100644
--- a/databases/postgis20/Makefile
+++ b/databases/postgis20/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= postgis
-PORTVERSION= 2.0.4
-PORTREVISION= 5
+PORTVERSION= 2.0.6
CATEGORIES= databases geography
MASTER_SITES= http://download.osgeo.org/postgis/source/
PKGNAMESUFFIX= 20
@@ -59,16 +58,11 @@ TOPOLOGY_CONFIGURE_WITH=topology
BROKEN= Raster suppport is broken on FreeBSD < 9.x
.endif
-post-patch:
- @${GREP} -lR 'bin/bash' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e "s|/bin/bash|/bin/sh|"
-
post-install:
- ${MKDIR} ${STAGEDIR}/${DATADIR}/tiger_2010
- (cd ${WRKSRC}/extras/tiger_geocoder/tiger_2010/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/tiger_2010/ "! ( -name *\.orig -o -name *\.bak )" )
- ${MKDIR} ${STAGEDIR}/${DATADIR}/utils
- (cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak )" )
- ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/postgresql/*.so \
- ${STAGEDIR}/${PREFIX}/lib/*.so \
- ${STAGEDIR}/${PREFIX}/bin/*
+ ${MKDIR} ${STAGEDIR}/${DATADIR}/tiger_2010/
+ cd ${WRKSRC}/extras/tiger_geocoder/tiger_2010/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/tiger_2010/
+ ${MKDIR} ${STAGEDIR}/${DATADIR}/utils/
+ cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/utils/
+ ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/* ${STAGEDIR}/${PREFIX}/lib/*.so ${STAGEDIR}/${PREFIX}/lib/postgresql/*.so
.include <bsd.port.post.mk>
diff --git a/databases/postgis20/distinfo b/databases/postgis20/distinfo
index fc0b2621a9bd..d6597e4b111e 100644
--- a/databases/postgis20/distinfo
+++ b/databases/postgis20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (postgis-2.0.4.tar.gz) = ad5016dce0a41dd81a64315ac9b46ebf77641e74d281017438eb8caeb6254be3
-SIZE (postgis-2.0.4.tar.gz) = 5534746
+SHA256 (postgis-2.0.6.tar.gz) = 438fc9cf8d008c537ed2d6776bc30e726eb1f9a85247df945c2beccc42f33489
+SIZE (postgis-2.0.6.tar.gz) = 5651448
diff --git a/databases/postgis20/files/patch-configure b/databases/postgis20/files/patch-configure
deleted file mode 100644
index 6d0ea7ac4367..000000000000
--- a/databases/postgis20/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig
-+++ configure
-@@ -19041,7 +19041,7 @@
- $as_echo "Using user-specified json-c directory: $JSONDIR" >&6; }
-
- JSON_CPPFLAGS="-I$JSONDIR/include"
-- JSON_LDFLAGS="-L$JSONDIR/lib -ljson"
-+ JSON_LDFLAGS="-L$JSONDIR/lib -ljson-c"
- fi
- fi
-
-@@ -19104,7 +19104,7 @@
- $as_echo "#define HAVE_LIBJSON 1" >>confdefs.h
-
- if test "x$JSON_LDFLAGS" = "x"; then
-- JSON_LDFLAGS="-ljson"
-+ JSON_LDFLAGS="-ljson-c"
- fi
- fi