CVS commit: pkgsrc/wm/flwm

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Oct 18 10:40:40 UTC 2019

Modified Files:
        pkgsrc/wm/flwm: Makefile PLIST distinfo
Added Files:
        pkgsrc/wm/flwm/patches: patch-Makefile patch-makeinclude.in
Removed Files:
        pkgsrc/wm/flwm/patches: patch-aa patch-ab patch-configure

Log Message:
wm/flwm: Update to 1.16

Switch to FLTK 1.3 (tested to work with FLTK 1.4 too).


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/wm/flwm/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/flwm/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/wm/flwm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/flwm/patches/patch-Makefile \
    pkgsrc/wm/flwm/patches/patch-makeinclude.in
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/wm/flwm/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/flwm/patches/patch-ab \
    pkgsrc/wm/flwm/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/wm/flwm/Makefile
diff -u pkgsrc/wm/flwm/Makefile:1.29 pkgsrc/wm/flwm/Makefile:1.30
--- pkgsrc/wm/flwm/Makefile:1.29        Sat Apr 25 14:24:59 2015
+++ pkgsrc/wm/flwm/Makefile     Fri Oct 18 10:40:40 2019
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.29 2015/04/25 14:24:59 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.30 2019/10/18 10:40:40 micha Exp $
 
-DISTNAME=      flwm-1.02
-PKGREVISION=   5
+DISTNAME=      flwm-1.16
 CATEGORIES=    x11 wm
-MASTER_SITES=  http://flwm.sourceforge.net/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=bbidulock/}
+GITHUB_PROJECT=        flwm
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://flwm.sourceforge.net/
+HOMEPAGE=      https://github.com/bbidulock/flwm
 COMMENT=       The Fast, Light Window Manager
+LICENSE=       gnu-gpl-v2
 
 USE_LANGUAGES= c c++
 GNU_CONFIGURE= yes
-CONFIGURE_ENV+=        X_LIBS="-lGL"
-MAKE_ENV+=     CXXFLAGS=${CXXFLAGS:M*:Q}
-CXXFLAGS+=     -DFLTK_1_0_COMPAT
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
-.include "../../x11/fltk/buildlink3.mk"
+# FLTK version 1.4 is supported too
+.include "../../x11/fltk13/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/wm/flwm/PLIST
diff -u pkgsrc/wm/flwm/PLIST:1.1 pkgsrc/wm/flwm/PLIST:1.2
--- pkgsrc/wm/flwm/PLIST:1.1    Wed Oct 31 20:59:12 2001
+++ pkgsrc/wm/flwm/PLIST        Fri Oct 18 10:40:40 2019
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/18 10:40:40 micha Exp $
 bin/flwm
 man/man1/flwm.1

Index: pkgsrc/wm/flwm/distinfo
diff -u pkgsrc/wm/flwm/distinfo:1.8 pkgsrc/wm/flwm/distinfo:1.9
--- pkgsrc/wm/flwm/distinfo:1.8 Mon Nov  2 23:42:52 2015
+++ pkgsrc/wm/flwm/distinfo     Fri Oct 18 10:40:40 2019
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2015/11/02 23:42:52 agc Exp $
+$NetBSD: distinfo,v 1.9 2019/10/18 10:40:40 micha Exp $
 
