[pkgsrc/trunk]: pkgsrc/wm/flwm wm/flwm: Update to 1.16

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/wm/flwm wm/flwm: Update to 1.16
From: micha <micha%pkgsrc.org@localhost>
Date: Mon, 06 Apr 2020 12:11:39 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/69f85a846322
branches:  trunk
changeset: 416007:69f85a846322
user:      micha <micha%pkgsrc.org@localhost>
date:      Fri Oct 18 10:40:40 2019 +0000

description:
wm/flwm: Update to 1.16

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

diffstat:

 wm/flwm/Makefile                     |  19 +++++++++----------
 wm/flwm/PLIST                        |   2 +-
 wm/flwm/distinfo                     |  15 +++++++--------
 wm/flwm/patches/patch-Makefile       |  18 ++++++++++++++++++
 wm/flwm/patches/patch-aa             |  20 --------------------
 wm/flwm/patches/patch-ab             |  15 ---------------
 wm/flwm/patches/patch-configure      |  22 ----------------------
 wm/flwm/patches/patch-makeinclude.in |  22 ++++++++++++++++++++++
 8 files changed, 57 insertions(+), 76 deletions(-)

diffs (181 lines):

diff -r bbcd7aec0a8d -r 69f85a846322 wm/flwm/Makefile
--- a/wm/flwm/Makefile  Fri Oct 18 10:14:14 2019 +0000
+++ b/wm/flwm/Makefile  Fri Oct 18 10:40:40 2019 +0000
@@ -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"
diff -r bbcd7aec0a8d -r 69f85a846322 wm/flwm/PLIST
--- a/wm/flwm/PLIST     Fri Oct 18 10:14:14 2019 +0000
+++ b/wm/flwm/PLIST     Fri Oct 18 10:40:40 2019 +0000
@@ -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
diff -r bbcd7aec0a8d -r 69f85a846322 wm/flwm/distinfo
--- a/wm/flwm/distinfo  Fri Oct 18 10:14:14 2019 +0000
+++ b/wm/flwm/distinfo  Fri Oct 18 10:40:40 2019 +0000
@@ -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
diff -r bbcd7aec0a8d -r 69f85a846322 wm/flwm/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/flwm/patches/patch-Makefile    Fri Oct 18 10:40:40 2019 +0000
@@ -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)
diff -r bbcd7aec0a8d -r 69f85a846322 wm/flwm/patches/patch-aa
--- a/wm/flwm/patches/patch-aa  Fri Oct 18 10:14:14 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
-
---- makeinclude.in.orig        Sat Jan  9 14:48:33 1999
-+++ makeinclude.in     Thu Aug  3 23:43:07 2000
-@@ -15,10 +15,11 @@
- 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
diff -r bbcd7aec0a8d -r 69f85a846322 wm/flwm/patches/patch-ab
--- a/wm/flwm/patches/patch-ab  Fri Oct 18 10:14:14 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/07/07 20:04:17 joerg Exp $
-
---- Makefile.orig      2009-07-07 22:01:57.000000000 +0200
-+++ Makefile
-@@ -44,8 +44,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)
diff -r bbcd7aec0a8d -r 69f85a846322 wm/flwm/patches/patch-configure
--- a/wm/flwm/patches/patch-configure   Fri Oct 18 10:14:14 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/02/26 10:59:44 joerg Exp $
-
---- configure.orig     2000-01-05 10:14:02.000000000 +0000
-+++ configure
-@@ -612,7 +612,7 @@ cross_compiling=$ac_cv_prog_cc_cross
- cat > conftest.$ac_ext <<EOF
- #line 614 "configure"
- #include "confdefs.h"
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   ac_cv_prog_cc_works=yes
-@@ -738,7 +738,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
- cat > conftest.$ac_ext <<EOF
- #line 740 "configure"
- #include "confdefs.h"
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   ac_cv_prog_cxx_works=yes
diff -r bbcd7aec0a8d -r 69f85a846322 wm/flwm/patches/patch-makeinclude.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/flwm/patches/patch-makeinclude.in      Fri Oct 18 10:40:40 2019 +0000
@@ -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
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated misc/libreoffice to 6.3.2.2nb1
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Update www/htmldoc to 1.9.7
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated misc/libreoffice to 6.3.2.2nb1
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Update www/htmldoc to 1.9.7
Indexes:
Home | Main Index | Thread Index | Old Index