ports/72685: [ patch ] x11-wm/fbdesk: unbreak via update

[Roman Bogorodskiy]

>Number:         72685
>Category:       ports
>Synopsis:       [ patch ] x11-wm/fbdesk: unbreak via update
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 14 13:20:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.3-BETA7 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-BETA7 FreeBSD 5.3-BETA7 #11: Sun Oct 10 18:12:32 MSD 2004 root at lame.novel.ru:/usr/obj/usr/home/novel/current/src/sys/NOVEL i386


>Description:
	Fix build via updating to 1.2.1. Remove patch-src::FbTk::FbWindow.cc
	since it is not needed.

>How-To-Repeat:
>Fix:

diff -ruN fbdesk.orig/Makefile fbdesk/Makefile
--- fbdesk.orig/Makefile	Thu Oct 14 16:59:15 2004
+++ fbdesk/Makefile	Thu Oct 14 16:59:41 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fbdesk
-PORTVERSION=	1.1.5
+PORTVERSION=	1.2.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
@@ -23,10 +23,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
diff -ruN fbdesk.orig/distinfo fbdesk/distinfo
--- fbdesk.orig/distinfo	Thu Oct 14 16:59:15 2004
+++ fbdesk/distinfo	Thu Oct 14 17:01:02 2004
@@ -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 -ruN fbdesk.orig/files/patch-src::FbTk::FbWindow.cc fbdesk/files/patch-src::FbTk::FbWindow.cc
--- fbdesk.orig/files/patch-src::FbTk::FbWindow.cc	Thu Oct 14 16:59:15 2004
+++ fbdesk/files/patch-src::FbTk::FbWindow.cc	Thu Jan  1 03:00:00 1970
@@ -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,
>Release-Note:
>Audit-Trail:
>Unformatted: