The x11/libcapplet has been broken for over a year (will be two in June 2011)

and no one has any of interest to fix it. It's an ancient software and
is part of GNOME 1. It's time for us to get rid of some of GNOME 1 stuff as
the GNOME 3 is coming sometimes in 2011. Any ports that required libcappet
are removed and ports that have optional aren't remove.

PR:		ports/153355
Discussed with:	My team, FreeBSD GNOME Team
Tested by:	pointyhat-exp (thanks pav!)

18 files changed, 4 insertions, 220 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 7228988f11d..6e8bfe5d43f 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -173,7 +173,6 @@
     SUBDIR += libXxf86dga
     SUBDIR += libXxf86misc
     SUBDIR += libXxf86vm
-    SUBDIR += libcapplet
     SUBDIR += libdmx
     SUBDIR += libdnd
     SUBDIR += libexo
@@ -305,7 +304,6 @@
     SUBDIR += wmdrawer
     SUBDIR += wmfstatus
     SUBDIR += wmmatrix
-    SUBDIR += wmmenu
     SUBDIR += wmmsg
     SUBDIR += wmoldmenu2new
     SUBDIR += wmxss
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 5be4bf93eac..27ae7bd199f 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdkxft
 PORTVERSION=	1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	SF
 
@@ -18,25 +18,16 @@ LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk12
-WANT_GNOME=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lgnuregex -liconv" \
 		CFLAGS="${CFLAGS} `pkg-config xft --cflags`"
-CONFIGURE_ARGS=	--sbindir=${PREFIX}/bin
+CONFIGURE_ARGS=	--sbindir=${PREFIX}/bin \
+		--without-gnome
 USE_LDCONFIG=	yes
 
 MAN8=		gdkxft_sysinstall.8
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mlibglade}!="" && ${HAVE_GNOME:Mlibcapplet}!=""
-USE_GNOME+=	gnomeprefix libglade libcapplet
-PKGNAMESUFFIX=	-gnome
-.else
-CONFIGURE_ARGS+=	--without-gnome
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|gtk-config --prefix|$$GTK_CONFIG --prefix|g ; \
 		 s|libgdk.la|libgdk-12.so|g ; \
@@ -58,4 +49,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/gdkxft/pkg-plist b/x11/gdkxft/pkg-plist
index 17aff6656a3..64e82201a81 100644
--- a/x11/gdkxft/pkg-plist
+++ b/x11/gdkxft/pkg-plist
@@ -1,13 +1,7 @@
-%%GNOME:%%bin/gdkxft-capplet
 bin/gdkxft_sysinstall
 etc/gdkxft.conf
 lib/libgdkxft.a
 lib/libgdkxft.la
 lib/libgdkxft.so
 %%PORTDOCS%%share/doc/gdkxft/README
