Sat Sep 29 15:05:03 2018 UTC ()
mapserver: build fix


(tnn)
diff -r1.9 -r1.10 pkgsrc/geography/mapserver/distinfo
diff -r1.1 -r1.2 pkgsrc/geography/mapserver/patches/patch-ab
cvs diff -r1.9 -r1.10 pkgsrc/geography/mapserver/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/mapserver/distinfo 2015/11/03 00:08:43 1.9
+++ pkgsrc/geography/mapserver/distinfo 2018/09/29 15:05:03 1.10
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.9 2015/11/03 00:08:43 agc Exp $ 1$NetBSD: distinfo,v 1.10 2018/09/29 15:05:03 tnn Exp $
2 2
3SHA1 (mapserver-5.6.8.tar.gz) = 44b813f888c8c950f5e2ba20ae4d7ef08d002bc4 3SHA1 (mapserver-5.6.8.tar.gz) = 44b813f888c8c950f5e2ba20ae4d7ef08d002bc4
4RMD160 (mapserver-5.6.8.tar.gz) = dd00c7e6ed57b3522f47a7fede8299bd8ef12566 4RMD160 (mapserver-5.6.8.tar.gz) = dd00c7e6ed57b3522f47a7fede8299bd8ef12566
5SHA512 (mapserver-5.6.8.tar.gz) = 33eb64be8420b04eb6017d0a96da11aa401c6aab670fa9dad59879d5da45b512205896cd1ce42fba5a0b0c7bc68a9cf774a0ce5b639177c8e29b43c66bb03a41 5SHA512 (mapserver-5.6.8.tar.gz) = 33eb64be8420b04eb6017d0a96da11aa401c6aab670fa9dad59879d5da45b512205896cd1ce42fba5a0b0c7bc68a9cf774a0ce5b639177c8e29b43c66bb03a41
6Size (mapserver-5.6.8.tar.gz) = 2332277 bytes 6Size (mapserver-5.6.8.tar.gz) = 2332277 bytes
7SHA1 (patch-aa) = d842afeab3455304236bebbf4ea576c974cafbdd 7SHA1 (patch-aa) = d842afeab3455304236bebbf4ea576c974cafbdd
8SHA1 (patch-ab) = f1521546905034304bc5f1556625d6171421d93d 8SHA1 (patch-ab) = 2fb63f73526fa2a3cdd7728a09cb89c9984a1741
9SHA1 (patch-mapserver.h) = 82e9f4f90495959190962286f9fae0e4be649d20 9SHA1 (patch-mapserver.h) = 82e9f4f90495959190962286f9fae0e4be649d20
10SHA1 (patch-maputil.c) = 4d50919a24af34a74d0e14684e3fab4269582639 10SHA1 (patch-maputil.c) = 4d50919a24af34a74d0e14684e3fab4269582639
11SHA1 (patch-renderers_agg_include_agg__renderer__outline__aa.h) = 84145a73bed1b016c6c13b5c2656b8957da9c71d 11SHA1 (patch-renderers_agg_include_agg__renderer__outline__aa.h) = 84145a73bed1b016c6c13b5c2656b8957da9c71d
12SHA1 (patch-renderers_agg_include_agg__scanline__u.h) = 13a83ce884c47b7f7aebcb4ad81f486725962010 12SHA1 (patch-renderers_agg_include_agg__scanline__u.h) = 13a83ce884c47b7f7aebcb4ad81f486725962010
cvs diff -r1.1 -r1.2 pkgsrc/geography/mapserver/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/geography/mapserver/patches/patch-ab 2010/01/26 09:01:24 1.1
+++ pkgsrc/geography/mapserver/patches/patch-ab 2018/09/29 15:05:03 1.2
@@ -1,22 +1,33 @@ @@ -1,22 +1,33 @@
1$NetBSD: patch-ab,v 1.1 2010/01/26 09:01:24 adam Exp $ 1$NetBSD: patch-ab,v 1.2 2018/09/29 15:05:03 tnn Exp $
2 2
3--- configure.orig 2009-11-27 21:16:01.000000000 +0000 3use correct --lib args to geos-config
 4
 5--- configure.orig 2011-10-04 15:01:41.000000000 +0000
4+++ configure 6+++ configure
5@@ -9186,7 +9186,7 @@ else 7@@ -9288,7 +9288,7 @@ else
6 echo "${ECHO_T}no" >&6 8 echo "${ECHO_T}no" >&6
7 fi 9 fi
8  10
9- if test "$FT_BIN" == "no" ; then 11- if test "$FT_BIN" == "no" ; then
10+ if test "$FT_BIN" = "no" ; then 12+ if test "$FT_BIN" = "no" ; then
11 { { echo "$as_me:$LINENO: error: the freetype-config executable could not be found and is required for agg support 13 { { echo "$as_me:$LINENO: error: the freetype-config executable could not be found and is required for agg support
12 to fix this, you should either: 14 to fix this, you should either:
13 * install the freetype development headers 15 * install the freetype development headers
14@@ -12159,7 +12159,7 @@ if test "$FRIBIDI_CONFIG" = "no" ; then 16@@ -11029,7 +11029,7 @@ echo "${ECHO_T}GEOS >= 3.0.0 found. Addi
 17
 18 GEOS_INCDIR=`$GEOS_CONFIG --includes`
 19 GEOS_INC="-I$GEOS_INCDIR"
 20- GEOS_LIB="`$GEOS_CONFIG --libs`_c"
 21+ GEOS_LIB="`$GEOS_CONFIG --clibs`"
 22
 23 GEOS_ENABLED=$GEOS_ENABLED
 24
 25@@ -12334,7 +12334,7 @@ if test "$FRIBIDI_CONFIG" = "no" ; then
15 FRIBIDI_INC= 26 FRIBIDI_INC=
16 FRIBIDI_LIB= 27 FRIBIDI_LIB=
17 else 28 else
18- if test "$FRIBIDI_PKG_CONFIG" = "yes" -o ${FRIBIDI_CONFIG: -3} = ".pc" ; then 29- if test "$FRIBIDI_PKG_CONFIG" = "yes" -o ${FRIBIDI_CONFIG: -3} = ".pc" ; then
19+ if test "$FRIBIDI_PKG_CONFIG" = "yes"; then 30+ if test "$FRIBIDI_PKG_CONFIG" = "yes"; then
20 echo "$as_me:$LINENO: result: yes, user supplied path to fribidi.pc" >&5 31 echo "$as_me:$LINENO: result: yes, user supplied path to fribidi.pc" >&5
21 echo "${ECHO_T}yes, user supplied path to fribidi.pc" >&6 32 echo "${ECHO_T}yes, user supplied path to fribidi.pc" >&6
22 FRIBIDI_ENABLED="-DUSE_FRIBIDI -DUSE_FRIBIDI2" 33 FRIBIDI_ENABLED="-DUSE_FRIBIDI -DUSE_FRIBIDI2"