CVS commit: pkgsrc/wm/skippy

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Fri Jul 29 06:04:25 UTC 2022

Modified Files:
        pkgsrc/wm/skippy: Makefile distinfo
Added Files:
        pkgsrc/wm/skippy/patches: patch-Makefile
Removed Files:
        pkgsrc/wm/skippy/patches: patch-aa

Log Message:
wm/skippy: Fix for graphics/imlib2 update

Switch to `pkg-config imlib2`.

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/wm/skippy/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/skippy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/skippy/patches/patch-Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/wm/skippy/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/skippy/Makefile
diff -u pkgsrc/wm/skippy/Makefile:1.33 pkgsrc/wm/skippy/Makefile:1.34
--- pkgsrc/wm/skippy/Makefile:1.33      Mon Aug 17 20:20:18 2020
+++ pkgsrc/wm/skippy/Makefile   Fri Jul 29 06:04:25 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2020/08/17 20:20:18 leot Exp $
+# $NetBSD: Makefile,v 1.34 2022/07/29 06:04:25 rin Exp $
 #
 
 DISTNAME=      skippy-0.5.0
-PKGREVISION=   19
+PKGREVISION=   20
 CATEGORIES=    wm
 MASTER_SITES=  http://thegraveyard.org/files/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/wm/skippy/distinfo
diff -u pkgsrc/wm/skippy/distinfo:1.6 pkgsrc/wm/skippy/distinfo:1.7
--- pkgsrc/wm/skippy/distinfo:1.6       Tue Oct 26 11:25:18 2021
+++ pkgsrc/wm/skippy/distinfo   Fri Jul 29 06:04:25 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:25:18 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/07/29 06:04:25 rin Exp $
 
 BLAKE2s (skippy-0.5.0.tar.bz2) = f8bf3b4a370461e55def49e4c8629c82a672900f0670f76cc41849974b2723a3
 SHA512 (skippy-0.5.0.tar.bz2) = 516e648e23a6a92e37f4d712b36f65ad640e299bd18677e30d4aa565929629c7749e64124b97da590d947daaa4e0de819cdcc3aec99c524833dea4c7955a7770
 Size (skippy-0.5.0.tar.bz2) = 23722 bytes
-SHA1 (patch-aa) = 8133c1fa2182af09a980e64066413c92216ef2b1
+SHA1 (patch-Makefile) = e1456df0aaf15d1867dea2180a43987c6ab9ece4
 SHA1 (patch-ab) = 3351514ec99c034fbe8aedf281f38164dc997cae

Added files:

Index: pkgsrc/wm/skippy/patches/patch-Makefile
diff -u /dev/null pkgsrc/wm/skippy/patches/patch-Makefile:1.1
--- /dev/null   Fri Jul 29 06:04:25 2022
+++ pkgsrc/wm/skippy/patches/patch-Makefile     Fri Jul 29 06:04:25 2022
@@ -0,0 +1,35 @@
+$NetBSD: patch-Makefile,v 1.1 2022/07/29 06:04:25 rin Exp $
+
+- Do not hardcode paths and tools.
+- Switch from imlib2-config to pkg-config.
+
+--- Makefile.orig      2004-05-20 06:23:50.000000000 +0900
++++ Makefile   2022-07-29 02:24:37.776750501 +0900
+@@ -1,10 +1,7 @@
+-PREFIX = /usr/local
+ BINDIR = ${PREFIX}/bin
+ 
+-X11PREFIX = /usr/X11R6
+-
+-CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft --cflags` -g -pedantic -Wall
+-LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs`
++CFLAGS += -I${X11BASE}/include `pkg-config imlib2 --cflags` `pkg-config xft --cflags` -pedantic -Wall
++LDFLAGS += -L${X11BASE}/lib -lX11 -lm `pkg-config imlib2 --libs` `pkg-config xft --libs`
+ 
+ # Comment these out to disable Xinerama support
+ CFLAGS += -DXINERAMA
+@@ -21,11 +18,11 @@ HEADERS = skippy.h wm.h dlist.h mainwin.
+ all: skippy${EXESUFFIX}
+ 
+ skippy${EXESUFFIX}: Makefile ${SOURCES} ${HEADERS}
+-      gcc ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDFLAGS}
++      gcc ${CPPFLAGS} ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDFLAGS}
+ 
+ clean:
+       rm -f skippy${EXESUFFIX}
+ 
+ install:
+-      install -d ${DESTDIR}${BINDIR}
+-      install -m 755 skippy$(EXESUFFIX) ${DESTDIR}${BINDIR}/skippy${EXESUFFIX}
++      $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}${BINDIR}
++      $(BSD_INSTALL_PROGRAM) skippy$(EXESUFFIX) ${DESTDIR}${BINDIR}/skippy${EXESUFFIX}