On 12/27/17 18:07, Brian Callahan wrote:
Hi ports --
For the fluxbox users out there, here's a diff to update fluxbox to
the tip of development, bringing in 3 years worth of improvements and
bug fixes. Two of our patches go away. Re-take MAINTAINER.
This is more of a preview, but I'd be happy to take oks too. Been
running fluxbox from head for at least the last 2 years or so.
~Brian
ugh, forgot to add the COMPILER line. New patch attached.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- Makefile 26 Jul 2017 22:45:32 -0000 1.86
+++ Makefile 27 Dec 2017 23:08:22 -0000
@@ -1,21 +1,25 @@
-# $OpenBSD: Makefile,v 1.86 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.83 2017/06/02 11:33:16 schwarze Exp $
COMMENT = window manager based on the original Blackbox code
-DISTNAME = fluxbox-1.3.7
+DISTNAME = fluxbox-1.3.7.0.20171119
CATEGORIES = x11
-REVISION = 3
HOMEPAGE = http://fluxbox.org/
+MAINTAINER = Brian Callahan <[email protected]>
# X11
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += Imlib2 X11 Xext Xft Xinerama Xpm Xrandr Xrender c fontconfig
-WANTLIB += freetype fribidi iconv m ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} Imlib2 X11 Xext Xft Xinerama Xpm
+WANTLIB += Xrandr Xrender c fontconfig freetype fribidi iconv
+WANTLIB += m z
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
+MASTER_SITES = https://devio.us/~bcallah/source/
-LIB_DEPENDS= converters/libiconv \
+# C++11
+COMPILER = base-clang ports-gcc ports-clang
+
+LIB_DEPENDS = converters/libiconv \
devel/fribidi \
graphics/imlib2
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo 9 Feb 2015 15:52:13 -0000 1.29
+++ distinfo 27 Dec 2017 23:08:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (fluxbox-1.3.7.tar.gz) = yZ4rqgb/8eljQrIEFQWdEv8fopF63gFzx1svpXApW58=
-SIZE (fluxbox-1.3.7.tar.gz) = 1267833
+SHA256 (fluxbox-1.3.7.0.20171119.tar.gz) = I6n2X722EegHKVJZzcmmO9VMcJZWY50CW8IeTLbZFFo=
+SIZE (fluxbox-1.3.7.0.20171119.tar.gz) = 1514237
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/fluxbox/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 9 Feb 2015 15:52:13 -0000 1.4
+++ patches/patch-Makefile_in 27 Dec 2017 23:08:22 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.4 2015/02/09 15:52:13 dcoppa Exp $
---- Makefile.in.orig Sun Feb 8 04:44:52 2015
-+++ Makefile.in Mon Feb 9 04:26:49 2015
-@@ -5275,7 +5275,6 @@ src/defaults.hh:
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -5307,7 +5307,6 @@ src/defaults.hh:
src/defaults.cc: force
@( \
@@ -9,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2015/0
echo '// This file is generated from Makefile. Do not edit!'; \
echo '#include "defaults.hh"'; \
echo ''; \
-@@ -5284,11 +5283,7 @@ src/defaults.cc: force
+@@ -5316,11 +5315,7 @@ src/defaults.cc: force
echo '}'; \
echo ''; \
echo 'const char* gitrevision() {'; \
Index: patches/patch-util_fluxbox-generate_menu_in
===================================================================
RCS file: patches/patch-util_fluxbox-generate_menu_in
diff -N patches/patch-util_fluxbox-generate_menu_in
--- patches/patch-util_fluxbox-generate_menu_in 9 Feb 2015 15:52:13 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.11 2015/02/09 15:52:13 dcoppa Exp $
-
-Adapt to our non-GNU grep
-
---- util/fluxbox-generate_menu.in.orig Sun Feb 8 04:44:45 2015
-+++ util/fluxbox-generate_menu.in Mon Feb 9 04:26:49 2015
-@@ -330,7 +330,7 @@ searchForIcon(){
- # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>"
- if [ -f "$entry_icon" ]; then
- # if icon exists and entry does not already exists, add it
-- if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
-+ if ! grep -q "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
- printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
- else
- : echo "# mapping already exists for ${execname}" >> $ICONMAPPING
Index: patches/patch-util_fluxbox-remote_cc
===================================================================
RCS file: patches/patch-util_fluxbox-remote_cc
diff -N patches/patch-util_fluxbox-remote_cc
--- patches/patch-util_fluxbox-remote_cc 22 Apr 2017 07:50:21 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-util_fluxbox-remote_cc,v 1.3 2017/04/22 07:50:21 jsg Exp $
---- util/fluxbox-remote.cc.orig Sun Feb 8 21:44:45 2015
-+++ util/fluxbox-remote.cc Sat Apr 22 17:45:31 2017
-@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
- if (strcmp(cmd, "result") == 0) {
- XTextProperty text_prop;
- if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0
-- && text_prop.value > 0
-+ && text_prop.value != 0
- && text_prop.nitems > 0) {
-
- printf("%s", text_prop.value);