-SHA1 (flwm-1.02.tgz) = bd348fa8a1c65b2318bf59e15cba0dcd511b3134
-RMD160 (flwm-1.02.tgz) = 634af3b1882f1753fd82d54e09f2484c9aadad68
-SHA512 (flwm-1.02.tgz) = a13c2c3801afc3efa8d42e5a2cbf2628e2b3433b66fd83cea22d503aed0838228466ea159a852459570838624d12696d88b2008ce9e336d68227954e5f3b378e
-Size (flwm-1.02.tgz) = 64142 bytes
-SHA1 (patch-aa) = f71ebceef3d4f39963113fbf32d3efddcf489c8f
-SHA1 (patch-ab) = 22cf873b56d36675c86fac3059490ed717ebed12
-SHA1 (patch-configure) = 34e598c3198604cd00275c8cc04a3b9bb7b28f4e
+SHA1 (flwm-1.16.tgz) = 9d384b27647851652a701df3925c71297b4ade06
+RMD160 (flwm-1.16.tgz) = 4cac5bb4960766aea8f340fa48997f2b6a4bb67e
+SHA512 (flwm-1.16.tgz) = d352e13b0385a017922d636988ba02f20cbe5f8ccd69522f43711a3d3cc04fe876af9f2126d63bd6c862494bace6510a5cda286ce165a54bf58cade1758e1f12
+Size (flwm-1.16.tgz) = 93510 bytes
+SHA1 (patch-Makefile) = a0617f7483c186c398ccc8a0ecce8765e741c2d3
+SHA1 (patch-makeinclude.in) = bde2c26c3c52882082926b48ae9ca8b9a0a3d5c7

Added files:

Index: pkgsrc/wm/flwm/patches/patch-Makefile
diff -u /dev/null pkgsrc/wm/flwm/patches/patch-Makefile:1.1
--- /dev/null   Fri Oct 18 10:40:41 2019
+++ pkgsrc/wm/flwm/patches/patch-Makefile       Fri Oct 18 10:40:40 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile,v 1.1 2019/10/18 10:40:40 micha Exp $
+
+Don't strip installed binary.
+Add support for DESTDIR.
+
+--- Makefile.orig      2015-12-14 18:43:32.000000000 +0000
++++ Makefile
+@@ -47,8 +47,8 @@ makedepend:
+ -include makedepend
+ 
+ install: $(PROGRAM)
+-      $(INSTALL) -s $(PROGRAM) $(bindir)/$(PROGRAM)
+-      $(INSTALL) $(PROGRAM).$(MANPAGE) $(mandir)/man$(MANPAGE)/$(PROGRAM).$(MANPAGE)
++      $(INSTALL) -s $(PROGRAM) ${DESTDIR}$(bindir)/$(PROGRAM)
++      $(INSTALL) $(PROGRAM).$(MANPAGE) ${DESTDIR}$(mandir)/man$(MANPAGE)/$(PROGRAM).$(MANPAGE)
+ 
+ uninstall:
+       -@ rm -f $(bindir)/$(PROGRAM)
Index: pkgsrc/wm/flwm/patches/patch-makeinclude.in
diff -u /dev/null pkgsrc/wm/flwm/patches/patch-makeinclude.in:1.1
--- /dev/null   Fri Oct 18 10:40:41 2019
+++ pkgsrc/wm/flwm/patches/patch-makeinclude.in Fri Oct 18 10:40:40 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-makeinclude.in,v 1.1 2019/10/18 10:40:40 micha Exp $
+
+Add CPPFLAGS to CFLAGS and CXXFLAGS.
+
+--- makeinclude.in.orig        2015-06-30 09:39:45.000000000 +0000
++++ makeinclude.in
+@@ -16,10 +16,11 @@ CC =@CC@
+ MAKEDEPEND =@MAKEDEPEND@
+ 
+ # flags for C++ compiler:
+-CFLAGS                =@CFLAGS@
+-CFLAGS_D      =@CFLAGS_D@
+-CXXFLAGS      =@CXXFLAGS@
+-CXXFLAGS_D    =@CXXFLAGS_D@
++CPPFLAGS      =@CPPFLAGS@
++CFLAGS                =@CFLAGS@ $(CPPFLAGS)
++CFLAGS_D      =@CFLAGS_D@ $(CPPFLAGS)
++CXXFLAGS      =@CXXFLAGS@ $(CPPFLAGS)
++CXXFLAGS_D    =@CXXFLAGS_D@ $(CPPFLAGS)
+ 
+ # libraries to link with:
+ LDLIBS        =@LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm