2012-11-28 editors/glimmer: Depends on the expired gtkglarea through py-gtk

2012-11-26 palm/txt2pdbdoc: No more public distfiles
2012-11-26 sysutils/xloadface: No more public distfiles
2012-11-26 shells/gscommander: Abandonware
2012-11-26 security/saferpay: No more public distfiles
2012-11-26 x11-wm/qvwm: No more public distfiles

Feature safe:	yes

63 files changed, 6 insertions, 1524 deletions

diff --git a/MOVED b/MOVED
index 22c6788d141b..47032d031be2 100644
--- a/MOVED
+++ b/MOVED
@@ -3846,3 +3846,9 @@ www/trac-customroadmap||2012-11-19|Has expired: Functionality of this plugin is
 net-mgmt/py-snmp2||2012-11-19|Has expired: Dead upstream, use net-mgmt/py-snmp4 instead
 net-im/ccmsn||2012-11-19|Has expired: The project no longer exists
 irc/py-irclib|irc/py-irc|2012-11-22|Rename according to upstream name change
+editors/glimmer||2012-11-28|Has expired: Depends on the expired gtkglarea through py-gtk
+palm/txt2pdbdoc||2012-11-28|Has expired: No more public distfiles
+sysutils/xloadface||2012-11-28|Has expired: No more public distfiles
+shells/gscommander||2012-11-28|Has expired: Abandonware
+security/saferpay||2012-11-28|Has expired: No more public distfiles
+x11-wm/qvwm||2012-11-28|Has expired: No more public distfiles
diff --git a/editors/Makefile b/editors/Makefile
index 5dc187fade40..e7383daab8db 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -74,7 +74,6 @@
     SUBDIR += gedit
     SUBDIR += gedit-plugins
     SUBDIR += ghex
