aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2004-10-18 20:44:49 +0000
committerPav Lucistnik <pav@FreeBSD.org>2004-10-18 20:44:49 +0000
commit847293a727686274a6fef0aa92f80d47b5f5efc9 (patch)
treea7bbf3a461ffe8628de78357d0c11335ac43b2b7
parentf30d42f081c8da76bb6f987d8cd65ace1c12d879 (diff)
downloadports-847293a727686274a6fef0aa92f80d47b5f5efc9.tar.gz
ports-847293a727686274a6fef0aa92f80d47b5f5efc9.zip
Notes
Diffstat
-rw-r--r--x11-wm/fbdesk/Makefile6
-rw-r--r--x11-wm/fbdesk/distinfo4
-rw-r--r--x11-wm/fbdesk/files/patch-src-FbTk-FbPixmap.cc10
-rw-r--r--x11-wm/fbdesk/files/patch-src-FbTk-Font.cc12
-rw-r--r--x11-wm/fbdesk/files/patch-src::FbTk::FbWindow.cc12
-rw-r--r--x11/fbdesk/Makefile6
-rw-r--r--x11/fbdesk/distinfo4
-rw-r--r--x11/fbdesk/files/patch-src-FbTk-FbPixmap.cc10
-rw-r--r--x11/fbdesk/files/patch-src-FbTk-Font.cc12
-rw-r--r--x11/fbdesk/files/patch-src::FbTk::FbWindow.cc12
10 files changed, 50 insertions, 38 deletions
diff --git a/x11-wm/fbdesk/Makefile b/x11-wm/fbdesk/Makefile
index de847543ac67..50071de2a78f 100644
--- a/x11-wm/fbdesk/Makefile
+++ b/x11-wm/fbdesk/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fbdesk
-PORTVERSION= 1.1.5
+PORTVERSION= 1.2.1
CATEGORIES= x11-wm
MASTER_SITES= http://fluxbox.sourceforge.net/download/
@@ -24,10 +24,6 @@ PORTDOCS= COPYING ChangeLog INSTALL README
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not compile on FreeBSD >= 5.x"
-.endif
-
.if ${OSVERSION} >= 500000
USE_REINPLACE= yes
post-patch:
diff --git a/x11-wm/fbdesk/distinfo b/x11-wm/fbdesk/distinfo
index 0cfff646ae7a..6be14cc69ab3 100644
--- a/x11-wm/fbdesk/distinfo
+++ b/x11-wm/fbdesk/distinfo
@@ -1,2 +1,2 @@
-MD5 (fbdesk-1.1.5.tar.gz) = c41319c9a2a03cf4d7d5e0586e57cba6
-SIZE (fbdesk-1.1.5.tar.gz) = 253057
+MD5 (fbdesk-1.2.1.tar.gz) = 382a32a6e26b3f3d3a647fa4bdc81b7a
+SIZE (fbdesk-1.2.1.tar.gz) = 388679
diff --git a/x11-wm/fbdesk/files/patch-src-FbTk-FbPixmap.cc b/x11-wm/fbdesk/files/patch-src-FbTk-FbPixmap.cc
new file mode 100644
index 000000000000..768b81bc4da5
--- /dev/null
+++ b/x11-wm/fbdesk/files/patch-src-FbTk-FbPixmap.cc
@@ -0,0 +1,10 @@
+--- src/FbTk/FbPixmap.cc.orig Mon Sep 20 12:26:19 2004
++++ src/FbTk/FbPixmap.cc Fri Oct 15 18:08:16 2004
+@@ -28,6 +28,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <iostream>
++#include <stdio.h>
+ using namespace std;
+
+ namespace FbTk {
diff --git a/x11-wm/fbdesk/files/patch-src-FbTk-Font.cc b/x11-wm/fbdesk/files/patch-src-FbTk-Font.cc
new file mode 100644
index 000000000000..82775aa6d50e
--- /dev/null
+++ b/x11-wm/fbdesk/files/patch-src-FbTk-Font.cc
@@ -0,0 +1,12 @@
+--- src/FbTk/Font.cc.orig Mon Sep 20 12:45:01 2004
++++ src/FbTk/Font.cc Fri Oct 15 18:04:48 2004
+@@ -89,9 +89,7 @@
+
+ namespace {
+
+-#ifdef HAVE_SETLOCALE
+ #include <locale.h>
+-#endif //HAVE_SETLOCALE
+
+ #ifdef HAVE_ICONV
+ /**
diff --git a/x11-wm/fbdesk/files/patch-src::FbTk::FbWindow.cc b/x11-wm/fbdesk/files/patch-src::FbTk::FbWindow.cc
deleted file mode 100644
index 9f79c911324e..000000000000
--- a/x11-wm/fbdesk/files/patch-src::FbTk::FbWindow.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/FbTk/FbWindow.cc.orig Sat Feb 14 10:48:03 2004
-+++ src/FbTk/FbWindow.cc Sat Feb 14 10:48:11 2004
-@@ -168,7 +168,8 @@
- Window root;
- size_t border_width, depth;
- XGetGeometry(s_display, m_window, &root, &m_x, &m_y,
-- &m_width, &m_height, &border_width, &depth);
-+ (unsigned int*) &m_width, (unsigned int*) &m_height,
-+ (unsigned int*) &border_width, (unsigned int*) &depth);
- }
-
- void FbWindow::create(Window parent, int x, int y,
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index de847543ac67..50071de2a78f 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fbdesk
-PORTVERSION= 1.1.5
+PORTVERSION= 1.2.1
CATEGORIES= x11-wm
MASTER_SITES= http://fluxbox.sourceforge.net/download/
@@ -24,10 +24,6 @@ PORTDOCS= COPYING ChangeLog INSTALL README
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not compile on FreeBSD >= 5.x"
-.endif
-
.if ${OSVERSION} >= 500000
USE_REINPLACE= yes
post-patch:
diff --git a/x11/fbdesk/distinfo b/x11/fbdesk/distinfo
index 0cfff646ae7a..6be14cc69ab3 100644
--- a/x11/fbdesk/distinfo
+++ b/x11/fbdesk/distinfo
@@ -1,2 +1,2 @@
-MD5 (fbdesk-1.1.5.tar.gz) = c41319c9a2a03cf4d7d5e0586e57cba6
-SIZE (fbdesk-1.1.5.tar.gz) = 253057
+MD5 (fbdesk-1.2.1.tar.gz) = 382a32a6e26b3f3d3a647fa4bdc81b7a
+SIZE (fbdesk-1.2.1.tar.gz) = 388679
diff --git a/x11/fbdesk/files/patch-src-FbTk-FbPixmap.cc b/x11/fbdesk/files/patch-src-FbTk-FbPixmap.cc
new file mode 100644
index 000000000000..768b81bc4da5
--- /dev/null
+++ b/x11/fbdesk/files/patch-src-FbTk-FbPixmap.cc
@@ -0,0 +1,10 @@
+--- src/FbTk/FbPixmap.cc.orig Mon Sep 20 12:26:19 2004
++++ src/FbTk/FbPixmap.cc Fri Oct 15 18:08:16 2004
+@@ -28,6 +28,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <iostream>
++#include <stdio.h>
+ using namespace std;
+
+ namespace FbTk {
diff --git a/x11/fbdesk/files/patch-src-FbTk-Font.cc b/x11/fbdesk/files/patch-src-FbTk-Font.cc
new file mode 100644
index 000000000000..82775aa6d50e
--- /dev/null
+++ b/x11/fbdesk/files/patch-src-FbTk-Font.cc
@@ -0,0 +1,12 @@
+--- src/FbTk/Font.cc.orig Mon Sep 20 12:45:01 2004
++++ src/FbTk/Font.cc Fri Oct 15 18:04:48 2004
+@@ -89,9 +89,7 @@
+
+ namespace {
+
+-#ifdef HAVE_SETLOCALE
+ #include <locale.h>
+-#endif //HAVE_SETLOCALE
+
+ #ifdef HAVE_ICONV
+ /**
diff --git a/x11/fbdesk/files/patch-src::FbTk::FbWindow.cc b/x11/fbdesk/files/patch-src::FbTk::FbWindow.cc
deleted file mode 100644
index 9f79c911324e..000000000000
--- a/x11/fbdesk/files/patch-src::FbTk::FbWindow.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/FbTk/FbWindow.cc.orig Sat Feb 14 10:48:03 2004
-+++ src/FbTk/FbWindow.cc Sat Feb 14 10:48:11 2004
-@@ -168,7 +168,8 @@
- Window root;
- size_t border_width, depth;
- XGetGeometry(s_display, m_window, &root, &m_x, &m_y,
-- &m_width, &m_height, &border_width, &depth);
-+ (unsigned int*) &m_width, (unsigned int*) &m_height,
-+ (unsigned int*) &border_width, (unsigned int*) &depth);
- }
-
- void FbWindow::create(Window parent, int x, int y,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 00:14:17 +0000