CVS commit: pkgsrc/x11/wdm

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Apr 13 10:35:27 UTC 2021

Modified Files:
        pkgsrc/x11/wdm: distinfo
Added Files:
        pkgsrc/x11/wdm/patches: patch-configure

Log Message:
wdm: fix build with newer WindowMaker

patch from FreeBSD Ports


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/wdm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/wdm/patches/patch-configure

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

Modified files:

Index: pkgsrc/x11/wdm/distinfo
diff -u pkgsrc/x11/wdm/distinfo:1.11 pkgsrc/x11/wdm/distinfo:1.12
--- pkgsrc/x11/wdm/distinfo:1.11        Wed Nov  4 03:28:56 2015
+++ pkgsrc/x11/wdm/distinfo     Tue Apr 13 10:35:27 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/11/04 03:28:56 agc Exp $
+$NetBSD: distinfo,v 1.12 2021/04/13 10:35:27 nia Exp $
 
 SHA1 (wdm-1.28.tar.gz) = eb806c5057bc69452547e4c78813e00f91bebe3b
 RMD160 (wdm-1.28.tar.gz) = c64d604e7f2fad68a298fb4fe0e655b1aa3a7b3b
@@ -6,4 +6,5 @@ SHA512 (wdm-1.28.tar.gz) = b7e06c81b66c0
 Size (wdm-1.28.tar.gz) = 409544 bytes
 SHA1 (patch-aa) = 7dc96ecf4d8e492bec54c5e6f2b9e5d6ec651103
 SHA1 (patch-ab) = 0a63e3b18aa002ece5c9f63ce6dbcdd9e0dbdb03
+SHA1 (patch-configure) = f2309d16215f4f50004ed483d1f728f7a1e60797
 SHA1 (patch-src_wdm_util.c) = 51c22f471d6e9cdde1fd4cb1cd06b11974529628

Added files:

Index: pkgsrc/x11/wdm/patches/patch-configure
diff -u /dev/null pkgsrc/x11/wdm/patches/patch-configure:1.1
--- /dev/null   Tue Apr 13 10:35:27 2021
+++ pkgsrc/x11/wdm/patches/patch-configure      Tue Apr 13 10:35:27 2021
@@ -0,0 +1,38 @@
+$NetBSD: patch-configure,v 1.1 2021/04/13 10:35:27 nia Exp $
+
+Replace use of get-wings-flags with pkg-config, since newer
+WindowMaker no longer has get-wings-flags. from FreeBSD Ports.
+
+--- configure.orig     2005-03-26 13:57:04.000000000 +0000
++++ configure
+@@ -6313,7 +6313,7 @@ fi
+ fi
+ 
+ # 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
++set dummy pkg-config; 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_prog_GETWINGSFLAGS+set}" = set; then
+@@ -6353,9 +6353,9 @@ echo "$as_me: error: 'get-wings-flags' c
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-WCFLAGS=`get-wings-flags --cflags`
+-WLDFLAGS=`get-wings-flags --ldflags`
+-WLIBS=`get-wings-flags --libs`
++WCFLAGS=`pkg-config WINGs --cflags`
++WLDFLAGS=
++WLIBS=`pkg-config WINGs --libs`
+ 
+ 
+ 
+@@ -6506,7 +6506,7 @@ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define DEF_AUTH_DIR "$DMDIR/authdir"
++#define DEF_AUTH_DIR "$DMDIR"
+ _ACEOF
+ 
+