Mon Jun 17 14:12:18 2019 UTC ()
vice: Fix configure with GNU_CONFIGURE_STRICT.

This was causing the build to fail.


(nia)
diff -r1.46 -r1.47 pkgsrc/emulators/vice/distinfo
diff -r1.2 -r1.3 pkgsrc/emulators/vice/patches/patch-configure
cvs diff -r1.46 -r1.47 pkgsrc/emulators/vice/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/vice/distinfo 2018/12/31 15:38:55 1.46
+++ pkgsrc/emulators/vice/distinfo 2019/06/17 14:12:18 1.47
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.46 2018/12/31 15:38:55 rhialto Exp $ 1$NetBSD: distinfo,v 1.47 2019/06/17 14:12:18 nia Exp $
2 2
3SHA1 (vice-3.3.tar.gz) = 55a34feb29955da40067ee5a5171278ed0191c93 3SHA1 (vice-3.3.tar.gz) = 55a34feb29955da40067ee5a5171278ed0191c93
4RMD160 (vice-3.3.tar.gz) = 7b014f2b3ed1287e74ba93c1e30a547fe40582ce 4RMD160 (vice-3.3.tar.gz) = 7b014f2b3ed1287e74ba93c1e30a547fe40582ce
5SHA512 (vice-3.3.tar.gz) = 702942e33b6e3d7e29ca6ed483242319ed5f6be26831def88a282cf7dce25d4c34dbf3651fcf8b583492fcb280ce5f4304c6eda3712088a73db24772c7a2bb3a 5SHA512 (vice-3.3.tar.gz) = 702942e33b6e3d7e29ca6ed483242319ed5f6be26831def88a282cf7dce25d4c34dbf3651fcf8b583492fcb280ce5f4304c6eda3712088a73db24772c7a2bb3a
6Size (vice-3.3.tar.gz) = 22742913 bytes 6Size (vice-3.3.tar.gz) = 22742913 bytes
7SHA1 (patch-configure) = fd17525277067aa8aee3e2ea85d4c59c7f52a969 7SHA1 (patch-configure) = df3517e6cb5c9b4a28fad4d9074b74cfae9d5d0b
8SHA1 (patch-data_fonts_Makefile.in) = ed5b427acb6c6a20ff9e69fa9863b108e1d1675d 8SHA1 (patch-data_fonts_Makefile.in) = ed5b427acb6c6a20ff9e69fa9863b108e1d1675d
cvs diff -r1.2 -r1.3 pkgsrc/emulators/vice/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/emulators/vice/patches/patch-configure 2018/12/31 15:38:55 1.2
+++ pkgsrc/emulators/vice/patches/patch-configure 2019/06/17 14:12:18 1.3
@@ -1,21 +1,34 @@ @@ -1,21 +1,34 @@
1$NetBSD: patch-configure,v 1.2 2018/12/31 15:38:55 rhialto Exp $ 1$NetBSD: patch-configure,v 1.3 2019/06/17 14:12:18 nia Exp $
2 2
31. Use the NetBSD configuration for every OS since the PLIST is 31. Use the NetBSD configuration for every OS since the PLIST is
4 hardcoded for that. Should fix every non-NetBSD platform. 4 hardcoded for that. Should fix every non-NetBSD platform.
5 5
 62. Ignore the option --enable-option-checking instead of erroring,
 7 it's the default anyway.
 8
6--- configure.orig 2018-12-19 21:25:02.000000000 +0000 9--- configure.orig 2018-12-19 21:25:02.000000000 +0000
7+++ configure 10+++ configure
8@@ -8782,34 +8782,6 @@ case "$host_os" in 11@@ -3300,6 +3300,9 @@ for argcheck in $@
 12 do
 13 argvalid=yes
 14 case $argcheck in
 15+ --enable-option-checking=*)
 16+ argvalid=yes
 17+ ;;
 18 --enable-arch=*)
 19 argvalid=yes
 20 ;;
 21@@ -8782,34 +8785,6 @@ case "$host_os" in
