pkg/38473: pkgsrc: updates x11/fbdesk to 1.4.1

[jdwhite%menelos.com@localhost]

>Number:         38473
>Category:       pkg
>Synopsis:       pkgsrc: updates x11/fbdesk to 1.4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Apr 21 05:05:00 +0000 2008
>Originator:     Jason White
>Release:        NetBSD 4.0_STABLE
>Organization:
Jason White <jdwhite%menelos.com@localhost>       Jabber: jdwhite(jabber.org)
http://jdwhite.menelos.com/                     jason.d.white(gmail.com)
PGP KeyID: 0x5290E477
>Environment:
System: NetBSD smeghead 4.0_STABLE NetBSD 4.0_STABLE (smeghead GENERIC_LAPTOP) 
#0: Sat Mar 29 00:51:02 CDT 2008  root@smeghead:/usr/obj/i386/SMEGHEAD i386
Architecture: i386
Machine: i386
>Description:
Was not able to compile x11/fbdesk 1.2.1 on a 4.0 machine:

[...]
c++ -DHAVE_CONFIG_H -I. -I. -I..   -I/usr/pkg/include -I/usr/include 
-I/usr/pkg/include/freetype2 -IFbTk -O2 -I/usr/pkg/include -I/usr/include 
-I/usr/pkg/include/freetype2    -D_POSIX_THREAD_SAFE_FUNCTIONS 
-I/usr/pkg/include -I/usr/pkg/include/freetype2   -I/usr/pkg/include/libpng12 
-c -o fbdesk-FbDesk.o `test -f FbDesk.cc || echo './'`FbDesk.cc
FbDesk.cc:47: error: specialization of 'void 
FbTk::Resource<T>::setFromString(const char*) [with T = int]' in different 
namespace
FbDesk.cc:47: error:   from definition of 'void 
FbTk::Resource<T>::setFromString(const char*) [with T = int]'
FbDesk.cc:52: error: specialization of 'std::string 
FbTk::Resource<T>::getString() [with T = int]' in different namespace
FbDesk.cc:52: error:   from definition of 'std::string 
FbTk::Resource<T>::getString() [with T = int]'
FbDesk.cc:59: error: specialization of 'void 
FbTk::Resource<T>::setFromString(const char*) [with T = 
std::basic_string<char, std::char_traits<char>, std::allocator<char> >]' in 
different namespace
FbDesk.cc:59: error:   from definition of 'void 
FbTk::Resource<T>::setFromString(const char*) [with T = 
std::basic_string<char, std::char_traits<char>, std::allocator<char> >]'
FbDesk.cc:64: error: specialization of 'std::string 
FbTk::Resource<T>::getString() [with T = std::basic_string<char, 
std::char_traits<char>, std::allocator<char> >]' in different namespace
FbDesk.cc:64: error:   from definition of 'std::string 
FbTk::Resource<T>::getString() [with T = std::basic_string<char, 
std::char_traits<char>, std::allocator<char> >]'
FbDesk.cc:71: error: specialization of 'std::string 
FbTk::Resource<T>::getString() [with T = FbDesk::Icon::TextPlacement]' in 
different namespace
FbDesk.cc:71: error:   from definition of 'std::string 
FbTk::Resource<T>::getString() [with T = FbDesk::Icon::TextPlacement]'
FbDesk.cc:87: error: specialization of 'void 
FbTk::Resource<T>::setFromString(const char*) [with T = 
FbDesk::Icon::TextPlacement]' in different namespace
FbDesk.cc:87: error:   from definition of 'void 
FbTk::Resource<T>::setFromString(const char*) [with T = 
FbDesk::Icon::TextPlacement]'
*** Error code 1
>How-To-Repeat:
        
>Fix:
Updated the package to 1.4.1 (from 1.2.1), removed patch-aa, and added a
dependency on libImlib2 to fix linker errors.  Patch follows:

