summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Li <pat@FreeBSD.org>2002-05-18 08:12:59 +0000
committerPatrick Li <pat@FreeBSD.org>2002-05-18 08:12:59 +0000
commite2d532dac2f07ef75c1045197b89f9491ae89f72 (patch)
treee2f5dcf0e69eeaca3a5932bc519c8fda89d87d28
parentAdd missing files to plist (diff)
Update to 0.1.8 and include bugpatch 1 and 2 from author
PR: 37587, 37718 Submitted by: Hendrik Scholz <hendrik@scholz.net>, Henrikas <Henrikas.hemry@delfi.lt> Approved by: 2 week maintainer timeout
-rw-r--r--x11-wm/fluxbox-devel/Makefile7
-rw-r--r--x11-wm/fluxbox-devel/distinfo3
-rw-r--r--x11-wm/fluxbox-devel/files/patch-src::Screen.cc13
-rw-r--r--x11-wm/fluxbox/Makefile7
-rw-r--r--x11-wm/fluxbox/distinfo3
-rw-r--r--x11-wm/fluxbox/files/patch-src::Screen.cc13
6 files changed, 14 insertions, 32 deletions
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile
index b7c24880fdb4..652d3bc6aaa5 100644
--- a/x11-wm/fluxbox-devel/Makefile
+++ b/x11-wm/fluxbox-devel/Makefile
@@ -6,12 +6,15 @@
#
PORTNAME= fluxbox
-PORTVERSION= 0.1.7
-PORTREVISION= 1
+PORTVERSION= 0.1.8
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
+PATCH_SITES= http://fluxbox.sourceforge.net/download/patches/
+PATCHFILES= fluxbox-0.1.8-bugfix-1-2.patch
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= spn@g0v.ru
USE_X_PREFIX= yes
diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo
index 88989c8130d3..1c9afb7edd20 100644
--- a/x11-wm/fluxbox-devel/distinfo
+++ b/x11-wm/fluxbox-devel/distinfo
@@ -1 +1,2 @@
-MD5 (fluxbox-0.1.7.tar.gz) = bb2c250128bbd1f33cbb5a1ca9e59615
+MD5 (fluxbox-0.1.8.tar.gz) = 599b5d25ab4c088df229387460a86cda
+MD5 (fluxbox-0.1.8-bugfix-1-2.patch) = 78ba4c56643ccb67224cbb3b3f00e05f
diff --git a/x11-wm/fluxbox-devel/files/patch-src::Screen.cc b/x11-wm/fluxbox-devel/files/patch-src::Screen.cc
deleted file mode 100644
index 7aca6efd1f86..000000000000
--- a/x11-wm/fluxbox-devel/files/patch-src::Screen.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Screen.cc.orig Thu Feb 28 10:46:01 2002
-+++ src/Screen.cc Tue Mar 12 16:48:03 2002
-@@ -877,8 +877,9 @@
- Netizens::iterator it_end = netizenList.end();
- for (; it != it_end; ++it) {
- if ((*it)->getWindowID() == w) {
-- Netizen *n = *netizenList.erase(it);
-+ Netizen *n = *it;
- delete n;
-+ netizenList.erase(it);
- break;
- }
- }
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index b7c24880fdb4..652d3bc6aaa5 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -6,12 +6,15 @@
#
PORTNAME= fluxbox
-PORTVERSION= 0.1.7
-PORTREVISION= 1
+PORTVERSION= 0.1.8
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
+PATCH_SITES= http://fluxbox.sourceforge.net/download/patches/
+PATCHFILES= fluxbox-0.1.8-bugfix-1-2.patch
+PATCH_DIST_STRIP= -p1
+
MAINTAINER= spn@g0v.ru
USE_X_PREFIX= yes
diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo
index 88989c8130d3..1c9afb7edd20 100644
--- a/x11-wm/fluxbox/distinfo
+++ b/x11-wm/fluxbox/distinfo
@@ -1 +1,2 @@
-MD5 (fluxbox-0.1.7.tar.gz) = bb2c250128bbd1f33cbb5a1ca9e59615
+MD5 (fluxbox-0.1.8.tar.gz) = 599b5d25ab4c088df229387460a86cda
+MD5 (fluxbox-0.1.8-bugfix-1-2.patch) = 78ba4c56643ccb67224cbb3b3f00e05f
diff --git a/x11-wm/fluxbox/files/patch-src::Screen.cc b/x11-wm/fluxbox/files/patch-src::Screen.cc
deleted file mode 100644
index 7aca6efd1f86..000000000000
--- a/x11-wm/fluxbox/files/patch-src::Screen.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Screen.cc.orig Thu Feb 28 10:46:01 2002
-+++ src/Screen.cc Tue Mar 12 16:48:03 2002
-@@ -877,8 +877,9 @@
- Netizens::iterator it_end = netizenList.end();
- for (; it != it_end; ++it) {
- if ((*it)->getWindowID() == w) {
-- Netizen *n = *netizenList.erase(it);
-+ Netizen *n = *it;
- delete n;
-+ netizenList.erase(it);
- break;
- }
- }