CVS commit: pkgsrc/wm/wmakerconf

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Apr 13 19:09:32 UTC 2020

Modified Files:
        pkgsrc/wm/wmakerconf: distinfo
        pkgsrc/wm/wmakerconf/patches: patch-aa

Log Message:
Fix build against newer windowmaker.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/wm/wmakerconf/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/wmakerconf/patches/patch-aa

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

Modified files:

Index: pkgsrc/wm/wmakerconf/distinfo
diff -u pkgsrc/wm/wmakerconf/distinfo:1.11 pkgsrc/wm/wmakerconf/distinfo:1.12
--- pkgsrc/wm/wmakerconf/distinfo:1.11  Sun Dec 15 08:02:50 2019
+++ pkgsrc/wm/wmakerconf/distinfo       Mon Apr 13 19:09:32 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2019/12/15 08:02:50 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2020/04/13 19:09:32 joerg Exp $
 
 SHA1 (wmakerconf-2.11.tar.gz) = 2c2409aad8b0348c2801c4350047a5468a800e48
 RMD160 (wmakerconf-2.11.tar.gz) = 18d661836272ae21f9d79398359b37b97b0a396a
 SHA512 (wmakerconf-2.11.tar.gz) = c867cd62d88f168c91b625776ceb77ad159b75b8a451be02416cc05ed8e0fcfcd8ddc88b97bddc0bbaf30a41ea14ab9e962b4449c65a7ac5677dd832002b0a8e
 Size (wmakerconf-2.11.tar.gz) = 791166 bytes
-SHA1 (patch-aa) = d26fdc359404796ea7bf6791014e3b8b3abc4cbc
+SHA1 (patch-aa) = 9b798864a234cbe504970b62b19149ca54eeba7d
 SHA1 (patch-ab) = 3e5f5f8cad200a6b09001572336920685d5e2a82
 SHA1 (patch-ad) = ebcd4d319c9f0cd995f6b43b30bf4446daf24934
 SHA1 (patch-ae) = b656967929071c09bef3315588fede877e839ce6

Index: pkgsrc/wm/wmakerconf/patches/patch-aa
diff -u pkgsrc/wm/wmakerconf/patches/patch-aa:1.5 pkgsrc/wm/wmakerconf/patches/patch-aa:1.6
--- pkgsrc/wm/wmakerconf/patches/patch-aa:1.5   Wed May 25 09:57:14 2005
+++ pkgsrc/wm/wmakerconf/patches/patch-aa       Mon Apr 13 19:09:32 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2005/05/25 09:57:14 adam Exp $
+$NetBSD: patch-aa,v 1.6 2020/04/13 19:09:32 joerg Exp $
 
 --- configure.orig     2005-03-02 18:36:35.000000000 +0000
 +++ configure
@@ -13,3 +13,49 @@ $NetBSD: patch-aa,v 1.5 2005/05/25 09:57
  
  # Checks for socket and nsl library, required on Solaris systems
  # (reported by Peter da Silva <peter%baileynm.com@localhost>)
+@@ -3458,35 +3458,7 @@ fi
+ libwmfun="no"
+ # Checks for wraster lib
+ # Extract the first word of "get-wings-flags", so it can be a program name with args.
+-set dummy get-wings-flags; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_wraster+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $wraster in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_wraster="$wraster" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_wraster="$as_dir/$ac_word$ac_exec_ext"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-  ;;
+-esac
+-fi
+-wraster=$ac_cv_path_wraster
++wraster="pkg-config wrlib WUtil"
+ 
+ if test -n "$wraster"; then
+   echo "$as_me:$LINENO: result: $wraster" >&5
+@@ -3497,7 +3469,7 @@ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test -n "$wraster"; then
+-        WRASTERLIBS=`($wraster --ldflags --libs 2>/dev/null || $wraster --lflags --libs) | xargs`
++        WRASTERLIBS=`$wraster --libs`
+         WRASTERINCLUDES=`$wraster --cflags`
+         MKPREVIEW="mkpreview"
+         OLD_LDFLAGS="$LDFLAGS"