svn commit: r369972 - head/graphics/geos

[Antoine Brodin]

On Sat, Oct 4, 2014 at 5:13 PM, Sunpoet Po-Chuan Hsieh
<sunpoet at freebsd.org> wrote:
> Author: sunpoet
> Date: Sat Oct  4 15:13:06 2014
> New Revision: 369972
> URL: https://svnweb.freebsd.org/changeset/ports/369972
> QAT: https://qat.redports.org/buildarchive/r369972/
>
> Log:
>   - Use INSTALL_TARGET=install-strip
>
> Modified:
>   head/graphics/geos/Makefile
>   head/graphics/geos/pkg-plist

Hi,

- Default options changed so portrevision should have been bumped
- This fails to build (in the ruby part), at least with clang on 10.1

Antoine

>
> Modified: head/graphics/geos/Makefile
> ==============================================================================
> --- head/graphics/geos/Makefile Sat Oct  4 15:13:01 2014        (r369971)
> +++ head/graphics/geos/Makefile Sat Oct  4 15:13:06 2014        (r369972)
> @@ -14,9 +14,11 @@ COMMENT=     GEOS implements all the OpenGIS
>  LICENSE=       LGPL21
>
>  OPTIONS_DEFINE=        PHP PYTHON RUBY
> +OPTIONS_DEFAULT=PHP PYTHON RUBY
>  OPTIONS_SUB=   yes
>
>  GNU_CONFIGURE= yes
> +INSTALL_TARGET=        install-strip
>  USE_LDCONFIG=  yes
>  USES=          gmake libtool tar:bzip2
>
> @@ -33,8 +35,4 @@ RUBY_CONFIGURE_ENABLE=        ruby
>  RUBY_CONFIGURE_ENV=    RUBY="${RUBY}"
>  RUBY_USE=              RUBY=yes
>
> -post-install:
> -       ${LN} -s ${PREFIX}/lib/libgeos-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libgeos.so.0
> -       ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgeos-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libgeos_c.so.1.8.2
> -
>  .include <bsd.port.mk>
>
> Modified: head/graphics/geos/pkg-plist
> ==============================================================================
> --- head/graphics/geos/pkg-plist        Sat Oct  4 15:13:01 2014        (r369971)
> +++ head/graphics/geos/pkg-plist        Sat Oct  4 15:13:06 2014        (r369972)
> @@ -380,55 +380,12 @@ lib/libgeos_c.a
>  lib/libgeos_c.so
>  lib/libgeos_c.so.1
>  lib/libgeos_c.so.1.8.2
> - at dirrm include/geos/util
> - at dirrm include/geos/triangulate/quadedge
> - at dirrm include/geos/triangulate
> - at dirrm include/geos/simplify
> - at dirrm include/geos/precision
> - at dirrm include/geos/planargraph/algorithm
> - at dirrm include/geos/planargraph
> - at dirrm include/geos/operation/valid
> - at dirrm include/geos/operation/union
> - at dirrm include/geos/operation/sharedpaths
> - at dirrm include/geos/operation/relate
> - at dirrm include/geos/operation/predicate
> - at dirrm include/geos/operation/polygonize
> - at dirrm include/geos/operation/overlay/snap
> - at dirrm include/geos/operation/overlay
> - at dirrm include/geos/operation/linemerge
> - at dirrm include/geos/operation/distance
> - at dirrm include/geos/operation/buffer
> - at dirrm include/geos/operation
> - at dirrm include/geos/noding/snapround
> - at dirrm include/geos/noding
> - at dirrm include/geos/linearref
> - at dirrm include/geos/io
> - at dirrm include/geos/index/sweepline
> - at dirrm include/geos/index/strtree
> - at dirrm include/geos/index/quadtree
> - at dirrm include/geos/index/intervalrtree
> - at dirrm include/geos/index/chain
> - at dirrm include/geos/index/bintree
> - at dirrm include/geos/index
> - at dirrm include/geos/geomgraph/index
> - at dirrm include/geos/geomgraph
> - at dirrm include/geos/geom/util
> - at dirrm include/geos/geom/prep
> - at dirrm include/geos/geom
> - at dirrm include/geos/algorithm/locate
> - at dirrm include/geos/algorithm/distance
> - at dirrm include/geos/algorithm
> - at dirrm include/geos
>  %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos.pth
>  %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.a
>  %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.so
>  %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.py
>  %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyc
>  %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyo
> -%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/geos
> -%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
>  %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.a
>  %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.so
> -%%RUBY%%@dirrmtry %%RUBY_SITEARCHLIBDIR%%/
> -%%PHP%%lib/php/20100525/geos.so
> -%%PHP%%@dirrmtry lib/php/20100525
> +%%PHP%%lib/php/%%PHP_EXT_DIR%%/geos.so
>