- Update comment

- Add forgotten geos-config patch
- Remove unused configure argument
This commit is contained in:
Dmitry Marakasov 2017-02-09 18:20:04 +00:00
parent 57f1306bc9
commit 96a93ecb7c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=433764
2 changed files with 52 additions and 4 deletions

View File

@ -3,20 +3,19 @@
PORTNAME= geos
PORTVERSION= 3.5.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/geos/ \
LOCAL/sunpoet
PKGNAMESUFFIX= 35
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= GEOS implements all the OpenGIS "Simple Features for SQL"
COMMENT= GEOS implements all the OpenGIS "Simple Features for SQL" (legacy)
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
CONFIGURE_ARGS= --program-suffix=35 \
ac_cv_path_SWIG=${LOCALBASE}/bin/swig3.0
CONFIGURE_ARGS= --program-suffix=35
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
TEST_TARGET= check

View File

@ -0,0 +1,49 @@
--- tools/geos-config.in.orig 2015-08-14 18:23:15 UTC
+++ tools/geos-config.in
@@ -6,7 +6,7 @@ libdir=@libdir@
usage()
{
cat <<EOF
-Usage: geos-config [OPTIONS]
+Usage: geos35-config [OPTIONS]
Options:
[--prefix]
[--version]
@@ -38,30 +38,30 @@ case $1 in
echo @VERSION@
;;
--cflags)
- echo -I${prefix}/include
+ echo -I${prefix}/include/geos35
;;
--libs)
# TODO: make an alias for --clibs
# see http://trac.osgeo.org/geos/ticket/497
- echo -L${libdir} -lgeos
+ echo -L${libdir} -lgeos35
;;
--clibs)
- echo -L${libdir} -lgeos_c
+ echo -L${libdir} -lgeos_c35
;;
--cclibs)
- echo -L${libdir} -lgeos
+ echo -L${libdir} -lgeos35
;;
--static-clibs)
- echo -L${libdir} -lgeos_c -lgeos -m
+ echo -L${libdir} -lgeos_c35 -lgeos -m
;;
--static-cclibs)
- echo -L${libdir} -lgeos -m
+ echo -L${libdir} -lgeos35 -m
;;
--ldflags)
echo -L${libdir}
;;
--includes)
- echo ${prefix}/include
+ echo ${prefix}/include/geos35
;;
--jtsport)
echo @JTS_PORT@