-    SUBDIR += glimmer
     SUBDIR += gmanedit
     SUBDIR += gnome2-office
     SUBDIR += gnotepad+
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
deleted file mode 100644
index f9d3557a1d6f..000000000000
--- a/editors/glimmer/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	glimmer
-PORTVERSION=	1.2.1
-PORTREVISION=	13
-CATEGORIES=	editors gnome python
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A full featured code editor for GNOME with many advanced features
-
-DEPRECATED=	Depends on the expired gtkglarea through py-gtk
-EXPIRATION_DATE=	2012-11-28
-
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_PYTHON=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomelibs gnomeprint gnomevfs \
-		gnomeprefix
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-regex
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lgnuregex"
-CPPFLAGS+=	-I${LOCALBASE}/include -I/usr/include/gnu
-
-.if exists(/usr/lib/libcrypto.a)
-PYTHON_LIBS=	-lssl -lcrypto
-.endif
-PYTHON_LIBS+=	-lutil -lreadline -lcrypt -lpython
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpython|${PYTHON_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|gnuregex\.h|regex.h|' \
-		${WRKSRC}/src/gtkextext/gtkextext.h
-
-.include <bsd.port.mk>
diff --git a/editors/glimmer/distinfo b/editors/glimmer/distinfo
deleted file mode 100644
index 9d5755bc84b4..000000000000
--- a/editors/glimmer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (glimmer-1.2.1.tar.gz) = 38e1bd264a45c25e67c1800ee92af6d45ca2f844bc6bf3126657d28053a9d616
-SIZE (glimmer-1.2.1.tar.gz) = 801711
diff --git a/editors/glimmer/files/patch-configure b/editors/glimmer/files/patch-configure
deleted file mode 100644
index e465f0cec6c0..000000000000
--- a/editors/glimmer/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Thu Feb  7 15:54:38 2002
-+++ configure	Thu Feb  7 16:09:08 2002
-@@ -8605,7 +8605,7 @@
- echo "${ECHO_T}no" >&6
- fi
- 
--	     CATOBJEXT=.gmo
-+	     CATOBJEXT=.mo
- 	   fi
- 
- fi
-@@ -8729,7 +8729,7 @@
- 
- 	BUILD_INCLUDED_LIBINTL=yes
- 	USE_INCLUDED_LIBINTL=yes
--        CATOBJEXT=.gmo
-+        CATOBJEXT=.mo
- 	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
- 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-       fi
-@@ -8819,7 +8819,7 @@
-     fi
- 
-                 for lang in $ALL_LINGUAS; do
--      GMOFILES="$GMOFILES $lang.gmo"
-+      GMOFILES="$GMOFILES $lang.mo"
-       POFILES="$POFILES $lang.po"
-     done
- 
-@@ -10202,7 +10202,7 @@
- fi
- echo System regex.......$use_system_regex
- 
--echo GTK+ version.......`gtk-config --version`
-+echo GTK+ version.......`$GTK_CONFIG --version`
- echo GNOME version......`gnome-config --version`
- echo
- echo
diff --git a/editors/glimmer/files/patch-intl::Makefile.in b/editors/glimmer/files/patch-intl::Makefile.in
deleted file mode 100644
index 80264a7d1b9a..000000000000
--- a/editors/glimmer/files/patch-intl::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- intl/Makefile.in.orig	2000-11-09 17:30:01.000000000 -0600
-+++ intl/Makefile.in	2011-03-25 13:42:37.000000000 -0500
-@@ -201,12 +201,2 @@
- 
--# The dependency for intlh.inst is different in gettext and all other
--# packages.  Because we cannot you GNU make features we have to solve
--# the problem while rewriting Makefile.in.
--@GT_YES@intlh.inst: intlh.inst.in ../config.status
--@GT_YES@	cd .. \
--@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
--@GT_YES@	  $(SHELL) ./config.status
--@GT_NO@.PHONY: intlh.inst
--@GT_NO@intlh.inst:
--
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
diff --git a/editors/glimmer/files/patch-ltmain.sh b/editors/glimmer/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/editors/glimmer/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/editors/glimmer/files/patch-po::Makefile.in.in b/editors/glimmer/files/patch-po::Makefile.in.in
deleted file mode 100644
index 1e58541d6e06..000000000000
--- a/editors/glimmer/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/02/07 13:50:02	1.1
-+++ po/Makefile.in.in	2002/02/07 13:51:15
-@@ -52,7 +52,7 @@
- POTFILES = \
- 
- CATALOGS = @CATALOGS@
--CATOBJEXT = @CATOBJEXT@
-+CATOBJEXT = .mo
- INSTOBJEXT = @INSTOBJEXT@
- 
- .SUFFIXES:
diff --git a/editors/glimmer/files/patch-src::gtkextext::gtkextext.h b/editors/glimmer/files/patch-src::gtkextext::gtkextext.h
deleted file mode 100644
index 3431a8d61d89..000000000000
--- a/editors/glimmer/files/patch-src::gtkextext::gtkextext.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- src/gtkextext/gtkextext.h.orig	Fri Oct 26 23:57:02 2001
-+++ src/gtkextext/gtkextext.h	Mon Nov 19 13:16:44 2001
-@@ -30,8 +30,10 @@
- 
- #include <sys/types.h>
- 
-+#include "config.h"
-+
- #ifdef WITH_SYSTEM_REGEX
--#include <regex.h>
-+#include <gnuregex.h>
- #else
- #include "regex.h"
- #endif
diff --git a/editors/glimmer/files/patch-src_file-io_c b/editors/glimmer/files/patch-src_file-io_c
deleted file mode 100644
index 4b5fa3a0f49b..000000000000
--- a/editors/glimmer/files/patch-src_file-io_c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/file-io.c.orig	Thu Jan 10 12:51:15 2002
-+++ src/file-io.c	Sat Jun 28 12:38:16 2003
-@@ -24,6 +24,7 @@
- 
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- 
- #include "declarations.h"
- #include "file-io.h"
-@@ -102,10 +103,10 @@
- new_file_real (char *filename)
- {
-     GnomeVFSURI *uri;
--    gchar cwd[256];
-+    gchar cwd[MAXPATHLEN];
-     gchar *full;
- 
--    getcwd (cwd, 256);
-+    getcwd (cwd, sizeof(cwd));
-     full = g_strconcat (cwd, "/", filename, NULL);
-     uri = gnome_vfs_uri_new (full);
-     g_free (full);
diff --git a/editors/glimmer/files/patch-src_gtkextext_gtkextext.c b/editors/glimmer/files/patch-src_gtkextext_gtkextext.c
deleted file mode 100644
index 4518af2b8394..000000000000
--- a/editors/glimmer/files/patch-src_gtkextext_gtkextext.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gtkextext/gtkextext.c.orig	Sat Apr  7 01:47:56 2007
-+++ src/gtkextext/gtkextext.c	Sat Apr  7 01:52:20 2007
-@@ -1140,7 +1140,8 @@ line_set_cursor_pos (GtkExText * text, g
-         val = (gfloat) width;
-         gtk_adjustment_set_value (text->hadj, val);
-     } else if (text->draw_numbers && width < (val + text->gutter_width)) {
--        val = (gfloat) width -= text->gutter_width;
-+        width -= text->gutter_width;
-+        val = (gfloat) width;
-         gtk_adjustment_set_value (text->hadj, val);
-     }
- 
diff --git a/editors/glimmer/files/patch-src_main_c b/editors/glimmer/files/patch-src_main_c
deleted file mode 100644
index e4d43afdfa3f..000000000000
--- a/editors/glimmer/files/patch-src_main_c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/main.c.orig	Thu Jan 10 12:37:37 2002
-+++ src/main.c	Sat Jun 28 12:38:50 2003
-@@ -15,6 +15,7 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <sys/param.h>
- #include <sys/wait.h>
- 
- #include "declarations.h"
-@@ -342,7 +343,7 @@
-     gchar *path;
-     gchar *file;
-     gchar *full;
--    gchar cwd[256];
-+    gchar cwd[MAXPATHLEN];
- 
-     args = (gchar **) poptGetArgs (pctx);
- 
-@@ -381,7 +382,7 @@
-         }
-     }
-     if (input_file) {
--        gchar *path, *file, *full, cwd[256];
-+        gchar *path, *file, *full, cwd[MAXPATHLEN];
- 
-         getcwd (cwd, sizeof (cwd));
-         path = get_path_from_filename (input_file);
diff --git a/editors/glimmer/files/patch-src_mdi-routines.c b/editors/glimmer/files/patch-src_mdi-routines.c
deleted file mode 100644
index 538cf80ed740..000000000000
--- a/editors/glimmer/files/patch-src_mdi-routines.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/mdi-routines.c.orig	Tue May  7 13:35:06 2002
-+++ src/mdi-routines.c	Tue May  7 13:40:16 2002
-@@ -150,7 +150,7 @@
-         length = text->length;
-         line = text->line_number + 1;
-         lines = GTK_EXTEXT (cur_file->text)->line_count + 1;
--        if (pos >= 0 && pos <= text->length && text->length > 0)
-+        if (pos >= 0 && pos < text->length && text->length > 0)
-             cur_char = GTK_EXTEXT_INDEX (text, pos);
-         else
-             cur_char = 0;
-@@ -166,7 +166,10 @@
-             else
-                 gtk_widget_set_sensitive (search_menu_match, TRUE);
- 
--            cur_char = GTK_EXTEXT_INDEX (text, pos);
-+	    if (pos < text->length)
-+            	cur_char = GTK_EXTEXT_INDEX (text, pos);
-+	    else
-+		cur_char = 0;
-             if (cur_char < 1 || !strchr ("{[()]}", cur_char) || length < 1)
-                 gtk_widget_set_sensitive (search_menu_select, FALSE);
-             else
diff --git a/editors/glimmer/files/patch-src_widgets_gnome-settings.c b/editors/glimmer/files/patch-src_widgets_gnome-settings.c
deleted file mode 100644
index 82adbe24682f..000000000000
--- a/editors/glimmer/files/patch-src_widgets_gnome-settings.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/widgets/gnome-settings.c.orig	Tue Jul  3 15:45:49 2007
-+++ src/widgets/gnome-settings.c	Tue Jul  3 15:46:49 2007
-@@ -138,7 +138,7 @@ select_event (GtkCTree * tree, gint row,
-         gtk_widget_hide (settings->current);
-     if (data) {
-         gtk_widget_show (GTK_WIDGET (data));
--        (void *) settings->current = data;
-+        settings->current = GTK_WIDGET (data);
-     }
- }
- 
diff --git a/editors/glimmer/pkg-descr b/editors/glimmer/pkg-descr
deleted file mode 100644
index 1856353166f4..000000000000
--- a/editors/glimmer/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Glimmer is currently the most advanced text/code editor for GNOME. It is a full
-featured code editor with many advanced features, including scripting
-integration with either Python or Guile.
-
-At the current time, Glimmer has syntax highlighting support for the following
-languages: Bash/Sh, C/C++, HTML, Java, Latex, GNU  Make, Perl, PHP, PO
-(Language Translation), Python, Scheme (guile, lisp, etc), SGML, WML, XML, and
-Z80 Assembly.
-
-WWW: http://glimmer.sourceforge.net/
diff --git a/editors/glimmer/pkg-plist b/editors/glimmer/pkg-plist
deleted file mode 100644
index c81ab7b219fd..000000000000
--- a/editors/glimmer/pkg-plist
+++ /dev/null
@@ -1,73 +0,0 @@
-bin/glimmer
-bin/glimmerout
-%%DATADIR%%/docs/AUTHORS
-%%DATADIR%%/docs/COPYING
-%%DATADIR%%/docs/ChangeLog
-%%DATADIR%%/docs/NEWS
-%%DATADIR%%/docs/PROPS
-%%DATADIR%%/docs/README
-%%DATADIR%%/docs/TODO
-%%DATADIR%%/languages/ada.lang
-%%DATADIR%%/languages/asp.lang
-%%DATADIR%%/languages/bash.lang
-%%DATADIR%%/languages/c.lang
-%%DATADIR%%/languages/cpp.lang
-%%DATADIR%%/languages/dtml.lang
-%%DATADIR%%/languages/fortran.lang
-%%DATADIR%%/languages/html.lang
-%%DATADIR%%/languages/java.lang
-%%DATADIR%%/languages/js.lang
-%%DATADIR%%/languages/lang.lang
-%%DATADIR%%/languages/latex.lang
-%%DATADIR%%/languages/make.lang
-%%DATADIR%%/languages/ocaml.lang
-%%DATADIR%%/languages/oolong.lang
-%%DATADIR%%/languages/perl.lang
-%%DATADIR%%/languages/php.lang
-%%DATADIR%%/languages/po.lang
-%%DATADIR%%/languages/python.lang
-%%DATADIR%%/languages/ruby.lang
-%%DATADIR%%/languages/scheme.lang
-%%DATADIR%%/languages/sgml.lang
-%%DATADIR%%/languages/sql.lang
-%%DATADIR%%/languages/tcltk.lang
-%%DATADIR%%/languages/wml.lang
-%%DATADIR%%/languages/x86.lang
-%%DATADIR%%/languages/xhtml-trans.lang
-%%DATADIR%%/languages/xml.lang
-%%DATADIR%%/languages/z80.lang
-%%DATADIR%%/scripts/Bookmarks.py
-%%DATADIR%%/scripts/Delete_To_End.py
-%%DATADIR%%/scripts/Delete_To_Start.py
-%%DATADIR%%/scripts/FileSelector.py
-%%DATADIR%%/scripts/Global.py
-%%DATADIR%%/scripts/ISO2HTML.py
-%%DATADIR%%/scripts/Replace_Spaces.py
-%%DATADIR%%/scripts/Replace_Tabs.py
-%%DATADIR%%/scripts/To_Lower.py
-%%DATADIR%%/scripts/To_Upper.py
-share/gnome/apps/Development/glimmer.desktop
-share/gnome/help/glimmer/C/bugs.html
-share/gnome/help/glimmer/C/customize.html
-share/gnome/help/glimmer/C/faq.html
-share/gnome/help/glimmer/C/gpl.html
-share/gnome/help/glimmer/C/index.html
-share/gnome/help/glimmer/C/menus.html
-share/gnome/help/glimmer/C/mission.html
-share/gnome/help/glimmer/C/preferences.html
-share/gnome/help/glimmer/C/properties.html
-share/gnome/help/glimmer/C/sessions.html
-share/gnome/help/glimmer/C/topic.dat
-share/locale/de/LC_MESSAGES/glimmer.mo
-share/locale/es/LC_MESSAGES/glimmer.mo
-share/locale/ja/LC_MESSAGES/glimmer.mo
-share/locale/sv/LC_MESSAGES/glimmer.mo
-share/pixmaps/glimmer-icon.png
-share/pixmaps/glimmer-splash.png
-share/pixmaps/glimmer-title.png
-@dirrm share/gnome/help/glimmer/C
-@dirrm share/gnome/help/glimmer
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/languages
-@dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%
diff --git a/palm/Makefile b/palm/Makefile
index e48a6da3bc62..60332f3cfaca 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -35,6 +35,5 @@
     SUBDIR += synce-sync-engine
     SUBDIR += synce-trayicon
     SUBDIR += synce-vdccm
-    SUBDIR += txt2pdbdoc
 
 .include <bsd.port.subdir.mk>
diff --git a/palm/txt2pdbdoc/Makefile b/palm/txt2pdbdoc/Makefile
deleted file mode 100644
index 37b9f05cef7e..000000000000
--- a/palm/txt2pdbdoc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: keichii@iteration.net
-# $FreeBSD$
-
-PORTNAME=	txt2pdbdoc
-PORTVERSION=	1.4.4
-CATEGORIES=	palm converters
-MASTER_SITES=	http://homepage.mac.com/pauljlucas/software/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Converts plain text and HTML files to Palm Pilot Doc formats
-
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-11-26
-
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-PLIST_FILES=	bin/pdbtxt2html bin/html2pdbtxt bin/txt2pdbdoc
-MAN1=		txt2pdbdoc.1 pdbtxt2html.1 html2pdbtxt.1
-MAN4=		doc.4
-
-.include <bsd.port.mk>
diff --git a/palm/txt2pdbdoc/distinfo b/palm/txt2pdbdoc/distinfo
deleted file mode 100644
index e697acda5fa7..000000000000
--- a/palm/txt2pdbdoc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (txt2pdbdoc-1.4.4.tar.gz) = db9e58a073d722c59c7fd1ffd6ebe3fc1be2007e826d6be5f94de26ea5a0c895
-SIZE (txt2pdbdoc-1.4.4.tar.gz) = 77486
diff --git a/palm/txt2pdbdoc/pkg-descr b/palm/txt2pdbdoc/pkg-descr
deleted file mode 100644
index 0e7be620faa6..000000000000
--- a/palm/txt2pdbdoc/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Converts plain text and HTML files to the Doc format used by PalmPilots,
-and vice versa.
-
-WWW: http://homepage.mac.com/pauljlucas/software/txt2pdbdoc
diff --git a/security/Makefile b/security/Makefile
index c528240723f3..3b10efc7d1d7 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -830,7 +830,6 @@
     SUBDIR += rubygem-razorback-scriptNugget
     SUBDIR += rubygem-roauth
     SUBDIR += rubygem-twitter_oauth
-    SUBDIR += saferpay
     SUBDIR += safesh
     SUBDIR += saint
     SUBDIR += samba-virusfilter
diff --git a/security/saferpay/Makefile b/security/saferpay/Makefile
deleted file mode 100644
index e0c51c85856a..000000000000
--- a/security/saferpay/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Created by: mb@imp.ch
-# $FreeBSD$
-
-PORTNAME=	saferpay
-PORTVERSION=	1.3.0
-PORTREVISION=	2
-CATEGORIES=	security
-MASTER_SITES=	http://www.saferpay.com/download/
-DISTFILES=	${PORTNAME}_${PORTVERSION}_linux-g++_src.tar.gz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A command line tool for online payment
-
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-11-26
-
-MAKEFILE=	${WRKSRC}/saferpay/Makefile
-
-USE_GMAKE=	yes
-USE_OPENSSL=	yes
-USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}
-
-post-patch:
-	@${SED} -i orig -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKDIR}/saferpay/Makefile
-.if exists(/usr/include/openssl/engine.h)
-CFLAGS+=	-DHAVE_SSLENGINE_H
-.endif
-
-.if !defined(WITH_P5_API)
-pre-build:
-	@${ECHO} "-----------------------------------------------------"
-	@${ECHO} You are building now the saferpay command line tool.
-	@${ECHO} If you like to install the perl API too, break this
-	@${ECHO} installation and start it again with WITH_P5_API=YES.
-	@${ECHO} "-----------------------------------------------------"
-.else
-pre-build:
-PLIST=		${PKGDIR}/pkg-plist.p5
-post-build:
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} xs)
-post-install:
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} installxs)
-	${GZIP_CMD} ${LOCALBASE}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/../man/man3/soplex::saferpay::MessageObject.3
-	${GZIP_CMD} ${LOCALBASE}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/../man/man3/soplex::saferpay::MessageFactory.3
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/security/saferpay/distinfo b/security/saferpay/distinfo
deleted file mode 100644
index 8d7882e54591..000000000000
--- a/security/saferpay/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (saferpay_1.3.0_linux-g++_src.tar.gz) = 04e5caad93d631fd21791a8efc048800a520cfcca26453939b07bbe463ec169c
-SIZE (saferpay_1.3.0_linux-g++_src.tar.gz) = 272777
diff --git a/security/saferpay/files/patch-IcctSign.cpp b/security/saferpay/files/patch-IcctSign.cpp
deleted file mode 100644
index 6325a978f2ec..000000000000
--- a/security/saferpay/files/patch-IcctSign.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- saferpay/IcctSign.cpp.orig	Wed Sep 24 15:13:06 2003
-+++ saferpay/IcctSign.cpp	Tue Jan  6 15:46:01 2004
-@@ -32,7 +32,11 @@
- 	#define RSA_generate_key_S RSA_generate_key
- #endif
- 
-+#ifdef HAVE_SSLENGINE_H
-+HRESULT ICCT_Signature(const UCHAR* pucPrivateKey, int cbPrivateKey, UCHAR* pMessage,
-+#else
- HRESULT ICCT_Signature(UCHAR* pucPrivateKey, int cbPrivateKey, UCHAR* pMessage,
-+#endif
- 					   ULONG cbMessage, /*[out]*/ UCHAR* pDigest, ULONG* pcbDigest)
- {
- 	RSA *pPrivateKey = RSA_new();
-@@ -64,7 +68,12 @@
- 	return -1;
- }
- 
-+#ifdef HAVE_SSLENGINE_H
-+HRESULT ICCT_Verify(const UCHAR* pucPublicKey, int cbPublicKey, UCHAR* pMessage, ULONG cbMessage,
-+#else
- HRESULT ICCT_Verify(UCHAR* pucPublicKey, int cbPublicKey, UCHAR* pMessage, ULONG cbMessage,
-+#endif
-+
- 					/*[in]*/ UCHAR* pDigest, ULONG cbDigest)
- {
- 	RSA *pPublicKey = RSA_new();
-@@ -255,3 +264,4 @@
- 	}
- }
- */
-+
diff --git a/security/saferpay/files/patch-IcctSign.h b/security/saferpay/files/patch-IcctSign.h
deleted file mode 100644
index 19e0153f859c..000000000000
--- a/security/saferpay/files/patch-IcctSign.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- saferpay/IcctSign.h.orig	Wed Apr 17 13:40:14 2002
-+++ saferpay/IcctSign.h	Wed Feb 19 12:22:17 2003
-@@ -11,11 +11,19 @@
- 						  int* cbPrivateKey, UCHAR* Seed,
- 						  int cbSeed = 0);
- 
-+#ifdef HAVE_SSLENGINE_H
-+HRESULT ICCT_Signature(const UCHAR* pucPrivateKey, int cbPrivateKey, UCHAR* pMessage,
-+					   ULONG cbMessage, /*[out]*/ UCHAR* pDigest, ULONG* pcbDigest);
-+
-+HRESULT ICCT_Verify(const UCHAR* pucPublicKey, int cbPublicKey, UCHAR* pMessage,
-+					ULONG cbMessage, /*[in]*/ UCHAR* pDigest, ULONG cbDigest);
-+#else
- HRESULT ICCT_Signature(UCHAR* pucPrivateKey, int cbPrivateKey, UCHAR* pMessage,
- 					   ULONG cbMessage, /*[out]*/ UCHAR* pDigest, ULONG* pcbDigest);
- 
- HRESULT ICCT_Verify(UCHAR* pucPublicKey, int cbPublicKey, UCHAR* pMessage,
- 					ULONG cbMessage, /*[in]*/ UCHAR* pDigest, ULONG cbDigest);
-+#endif
- 
- 
- HRESULT ICCT_CryptDigest(UCHAR* pucPublicKey, int cbPublicKey,
diff --git a/security/saferpay/files/patch-Makefile b/security/saferpay/files/patch-Makefile
deleted file mode 100644
index 9c29ad738227..000000000000
--- a/security/saferpay/files/patch-Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
---- saferpay/Makefile.orig	Thu Aug  8 15:59:09 2002
-+++ saferpay/Makefile	Tue Feb 18 17:28:00 2003
-@@ -1,45 +1,37 @@
--PREFIX = /usr
--SSLVERSION = openssl-0.9.6c
--SSLEAYDIR = ../$(SSLVERSION)
--
-+PREFIX = %%PREFIX%%
- 
- all:
--
--	make -f idpapp.mk
--	cp ./out/libidpapp.s* $(PREFIX)/lib
--	make -f saferpay.mk
--	cp idpapi.h ./out
--	cp idperrc.h ./out
--	cp ./out/settings.template ./out/settings.xml
-+	gmake -f idpapp.mk -C saferpay
-+	gmake -f saferpay.mk -C saferpay
- 
- clean:
--	make -f idpapp.mk clean
--	make -f saferpay.mk clean
-+	gmake -f idpapp.mk clean
-+	gmake -f saferpay.mk clean
- 
- xs: all
--	perl -e 'system("cd perl/MessageObject\nperl Makefile.PL\nmake");'
--	perl -e 'system("cd perl/MessageFactory\nperl Makefile.PL\nmake");'
--	perl -e 'system("cd perl/ConfigurationSetup\nperl Makefile.PL\nmake");'
-+	perl -e 'system("cd saferpay/perl/MessageObject\nperl Makefile.PL\nmake");'
-+	perl -e 'system("cd saferpay/perl/MessageFactory\nperl Makefile.PL\nmake");'
-+	perl -e 'system("cd saferpay/perl/ConfigurationSetup\nperl Makefile.PL\nmake");'
- 
- testxs:
--	perl -e 'system("cd perl/ConfigurationSetup\nmake test");'
--	perl -e 'system("cd perl/MessageFactory\nmake test");'
-+	perl -e 'system("cd saferpay/perl/ConfigurationSetup\nmake test");'
-+	perl -e 'system("cd saferpay/perl/MessageFactory\nmake test");'
- 
- installxs:
--	perl -e 'system("cd perl/ConfigurationSetup\nmake install");'
--	perl -e 'system("cd perl/MessageFactory\nmake install");'
--	perl -e 'system("cd perl/MessageObject\nmake install");'
-+	perl -e 'system("cd saferpay/perl/ConfigurationSetup\nmake install");'
-+	perl -e 'system("cd saferpay/perl/MessageFactory\nmake install");'
-+	perl -e 'system("cd saferpay/perl/MessageObject\nmake install");'
- 
- cleanxs:
--	perl -e 'system("cd perl/ConfigurationSetup\nmake clean");'
--	perl -e 'system("cd perl/MessageFactory\nmake clean");'
--	perl -e 'system("cd perl/MessageObject\nmake clean");'
--	
--testmk:
--	echo "SSLVERSION: $(SSLVERSION)"
--	echo "SSLEAYDIR: $(SSLEAYDIR)"
--
--
--
--
--
-+	perl -e 'system("cd saferpay/perl/ConfigurationSetup\nmake clean");'
-+	perl -e 'system("cd saferpay/perl/MessageFactory\nmake clean");'
-+	perl -e 'system("cd saferpay/perl/MessageObject\nmake clean");'
-+
-+install:
-+	install -C saferpay/out/libidpapp.so.1.0.0 $(PREFIX)/lib/libidpapp.so.1
-+	install -C saferpay/idpapi.h $(PREFIX)/include
-+	install -C saferpay/idperrc.h $(PREFIX)/include
-+	install -m 0555 -C saferpay/out/saferpay $(PREFIX)/bin
-+	mkdir -p $(PREFIX)/share/examples/saferpay/
-+	install -C saferpay/out/settings.template $(PREFIX)/share/examples/saferpay/
-+	ln -s -f $(PREFIX)/lib/libidpapp.so.1 $(PREFIX)/lib/libidpapp.so
diff --git a/security/saferpay/files/patch-file-endings b/security/saferpay/files/patch-file-endings
deleted file mode 100644
index fb030f054b75..000000000000
--- a/security/saferpay/files/patch-file-endings
+++ /dev/null
@@ -1,222 +0,0 @@
---- saferpay/xml/xmlElement.h.orig	Mon Sep  9 21:59:36 2002
-+++ saferpay/xml/xmlElement.h	Mon Sep  9 22:00:04 2002
-@@ -117,4 +117,5 @@
- bool xmlSetAttributeEx(xmlElement * pElement, const SxString & strId, const SxString & strValue);
- 
- 
--#endif
-+#endif
-+
---- saferpay/xml/xmlParser.h.orig	Mon Sep  9 21:59:41 2002
-+++ saferpay/xml/xmlParser.h	Mon Sep  9 22:00:11 2002
-@@ -18,4 +18,5 @@
- 	void createElement(const SxString & tag, xmlElement ** ppElement);
- };
- 
--#endif
-+#endif
-+
---- saferpay/xml/xmlerror.h.orig	Mon Sep  9 21:59:46 2002
-+++ saferpay/xml/xmlerror.h	Mon Sep  9 22:00:18 2002
-@@ -5,3 +5,4 @@
- #define XMLE_FILE_INCOMPLETE		2
- #define XMLE_INVALID_STRUCTURE		3
- #define XMLE_TAG_NOT_FOUND			4
-+
---- saferpay/xml/xmlElementEnum.h.orig	Mon Sep  9 21:59:51 2002
-+++ saferpay/xml/xmlElementEnum.h	Mon Sep  9 22:00:08 2002
-@@ -85,3 +85,4 @@
- 
- 
- #endif
-+
---- saferpay/xml/xmlcore.h.orig	Mon Sep  9 21:59:55 2002
-+++ saferpay/xml/xmlcore.h	Mon Sep  9 22:00:14 2002
-@@ -25,3 +25,4 @@
- 
- 
- #endif // __XMLCORE_H__
-+
---- saferpay/sxfc/sxfctype.h.orig	Mon Sep  9 22:05:18 2002
-+++ saferpay/sxfc/sxfctype.h	Mon Sep  9 22:06:10 2002
-@@ -11,3 +11,4 @@
- typedef unsigned int SX_SIZE_T;
- 
- #endif // __SXFCTYPE_H__
-+
---- saferpay/sxfc/sxexcept.h.orig	Mon Sep  9 22:05:14 2002
-+++ saferpay/sxfc/sxexcept.h	Mon Sep  9 22:06:04 2002
-@@ -46,4 +46,5 @@
- };
- 
- 
--#endif // __SXFCEXCEPT_H__
-+#endif // __SXFCEXCEPT_H__
-+
---- saferpay/sxfc/sxfcerr.h.orig	Mon Sep  9 22:04:40 2002
-+++ saferpay/sxfc/sxfcerr.h	Mon Sep  9 22:06:07 2002
-@@ -6,3 +6,4 @@
- 
- #define E_SXFC_OUT_OF_MEMORY		0x80040217L
- #define E_SXFC_PARAMETER			0x80040218L
-+
---- saferpay/sxfc/sxfctype.h.orig	Mon Sep  9 22:05:18 2002
-+++ saferpay/sxfc/sxfctype.h	Mon Sep  9 22:06:10 2002
-@@ -11,3 +11,4 @@
- typedef unsigned int SX_SIZE_T;
- 
- #endif // __SXFCTYPE_H__
-+
---- saferpay/sxfc/sxlist.h.orig	Mon Sep  9 22:05:22 2002
-+++ saferpay/sxfc/sxlist.h	Mon Sep  9 22:06:15 2002
-@@ -35,4 +35,5 @@
- 	SxObject *m_pObj;
- };
- 
--#endif // __SXLIST_H__
-+#endif // __SXLIST_H__
-+
---- saferpay/sxfc/sxpair.h.orig	Mon Sep  9 22:04:53 2002
-+++ saferpay/sxfc/sxpair.h	Mon Sep  9 22:06:24 2002
-@@ -166,4 +166,5 @@
- 	SxPtr m_pObj;
- };
- 
--#endif // __SXPAIR_H__
-+#endif // __SXPAIR_H__
-+
---- saferpay/sxfc/sxsort.h.orig	Mon Sep  9 22:04:58 2002
-+++ saferpay/sxfc/sxsort.h	Mon Sep  9 22:06:31 2002
-@@ -27,4 +27,5 @@
- };
- 
- 
--#endif // __SXSORT_H__
-+#endif // __SXSORT_H__
-+
---- saferpay/sxfc/sxstack.h.orig	Mon Sep  9 22:05:34 2002
-+++ saferpay/sxfc/sxstack.h	Mon Sep  9 22:06:34 2002
-@@ -55,4 +55,5 @@
- };
- 
- 
--#endif // __SXSTACK_H__
-+#endif // __SXSTACK_H__
-+
---- saferpay/sxfc/sxstream.h.orig	Mon Sep  9 22:05:03 2002
-+++ saferpay/sxfc/sxstream.h	Mon Sep  9 22:06:37 2002
-@@ -103,4 +103,5 @@
- 	bool m_bad;
- };
- 
--#endif // __SXSTREAM_H__
-+#endif // __SXSTREAM_H__
-+
---- saferpay/sxfc/sxstring.h.orig	Mon Sep  9 22:05:38 2002
-+++ saferpay/sxfc/sxstring.h	Mon Sep  9 22:06:40 2002
-@@ -333,4 +333,5 @@
- SxString operator +(const TCHAR*, const SxString&);
- 
- 
--#endif // __SXSTRING_H__
-+#endif // __SXSTRING_H__
-+
---- saferpay/sxfc/sxvector.h.orig	Mon Sep  9 22:05:42 2002
-+++ saferpay/sxfc/sxvector.h	Mon Sep  9 22:06:47 2002
-@@ -110,4 +110,5 @@
- 	const SxFindable **m_ppObj;
- };
- 
--#endif // __SXVECTOR_H__
-+#endif // __SXVECTOR_H__
-+
---- saferpay/sxfc/sxcontainer.h.orig	Mon Sep  9 22:12:28 2002
-+++ saferpay/sxfc/sxcontainer.h	Mon Sep  9 22:12:34 2002
-@@ -75,4 +75,5 @@
- 	SX_SIZE_T m_capacity;
- };
- 
--#endif // __SXCONTAINER_H__
-+#endif // __SXCONTAINER_H__
-+
---- saferpay/sxfc/sxobject.h.orig	Mon Sep  9 22:13:26 2002
-+++ saferpay/sxfc/sxobject.h	Mon Sep  9 22:13:32 2002
-@@ -61,4 +61,5 @@
- 	}
- };
- 
--#endif // __SXOBJECT_H__
-+#endif // __SXOBJECT_H__
-+
---- saferpay/idptypes.h.orig	Mon Sep  9 22:14:11 2002
-+++ saferpay/idptypes.h	Mon Sep  9 22:14:22 2002
-@@ -87,4 +87,5 @@
- #endif
- 
- 
--#endif
-+#endif
-+
---- saferpay/idpdattr.h.orig	Mon Sep  9 22:15:01 2002
-+++ saferpay/idpdattr.h	Mon Sep  9 22:15:07 2002
-@@ -5,4 +5,5 @@
- 	LPCTSTR Name;
- };
- 
--extern DefaultAttributeName AttributeNames[];
-+extern DefaultAttributeName AttributeNames[];
-+
---- saferpay/IcctSign.cpp.orig	Mon Sep  9 22:16:04 2002
-+++ saferpay/IcctSign.cpp	Mon Sep  9 22:16:57 2002
-@@ -231,4 +231,5 @@
- 		printf("ICCT_Verify succeeded!\n");
- 	}
- }
--*/
-+*/
-+
---- saferpay/cConfigurationSetup.cpp.orig	Mon Sep  9 22:16:20 2002
-+++ saferpay/cConfigurationSetup.cpp	Mon Sep  9 22:17:00 2002
-@@ -176,4 +176,5 @@
- 	}
- }
- 
--}	// extern "C"
-+}	// extern "C"
-+
---- saferpay/cMessageObject.cpp.orig	Mon Sep  9 22:16:35 2002
-+++ saferpay/cMessageObject.cpp	Mon Sep  9 22:17:04 2002
-@@ -300,4 +300,5 @@
- 	return hr;
- }
- 
--}	// extern "C"
-+}	// extern "C"
-+
---- saferpay/uuid_time.c.orig	Mon Sep  9 22:19:00 2002
-+++ saferpay/uuid_time.c	Mon Sep  9 22:19:24 2002
-@@ -135,4 +135,5 @@
- 
-          return 0;
-  }
-- #endif
-+ #endif
-+
---- saferpay/pack.c.orig	Mon Sep  9 22:19:05 2002
-+++ saferpay/pack.c	Mon Sep  9 22:19:27 2002
-@@ -42,4 +42,5 @@
-           out[8] = (unsigned char) tmp;
- 
-           memcpy(out+10, uu->node, 6);
--  }
-+  }
-+
---- saferpay/unpack.c.orig	Mon Sep  9 22:19:09 2002
-+++ saferpay/unpack.c	Mon Sep  9 22:19:31 2002
-@@ -36,4 +36,5 @@
-           uu->clock_seq = tmp;
- 
-           memcpy(uu->node, ptr, 6);
--  }
-+  }
-+
diff --git a/security/saferpay/files/patch-idpapp.mk b/security/saferpay/files/patch-idpapp.mk
deleted file mode 100644
index 02c7a4251ce7..000000000000
--- a/security/saferpay/files/patch-idpapp.mk
+++ /dev/null
@@ -1,27 +0,0 @@
---- saferpay/idpapp.mk.orig	Tue Jul 22 07:07:20 2003
-+++ saferpay/idpapp.mk	Sat Mar 13 18:15:44 2004
-@@ -1,19 +1,13 @@
- ####### Compiler, tools and options
- 
--SSLVERSION = openssl-0.9.7b
--SSLEAYDIR = ./ssl
--SSLINCDIR = -I ./ssl
-+SSLINCDIR = -I /usr/include/openssl
- 
--
--CC	=	gcc
--CXX	=	g++
--
--CFLAGS	=	-pipe -DUNIX -DHAVE_UNISTD_H -DHAVE_STDLIB_H -O2 -fPIC
--CXXFLAGS=	-pipe -DUNIX -O2 -fPIC
-+CFLAGS	+=	-pipe -DUNIX -DHAVE_UNISTD_H -DHAVE_STDLIB_H -O2 -fPIC
-+CXXFLAGS+=	-pipe -DUNIX -O2 -fPIC
- INCPATH	=	-I"./xml" -I"./jni" -I"./sxfc" $(SSLINCDIR)
--LINK	=	g++
-+LINK	+=	${CXX}
- LFLAGS	=	-fPIC -shared
--LIBS	=	/usr/lib/libssl.a /usr/lib/libcrypto.a
-+LIBS	=	-lssl -lcrypto
- AR	=	ar cq
- RANLIB	=	
- MOC	=	moc
diff --git a/security/saferpay/files/patch-jConfigurationSetup.cpp b/security/saferpay/files/patch-jConfigurationSetup.cpp
deleted file mode 100644
index a6eff9322a3a..000000000000
--- a/security/saferpay/files/patch-jConfigurationSetup.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- saferpay/jConfigurationSetup.cpp.orig	2008-12-19 13:13:09.000000000 +0100
-+++ saferpay/jConfigurationSetup.cpp	2008-12-19 13:12:50.000000000 +0100
-@@ -33,7 +33,7 @@
- 			IDP_E_UNEXPECTED)
- 		return;
- 	}
-+	env->SetIntField(obj, fid, (jlong)CreateConfigurationSetup());
--	env->SetIntField(obj, fid, (jint)CreateConfigurationSetup());
- }
- 
- JNIEXPORT void JNICALL Java_soplex_saferpay_ConfigurationSetup_nDestruct
diff --git a/security/saferpay/files/patch-jMessageFactory.cpp b/security/saferpay/files/patch-jMessageFactory.cpp
deleted file mode 100644
index 7218e9a41128..000000000000
--- a/security/saferpay/files/patch-jMessageFactory.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
---- saferpay/jMessageFactory.cpp.orig	2008-12-19 13:15:19.000000000 +0100
-+++ saferpay/jMessageFactory.cpp	2008-12-19 13:13:40.000000000 +0100
-@@ -29,7 +29,7 @@
- 		IDPJNI_THROW1("MessageFactory::Construct(): m_Handle != 0", IDP_E_UNEXPECTED)
- 		return;
- 	}
-+	env->SetIntField(obj, fid, (jlong)CreateMessageFactory());
--	env->SetIntField(obj, fid, (jint)CreateMessageFactory());
- }
- 
- JNIEXPORT void JNICALL Java_soplex_saferpay_MessageFactory_nDestruct
-@@ -40,7 +40,7 @@
- 	DestroyMessageFactory(p);
- }
- 
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageFactory_nVerifyPayConfirm
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageFactory_nVerifyPayConfirm
-   (JNIEnv *env, jobject obj, jstring Data, jstring Signature)
- {
- 	IDPCIMPL_MessageFactory *p = 0;
-@@ -53,7 +53,7 @@
- 
- 	try
- 	{
-+		jlong r = (jlong)p->VerifyPayConfirm(mbstoSTRING(pszData), mbstoSTRING(pszSignature));
--		jint r = (jint)p->VerifyPayConfirm(mbstoSTRING(pszData), mbstoSTRING(pszSignature));
- 		env->ReleaseStringUTFChars(Data, pszData);
- 		env->ReleaseStringUTFChars(Signature, pszSignature);
- 		return r;
-@@ -104,7 +104,7 @@
- 	env->ReleaseStringUTFChars(Path, pszPath);
- }
- 
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageFactory_nCreatePayInit
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageFactory_nCreatePayInit
-   (JNIEnv *env, jobject obj)
- {
- 	IDPCIMPL_MessageFactory *p = 0;
-@@ -114,7 +114,7 @@
- 
- 	try
- 	{
-+		return (jlong)p->CreatePayInit();
--		return (jint)p->CreatePayInit();
- 	}
- 	catch(IDP_Exception e)
- 	{
-@@ -132,7 +132,7 @@
- 	}
- }
- 
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageFactory_nCreatePayComplete
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageFactory_nCreatePayComplete
-   (JNIEnv *env, jobject obj, jstring Id, jstring Token)
- {
- 	IDPCIMPL_MessageFactory *p = 0;
-@@ -145,7 +145,7 @@
- 
- 	try
- 	{
-+		jlong r = (jlong)p->CreatePayComplete(mbstoSTRING(pszId), mbstoSTRING(pszToken));
--		jint r = (jint)p->CreatePayComplete(mbstoSTRING(pszId), mbstoSTRING(pszToken));
- 		env->ReleaseStringUTFChars(Id, pszId);
- 		env->ReleaseStringUTFChars(Token, pszToken);
- 		return r;
-@@ -168,7 +168,7 @@
- 	}
- }
- 
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageFactory_nCreateRequest
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageFactory_nCreateRequest
-   (JNIEnv *env, jobject obj, jstring MsgType)
- {
- 	IDPCIMPL_MessageFactory *p = 0;
-@@ -180,7 +180,7 @@
- 
- 	try
- 	{
-+		jlong r = (jlong)p->CreateRequest(mbstoSTRING(pszMsgType));
--		jint r = (jint)p->CreateRequest(mbstoSTRING(pszMsgType));
- 		env->ReleaseStringUTFChars(MsgType, pszMsgType);
- 		return r;
- 	}
diff --git a/security/saferpay/files/patch-jMessageFactory.h b/security/saferpay/files/patch-jMessageFactory.h
deleted file mode 100644
index caa16eb617b5..000000000000
--- a/security/saferpay/files/patch-jMessageFactory.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- saferpay/jMessageFactory.h.orig	2008-12-19 13:15:44.000000000 +0100
-+++ saferpay/jMessageFactory.h	2008-12-19 13:13:46.000000000 +0100
-@@ -12,7 +12,7 @@
-  * Method:    nVerifyPayConfirm
-  * Signature: (Ljava/lang/String;Ljava/lang/String;)I
-  */
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageFactory_nVerifyPayConfirm
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageFactory_nVerifyPayConfirm
-   (JNIEnv *, jobject, jstring, jstring);
- 
- /*
-@@ -44,7 +44,7 @@
-  * Method:    nCreatePayInit
-  * Signature: ()I
-  */
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageFactory_nCreatePayInit
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageFactory_nCreatePayInit
-   (JNIEnv *, jobject);
- 
- /*
-@@ -52,7 +52,7 @@
-  * Method:    nCreatePayComplete
-  * Signature: (Ljava/lang/String;Ljava/lang/String;)I
-  */
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageFactory_nCreatePayComplete
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageFactory_nCreatePayComplete
-   (JNIEnv *, jobject, jstring Id, jstring Token);
- 
- /*
-@@ -60,7 +60,7 @@
-  * Method:    nCreateRequest
-  * Signature: (Ljava/lang/String;)I
-  */
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageFactory_nCreateRequest
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageFactory_nCreateRequest
-   (JNIEnv *env, jobject obj, jstring MsgType);
- 
- #ifdef __cplusplus
diff --git a/security/saferpay/files/patch-jMessageObject.cpp b/security/saferpay/files/patch-jMessageObject.cpp
deleted file mode 100644
index ff378eec082e..000000000000
--- a/security/saferpay/files/patch-jMessageObject.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- saferpay/jMessageObject.cpp.orig	2008-12-19 13:17:10.000000000 +0100
-+++ saferpay/jMessageObject.cpp	2008-12-19 13:16:25.000000000 +0100
-@@ -30,7 +30,7 @@
- 		IDPJNI_THROW1("MessageObject::Construct(): m_Handle != 0", IDP_E_UNEXPECTED)
- 		return;
- 	}
-+	env->SetIntField(obj, fid, (jlong)CreateMessageObject());
--	env->SetIntField(obj, fid, (jint)CreateMessageObject());
- }
- 
- JNIEXPORT void JNICALL Java_soplex_saferpay_MessageObject_nDestruct
-@@ -169,7 +169,7 @@
- 	}
- }
- 
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageObject_nExecute
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageObject_nExecute
-   (JNIEnv *env, jobject obj)
- {
- 	IDPCIMPL_MessageObject *p;
-@@ -178,7 +178,7 @@
- 
- 	try
- 	{
-+		return (jlong)p->Execute();
--		return (jint)p->Execute();
- 	}
- 	catch(IDP_Exception e)
- 	{
diff --git a/security/saferpay/files/patch-jMessageObject.h b/security/saferpay/files/patch-jMessageObject.h
deleted file mode 100644
index 49726a598436..000000000000
--- a/security/saferpay/files/patch-jMessageObject.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- saferpay/jMessageObject.h.orig	2008-12-19 13:17:21.000000000 +0100
-+++ saferpay/jMessageObject.h	2008-12-19 13:16:20.000000000 +0100
-@@ -52,7 +52,7 @@
-  * Method:    nExecute
-  * Signature: ()I;
-  */
-+JNIEXPORT jlong JNICALL Java_soplex_saferpay_MessageObject_nExecute
--JNIEXPORT jint JNICALL Java_soplex_saferpay_MessageObject_nExecute
-   (JNIEnv *, jobject);
- 
- /*
-
diff --git a/security/saferpay/files/patch-saferpay.c b/security/saferpay/files/patch-saferpay.c
deleted file mode 100644
index 1a936e37777b..000000000000
--- a/security/saferpay/files/patch-saferpay.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- saferpay/saferpay.c.orig	Tue Jan  6 15:12:14 2004
-+++ saferpay/saferpay.c	Tue Jan  6 15:12:28 2004
-@@ -3,7 +3,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "idpapi.h"
- #include "idperrc.h"
- 
diff --git a/security/saferpay/files/patch-saferpay.mk b/security/saferpay/files/patch-saferpay.mk
deleted file mode 100644
index 3ecfef17c65c..000000000000
--- a/security/saferpay/files/patch-saferpay.mk
+++ /dev/null
@@ -1,20 +0,0 @@
---- saferpay/saferpay.mk.orig	Tue Jul 22 16:08:35 2003
-+++ saferpay/saferpay.mk	Tue Jan  6 15:10:05 2004
-@@ -1,13 +1,11 @@
- ####### Compiler, tools and options
--CC	=	gcc
--CXX	=	g++
- 
--CFLAGS	=	-pipe -fPIC -O2
--CXXFLAGS=	-pipe -fPIC -O2
-+CFLAGS		+=	-fPIC
-+CXXFLAGS	+=	-fPIC
- INCPATH	=		
- 
--LINK	=	g++
--LFLAGS	=	-fPIC -ldl
-+LINK	+=	$(CXX) -Lout
-+LFLAGS	+=	-fPIC
- LIBS	=	-lidpapp
- MOC	=	$(QTDIR)/bin/moc
- 
diff --git a/security/saferpay/pkg-descr b/security/saferpay/pkg-descr
deleted file mode 100644
index aa0a9aeb1699..000000000000
--- a/security/saferpay/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Saferpay is a online payment software with P5 API and a
-command line tool.  At the moment it is used in Europe,
-mostly Germany and Switzerland.
-
-The saferpay command line tool offers web shop operators
-all the equipment they need so that they can collect
-payment online quickly and easily on the Internet.
-
-WWW: http://www.saferpay.com/
diff --git a/security/saferpay/pkg-plist b/security/saferpay/pkg-plist
deleted file mode 100644
index 6418bb1416a3..000000000000
--- a/security/saferpay/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-include/idpapi.h
-include/idperrc.h
-lib/libidpapp.so
-lib/libidpapp.so.1
-bin/saferpay
-share/examples/saferpay/settings.template
-@dirrm share/examples/saferpay
diff --git a/security/saferpay/pkg-plist.p5 b/security/saferpay/pkg-plist.p5
deleted file mode 100644
index 6936372b6e2b..000000000000
--- a/security/saferpay/pkg-plist.p5
+++ /dev/null
@@ -1,27 +0,0 @@
-lib/libidpapp.so
-lib/libidpapp.so.1
-bin/saferpay
-share/examples/saferpay/settings.template
-@dirrm share/examples/saferpay
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/ConfigurationSetup.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/ConfigurationSetup.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/soplex/saferpay/ConfigurationSetup.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/MessageFactory.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/MessageFactory.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/soplex/saferpay/MessageFactory.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/MessageObject.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/MessageObject.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/soplex/saferpay/MessageObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject/autosplit.ix
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/../man/man3/soplex::saferpay::MessageFactory.3.gz
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/../man/man3/soplex::saferpay::MessageObject.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/ConfigurationSetup
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageObject
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay/MessageFactory
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex/saferpay
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/soplex
diff --git a/shells/Makefile b/shells/Makefile
index 6085ecd8efc9..57225c07ec30 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -16,7 +16,6 @@
     SUBDIR += fd
     SUBDIR += fish
     SUBDIR += flash
-    SUBDIR += gscommander
     SUBDIR += heirloom-sh
     SUBDIR += ibsh
     SUBDIR += jailkit
diff --git a/shells/gscommander/Makefile b/shells/gscommander/Makefile
deleted file mode 100644
index d8134d7573ff..000000000000
--- a/shells/gscommander/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	gscommander
-PORTVERSION=	0.1
-PORTREVISION=	3
-CATEGORIES=	shells gnustep
-MASTER_SITES=	http://www.nice.ch/~phip/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
-DISTNAME=	GSCommander-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GNUstep simple unix command monitor
-
-DEPRECATED=	Abandonware
-EXPIRATION_DATE=	2012-11-26
-
-LICENSE=	GPLv2
-
-USE_GNUSTEP=	yes
-USE_GNUSTEP_BACK=	yes
-USE_GNUSTEP_BUILD=	yes
-USE_GNUSTEP_INSTALL=	yes
-
-WRKSRC=		${WRKDIR}/GSCommander
-
-.include <bsd.port.mk>
diff --git a/shells/gscommander/distinfo b/shells/gscommander/distinfo
deleted file mode 100644
index c986e7310146..000000000000
--- a/shells/gscommander/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (GSCommander-0.1.tar.gz) = 27856fa4b78273bcfdd2c03d519e3aab5fcda6b867f564ca92253025cd17e7c7
-SIZE (GSCommander-0.1.tar.gz) = 17932
diff --git a/shells/gscommander/pkg-descr b/shells/gscommander/pkg-descr
deleted file mode 100644
index bf4a9cc6b011..000000000000
--- a/shells/gscommander/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-GSCommander is a simple unix command monitor for GNUstep. 
-
-LICENSE: GPL2 or later
-
-WWW: http://www.nice.ch/~phip/softcorner.html#cmdr
diff --git a/shells/gscommander/pkg-plist b/shells/gscommander/pkg-plist
deleted file mode 100644
index c6b5bb57d2db..000000000000
--- a/shells/gscommander/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-GNUstep/Local/Applications/GSCommander.app/GSCommander
-GNUstep/Local/Applications/GSCommander.app/Resources/COPYING
-GNUstep/Local/Applications/GSCommander.app/Resources/GSCommander.desktop
-GNUstep/Local/Applications/GSCommander.app/Resources/GSCommander.tiff
-GNUstep/Local/Applications/GSCommander.app/Resources/GSCommanderInfo.plist
-GNUstep/Local/Applications/GSCommander.app/Resources/Info-gnustep.plist
-GNUstep/Local/Applications/GSCommander.app/Resources/README
-GNUstep/Local/Applications/GSCommander.app/stamp.make
-GNUstep/Local/Tools/GSCommander
-@dirrm GNUstep/Local/Applications/GSCommander.app/Resources
-@dirrm GNUstep/Local/Applications/GSCommander.app
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 1cbf6b9d246e..c32561300502 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1037,7 +1037,6 @@
     SUBDIR += xfsprogs
     SUBDIR += xin
     SUBDIR += xjobs
-    SUBDIR += xloadface
     SUBDIR += xlogmaster
     SUBDIR += xmbmon
     SUBDIR += xorriso
diff --git a/sysutils/xloadface/Makefile b/sysutils/xloadface/Makefile
deleted file mode 100644
index e2cfcc3f8e53..000000000000
--- a/sysutils/xloadface/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Created by: FURUSAWA,Kazuhisa <kazu@jp.freebsd.org>
-# $FreeBSD$
-
-PORTNAME=	xloadface
-PORTVERSION=	1.6.1
-PORTREVISION=	3
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.kazu.kz/freebsd/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Network load monitor for X11
-
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
-
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-11-26
-
-PATCH_STRIP=	-p1
-USE_IMAKE=	yes
-USE_XORG=	ice sm x11 xaw xext xmu xt
-XLOADFACEDIR=	$(LOCALBASE)/lib/X11/xloadface
-
-MAN1=		xloadface.1
-MANLANG=	ja
-
-.include <bsd.port.pre.mk>
-
-pre-build:
-	${LOCALBASE}/bin/nkf -e ${WRKSRC}/xloadface.1 > ${WRKSRC}/xloadface.man
-
-pre-install:
-	${MKDIR} $(XLOADFACEDIR)
-	${INSTALL_DATA} ${WRKSRC}/README $(XLOADFACEDIR)
-	${INSTALL_DATA} ${WRKSRC}/host_org.sample $(XLOADFACEDIR)
-	${MKDIR} $(XLOADFACEDIR)/bigfaces
-	${MKDIR} $(XLOADFACEDIR)/bitmap
-	${MKDIR} $(XLOADFACEDIR)/catfaces
-	${INSTALL_DATA} ${WRKSRC}/bigfaces/* $(XLOADFACEDIR)/bigfaces
-	${INSTALL_DATA} ${WRKSRC}/bitmap/*   $(XLOADFACEDIR)/bitmap
-	${INSTALL_DATA} ${WRKSRC}/catfaces/* $(XLOADFACEDIR)/catfaces
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/xloadface/distinfo b/sysutils/xloadface/distinfo
deleted file mode 100644
index f7ca8b12eccc..000000000000
--- a/sysutils/xloadface/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xloadface-1.6.1.tar.gz) = 319e50ccd4330cf96f511d3e3b978fbef5fc419966e458db575374ac71bc39f4
-SIZE (xloadface-1.6.1.tar.gz) = 27991
diff --git a/sysutils/xloadface/files/patch-01 b/sysutils/xloadface/files/patch-01
deleted file mode 100644
index 8cef45c45e8f..000000000000
--- a/sysutils/xloadface/files/patch-01
+++ /dev/null
@@ -1,10 +0,0 @@
---- Imakefile.orig	Wed Feb 19 10:59:43 1992
-+++ Imakefile	Wed Jan 10 13:17:54 2001
-@@ -10,5 +10,5 @@
- LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
- SYS_LIBRARIES = -lm
- 
--ComplexProgramTarget(xloadface)
--InstallManPage(xloadface.1,$(MANDIR)/xalive.n)
-+ComplexProgramTargetNoMan(xloadface)
-+InstallManPage(xloadface,$(MANPATH)/ja/man1)
diff --git a/sysutils/xloadface/files/patch-02 b/sysutils/xloadface/files/patch-02
deleted file mode 100644
index 65124a746fb8..000000000000
--- a/sysutils/xloadface/files/patch-02
+++ /dev/null
@@ -1,40 +0,0 @@
---- ArrangeBox.c.orig	Tue Apr  2 06:44:19 1991
-+++ ArrangeBox.c	Fri Dec  6 14:27:43 1996
-@@ -69,7 +69,7 @@
- },
- {
- /* box_class fields */
--    /* empty              */	NULL,
-+    /* empty              */	0,
- },
- {
- /* ArrangeBox class fields */
-@@ -194,8 +194,8 @@
- 				       w->core.parent->core.border_width);
- 			XtResizeWindow(w->core.parent);
- 		}
--		XtResizeWidget(w,width,height,w->core.border_width);
--		XtResizeWindow(w);
-+		XtResizeWidget((Widget)w,width,height,w->core.border_width);
-+		XtResizeWindow((Widget)w);
- 	}
- }
- 
-@@ -203,15 +203,13 @@
-  * Insert child method
-  */
- static void
--InsertChild(w,arg,num_args)
-+InsertChild(w)
- Widget w;
--ArgList arg;
--Cardinal *num_args;
- {
- 	ArrangeBoxWidget ab;
- 
- 	ab = (ArrangeBoxWidget)w->core.parent;
--	(*((CompositeClassRec*)XtSuperclass(ab))->composite_class.insert_child)(w,arg,num_args);
-+	(*((CompositeClassRec*)XtSuperclass(ab))->composite_class.insert_child)(w);
- 	RearrangeSize(ab);
- }
- 	
diff --git a/sysutils/xloadface/files/patch-03 b/sysutils/xloadface/files/patch-03
deleted file mode 100644
index d02ff122b7ee..000000000000
--- a/sysutils/xloadface/files/patch-03
+++ /dev/null
@@ -1,29 +0,0 @@
---- LabeledPicture.c.orig	Thu Apr  4 05:36:23 1991
-+++ LabeledPicture.c	Fri Dec  6 14:27:44 1996
-@@ -153,7 +153,7 @@
- 	Window rootwin;
- 	
- 	lp->label_width = XTextWidth(lp->font,lp->label,strlen(lp->label));
--	if (lp->pixmap != NULL && lp->pixmap != AiNullPixmap) {
-+	if (lp->pixmap != 0 && lp->pixmap != AiNullPixmap) {
- 		XGetGeometry(XtDisplay(w),lp->pixmap,
- 			     &rootwin,
- 			     &x,
-@@ -355,7 +355,7 @@
- {
- 	UnSelectIt(w);
- 	if (w->labeled_picture.sensitive) {
--		XtCallCallbacks(w, AiNcallback, (caddr_t)event);
-+		XtCallCallbacks((Widget)w, AiNcallback, (caddr_t)event);
- 	}
- }
- 
-@@ -391,7 +391,7 @@
- 	AdjustSize(w,True);
- 	
- 	if (width != w->core.width || height != w->core.height) {
--		XtResizeWidget(w,
-+		XtResizeWidget((Widget)w,
- 			       w->core.width,
- 			       w->core.height,
- 			       w->core.border_width);
diff --git a/sysutils/xloadface/files/patch-04 b/sysutils/xloadface/files/patch-04
deleted file mode 100644
index aaf6d80287c8..000000000000
--- a/sysutils/xloadface/files/patch-04
+++ /dev/null
@@ -1,65 +0,0 @@
---- LoadFace.c.orig	Fri Jun 12 04:52:31 1992
-+++ LoadFace.c	Fri Dec  6 14:27:44 1996
-@@ -2,6 +2,7 @@
- #include <X11/StringDefs.h>
- #include "LoadFaceP.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <netinet/in.h>
- #include <math.h>
-@@ -47,7 +48,7 @@
- {AiNinterval, AiCInterval, XtRInt, sizeof(int),
- 	 LFOffset(interval), XtRString, (caddr_t)"60"},
- {AiNwhodDirectory, AiCWhodDirectory, XtRString,sizeof(String),
--	 LFOffset(whod_directory), XtRString, (caddr_t)"/usr/spool/rwho"},
-+	 LFOffset(whod_directory), XtRString, (caddr_t)"/var/rwho"},
- {AiNshuffle, AiCShuffle, XtRBoolean,sizeof(Boolean),
- 	 LFOffset(shuffle), XtRString, (caddr_t)"TRUE"},
- {AiNloadBound, AiCLoadBound, AiRLoadBound, sizeof(AiLoadBound),
-@@ -166,7 +167,7 @@
- {
- 	LoadFaceWidget w = (LoadFaceWidget)new;
- 
--	CALL_SUPER(w,expose,(new));
-+	CALL_SUPER(w,expose,(new,NULL,NULL));
- }
- 
- #define HERE(w,tag) (w)->core_class.tag
-@@ -208,14 +209,14 @@
- 		picture = class->faces_data[0].pixmap;
- 	}
- 	AiChangePixmap(w,picture,False,True);
--	CALL_SUPER(new,initialize,(request,new));
-+	CALL_SUPER(new,initialize,(request,new,NULL,NULL));
- 	if (w->load_face.interval > 0) {
- 		if (w->load_face.shuffle)
- 			firstInterval = random()%(w->load_face.interval*2000);
- 		else
- 			firstInterval = w->load_face.interval*1000;
- 		w->load_face.interval_id =
--			XtAppAddTimeOut(XtWidgetToApplicationContext(w),
-+			XtAppAddTimeOut(XtWidgetToApplicationContext((Widget)w),
- 					firstInterval,
- 					updateLoad,
- 					(caddr_t)w);
-@@ -262,7 +263,7 @@
- 		wd.wd_sendtime = wd.wd_recvtime = 0;
- 	AiChangeLoad(w,&wd);
- 	w->load_face.interval_id =
--		XtAppAddTimeOut(XtWidgetToApplicationContext(w),
-+		XtAppAddTimeOut(XtWidgetToApplicationContext((Widget)w),
- 				w->load_face.interval*1000,
- 				updateLoad,
- 				(caddr_t)w);
-@@ -290,8 +291,8 @@
- 		newFace = FACE(w,newload);
- 	AiChangePixmap(w,newFace->pixmap,False,False);
- 
--	if (XtIsRealized(w) && oldload != newload)
--		CALL_SELF(w, expose, (w));
-+	if (XtIsRealized((Widget)w) && oldload != newload)
-+		CALL_SELF(w, expose, (w,NULL,NULL));
- }
- 
- static void
diff --git a/sysutils/xloadface/files/patch-05 b/sysutils/xloadface/files/patch-05
deleted file mode 100644
index cb8a360f1fe5..000000000000
--- a/sysutils/xloadface/files/patch-05
+++ /dev/null
@@ -1,9 +0,0 @@
---- MachineInfo.c.orig	Mon Apr 22 18:44:26 1991
-+++ MachineInfo.c	Fri Dec  6 14:27:44 1996
-@@ -295,5 +295,5 @@
- 			LINE_SKIP(w->machine_info.title_font)+
- 			LINE_SKIP(w->machine_info.load_info_font)*3+
- 			LINE_SKIP(w->machine_info.user_info_font)*nusers(wd);
--	XtResizeWidget(w, w->core.width, h, w->core.border_width);
-+	XtResizeWidget((Widget)w, w->core.width, h, w->core.border_width);
- }
diff --git a/sysutils/xloadface/files/patch-06 b/sysutils/xloadface/files/patch-06
deleted file mode 100644
index 33f503ff4692..000000000000
--- a/sysutils/xloadface/files/patch-06
+++ /dev/null
@@ -1,20 +0,0 @@
---- widgets.c.orig	Tue Feb 18 18:06:34 1992
-+++ widgets.c	Fri Dec  6 14:27:45 1996
-@@ -224,7 +224,7 @@
- 
- 	/***** Popup Info *****/
- 	PopupInfo = XtCreatePopupShell("PopupInfo",transientShellWidgetClass,
--				       Toplevel,NULL,NULL);
-+				       Toplevel,NULL,0);
- 	PopupPane = mkWidget("InfoPane",arrangeBoxWidgetClass,PopupInfo,
- 			     AiNvertNum, 1,
- 			     AiNresizeParent, True,
-@@ -236,7 +236,7 @@
- 
- 	/***** Popup Help *****/
- 	helpScreen = XtCreatePopupShell("Help",transientShellWidgetClass,
--					Toplevel,NULL,NULL);
-+					Toplevel,NULL,0);
- 
- 	addFaces();
- 	adjustWindowSize();
diff --git a/sysutils/xloadface/files/patch-07 b/sysutils/xloadface/files/patch-07
deleted file mode 100644
index 894bd2e7a80b..000000000000
--- a/sysutils/xloadface/files/patch-07
+++ /dev/null
@@ -1,28 +0,0 @@
---- alive.h.orig	Sat Mar 16 01:49:43 1991
-+++ alive.h	Fri May  7 23:36:11 1999
-@@ -1,15 +1,10 @@
- #include	<stdio.h>
-+#include	<sys/types.h>
- 
- #include	<protocols/rwhod.h>
- 
--#include	<sys/types.h>
--#ifdef SYSV
- #include	<dirent.h>
- typedef struct dirent	Directory;
--#else
--#include	<sys/dir.h>
--typedef struct direct	Directory;
--#endif
- 
- #include	<sys/file.h>
- #include	"gmac.h"
-@@ -31,7 +26,7 @@
- #define	SSIZE	sizeof(u_short)
- #define	LSIZE	sizeof(u_long)
- 
--#define	SPOOLDIR	"/usr/spool/rwho"
-+#define	SPOOLDIR	"/var/rwho"
- #define	ORGAN_FILE	"/etc/host_org"
- 
- typedef char	bool;
diff --git a/sysutils/xloadface/files/patch-08 b/sysutils/xloadface/files/patch-08
deleted file mode 100644
index 51f04e9b746c..000000000000
--- a/sysutils/xloadface/files/patch-08
+++ /dev/null
@@ -1,11 +0,0 @@
---- xloadface.1.orig	Mon Apr 22 20:03:17 1991
-+++ xloadface.1	Fri Dec  6 14:27:45 1996
-@@ -104,7 +104,7 @@
- $@%0%k!<%WL>$r>JN,$7$?>l9g$K$O$3$N%0%k!<%W$,I=<($5$l$k!%(J
- .SH FILES
- .TP
--.IR /usr/spool/rwho/whod.* 	$@3F%[%9%H$N>pJs(J
-+.IR /var/rwho/whod.* 	$@3F%[%9%H$N>pJs(J
- .TP
- .IR /etc/host_org 	$@%0%k!<%W5-=R%U%!%$%k(J
- .SH RELATED INFORMATION
diff --git a/sysutils/xloadface/files/patch-widgets.c b/sysutils/xloadface/files/patch-widgets.c
deleted file mode 100644
index 68611d9afed5..000000000000
--- a/sysutils/xloadface/files/patch-widgets.c
+++ /dev/null
@@ -1,46 +0,0 @@
-
------------------------- start of patch ------------------------
---- widgets.c.orig	Fri Apr 29 16:37:58 2005
-+++ widgets.c	Fri Apr 29 16:39:09 2005
-@@ -18,7 +18,7 @@
- #include "LoadFace.h"
- #include "ArrangeBox.h"
- #include "MachineInfo.h"
--#include <varargs.h>
-+#include <stdarg.h>
- #include "version.h"
- #include <math.h>
- #include <X11/Xresource.h>
-@@ -49,7 +49,7 @@
- 
- static void exitDisplay(),popdown(),showHelp(),popdownHelp();
- 
--Widget mkWidget();
-+Widget mkWidget(char* name, ...);
- 
- static XrmOptionDescRec optionTable[] = {
- {"-interval",	"*interval",		XrmoptionSepArg,(caddr_t)NULL},
-@@ -571,11 +571,9 @@
-  *                 resource-name, resource, ... , NULL);
-  */
- Widget
--mkWidget(va_alist)
--va_dcl
-+mkWidget(char* name, ...)
- {
- 	va_list arg;
--	char *name;
- 	WidgetClass class;
- 	Widget parent;
- 	String argname;
-@@ -583,8 +581,7 @@
- 	int n = 0;
- 	Arg args[20];
- 	
--	va_start(arg);
--	name   = va_arg(arg,char*);
-+	va_start(arg, name);
- 	class  = va_arg(arg,WidgetClass);
- 	parent = va_arg(arg,Widget);
- 
------------------------- end of patch ------------------------
diff --git a/sysutils/xloadface/pkg-descr b/sysutils/xloadface/pkg-descr
deleted file mode 100644
index 57aa9e9fa38e..000000000000
--- a/sysutils/xloadface/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-`xloadface' is a network load monitor for X11. This program use the rwhod
-database for display `user' and `CPU load'. 
-
-See README and man page for details. The man page and README are only in
-Japanese for now, but it is easy to use none the less..
-
-Orignal xloadface written by aito@rcais.tohoku.ac.jp .
-This port is done by kazu@jp.freebsd.org .
diff --git a/sysutils/xloadface/pkg-plist b/sysutils/xloadface/pkg-plist
deleted file mode 100644
index 73a594961048..000000000000
--- a/sysutils/xloadface/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/xloadface
-lib/X11/xloadface/README
-lib/X11/xloadface/host_org.sample
-lib/X11/xloadface/bigfaces/busy.icon
-lib/X11/xloadface/bigfaces/crazy.icon
-lib/X11/xloadface/bigfaces/down.icon
-lib/X11/xloadface/bigfaces/fever.icon
-lib/X11/xloadface/bigfaces/heavy.icon
-lib/X11/xloadface/bigfaces/idle.icon
-lib/X11/xloadface/bigfaces/run.icon
-lib/X11/xloadface/bitmap/busy.icon
-lib/X11/xloadface/bitmap/crazy.icon
-lib/X11/xloadface/bitmap/down.icon
-lib/X11/xloadface/bitmap/fever.icon
-lib/X11/xloadface/bitmap/heavy.icon
-lib/X11/xloadface/bitmap/icon.icon
-lib/X11/xloadface/bitmap/idle.icon
-lib/X11/xloadface/bitmap/run.icon
-lib/X11/xloadface/catfaces/busy.icon
-lib/X11/xloadface/catfaces/crazy.icon
-lib/X11/xloadface/catfaces/down.icon
-lib/X11/xloadface/catfaces/fever.icon
-lib/X11/xloadface/catfaces/heavy.icon
-lib/X11/xloadface/catfaces/idle.icon
-lib/X11/xloadface/catfaces/run.icon
-@dirrm lib/X11/xloadface/bigfaces
-@dirrm lib/X11/xloadface/bitmap
-@dirrm lib/X11/xloadface/catfaces
-@dirrm lib/X11/xloadface
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index c39212bf0f93..f3f37de6ae93 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -136,7 +136,6 @@
     SUBDIR += plwm
     SUBDIR += pwm
     SUBDIR += qlwm
-    SUBDIR += qvwm
     SUBDIR += ratmen
     SUBDIR += ratmenu
     SUBDIR += ratpoison
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
deleted file mode 100644
index bf975ee3939b..000000000000
--- a/x11-wm/qvwm/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
-# $FreeBSD$
-
-PORTNAME=	qvwm
-PORTVERSION=	1.1.12
-PORTREVISION=	9
-CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
-		ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Windows 95/98/NT like window manager for X11
-
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2012-11-26
-
-USE_XORG=	x11 ice sm xext xpm xscrnsaver
-USE_GNOME=	esound imlib
-GNU_CONFIGURE=	yes
-
-MAN1=		qvwm.1x
-
-.include <bsd.port.mk>
diff --git a/x11-wm/qvwm/distinfo b/x11-wm/qvwm/distinfo
deleted file mode 100644
index f223e62ca598..000000000000
--- a/x11-wm/qvwm/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (qvwm-1.1.12.tar.gz) = b8b25fcf78f07988cf6f0fdd48741c34cba9973daa4335e4e2045eb26c9f3140
-SIZE (qvwm-1.1.12.tar.gz) = 434618
diff --git a/x11-wm/qvwm/files/patch-aa b/x11-wm/qvwm/files/patch-aa
deleted file mode 100644
index f4cfbd2de27b..000000000000
--- a/x11-wm/qvwm/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/audiodev_oss.h.orig	Sat Sep  7 18:13:06 2002
-+++ ./src/audiodev_oss.h	Sat Sep  7 18:13:12 2002
-@@ -33,7 +33,7 @@
- #endif
- 
- #ifdef __FreeBSD__
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- 
- // set endian
diff --git a/x11-wm/qvwm/pkg-descr b/x11-wm/qvwm/pkg-descr
deleted file mode 100644
index 8b1f13b4fd6b..000000000000
--- a/x11-wm/qvwm/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Qvwm, the most Windows 95/98/NT like window manager for X11.
-q for qvwm means number 9, v means 5 in roman.
-
-This is a standalone window manager, not patched ontop of another.
-Qvwm requires the Imlib library and shape extension.
-
-WWW: http://www.csg.is.titech.ac.jp/~kourai/qvwm/download-en.html
diff --git a/x11-wm/qvwm/pkg-plist b/x11-wm/qvwm/pkg-plist
deleted file mode 100644
index 23db8d40676a..000000000000
--- a/x11-wm/qvwm/pkg-plist
+++ /dev/null
@@ -1,46 +0,0 @@
-bin/qvwm
-%%DATADIR%%/clouds.qvwm-theme
-%%DATADIR%%/default.qvwm-theme
-%%DATADIR%%/french.qvwmrc
-%%DATADIR%%/german.qvwmrc
-%%DATADIR%%/images/clouds.xpm
-%%DATADIR%%/images/clouds2.xpm
-%%DATADIR%%/images/def16.ani
-%%DATADIR%%/images/def32.ani
-%%DATADIR%%/images/emacs16.ani
-%%DATADIR%%/images/emacs32.ani
-%%DATADIR%%/images/exit32.ani
-%%DATADIR%%/images/find32.ani
-%%DATADIR%%/images/help32.xpm
-%%DATADIR%%/images/icon16.ani
-%%DATADIR%%/images/icon32.ani
-%%DATADIR%%/images/logo_clouds.xpm
-%%DATADIR%%/images/logo_os2.xpm
-%%DATADIR%%/images/netscape16.ani
-%%DATADIR%%/images/netscape32.ani
-%%DATADIR%%/images/quit32.ani
-%%DATADIR%%/images/qvwmdesk.ani
-%%DATADIR%%/images/run32.ani
-%%DATADIR%%/images/setting32.ani
-%%DATADIR%%/images/space.ani
-%%DATADIR%%/images/space2.ani
-%%DATADIR%%/images/taskbar16.ani
-%%DATADIR%%/images/xcalc16.xpm
-%%DATADIR%%/images/xcalc32.ani
-%%DATADIR%%/images/xeyes16.ani
-%%DATADIR%%/images/xeyes32.ani
-%%DATADIR%%/images/xterm16.xpm
-%%DATADIR%%/images/xterm32.ani
-%%DATADIR%%/images/xv16.xpm
-%%DATADIR%%/images/xv32.xpm
-%%DATADIR%%/italian.qvwmrc
-%%DATADIR%%/kanji.qvwmrc
-%%DATADIR%%/korean.qvwmrc
-%%DATADIR%%/light.qvwmrc
-%%DATADIR%%/portuguese.qvwmrc
-%%DATADIR%%/sounds/chimes.wav
-%%DATADIR%%/space.qvwm-theme
-%%DATADIR%%/system.qvwmrc
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/sounds
-@dirrm %%DATADIR%%