- Move x11-wm/fbdesk to x11 category, to improve consistency (idesk port

  is already in x11).

PR:		ports/72860
Submitted by:	Roman Bogorodskiy <bogorodskiy@inbox.ru>
Approved by:	Hendrik Scholz <hscholz@raisdorf.net> (maintainer)
Repocopy by:	marcus

9 files changed, 3 insertions, 86 deletions

diff --git a/MOVED b/MOVED
index 09611cc3efdb..3533cef68dbe 100644
--- a/MOVED
+++ b/MOVED
@@ -1289,3 +1289,4 @@ graphics/ruby-gdchart||2004-10-23|build failure
 hebrew/pine||2004-10-23|contained serious vulnerabilities
 mail/cyrus|cyrus-imapd22|2004-10-23|contained serious vulnerabilities
 archivers/alz2zip||2004-10-23|no longer maintained
+x11-wm/fbdesk|x11/fbdesk|2004-10-24|better category
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 35ceaddd20ae..7cda89a4491f 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -32,7 +32,6 @@
     SUBDIR += evilwm
     SUBDIR += expocity
     SUBDIR += fbcmd
-    SUBDIR += fbdesk
     SUBDIR += fbpager
     SUBDIR += fluxbox
     SUBDIR += fluxbox-devel
diff --git a/x11-wm/fbdesk/Makefile b/x11-wm/fbdesk/Makefile
deleted file mode 100644
index 50071de2a78f..000000000000
--- a/x11-wm/fbdesk/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for:    fbdesk
-# Date created: 16 January 2003
-# Whom: Hendrik Scholz <hendrik@scholz.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	fbdesk
-PORTVERSION=	1.2.1
-CATEGORIES=	x11-wm
-MASTER_SITES=	http://fluxbox.sourceforge.net/download/
-
-MAINTAINER=	hendrik@scholz.net
-COMMENT=	A Fluxbox utility to create and manage icons on the desktop
-
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
-
-PLIST_FILES=	bin/fbdesk
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-
-PORTDOCS=	COPYING ChangeLog INSTALL README
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000
-USE_REINPLACE=	yes
-post-patch:
-	${REINPLACE_CMD} -e "s/inttypes\.h/stdint\.h/" \
-		${WRKSRC}/src/FbTk/Timer.hh
-.endif
-
-post-install:
-.ifndef (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/x11-wm/fbdesk/distinfo b/x11-wm/fbdesk/distinfo
deleted file mode 100644
index 6be14cc69ab3..000000000000
--- a/x11-wm/fbdesk/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 768b81bc4da5..000000000000
--- a/x11-wm/fbdesk/files/patch-src-FbTk-FbPixmap.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 82775aa6d50e..000000000000
--- a/x11-wm/fbdesk/files/patch-src-FbTk-Font.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/pkg-descr b/x11-wm/fbdesk/pkg-descr
deleted file mode 100644
index 5d340812e700..000000000000
--- a/x11-wm/fbdesk/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-fbdesk is a small application designed for the Fluxbox windowmanager that
-allows management of icons on the desktop.
-
-current features:
-
- o XPM and PNG image loading
- o Antialias text
- o UTF-8 and multibyte support
- o Vertical text
- o Grid snapping
- o GUI for icon management
- o Fluxbox menu style
-
-
-WWW: http://fluxbox.sourceforge.net/fbdesk/
-
-- Hendrik Scholz
-hendrik@scholz.net
diff --git a/x11/Makefile b/x11/Makefile
index 1eeb6e93b0d2..a8c80939b919 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -44,6 +44,7 @@
     SUBDIR += erun
     SUBDIR += eterm
     SUBDIR += eweather
+    SUBDIR += fbdesk
     SUBDIR += fbpanel
     SUBDIR += fbsd-icons
     SUBDIR += fixesext
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 50071de2a78f..31d7563287ab 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fbdesk
 PORTVERSION=	1.2.1
-CATEGORIES=	x11-wm
+CATEGORIES=	x11
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
 MAINTAINER=	hendrik@scholz.net