diff -ur fbdesk/CVS/Entries fbdesk.new/CVS/Entries
--- fbdesk/CVS/Entries  2008-04-20 23:41:12.000000000 -0500
+++ fbdesk.new/CVS/Entries      2006-12-28 05:37:32.000000000 -0600
@@ -1,6 +1,6 @@
-/DESCR/1.3/Fri Sep 24 19:07:52 2004//
-/Makefile/1.22/Wed Dec 27 13:37:42 2006//
-/PLIST/1.2/Fri Sep 24 19:06:39 2004//
-/distinfo/1.5/Wed Feb 23 17:36:10 2005//
 D/patches////
+/DESCR/1.3/Sat May 13 04:15:11 2006//
+/PLIST/1.2/Sat May 13 04:15:11 2006//
+/distinfo/1.5/Sat May 13 04:15:11 2006//
+/Makefile/1.22/Thu Dec 28 11:37:32 2006//
 D
diff -ur fbdesk/Makefile fbdesk.new/Makefile
--- fbdesk/Makefile     2006-12-27 07:37:42.000000000 -0600
+++ fbdesk.new/Makefile 2008-04-20 23:43:51.000000000 -0500
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.22 2006/12/27 13:37:42 joerg Exp $
 #
 
-DISTNAME=      fbdesk-1.2.1
-PKGREVISION=   4
+DISTNAME=      fbdesk-1.4.1
 CATEGORIES=    x11 wm
 MASTER_SITES=  http://fluxbox.sourceforge.net/download/
 
@@ -23,6 +22,7 @@
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
diff -ur fbdesk/distinfo fbdesk.new/distinfo
--- fbdesk/distinfo     2005-02-23 11:36:10.000000000 -0600
+++ fbdesk.new/distinfo 2008-04-20 23:44:12.000000000 -0500
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.5 2005/02/23 17:36:10 wiz Exp $
 
-SHA1 (fbdesk-1.2.1.tar.gz) = d3095dc51f91aa919371b582a546fa3e018533e3
-RMD160 (fbdesk-1.2.1.tar.gz) = a3ae892c5c733351b1525e874875c09078ac5aa7
-Size (fbdesk-1.2.1.tar.gz) = 388679 bytes
-SHA1 (patch-aa) = b0ccdbfa83d7fe2a2f1f6f3c22b15508d0165602
-SHA1 (patch-ab) = 765d275b51250463f924accec763a1df40aad6e8
+SHA1 (fbdesk-1.4.1.tar.gz) = b5a2f446fa27406d9adb9a9608f1dc3c638d37ff
+RMD160 (fbdesk-1.4.1.tar.gz) = ce22936b73acd8273e9816f4c2a5458cc98cf45a
+Size (fbdesk-1.4.1.tar.gz) = 426550 bytes
+SHA1 (patch-ab) = 9b263b1a6fe44f4d5b8b3da70e31e98e8103c1da
diff -ur fbdesk/patches/CVS/Entries fbdesk.new/patches/CVS/Entries
--- fbdesk/patches/CVS/Entries  2008-04-20 23:41:05.000000000 -0500
+++ fbdesk.new/patches/CVS/Entries      2006-05-13 11:34:34.000000000 -0500
@@ -1,3 +1,3 @@
-/patch-aa/1.1/Fri Sep 24 19:06:39 2004//
-/patch-ab/1.1/Fri Sep 24 19:06:39 2004//
+/patch-aa/1.1/Sat May 13 04:15:11 2006//
+/patch-ab/1.1/Sat May 13 04:15:11 2006//
 D
diff -ur fbdesk/patches/patch-ab fbdesk.new/patches/patch-ab
--- fbdesk/patches/patch-ab     2004-09-24 14:06:39.000000000 -0500
+++ fbdesk.new/patches/patch-ab 2008-04-20 23:44:05.000000000 -0500
@@ -7,4 +7,3 @@
 +#include <stdio.h>
 +
  #include "FbPixmap.hh"
-