-%%GNOME:%%share/apps/Settings/UIOptions/gdkxft.desktop
-%%GNOME:%%share/control-center/UIOptions/gdkxft.desktop
-%%GNOME:%%share/gdkxft/gdkxft-capplet.glade
-%%GNOME:%%share/pixmaps/gdkxft.png
-%%GNOME:%%@dirrm share/gdkxft
 %%PORTDOCS%%@dirrm share/doc/gdkxft
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
deleted file mode 100644
index cfcbd8fc34c..00000000000
--- a/x11/libcapplet/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	libcapplet
-# Date created:				10 July 2002
-# Whom:					Maxim Soboleb <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/x11/libcapplet/Makefile,v 1.7 2007/05/19 21:36:29 marcus Exp $
-#
-
-PORTNAME=	libcapplet
-PORTVERSION=	1.4.0.5
-PORTREVISION=	13
-CATEGORIES=	x11 gnome
-MASTER_SITES=	http://people.freebsd.org/~sobomax/
-DIST_SUBDIR=	gnome
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A library for writing custom applets for GNOME Control Center
-
-USE_BZIP2=	yes
-USE_GNOME=	gnomelibs
-USE_LDCONFIG=	yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800000
-BROKEN=		does not build on 8.X
-.endif
-
-post-build:
-	@${REINPLACE_CMD} -e 's/-lgnugetopt //' ${WRKSRC}/cappletConf.sh
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libcapplet.so.5 ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libcapplet.a ${PREFIX}/lib
-	${LN} -sf libcapplet.so.5 ${PREFIX}/lib/libcapplet.so
-	${MKDIR} ${PREFIX}/include/libcapplet1
-	${INSTALL_DATA} ${WRKSRC}/capplet-widget.h \
-		${PREFIX}/include/libcapplet1
-	${MKDIR} ${PREFIX}/share/idl
-	${INSTALL_DATA} ${WRKSRC}/control-center.idl ${PREFIX}/share/idl
-	${INSTALL_SCRIPT} ${WRKSRC}/cappletConf.sh ${PREFIX}/etc
-
-.include <bsd.port.post.mk>
diff --git a/x11/libcapplet/distinfo b/x11/libcapplet/distinfo
deleted file mode 100644
index 5c72444c153..00000000000
--- a/x11/libcapplet/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome/libcapplet-1.4.0.5.tar.bz2) = eeffa3f60ca0c253915ae6fb60cabf09
-SHA256 (gnome/libcapplet-1.4.0.5.tar.bz2) = 33dc45a2b1f0c4a974a4a548f6906eeda132b390527b12fda31c2caac40f7635
-SIZE (gnome/libcapplet-1.4.0.5.tar.bz2) = 6023
diff --git a/x11/libcapplet/files/patch-Makefile b/x11/libcapplet/files/patch-Makefile
deleted file mode 100644
index e3f3e1d7fdc..00000000000
--- a/x11/libcapplet/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	2002-07-10 14:32:05.000000000 +0200
-+++ Makefile	2008-04-12 14:10:37.000000000 +0200
-@@ -7,14 +7,14 @@
- SRCS=	capplet-widget-libs.c capplet-widget.c capplet-widget-libs.h \
- 	capplet-widget.h control-center-common.c control-center-skels.c \
- 	control-center-stubs.c control-center.h
--CFLAGS+=-I. -I${X11BASE}/include -I${X11BASE}/include/gtk12 \
--	-I${X11BASE}/include/gnome-1.0 -I${LOCALBASE}/include \
-+CFLAGS+=-I. -I${LOCALBASE}/include -I${LOCALBASE}/include/gtk12 \
-+	-I${LOCALBASE}/include/gnome-1.0 -I${LOCALBASE}/include \
- 	-I${LOCALBASE}/include/glib12 -I${LOCALBASE}/include/orbit-1.0
--LDADD+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \
--	-lORBitutil -lglib12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \
--	-lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 \
--	-lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl \
--	-lesd -lgnugetopt -laudiofile 
-+LDADD+=	-L${LOCALBASE}/lib -lORBitCosNaming -lORBit -lIIOP \
-+	-lORBitutil -lglib-12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \
-+	-lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 \
-+	-lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl \
-+	-lesd ${LDFLAGS} -laudiofile 
- 
- CLEANFILES+=control-center-common.c control-center-skels.c \
- 	    control-center-stubs.c control-center.h cappletConf.sh \
diff --git a/x11/libcapplet/files/patch-cappletConf.sh.in b/x11/libcapplet/files/patch-cappletConf.sh.in
deleted file mode 100644
index b146abff208..00000000000
--- a/x11/libcapplet/files/patch-cappletConf.sh.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- cappletConf.sh.in.orig	2002-07-10 14:42:31.000000000 +0200
-+++ cappletConf.sh.in	2008-04-12 14:12:31.000000000 +0200
-@@ -1,4 +1,4 @@
--CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib"
--CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib12 -lwrap -lm -lgnorba"
--CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12"
-+CAPPLET_LIBDIR="-Wl,-E -L%%LOCALBASE%%/lib"
-+CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib-12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib-12 -lwrap -lm -lgnorba"
-+CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12"
- MODULE_VERSION="capplet-1.4.0.5"
diff --git a/x11/libcapplet/pkg-descr b/x11/libcapplet/pkg-descr
deleted file mode 100644
index f2ba80523ee..00000000000
--- a/x11/libcapplet/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Small library for writing custom applets for GNOME Control Center.
-
-WWW: http://www.gnome.org/
diff --git a/x11/libcapplet/pkg-plist b/x11/libcapplet/pkg-plist
deleted file mode 100644
index 906f23b6cdf..00000000000
--- a/x11/libcapplet/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/cappletConf.sh
-include/libcapplet1/capplet-widget.h
-lib/libcapplet.a
-lib/libcapplet.so
-lib/libcapplet.so.5
-share/idl/control-center.idl
-@dirrm include/libcapplet1
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
deleted file mode 100644
index 0c17cb6c8c9..00000000000
--- a/x11/wmmenu/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	wmmenu
-# Date created:		16 November 2000
-# Whom:			Jeremy <karlj000@unbc.ca>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wmmenu
-PORTVERSION=	1.2
-PORTREVISION=	9
-CATEGORIES=	x11 gnome
-MASTER_SITES=	http://www.fcoutant.freesurf.fr/download/
-
-MAINTAINER=	karlj000@unbc.ca
-COMMENT=	A popup menu of icons that launch programs for the WindowMaker dock
-
-LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GNOME=	libcapplet gdkpixbuf
-USE_GMAKE=	yes
-
-MAN1=		wmmenu.1
-
-post-patch:
-	@${MV} ${WRKSRC}/example/defaults ${WRKSRC}/example/defaults.presed
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/example/defaults.presed \
-	> ${WRKSRC}/example/defaults
-
-post-install:
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/wmmenu
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmmenu
-	${INSTALL_DATA} ${WRKSRC}/example/apps ${PREFIX}/share/doc/wmmenu/apps.sample
-	${INSTALL_DATA} ${WRKSRC}/example/defaults ${PREFIX}/share/doc/wmmenu/defaults.sample
-.endif
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE} | ${SED} -e 's#%%PORTNAME%%#${PORTNAME}#g'
-
-.include <bsd.port.mk>
diff --git a/x11/wmmenu/distinfo b/x11/wmmenu/distinfo
deleted file mode 100644
index 441acbe0163..00000000000
--- a/x11/wmmenu/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (wmmenu-1.2.tar.gz) = 0cc8970ff54182a08fe848d65546f70f
-SHA256 (wmmenu-1.2.tar.gz) = c2270fdd636e82bcddbd3a43c4ae7b8dc2f5f0f8890cf8f404ce024d5f7dab87
-SIZE (wmmenu-1.2.tar.gz) = 32845
diff --git a/x11/wmmenu/files/patch-Makefile b/x11/wmmenu/files/patch-Makefile
deleted file mode 100644
index fb20c04d5c3..00000000000
--- a/x11/wmmenu/files/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	Sat Dec  2 22:42:40 2006
-+++ Makefile	Sat Dec  2 22:43:21 2006
-@@ -1,3 +1,4 @@
-+PREFIX ?= /usr/local
- prefix = $(PREFIX)
- BINDIR = $(prefix)/bin
- MANDIR = $(prefix)/man
-@@ -7,8 +8,8 @@
- GDKPIXBUF = 1
- #GDKPIXBUF2 = 1
- 
--XROOT = /usr/X11R6
--DAROOT = /usr/local
-+XROOT = $(LOCALBASE)
-+DAROOT = $(LOCALBASE)
- 
- # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
- ifdef GDKPIXBUF
diff --git a/x11/wmmenu/files/patch-aa b/x11/wmmenu/files/patch-aa
deleted file mode 100644
index a13d5a43a89..00000000000
--- a/x11/wmmenu/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- example/apps.Dist	Sat Aug  5 00:40:31 2000
-+++ example/apps	Sun Nov 19 18:32:02 2000
-@@ -4,8 +4,6 @@
- 
- "GNUstep.xpm"		Menu title
- "linuxterm.xpm"		xterm -T Terminal -name terminal -geometry 80x50 &
--"HomeNeighborOpen.xpm"	xterm -T "Login terminal" -name loginxterm -e bin/rloginsession &
--"FileManager.xpm"	xterm -T "Midnight Commander" -name mc -geometry 100x50 -sl 1000 -e mc -c &
- "mixer.xpm"		gaumix &
- "HP-16C-48.xpm"		kcalc &
- 
diff --git a/x11/wmmenu/files/patch-ab b/x11/wmmenu/files/patch-ab
deleted file mode 100644
index 0c675beff9c..00000000000
--- a/x11/wmmenu/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- example/defaults.Dist	Sat Aug  5 00:40:06 2000
-+++ example/defaults	Sun Nov 19 18:28:53 2000
-@@ -12,4 +12,10 @@
- 
- xpmpath	/usr/local/share/WindowMaker/Icons
- xpmpath /usr/local/share/pixmaps
-+
-+xpmpath %%PREFIX%%/share/WindowMaker/Backgrounds
-+xpmpath %%PREFIX%%/share/WindowMaker/Icons
-+xpmpath %%PREFIX%%/share/WindowMaker/Pixmaps
-+xpmpath %%PREFIX%%/include/X11/pixmaps
-+
- tile	tile2.xpm
diff --git a/x11/wmmenu/files/patch-ac b/x11/wmmenu/files/patch-ac
deleted file mode 100644
index 9dcbd06f4d5..00000000000
--- a/x11/wmmenu/files/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.orig	Sun Dec  2 21:01:18 2001
-+++ Makefile	Sun Dec  2 21:01:49 2001
-@@ -1,4 +1,5 @@
--prefix = /usr/local
-+PREFIX ?= /usr/local
-+prefix = $(PREFIX)
- BINDIR = $(prefix)/bin
- MANDIR = $(prefix)/man
- ETCDIR = $(prefix)/etc
diff --git a/x11/wmmenu/pkg-descr b/x11/wmmenu/pkg-descr
deleted file mode 100644
index 5081307150a..00000000000
--- a/x11/wmmenu/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-A dockapp for WindowMaker that provides a popup menu of icons that launch
-applications, like in AfterStep.  The program can be run more than once at
-the same time, which allows many different menus, each one described in a
-separate file.
-
-WWW: http://www.fcoutant.freesurf.fr/wmmenu.html
-
-Jeremy
-karlj000@unbc.ca
diff --git a/x11/wmmenu/pkg-message b/x11/wmmenu/pkg-message
deleted file mode 100644
index 84fbe4fef4d..00000000000
--- a/x11/wmmenu/pkg-message
+++ /dev/null
@@ -1 +0,0 @@
-Read man page on "%%PORTNAME%%" and see samples in %%PREFIX%%/share/doc/wmmenu for info on configuring this dockapp.
diff --git a/x11/wmmenu/pkg-plist b/x11/wmmenu/pkg-plist
deleted file mode 100644
index d9862995df7..00000000000
--- a/x11/wmmenu/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/wmmenu
-%%PORTDOCS%%%%DOCSDIR%%/apps.sample
-%%PORTDOCS%%%%DOCSDIR%%/defaults.sample
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%