CVS commit: pkgsrc/geography/mapserver

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Sep 29 15:05:03 UTC 2018

Modified Files:
        pkgsrc/geography/mapserver: distinfo
        pkgsrc/geography/mapserver/patches: patch-ab

Log Message:
mapserver: build fix


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/geography/mapserver/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/geography/mapserver/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/mapserver/distinfo
diff -u pkgsrc/geography/mapserver/distinfo:1.9 pkgsrc/geography/mapserver/distinfo:1.10
--- pkgsrc/geography/mapserver/distinfo:1.9     Tue Nov  3 00:08:43 2015
+++ pkgsrc/geography/mapserver/distinfo Sat Sep 29 15:05:03 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 00:08:43 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/09/29 15:05:03 tnn Exp $
 
 SHA1 (mapserver-5.6.8.tar.gz) = 44b813f888c8c950f5e2ba20ae4d7ef08d002bc4
 RMD160 (mapserver-5.6.8.tar.gz) = dd00c7e6ed57b3522f47a7fede8299bd8ef12566
 SHA512 (mapserver-5.6.8.tar.gz) = 33eb64be8420b04eb6017d0a96da11aa401c6aab670fa9dad59879d5da45b512205896cd1ce42fba5a0b0c7bc68a9cf774a0ce5b639177c8e29b43c66bb03a41
 Size (mapserver-5.6.8.tar.gz) = 2332277 bytes
 SHA1 (patch-aa) = d842afeab3455304236bebbf4ea576c974cafbdd
-SHA1 (patch-ab) = f1521546905034304bc5f1556625d6171421d93d
+SHA1 (patch-ab) = 2fb63f73526fa2a3cdd7728a09cb89c9984a1741
 SHA1 (patch-mapserver.h) = 82e9f4f90495959190962286f9fae0e4be649d20
 SHA1 (patch-maputil.c) = 4d50919a24af34a74d0e14684e3fab4269582639
 SHA1 (patch-renderers_agg_include_agg__renderer__outline__aa.h) = 84145a73bed1b016c6c13b5c2656b8957da9c71d

Index: pkgsrc/geography/mapserver/patches/patch-ab
diff -u pkgsrc/geography/mapserver/patches/patch-ab:1.1 pkgsrc/geography/mapserver/patches/patch-ab:1.2
--- pkgsrc/geography/mapserver/patches/patch-ab:1.1     Tue Jan 26 09:01:24 2010
+++ pkgsrc/geography/mapserver/patches/patch-ab Sat Sep 29 15:05:03 2018
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2010/01/26 09:01:24 adam Exp $
+$NetBSD: patch-ab,v 1.2 2018/09/29 15:05:03 tnn Exp $
 
---- configure.orig     2009-11-27 21:16:01.000000000 +0000
+use correct --lib args to geos-config
+
+--- configure.orig     2011-10-04 15:01:41.000000000 +0000
 +++ configure
-@@ -9186,7 +9186,7 @@ else
+@@ -9288,7 +9288,7 @@ else
  echo "${ECHO_T}no" >&6
  fi
  
@@ -11,7 +13,16 @@ $NetBSD: patch-ab,v 1.1 2010/01/26 09:01
        { { echo "$as_me:$LINENO: error: the freetype-config executable could not be found and is required for agg support
          to fix this, you should either:
          * install the freetype development headers
-@@ -12159,7 +12159,7 @@ if test "$FRIBIDI_CONFIG" = "no" ; then
+@@ -11029,7 +11029,7 @@ echo "${ECHO_T}GEOS >= 3.0.0 found. Addi
+ 
+   GEOS_INCDIR=`$GEOS_CONFIG --includes`
+   GEOS_INC="-I$GEOS_INCDIR"
+-  GEOS_LIB="`$GEOS_CONFIG --libs`_c"
++  GEOS_LIB="`$GEOS_CONFIG --clibs`"
+ 
+   GEOS_ENABLED=$GEOS_ENABLED
+ 
+@@ -12334,7 +12334,7 @@ if test "$FRIBIDI_CONFIG" = "no" ; then
    FRIBIDI_INC=
    FRIBIDI_LIB=
  else