9 esac 22 esac
10  23
11  24
12-case "$host_os" in 25-case "$host_os" in
13- freebsd*) 26- freebsd*)
14- CPPFLAGS="$CPPFLAGS -I/usr/local/include" 27- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
15- fbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/local/lib"` 28- fbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/local/lib"`
16- LDFLAGS="$LDFLAGS $fbsdrtp -L/usr/local/lib" 29- LDFLAGS="$LDFLAGS $fbsdrtp -L/usr/local/lib"
17- ;; 30- ;;
18- netbsd*) 31- netbsd*)
19- CPPFLAGS="$CPPFLAGS -I/usr/pkg/include -I/usr/include" 32- CPPFLAGS="$CPPFLAGS -I/usr/pkg/include -I/usr/include"
20- nbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/pkg/lib"` 33- nbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/pkg/lib"`
21- LDFLAGS="$LDFLAGS $nbsdrtp -L/usr/pkg/lib" 34- LDFLAGS="$LDFLAGS $nbsdrtp -L/usr/pkg/lib"
@@ -30,36 +43,36 @@ $NetBSD: patch-configure,v 1.2 2018/12/3 @@ -30,36 +43,36 @@ $NetBSD: patch-configure,v 1.2 2018/12/3
30- fi 43- fi
31- ;; 44- ;;
32- dragonfly*) 45- dragonfly*)
33- CPPFLAGS="$CPPFLAGS -I/usr/local/include" 46- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
34- dfbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/local/lib"` 47- dfbsdrtp=`${CONFIG_SHELL-/bin/sh} "$srcdir/config.rpath" "$CC" "$GCC" "$LDFLAGS" "$LD" "$with_gnu_ld" "$host" "/usr/local/lib"`
35- LDFLAGS="$LDFLAGS $dfbsdrtp -L/usr/local/lib" 48- LDFLAGS="$LDFLAGS $dfbsdrtp -L/usr/local/lib"
36- ;; 49- ;;
37- *) 50- *)
38- ;; 51- ;;
39-esac 52-esac
40  53
41  54
42 if test x"$enable_shared_ffmpeg" = "xyes" -o x"$enable_static_ffmpeg" = "xyes"; then 55 if test x"$enable_shared_ffmpeg" = "xyes" -o x"$enable_static_ffmpeg" = "xyes"; then
43@@ -21894,7 +21866,7 @@ _ACEOF 56@@ -21894,7 +21869,7 @@ _ACEOF
44  57
45  58
46 case "$host_os" in 59 case "$host_os" in
47- netbsd*) 60- netbsd*)
48+ *) 61+ *)
49 VICEDIR="$PREFIX/share/vice" 62 VICEDIR="$PREFIX/share/vice"
50 if true; then 63 if true; then
51 ALTERNATE_DOCDIR_TRUE= 64 ALTERNATE_DOCDIR_TRUE=
52@@ -21905,51 +21877,6 @@ else 65@@ -21905,51 +21880,6 @@ else
53 fi 66 fi
54  67
55 ;; 68 ;;
56- freebsd*) 69- freebsd*)
57- VICEDIR="$PREFIX/lib/vice" 70- VICEDIR="$PREFIX/lib/vice"
58- if true; then 71- if true; then
59- ALTERNATE_DOCDIR_TRUE= 72- ALTERNATE_DOCDIR_TRUE=
60- ALTERNATE_DOCDIR_FALSE='#' 73- ALTERNATE_DOCDIR_FALSE='#'
61-else 74-else
62- ALTERNATE_DOCDIR_TRUE='#' 75- ALTERNATE_DOCDIR_TRUE='#'
63- ALTERNATE_DOCDIR_FALSE= 76- ALTERNATE_DOCDIR_FALSE=
64-fi 77-fi
65- 78-