- remove broken/expired ports@ ports

Approved by: portmgr (miwi) audio/ccaudio||2010-01-18|Has expired: has been broken for 4 months audio/py-libmpdclient||2010-01-18|Has expired: has been broken for 3 months chinese/gbk2uni||2010-01-18|Has expired: has been broken for 6 months chinese/iiimf-le-xcin||2010-01-18|Has expired: has been broken for 3 months devel/adabindx||2010-01-18|Has expired: has been broken for 3 months devel/agide||2010-01-18|Has expired: has been broken for 6 months devel/asis||2010-01-18|Has expired: has been broken for 3 months devel/callgrind||2010-01-18|Has expired: Included in devel/valgrind devel/florist||2010-01-18|Has expired: has been broken for 3 months editors/xml2rfc-xxe||2010-01-18|Has expired: has been broken for 4 months graphics/gephex||2010-01-18|Has expired: has been broken for 3 months graphics/irit||2010-01-18|Has expired: has been broken for 3 months graphics/pixieplus||2010-01-18|Has expired: has been broken for 6 months japanese/expect||2010-01-18|Has expired: has been broken for 3 months lang/pnetc||2010-01-18|Has expired: has been broken for 5 months mail/libnewmail||2010-01-18|Has expired: has been broken for 3 months net-mgmt/flowscan||2010-01-18|Has expired: has been broken for 5 months net/astmanproxy||2010-01-18|Has expired: has been broken for 3 months palm/prc-tools||2010-01-18|Has expired: has been broken for 4 months print/latex-msc||2010-01-18|Has expired: has been broken for 3 months science/xloops-ginac||2010-01-18|Has expired: has been broken for 3 months shells/bush||2010-01-18|Has expired: has been broken for 3 months textproc/iiimf-gnome-im-switcher||2010-01-18|Has expired: has been broken for 4 months textproc/iiimf-gtk||2010-01-18|Has expired: has been broken for 3 months x11-toolkits/gtkada-devel||2010-01-18|Has expired: has been broken for 3 months x11-toolkits/gtkada||2010-01-18|Has expired: has been broken for 3 months x11-wm/ion-2||2010-01-18|Has expired: has been broken for 4 months
author: pgollucci <pgollucci@FreeBSD.org> 2010-01-18 06:46:44 +0000
committer: pgollucci <pgollucci@FreeBSD.org> 2010-01-18 06:46:44 +0000
commit: 21623aab02861d38823c01e555e67680543631b5 (patch)
tree: df1d5873daf262392584db897ee951887d6adbc2
parent: 28b2532f6a610d812f7f05afc483e035f72cb640 (diff)
download: FreeBSD-ports-21623aab02861d38823c01e555e67680543631b5.zip
FreeBSD-ports-21623aab02861d38823c01e555e67680543631b5.tar.gz
211 files changed, 27 insertions, 15003 deletions
diff --git a/MOVED b/MOVED
index e77c73a..9e4a935 100644
--- a/MOVED
+++ b/MOVED
@@ -4257,3 +4257,30 @@ devel/cl-asdf-sbcl||2010-01-12|lang/sbcl has a bundled asdf version
 emulators/virtualbox|emulators/virtualbox-ose|2010-01-13|Renamed and split into two components
 devel/gold|devel/binutils|2010-01-13|part of binutils
 shells/tcsh-bofh||2010-01-15|Removed
+audio/ccaudio||2010-01-18|Has expired: has been broken for 4 months
+audio/py-libmpdclient||2010-01-18|Has expired: has been broken for 3 months
+chinese/gbk2uni||2010-01-18|Has expired: has been broken for 6 months
+chinese/iiimf-le-xcin||2010-01-18|Has expired: has been broken for 3 months
+devel/adabindx||2010-01-18|Has expired: has been broken for 3 months
+devel/agide||2010-01-18|Has expired: has been broken for 6 months
+devel/asis||2010-01-18|Has expired: has been broken for 3 months
+devel/callgrind||2010-01-18|Has expired: Included in devel/valgrind
+devel/florist||2010-01-18|Has expired: has been broken for 3 months
+editors/xml2rfc-xxe||2010-01-18|Has expired: has been broken for 4 months
+graphics/gephex||2010-01-18|Has expired: has been broken for 3 months
+graphics/irit||2010-01-18|Has expired: has been broken for 3 months
+graphics/pixieplus||2010-01-18|Has expired: has been broken for 6 months
+japanese/expect||2010-01-18|Has expired: has been broken for 3 months
+lang/pnetc||2010-01-18|Has expired: has been broken for 5 months
+mail/libnewmail||2010-01-18|Has expired: has been broken for 3 months
+net-mgmt/flowscan||2010-01-18|Has expired: has been broken for 5 months
+net/astmanproxy||2010-01-18|Has expired: has been broken for 3 months
+palm/prc-tools||2010-01-18|Has expired: has been broken for 4 months
+print/latex-msc||2010-01-18|Has expired: has been broken for 3 months
+science/xloops-ginac||2010-01-18|Has expired: has been broken for 3 months
+shells/bush||2010-01-18|Has expired: has been broken for 3 months
+textproc/iiimf-gnome-im-switcher||2010-01-18|Has expired: has been broken for 4 months
+textproc/iiimf-gtk||2010-01-18|Has expired: has been broken for 3 months
+x11-toolkits/gtkada-devel||2010-01-18|Has expired: has been broken for 3 months
+x11-toolkits/gtkada||2010-01-18|Has expired: has been broken for 3 months
+x11-wm/ion-2||2010-01-18|Has expired: has been broken for 4 months
diff --git a/audio/Makefile b/audio/Makefile
index 46006a2..73c3132 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -85,7 +85,6 @@
     SUBDIR += cantus
     SUBDIR += cantus_3
     SUBDIR += caps-plugins
-    SUBDIR += ccaudio
     SUBDIR += ccaudio2
     SUBDIR += cd-console
     SUBDIR += cd-discid
@@ -586,7 +585,6 @@
     SUBDIR += py-flac
     SUBDIR += py-id3
     SUBDIR += py-karaoke
-    SUBDIR += py-libmpdclient
     SUBDIR += py-libtunepimp
     SUBDIR += py-mad
     SUBDIR += py-mpd
diff --git a/audio/ccaudio/Makefile b/audio/ccaudio/Makefile
deleted file mode 100644
index cfbec05..0000000
--- a/audio/ccaudio/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	ccaudio
-# Date created:				26 July 2000
-# Whom:					David Sugar <dyfet@gnu.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ccaudio
-PORTVERSION=	1.2.0
-CATEGORIES=	audio
-MASTER_SITES=	SF/gnutelephony/production/1.2.16
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	C++ class framework for manipulating audio files
-
-LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp
-
-BROKEN=		Does not build with libtool 2.2.
-DEPRECATED=	has been broken for 4 months
-EXPIRATION_DATE=2010-01-08
-
-USE_AUTOTOOLS=	libtool:22
-USE_GNOME=	gnometarget
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|<stdint\.h>|<stdlib.h>|g' ${WRKSRC}/src/dtmf.cpp
-	@${REINPLACE_CMD} -e \
-		's|@CXXFLAGS@|& $$(g_711_CXXFLAGS)|' ${WRKSRC}/dso/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/audio/ccaudio/distinfo b/audio/ccaudio/distinfo
deleted file mode 100644
index 97e3a80..0000000
--- a/audio/ccaudio/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ccaudio-1.2.0.tar.gz) = 919210cf0d917fbb7813d2cbf2c1e941
-SHA256 (ccaudio-1.2.0.tar.gz) = 6805fe04a3281fbcc66d247f63f6def5db042c7cf55fd7a5b3b783de4999c387
-SIZE (ccaudio-1.2.0.tar.gz) = 343071
diff --git a/audio/ccaudio/files/patch-src-audio.h b/audio/ccaudio/files/patch-src-audio.h
deleted file mode 100644
index 9ed4e5c..0000000
--- a/audio/ccaudio/files/patch-src-audio.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/audio.h.orig	2008-04-20 13:44:11.457927908 +0200
-+++ src/audio.h	2008-04-20 13:45:31.343228414 +0200
-@@ -53,6 +53,10 @@
- namespace ost {
- #endif
- 
-+#ifndef CCXX_CLASS_EXPORT
-+#define CCXX_CLASS_EXPORT __EXPORT
-+#endif
-+
- #define	AUDIO_SIGNED_LINEAR_RAW	1
- #define	AUDIO_LINEAR_CONVERSION 1
- #define	AUDIO_CODEC_MODULES	1
diff --git a/audio/ccaudio/files/patch-src-audiofile.cpp b/audio/ccaudio/files/patch-src-audiofile.cpp
deleted file mode 100644
index 090cbc8..0000000
--- a/audio/ccaudio/files/patch-src-audiofile.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/audiofile.cpp.orig	Mon Jul 31 17:13:02 2006
-+++ src/audiofile.cpp	Mon Jul 31 17:13:20 2006
-@@ -38,6 +38,8 @@
- // whether to permit this exception to apply to your modifications.
- // If you do not wish that, delete this exception notice.  
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <cc++/config.h>
- #include <cc++/strchar.h>
- #include <cc++/export.h>
diff --git a/audio/ccaudio/pkg-descr b/audio/ccaudio/pkg-descr
deleted file mode 100644
index b98289e..0000000
--- a/audio/ccaudio/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-ccaudio offers a portable framework for developing applications which
-access audio files.  This library is optimized for DSP frame presentation
-and for merging audio from multiple sources.  Support is provided for many
-common and popular sound file formats such as .au, .wav/RIFF, etc.
-
-WWW: http://www.gnutelephony.org/
diff --git a/audio/ccaudio/pkg-plist b/audio/ccaudio/pkg-plist
deleted file mode 100644
index b97f318..0000000
--- a/audio/ccaudio/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-include/cc++2/cc++/audio.h
-lib/ccaudio1/g.711
-lib/libccaudio1-1.2.so
-lib/libccaudio1-1.2.so.0
-lib/libccaudio1.a
-lib/libccaudio1.la
-lib/libccaudio1.so
-@dirrmtry include/cc++2/cc++
-@dirrmtry include/cc++2
-@dirrmtry lib/ccaudio1
diff --git a/audio/py-libmpdclient/Makefile b/audio/py-libmpdclient/Makefile
deleted file mode 100644
index ea4c58b..0000000
--- a/audio/py-libmpdclient/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	py-libmpdclient
-# Date created:				Sat Jan 31 2004
-# Whom:				Tim Hemel <tim@n2it.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libmpdclient
-PORTVERSION=	0.10.0
-CATEGORIES=	audio python
-MASTER_SITES=	http://mercury.chem.pitt.edu/~shank/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	py-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Python bindings for libmpdclient
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-.include <bsd.port.mk>
diff --git a/audio/py-libmpdclient/distinfo b/audio/py-libmpdclient/distinfo
deleted file mode 100644
index 896b96a..0000000
--- a/audio/py-libmpdclient/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (py-libmpdclient-0.10.0.tar.gz) = 3a26540b7e057f23187b56e85dc82f95
-SHA256 (py-libmpdclient-0.10.0.tar.gz) = fad4e6ca8e9e2a9e4bcddc96194db69827164f65b8a35cb326d0c8cd3a870238
-SIZE (py-libmpdclient-0.10.0.tar.gz) = 19020
diff --git a/audio/py-libmpdclient/pkg-descr b/audio/py-libmpdclient/pkg-descr
deleted file mode 100644
index c691a63..0000000
--- a/audio/py-libmpdclient/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Music Player Daemon (MPD) allows remote access for playing music
-(MP3's, Ogg's, and Flac's) and managing playlists.
-The design focus is on integrating a computer into a stereo system
-that provides control for music playback over a local network.
-
-py-libmpdclient is a library to aid in rapid client development for
-the Python programming language.
-
-WWW:    http://www.musicpd.org/py-libmpdclient.shtml
diff --git a/audio/py-libmpdclient/pkg-plist b/audio/py-libmpdclient/pkg-plist
deleted file mode 100644
index a64974e..0000000
--- a/audio/py-libmpdclient/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PYTHON_SITELIBDIR%%/mpdclient.py
-%%PYTHON_SITELIBDIR%%/mpdclient.pyc
-%%PYTHON_SITELIBDIR%%/mpdclient.pyo
diff --git a/chinese/Makefile b/chinese/Makefile
index e3e5f59..ab65c47 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -44,7 +44,6 @@
     SUBDIR += fqterm
     SUBDIR += gb2jis
     SUBDIR += gb2ps
-    SUBDIR += gbk2uni
     SUBDIR += gbscript
     SUBDIR += gcin
     SUBDIR += gcin-devel
@@ -56,7 +55,6 @@
     SUBDIR += ibus-pinyin
     SUBDIR += iiimf-le-newpy
     SUBDIR += iiimf-le-ude
-    SUBDIR += iiimf-le-xcin
     SUBDIR += irssi
     SUBDIR += jis2gb
     SUBDIR += joe
diff --git a/chinese/gbk2uni/Makefile b/chinese/gbk2uni/Makefile
deleted file mode 100644
index e293ef3..0000000
--- a/chinese/gbk2uni/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection Makefile for:	zh-gbk2uni
-# Date created:        09 April 2006
-# Whom:                Yuan, Jue (yuanjue@yuanjue.net)
-#
-# $FreeBSD$
-#
-
-PORTNAME=		gbk2uni
-PORTVERSION=		0.22
-CATEGORIES=		chinese converters
-MASTER_SITES=		http://www.yuanjue.net/download/
-PKGNAMEPREFIX=		zh-
-
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		TeX applet used to generate correct Chinese PDF bookmarks
-
-BROKEN=	does not fetch
-DEPRECATED=	has been broken for 6 months
-EXPIRATION_DATE=2010-01-08
-
-PLIST_FILES=		bin/gbk2uni
-
-.include <bsd.port.mk>
diff --git a/chinese/gbk2uni/distinfo b/chinese/gbk2uni/distinfo
deleted file mode 100644
index 8a51879..0000000
--- a/chinese/gbk2uni/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gbk2uni-0.22.tar.gz) = 67b82ea15e68895f8150284a095586da
-SHA256 (gbk2uni-0.22.tar.gz) = 2565641bfd0f7b6253b04338739c16f84e58ae8e739ed2b9a93981ef4af42dd4
-SIZE (gbk2uni-0.22.tar.gz) = 69551
diff --git a/chinese/gbk2uni/pkg-descr b/chinese/gbk2uni/pkg-descr
deleted file mode 100644
index 3a36a35..0000000
--- a/chinese/gbk2uni/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-gbk2uni is a command-line applet for TeX writing which is
-used to generate correct PDF bookmark that includes
-Chinese characters. It transforms GBK characters in
-.out file to unicode code.
diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile
deleted file mode 100644
index 9fa595a..0000000
--- a/chinese/iiimf-le-xcin/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	iiimf-le-xcin
-# Date created:		2004-09-09
-# Whom:			Kuang-che Wu <kcwu@csie.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	iiimf-le-xcin
-PORTVERSION=	0.1.7
-PORTREVISION=	5
-CATEGORIES=	chinese textproc
-MASTER_SITES=	http://people.redhat.com/llch/iiimf-xcin/${PORTVERSION}/
-EXTRACT_SUFX=	-11.src.rpm
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	IIIMF xcin language engine, a traditional Chinese input method
-
-EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_XORG=	x11 xproto
-WRKSRC=		${WRKDIR}/iiimf-xcin
-USE_BZIP2=	yes
-USE_GNOME=	libxml2
-USE_AUTOTOOLS=	automake:19 autoheader:262 autoconf:262 libtool:22
-AUTOMAKE_ARGS=	--add-missing
-
-do-extract:
-	${MKDIR} ${WRKDIR}
-	cd ${WRKDIR} && \
-	${LOCALBASE}/bin/rpm2cpio.pl ${DISTDIR}/${DISTFILES} | \
-	${CPIO} -iud
-	cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	${WRKDIR}/${DISTNAME}.tar.bz2 ${EXTRACT_AFTER_ARGS}
-
-post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/iiim,g" \
-		${WRKSRC}/acfiles/im_common.m4 \
-		${WRKSRC}/src/cin2tab/constant.h \
-		${WRKSRC}/src/xmlconf.c \
-		${WRKSRC}/xcin.xml.conf
-
-pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I acfiles
-
-.include <bsd.port.mk>
diff --git a/chinese/iiimf-le-xcin/distinfo b/chinese/iiimf-le-xcin/distinfo
deleted file mode 100644
index a01ab19..0000000
--- a/chinese/iiimf-le-xcin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (iiimf-le-xcin-0.1.7-11.src.rpm) = 4b94afa219a3a6e20ba36db80b0f9747
-SHA256 (iiimf-le-xcin-0.1.7-11.src.rpm) = cdbaf0282d03d95a6ed660c3f352d7ad6a783dc5ecbd3fd25c2704e2c05fff5f
-SIZE (iiimf-le-xcin-0.1.7-11.src.rpm) = 1330855
diff --git a/chinese/iiimf-le-xcin/files/patch-acfiles_check_sys.m4 b/chinese/iiimf-le-xcin/files/patch-acfiles_check_sys.m4
deleted file mode 100644
index ca7c60c..0000000
--- a/chinese/iiimf-le-xcin/files/patch-acfiles_check_sys.m4
+++ /dev/null
@@ -1,36 +0,0 @@
---- acfiles/check_sys.m4.orig	Wed Dec 10 12:42:54 2003
-+++ acfiles/check_sys.m4	Fri Sep 10 00:33:55 2004
-@@ -73,6 +73,11 @@
- ## Checks for thread library.
- 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
- 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
-+
-+	case "${target}" in
-+		*freebsd*) HAVE_LIBPTHREAD="yes";;
-+	esac
-+
- 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
- 		HAVE_THREAD="pthread"
- 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
-@@ -194,8 +199,6 @@
- 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
- 		;;
- 	    *freebsd*)
--		THREAD_LDFLAGS="-pthread"
--		PTHREAD_LIBS=""
- 		;;
- 	esac
- 
-@@ -245,9 +248,9 @@
- 	    *solaris*@cc:*)
- 		THREAD_CXX_CFLAGS="-mt"
- 		;;
--	    *freebsd*@gcc:*)
--		THREAD_LDFLAGS="-pthread"
--		THREAD_LIBS=""
-+ 	    *freebsd*)
-+ 		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
-+ 		THREAD_LIBS="${PTHREAD_LIBS}"
- 		;;
- 	    *linux*)
- 		THREAD_CXX_CFLAGS="${THREAD_CXX_CFLAGS} -D_SVID_SOURCE -D_BSD_SOURCE"
diff --git a/chinese/iiimf-le-xcin/files/patch-acfiles_im_common.m4 b/chinese/iiimf-le-xcin/files/patch-acfiles_im_common.m4
deleted file mode 100644
index a0bd33b..0000000
--- a/chinese/iiimf-le-xcin/files/patch-acfiles_im_common.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- acfiles/im_common.m4.orig	Wed May 25 18:14:16 2005
-+++ acfiles/im_common.m4	Wed May 25 18:14:23 2005
-@@ -11,7 +11,7 @@
- 
- 	IMDIR="/usr/lib/im"
- 	IMBINDIR=${IMDIR}
--	IM_LEIFDIR="${IMDIR}/leif"
-+	IM_LEIFDIR="${IMDIR}/le/xcin"
- 	IM_LOCALEDIR="${IMDIR}/locale"
- 	IM_TOPDIR='$(top_srcdir)'/${TOPDIR}
- 	IM_INCLUDEDIR="${IM_TOPDIR}/include"
diff --git a/chinese/iiimf-le-xcin/files/patch-src_Makefile.am b/chinese/iiimf-le-xcin/files/patch-src_Makefile.am
deleted file mode 100644
index 0e5c6a2..0000000
--- a/chinese/iiimf-le-xcin/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/Makefile.am.orig	Wed May 25 20:10:15 2005
-+++ src/Makefile.am	Wed May 25 20:11:40 2005
-@@ -2,12 +2,12 @@
- 
- LE_FILES = xcin.so
- 
--libdir = $(prefix)/lib/im/leif
-+libdir = $(prefix)/lib/iiim/le/xcin
- 
- xcin_la_CFLAGS = $(SHLIBCFLAGS) \
- 	$(THREAD_CXX_CFLAGS) \
- 	-DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
--	-I$(IM_INCLUDEDIR)/iml -I$(XML_CFLAGS)
-+	-I$(IM_INCLUDEDIR)/iml $(XML_CFLAGS) $(X_CFLAGS)
- 
- xcin_la_LDFLAGS = \
- 	-shared -module -rpath \
diff --git a/chinese/iiimf-le-xcin/files/patch-src_cin2tab_Makefile.am b/chinese/iiimf-le-xcin/files/patch-src_cin2tab_Makefile.am
deleted file mode 100644
index 069ee44..0000000
--- a/chinese/iiimf-le-xcin/files/patch-src_cin2tab_Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/cin2tab/Makefile.am.orig	Wed May 25 19:57:29 2005
-+++ src/cin2tab/Makefile.am	Wed May 25 19:57:06 2005
-@@ -1,5 +1,6 @@
- bin_PROGRAMS = cin2tab
- 
-+cin2tab_CPPFLAGS = $(X_CFLAGS)
- cin2tab_SOURCES = charcode.c cin2tab.c gencin.c keymap.c syscin.c xcin_rc.c xcintool/check_file.c xcintool/open_data.c xcintool/snprintf.c xcintool/check_version.c xcintool/open_file.c xcintool/stable_sort.c xcintool/get_line.c xcintool/perr.c xcintool/xcin_malloc.c xcintool/get_word.c xcintool/set_locale.c
- 
- install-binPROGRAMS:
diff --git a/chinese/iiimf-le-xcin/files/patch-src_debugInfo.c b/chinese/iiimf-le-xcin/files/patch-src_debugInfo.c
deleted file mode 100644
index 6c869be..0000000
--- a/chinese/iiimf-le-xcin/files/patch-src_debugInfo.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/debugInfo.c.orig	Mon Aug 16 08:18:25 2004
-+++ src/debugInfo.c	Thu Oct 14 00:46:26 2004
-@@ -12,9 +12,9 @@
- 
- void debug(const char *format, ...)
- {
-+    va_list args;
-     if(!isDebugMode()) return;
- 
--    va_list args;
-     va_start(args, format);
-     vfprintf(stderr, format, args);
-     fprintf(stderr, "\n");
diff --git a/chinese/iiimf-le-xcin/files/patch-src_key_event.c b/chinese/iiimf-le-xcin/files/patch-src_key_event.c
deleted file mode 100644
index 1c09db0b..0000000
--- a/chinese/iiimf-le-xcin/files/patch-src_key_event.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/key_event.c.orig	Mon Aug 16 08:40:30 2004
-+++ src/key_event.c	Thu Oct 14 00:51:11 2004
-@@ -140,6 +140,7 @@
-     
-     int i;
-     int index;
-+    UTFCHAR buf;
- 
-     IMKeyEventStruct *k = (IMKeyEventStruct *) keylist->keylist;
-     MyDataPerSession *session_data = (MyDataPerSession *) s->specific_data;
-@@ -289,7 +290,7 @@
- 
-         /* lock candidate if numbers are not keyname */
-         /* XXX fix in v.2 on not only checking '1' */
--        UTFCHAR buf = (UTFCHAR)UTF8toUnicode((wchar_t)session_data->cf->header.keyname[key2code('1')].wch);
-+        buf = (UTFCHAR)UTF8toUnicode((wchar_t)session_data->cf->header.keyname[key2code('1')].wch);
-         if (!buf)
-         {
-             session_data->luc_commit = True;
diff --git a/chinese/iiimf-le-xcin/files/patch-src_xmlconf.c b/chinese/iiimf-le-xcin/files/patch-src_xmlconf.c
deleted file mode 100644
index c511072..0000000
--- a/chinese/iiimf-le-xcin/files/patch-src_xmlconf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/xmlconf.c.orig	Thu Oct 14 00:54:03 2004
-+++ src/xmlconf.c	Thu Oct 14 00:55:28 2004
-@@ -3,9 +3,9 @@
- void
- debugPrintLangIM (langim *langIM) {
- 
--    if(!isDebugMode()) return;
--    
-     imnodes *node;
-+    
-+    if(!isDebugMode()) return;
-     
-     if(langIM->lang)
-         printf("lang: %s\n", langIM->lang);
diff --git a/chinese/iiimf-le-xcin/pkg-descr b/chinese/iiimf-le-xcin/pkg-descr
deleted file mode 100644
index 95a3c7c..0000000
--- a/chinese/iiimf-le-xcin/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-A IIIMF language engine which ported from a popular traditional chinese
-input method, xcin, which was written using XIM protocol. It is now
-includes following input methods:
-    CangJie
-    Simplex
-    Phone
-    PinYin
-    NoTonePinYin
-    Cantonese PinYin
-    Array
-    EZ
-    Telecode
-
-WWW:	http://tciiimf.sourceforge.net/
diff --git a/chinese/iiimf-le-xcin/pkg-plist b/chinese/iiimf-le-xcin/pkg-plist
deleted file mode 100644
index a5838c6..0000000
--- a/chinese/iiimf-le-xcin/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-lib/iiim/le/xcin/xcin.a
-lib/iiim/le/xcin/xcin.la
-lib/iiim/le/xcin/xcin.so
-lib/iiim/le/xcin/xcin.so.0
-lib/iiim/locale/zh_TW/xcin/cin2tab
-lib/iiim/locale/zh_TW/xcin/xcin.xml.conf
-lib/iiim/locale/zh_TW/xcin/tab/array30.tab
-lib/iiim/locale/zh_TW/xcin/tab/cj.tab
-lib/iiim/locale/zh_TW/xcin/tab/cj5.tab
-lib/iiim/locale/zh_TW/xcin/tab/ez.tab
-lib/iiim/locale/zh_TW/xcin/tab/jyutping0.tab
-lib/iiim/locale/zh_TW/xcin/tab/phone.tab
-lib/iiim/locale/zh_TW/xcin/tab/pinyin.tab
-lib/iiim/locale/zh_TW/xcin/tab/pinyin0.tab
-lib/iiim/locale/zh_TW/xcin/tab/simplex.tab
-lib/iiim/locale/zh_TW/xcin/tab/simplex5.tab
-lib/iiim/locale/zh_TW/xcin/tab/sys.tab
-lib/iiim/locale/zh_TW/xcin/tab/telecode.tab
-@dirrm lib/iiim/locale/zh_TW/xcin/tab
-@dirrm lib/iiim/locale/zh_TW/xcin
-@dirrmtry lib/iiim/locale/zh_TW
-@dirrmtry lib/iiim/locale
-@dirrmtry lib/iiim/le/xcin
-@dirrmtry lib/iiim/le
diff --git a/devel/Makefile b/devel/Makefile
index b8d4e68..f007cab 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -20,7 +20,6 @@
     SUBDIR += acovea-gtk
     SUBDIR += acpicatools
     SUBDIR += activitymail
-    SUBDIR += adabindx
     SUBDIR += adabooch
     SUBDIR += adabooch-doc-html
     SUBDIR += adacurses
@@ -29,7 +28,6 @@
     SUBDIR += adocman
     SUBDIR += aegis
     SUBDIR += afay
-    SUBDIR += agide
     SUBDIR += aifad
     SUBDIR += alabastra
     SUBDIR += ald
@@ -52,7 +50,6 @@
     SUBDIR += aros-sdk
     SUBDIR += as31
     SUBDIR += asdlgen
-    SUBDIR += asis
     SUBDIR += asis-gpl
     SUBDIR += asl
     SUBDIR += asmutils
@@ -143,7 +140,6 @@
     SUBDIR += c_c++_reference
     SUBDIR += c_parser
     SUBDIR += calibrator
-    SUBDIR += callgrind
     SUBDIR += cbind
     SUBDIR += cbrowser
     SUBDIR += cc65
@@ -374,7 +370,6 @@
     SUBDIR += flexdock
     SUBDIR += flexjson
     SUBDIR += flick
-    SUBDIR += florist
     SUBDIR += florist-gpl
     SUBDIR += flowdesigner
     SUBDIR += flyspray
diff --git a/devel/adabindx/Makefile b/devel/adabindx/Makefile
deleted file mode 100644
index 11e229c..0000000
--- a/devel/adabindx/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:   adabindx
-# Date created:        23 December 2002
-# Whom:                David Holm <david@realityrift.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	adabindx
-PORTVERSION=	0.7.2
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	http://home.arcor.de/hfvogt/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An Ada-binding to the X Window System and *tif
-
-BUILD_DEPENDS=	gnatmake:${PORTSDIR}/lang/gnat
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_MOTIF=	yes
-USE_XORG=	x11
-
-post-patch:
-#	@mv ${WRKSRC}/lib ${WRKSRC}/src
-
-#do-install:
-#	@${MKDIR} ${LOCALBASE}/lib/adabindx
-#	@(for i in `cat pkg-plist|grep "lib/adabindx"|grep -v dirrm|sed "s/lib\/adabindx\///"`; do \
-#		${INSTALL_DATA} ${WRKSRC}/lib/$${i} ${PREFIX}/lib/adabindx; \
-#	done)
-#
-#	@${MKDIR} ${LOCALBASE}/share/adabindx
-#	@(for i in `cat pkg-plist|grep "share/adabindx"|grep -v dirrm|sed "s/share\/adabindx\///"`; do \
-#		${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/share/adabindx; \
-#	done)
-
-.include <bsd.port.mk>
diff --git a/devel/adabindx/distinfo b/devel/adabindx/distinfo
deleted file mode 100644
index c37c189..0000000
--- a/devel/adabindx/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (adabindx-0.7.2.tar.gz) = 0792385341fa298909a69a379bdc1b62
-SHA256 (adabindx-0.7.2.tar.gz) = ecadec86442e74a561d82c6e1353b67961cc83b2a9b015304a84db140a093a3b
-SIZE (adabindx-0.7.2.tar.gz) = 302638
diff --git a/devel/adabindx/files/patch-aa b/devel/adabindx/files/patch-aa
deleted file mode 100644
index 79ef353..0000000
--- a/devel/adabindx/files/patch-aa
+++ /dev/null
@@ -1,5445 +0,0 @@
-diff -Naur ../adabindx-0.7.2.orig/Local.conf ./Local.conf
---- ../adabindx-0.7.2.orig/Local.conf	Sat Feb  9 14:48:55 2002
-+++ ./Local.conf	Thu Dec 26 13:36:40 2002
-@@ -43,7 +43,7 @@
- 
- # Ada compiler (for gnat this is gcc, sometimes also called gnatgcc)
- #ADA_COMP = gcc
--ADA_COMP = gnatgcc
-+ADA_COMP = adagcc
- # compilation flags (I like optimizing)
- ADA_CFLAGS = -c -gnatnv -O3 -mpentium -malign-loops=2 -malign-jumps=2 -malign-functions=2
- # special make command for Ada
-diff -Naur ../adabindx-0.7.2.orig/Makefile ./Makefile
---- ../adabindx-0.7.2.orig/Makefile	Sun Aug 26 14:46:05 2001
-+++ ./Makefile	Thu Dec 26 13:37:07 2002
-@@ -21,6 +21,9 @@
- 		(cd $$i; make all); \
- 	done
- 
-+install:
-+	make -C lib install
-+
- config: Local.conf utils/preprocess utils/islittleend
- 	@cd lib; \
- 	if test -f ../config ; \
-diff -Naur ../adabindx-0.7.2.orig/examples/actions/Makefile ./examples/actions/Makefile
---- ../adabindx-0.7.2.orig/examples/actions/Makefile	Mon Oct  6 23:26:35 1997
-+++ ./examples/actions/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: actions
- 
- actions: actions.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/clock/Makefile ./examples/clock/Makefile
---- ../adabindx-0.7.2.orig/examples/clock/Makefile	Mon Oct  6 23:27:00 1997
-+++ ./examples/clock/Makefile	Thu Dec 26 13:36:40 2002
-@@ -12,7 +12,7 @@
- all: clock
- 
- clock: clock.adb clock_global.ads clock_global.adb fallback.ads
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
- 
- fallback.ads: AdaClock.ad
- 	../../utils/makefallb AdaClock.ad > $@
-diff -Naur ../adabindx-0.7.2.orig/examples/dig_clock/Makefile ./examples/dig_clock/Makefile
---- ../adabindx-0.7.2.orig/examples/dig_clock/Makefile	Sat Mar  2 13:49:14 2002
-+++ ./examples/dig_clock/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: dig_clock
- 
- dig_clock: dig_clock.adb dig_clock_global.adb  dig_clock_global.ads
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(XPM_LIB)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(XPM_LIB) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/display_info/Makefile ./examples/display_info/Makefile
---- ../adabindx-0.7.2.orig/examples/display_info/Makefile	Mon Oct  6 23:27:26 1997
-+++ ./examples/display_info/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: display_info
- 
- display_info: display_info.adb bubble_sort.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/hello_world/Makefile ./examples/hello_world/Makefile
---- ../adabindx-0.7.2.orig/examples/hello_world/Makefile	Fri Apr  3 23:20:32 1998
-+++ ./examples/hello_world/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: hello_world
- 
- hello_world: hello_world.adb hello_world_global.ads hello_world_global.adb earth.ads
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(XMU_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(XMU_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/i18n/Makefile ./examples/i18n/Makefile
---- ../adabindx-0.7.2.orig/examples/i18n/Makefile	Sun Feb  1 17:57:07 1998
-+++ ./examples/i18n/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: i18n
- 
- i18n: i18n.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/image/Makefile ./examples/image/Makefile
---- ../adabindx-0.7.2.orig/examples/image/Makefile	Mon Oct  6 23:27:56 1997
-+++ ./examples/image/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: image
- 
- image: common.ads image.adb image_global.adb image_global.ads motif_graphics.adb motif_graphics.ads
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/mandel/Makefile ./examples/mandel/Makefile
---- ../adabindx-0.7.2.orig/examples/mandel/Makefile	Sun Feb  3 18:05:55 2002
-+++ ./examples/mandel/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: mandel
- 
- mandel: mandel.adb mandel_global.ads mandel_global.adb fallback.ads
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/rotate_arrow/Makefile ./examples/rotate_arrow/Makefile
---- ../adabindx-0.7.2.orig/examples/rotate_arrow/Makefile	Mon Oct  6 23:28:59 1997
-+++ ./examples/rotate_arrow/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: rotate_arrow
- 
- rotate_arrow: rotate_arrow.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/show_extensions/Makefile ./examples/show_extensions/Makefile
---- ../adabindx-0.7.2.orig/examples/show_extensions/Makefile	Sat Feb  9 14:11:01 2002
-+++ ./examples/show_extensions/Makefile	Thu Dec 26 13:36:40 2002
-@@ -12,7 +12,7 @@
- all: show_extensions
- 
- show_extensions: show_extensions.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I../generic -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I../generic -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/show_hosts/Makefile ./examples/show_hosts/Makefile
---- ../adabindx-0.7.2.orig/examples/show_hosts/Makefile	Sat Oct 10 18:46:06 1998
-+++ ./examples/show_hosts/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- SRCS = show_hosts.adb
- 
- all:
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/show_printers/Makefile ./examples/show_printers/Makefile
---- ../adabindx-0.7.2.orig/examples/show_printers/Makefile	Sat Mar  2 14:14:39 2002
-+++ ./examples/show_printers/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- SRCS = show_printers.adb
- 
- all: show_printers.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XP_LIB) $(XEXT_LIB) $(X_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XP_LIB) $(XEXT_LIB) $(X_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/show_screen_saver/Makefile ./examples/show_screen_saver/Makefile
---- ../adabindx-0.7.2.orig/examples/show_screen_saver/Makefile	Mon Oct  6 23:29:51 1997
-+++ ./examples/show_screen_saver/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: show_screen_saver
- 
- show_screen_saver: show_screen_saver.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/testpath/Makefile ./examples/testpath/Makefile
---- ../adabindx-0.7.2.orig/examples/testpath/Makefile	Sun Feb  8 19:56:57 1998
-+++ ./examples/testpath/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: testpath
- 
- testpath: testpath.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XT_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/xau_test/Makefile ./examples/xau_test/Makefile
---- ../adabindx-0.7.2.orig/examples/xau_test/Makefile	Sun Jan 10 19:52:00 1999
-+++ ./examples/xau_test/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- SRCS = xau_test.adb
- 
- all:
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XAU_LIBS) $(X_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $(SRCS) -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XAU_LIBS) $(X_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/xlib_rubik/Makefile ./examples/xlib_rubik/Makefile
---- ../adabindx-0.7.2.orig/examples/xlib_rubik/Makefile	Mon Oct  6 23:30:05 1997
-+++ ./examples/xlib_rubik/Makefile	Thu Dec 26 13:36:40 2002
-@@ -29,7 +29,7 @@
- all: xlib_rubik
- 
- xlib_rubik: $(SOURCES)
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(X_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/xmmore/Makefile ./examples/xmmore/Makefile
---- ../adabindx-0.7.2.orig/examples/xmmore/Makefile	Sun Jan 20 21:31:19 2002
-+++ ./examples/xmmore/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: xmmore
- 
- xmmore: fallback.ads  xmmore.adb  xmmore_global.adb  xmmore_global.ads
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XM_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/examples/xpminfo/Makefile ./examples/xpminfo/Makefile
---- ../adabindx-0.7.2.orig/examples/xpminfo/Makefile	Mon Oct  6 23:30:33 1997
-+++ ./examples/xpminfo/Makefile	Thu Dec 26 13:36:40 2002
-@@ -11,7 +11,7 @@
- all: xpminfo
- 
- xpminfo: xpminfo.adb
--	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XPM_LIB) $(XT_LIBS)
-+	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../../lib -I.. $@ -largs $(ADA_LINK_FLAGS) $(XLIB_DIR) $(XPM_LIB) $(XT_LIBS) $(ADABINDX_LIBS)
- 
- clean:
- 	$(RM) *.ali *.o
-diff -Naur ../adabindx-0.7.2.orig/lib/Makefile ./lib/Makefile
---- ../adabindx-0.7.2.orig/lib/Makefile	Sun Aug 26 17:26:39 2001
-+++ ./lib/Makefile	Thu Dec 26 13:37:20 2002
-@@ -67,6 +67,10 @@
- # source solely for Motif2.0
- XM20_BIND_SRC = xm_widgets-primitive-cs_text.adb
- 
-+# source for Motif2.2
-+XM22_BIND_SRC = xm_widgets-manager-bulletin_board-column.adb \
-+				xm_widgets-primitive-text-data_field.adb
-+
- XPM_BIND_SRC = xpm_lib.adb
- 
- X63_BIND_SRC = x_lib-extensions-print.adb
-@@ -108,7 +112,7 @@
- 	do \
- 		$(ADA_MAKE) -c $(ADA_MAKE_FLAGS) $$i ;\
- 	done
--	@if test -n "$(IS_MOTIF21)" -o -n "$(IS_MOTIF20)" ; \
-+	@if test -n "$(IS_OPENMOTIF22)" -o -n "$(IS_MOTIF21)" -o -n "$(IS_MOTIF20)" ; \
- 	then \
- 		for i in $(XM2X_BIND_SRC); \
- 		do \
-@@ -120,7 +124,14 @@
- 			do \
- 				$(ADA_MAKE) -c $(ADA_MAKE_FLAGS) $$i ;\
- 			done; \
--		fi \
-+		fi; \
-+		if test -n "$(IS_OPENMOTIF22)" ; \
-+		then \
-+			for i in $(XM22_BIND_SRC); \
-+			do \
-+				$(ADA_MAKE) -c $(ADA_MAKE_FLAGS) $$i ;\
-+			done; \
-+		fi; \
- 	fi
- 	@if test -n "$(HAS_XPM)" ; \
- 	then \
-@@ -129,12 +140,21 @@
- 			$(ADA_MAKE) -c $(ADA_MAKE_FLAGS) $$i ;\
- 		done \
- 	fi
-+	ar -r libadabindx.a *.o
- 
- i-cwstri.o: i-cwstri.ads i-cwstri.adb
- 	$(ADA_COMP) $(ADA_CFLAGS) -gnatg i-cwstri.adb
- 
- i-csstli.o: i-csstli.ads i-csstli.adb
- 	$(ADA_COMP) $(ADA_CFLAGS) -gnatg i-csstli.adb
-+
-+install: ../lib
-+	rm -rf $(PREFIX)/lib/adabindx
-+	rm -f $(PREFIX)/lib/libadabindx.a
-+	mkdir $(PREFIX)/lib/adabindx
-+	cp *.ad[sb] $(PREFIX)/lib/adabindx
-+	cp libadabindx.a $(PREFIX)/lib
-+	cp *.ali $(PREFIX)/lib/adabindx
- 
- clean:
- 
-diff -Naur ../adabindx-0.7.2.orig/lib/x_toolkit.ads ./lib/x_toolkit.ads
---- ../adabindx-0.7.2.orig/lib/x_toolkit.ads	Sat Mar  2 12:17:16 2002
-+++ ./lib/x_toolkit.ads	Thu Dec 26 13:36:40 2002
-@@ -1446,10 +1446,34 @@
-                          Name  : in     Xt_N_Resource_String;
-                          Value : in     Xt_Accelerators);
- 
-+
-+   ---------------------------------------------------------------------------
-+   --| <Subprogram>
-+   --|    <Unit> Append_Get
-+   --|    <Purpose> 
-+   --|    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Get (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value :    out Xt_Accelerators);
-+   pragma Convention (C, Append_Get);
-+
-+
-    procedure Append_Set (List  : in out Arg_List;
-                          Name  : in     Xt_N_Resource_String;
-                          Value : in     Xt_Translations);
- 
-+
-+   ---------------------------------------------------------------------------
-+   --| <Subprogram>
-+   --|    <Unit> Append_Get
-+   --|    <Purpose> 
-+   --|    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Get (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value :    out Xt_Translations);
-+   pragma Convention (C, Append_Get);
- 
- 
-    function  Xt_Parse_Translation_Table (Table : in String) return Xt_Translations;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-form.adb ./lib/xm_utilities-form.adb
---- ../adabindx-0.7.2.orig/lib/xm_utilities-form.adb	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities-form.adb	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,69 @@
-+--  2002-10-07
-+with Resource_Strings; use Resource_Strings;
-+with X_Toolkit;        use X_Toolkit;
-+with Xm_Widgets.Manager.Bulletin_Board.Form;
-+use  Xm_Widgets.Manager.Bulletin_Board.Form;
-+
-+
-+package body Xm_Utilities.Form is
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Set
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Set (List       : in out Arg_List;
-+                         Name       : in     Xt_N_Resource_String;
-+                         Attachment : in     Attachment_Type;
-+                         W          : in     Widget) is
-+   begin
-+      if Attachment /= Attach_Widget
-+        and Attachment /= Attach_Opposite_Widget
-+      then
-+         raise Use_Error;
-+      end if;
-+
-+      if Name = Xm_N_Top_Attachment then
-+         Append_Set (List, Xm_N_Top_Widget, W);
-+      elsif Name = Xm_N_Bottom_Attachment then
-+         Append_Set (List, Xm_N_Bottom_Widget, W);
-+      elsif Name = Xm_N_Left_Attachment then
-+         Append_Set (List, Xm_N_Left_Widget, W);
-+      elsif Name = Xm_N_Right_Attachment then
-+         Append_Set (List, Xm_N_Right_Widget, W);
-+      else
-+         raise Use_Error;
-+      end if;
-+      Append_Set (List, Name, Attachment);
-+   end Append_Set;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Set
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Set (List       : in out Arg_List;
-+                         Name       : in     Xt_N_Resource_String;
-+                         Attachment : in     Attachment_Type;
-+                         Position   : in     Integer) is
-+   begin
-+      if Attachment /= Attach_Position then
-+         raise Use_Error;
-+      end if;
-+
-+      if Name = Xm_N_Top_Attachment then
-+         Append_Set (List, Xm_N_Top_Position, Position);
-+      elsif Name = Xm_N_Bottom_Attachment then
-+         Append_Set (List, Xm_N_Bottom_Position, Position);
-+      elsif Name = Xm_N_Left_Attachment then
-+         Append_Set (List, Xm_N_Left_Position, Position);
-+      elsif Name = Xm_N_Right_Attachment then
-+         Append_Set (List, Xm_N_Right_Position, Position);
-+      else
-+         raise Use_Error;
-+      end if;
-+      Append_Set (List, Name, Attachment);
-+   end Append_Set;
-+
-+end Xm_Utilities.Form;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-form.ads ./lib/xm_utilities-form.ads
---- ../adabindx-0.7.2.orig/lib/xm_utilities-form.ads	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities-form.ads	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,34 @@
-+--  2002-10-07
-+with X_Toolkit;
-+with Xm_Widgets.Manager.Bulletin_Board.Form;
-+
-+
-+package Xm_Utilities.Form is
-+
-+   package Xm_Form renames Xm_Widgets.Manager.Bulletin_Board.Form;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Set
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Set (List       : in out X_Toolkit.Arg_List;
-+                         Name       : in     X_Toolkit.Xt_N_Resource_String;
-+                         Attachment : in     Xm_Form.Attachment_Type;
-+                         W          : in     X_Toolkit.Widget);
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Set
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Set (List       : in out X_Toolkit.Arg_List;
-+                         Name       : in     X_Toolkit.Xt_N_Resource_String;
-+                         Attachment : in     Xm_Form.Attachment_Type;
-+                         Position   : in     Integer);
-+
-+end Xm_Utilities.Form;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-list.adb ./lib/xm_utilities-list.adb
---- ../adabindx-0.7.2.orig/lib/xm_utilities-list.adb	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities-list.adb	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,49 @@
-+--  2002-10-24
-+with X_Toolkit;                 use X_Toolkit;
-+with Xm_Widgets;                use Xm_Widgets;
-+with Xm_Widgets.Primitive.List; use Xm_Widgets.Primitive.List;
-+
-+
-+package body Xm_Utilities.List is
-+
-+
-+   procedure Format_List (Widgets      : in Widget_List_Type;
-+                          String_Table : in Xm_String_Table) is
-+      Argl           : Arg_List;
-+      Tab_List       : Xm_Tab_List;
-+      Render_Table   : Xm_Render_Table;
-+      Rendition_List : Xm_Rendition_Array (1 .. 1);
-+   begin
-+      Tab_List :=
-+        Xm_String_Table_Propose_Tablist
-+         (String_Table, Widgets (Widgets'First), Float (6.0), Relative);
-+
-+      Argl := Null_Arg_List;
-+      Append_Get (Argl, Xm_N_Render_Table, Render_Table);
-+      Xt_Get_Values (Widgets (Widgets'First), Argl);
-+
-+      Rendition_List (1) :=
-+        Xm_Render_Table_Get_Rendition (Render_Table, Motif_Default_Locale);
-+
-+      Argl := Null_Arg_List;
-+      Append_Set (Argl, Xm_N_Tab_List, Tab_List);
-+      Xm_Rendition_Update (Rendition_List (1), Argl);
-+
-+      Render_Table :=
-+        Xm_Render_Table_Add_Renditions
-+         (Xm_Render_Table_Copy (Render_Table, Null_Xm_String_Tag_Array),
-+          Rendition_List, Merge_Replace);
-+
-+      Argl := Null_Arg_List;
-+      Append_Set (Argl, Xm_N_Render_Table, Render_Table);
-+      for I in Widgets'Range loop
-+         Xt_Set_Values (Widgets (I), Argl);
-+      end loop;
-+
-+      Xm_Render_Table_Free (Render_Table);
-+      Xm_Rendition_Free (Rendition_List (1));
-+      Xm_Tab_List_Free (Tab_List);
-+   end Format_List;
-+
-+
-+end Xm_Utilities.List;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-list.ads ./lib/xm_utilities-list.ads
---- ../adabindx-0.7.2.orig/lib/xm_utilities-list.ads	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities-list.ads	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,12 @@
-+--  2002-10-24
-+with X_Toolkit;
-+with Xm_Widgets;
-+
-+package Xm_Utilities.List is
-+
-+
-+   procedure Format_List (Widgets      : in X_Toolkit.Widget_List_Type;
-+                          String_Table : in Xm_Widgets.Xm_String_Table);
-+
-+
-+end Xm_Utilities.List;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-protocols.adb ./lib/xm_utilities-protocols.adb
---- ../adabindx-0.7.2.orig/lib/xm_utilities-protocols.adb	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities-protocols.adb	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,27 @@
-+--  2002-10-05
-+with X_Toolkit;               use X_Toolkit;
-+with Xm_Widgets.Atom_Manager; use Xm_Widgets.Atom_Manager;
-+with Xm_Widgets.Protocols;    use Xm_Widgets.Protocols;
-+
-+
-+package body Xm_Utilities.Protocols is
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Add_WM_Delete_Window_Callback
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Add_WM_Delete_Window_Callback
-+    (Shell    : in Widget;
-+     Callback : in Xt_Callback_Proc;
-+     Closure  : in Xt_Pointer := Null_Xt_Pointer) is
-+   begin
-+      Xm_Add_WM_Protocol_Callback
-+       (Shell,
-+        Xm_Intern_Atom (Xt_Display_Of_Object (Shell),
-+                        "WM_DELETE_WINDOW", True),
-+        Callback,
-+        Closure);
-+   end Add_WM_Delete_Window_Callback;
-+
-+end Xm_Utilities.Protocols;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-protocols.ads ./lib/xm_utilities-protocols.ads
---- ../adabindx-0.7.2.orig/lib/xm_utilities-protocols.ads	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities-protocols.ads	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,18 @@
-+--  2002-10-05
-+with X_Toolkit;
-+
-+
-+package Xm_Utilities.Protocols is
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Add_WM_Delete_Window_Callback
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Add_WM_Delete_Window_Callback
-+    (Shell    : in X_Toolkit.Widget;
-+     Callback : in X_Toolkit.Xt_Callback_Proc;
-+     Closure  : in X_Toolkit.Xt_Pointer := X_Toolkit.Null_Xt_Pointer);
-+
-+end Xm_Utilities.Protocols;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-strings.ads ./lib/xm_utilities-strings.ads
---- ../adabindx-0.7.2.orig/lib/xm_utilities-strings.ads	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities-strings.ads	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,46 @@
-+--  2002-10-19
-+with Xm_Widgets;
-+
-+
-+package Xm_Utilities.Xm_Strings is
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Append (Source   : in out Xm_Widgets.Xm_String;
-+                     New_Item : in     String);
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Append (Source   : in out Xm_Widgets.Xm_String;
-+                     New_Item : in     Wide_String);
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Separator
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Separator (Source : in out Xm_Widgets.Xm_String);
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Tab
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Tab (Source : in out Xm_Widgets.Xm_String);
-+
-+
-+end Xm_Utilities.Xm_Strings;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities-xm_strings.adb ./lib/xm_utilities-xm_strings.adb
---- ../adabindx-0.7.2.orig/lib/xm_utilities-xm_strings.adb	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities-xm_strings.adb	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,80 @@
-+--  2002-10-19
-+with X_Toolkit;  use X_Toolkit;
-+with Xm_Widgets; use Xm_Widgets;
-+
-+
-+package body Xm_Utilities.Xm_Strings is
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append (Source   : in out Xm_String;
-+                     New_Item : in     String) is
-+      Tmp : Xm_String;
-+   begin
-+      Tmp := Xm_String_Generate (New_Item);
-+      if Source = Null_Xm_String then
-+         Source := Tmp;
-+      else
-+         Source := Xm_String_Concat_And_Free (Source, Tmp);
-+      end if;
-+   end Append;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append (Source   : in out Xm_String;
-+                     New_Item : in     Wide_String) is
-+      Tmp : Xm_String;
-+   begin
-+      Tmp := Xm_String_Generate (New_Item);
-+      if Source = Null_Xm_String then
-+         Source := Tmp;
-+      else
-+         Source := Xm_String_Concat_And_Free (Source, Tmp);
-+      end if;
-+   end Append;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Separator
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Separator (Source : in out Xm_String) is
-+      Tmp : Xm_String;
-+   begin
-+      Tmp :=
-+        Xm_String_Component_Create (Component_Separator, 0, Null_Xt_Pointer);
-+      if Source = Null_Xm_String then
-+         Source := Tmp;
-+      else
-+         Source := Xm_String_Concat_And_Free (Source, Tmp);
-+      end if;
-+   end Append_Separator;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Tab
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Tab (Source : in out Xm_String) is
-+      Tmp : Xm_String;
-+   begin
-+      Tmp := Xm_String_Component_Create (Component_Tab, 0, Null_Xt_Pointer);
-+      if Source = Null_Xm_String then
-+         Source := Tmp;
-+      else
-+         Source := Xm_String_Concat_And_Free (Source, Tmp);
-+      end if;
-+   end Append_Tab;
-+
-+
-+end Xm_Utilities.Xm_Strings;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_utilities.ads ./lib/xm_utilities.ads
---- ../adabindx-0.7.2.orig/lib/xm_utilities.ads	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_utilities.ads	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,9 @@
-+--  2002-10-07
-+
-+package Xm_Utilities is
-+
-+   pragma Pure (Xm_Utilities);
-+
-+   Use_Error : exception;
-+
-+end Xm_Utilities;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-display.adb ./lib/xm_widgets-display.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-display.adb	Sat Mar  2 12:17:14 2002
-+++ ./lib/xm_widgets-display.adb	Thu Dec 26 13:36:40 2002
-@@ -43,7 +43,7 @@
- with Ada.Unchecked_Conversion;
- package body Xm_Widgets.Display is
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Callback_Struct (Pointer : in Xt_Pointer)
-       return Xm_Drag_Start_Callback_Struct_Access is
-       function To_CS is
-@@ -94,7 +94,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Drag_Protocol_Style_Type, Interfaces.C.unsigned_char);
-@@ -121,7 +121,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Enable_Btn1_Transfer_Type, Interfaces.C.unsigned_char);
- 
-@@ -172,6 +172,6 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Display;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-display.ads ./lib/xm_widgets-display.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-display.ads	Sat Mar  2 12:17:14 2002
-+++ ./lib/xm_widgets-display.ads	Thu Dec 26 13:36:40 2002
-@@ -44,7 +44,7 @@
- package Xm_Widgets.Display is
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Xm_Drag_Start_Callback_Struct is record
-       Reason : Callback_Reason;
-       Event  : X_Lib.X_Event_Pointer;
-@@ -80,7 +80,7 @@
-    function To_Callback_Struct (Pointer : in Xt_Pointer)
-       return Xm_Display_Callback_Struct_Access;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- 
-@@ -95,7 +95,7 @@
-    --
-    -- resources
-    --
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Default_Button_Emphasis       : constant Xt_N_Resource_String;
- 
-    type Default_Button_Emphasis_Type is
-@@ -110,7 +110,7 @@
-                          Value :    out Default_Button_Emphasis_Type);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Default_Virtual_Bindings      : constant Xt_N_Resource_String;
-    Xm_N_Drag_Initiator_Protocol_Style : constant Xt_N_Resource_String;
-@@ -131,7 +131,7 @@
-                          Value :    out Drag_Protocol_Style_Type);
-    pragma Convention (C, Append_Get);
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Drag_Start_Callback           : constant Xt_N_Resource_String;
-    Xm_N_Enable_Btn1_Transfer          : constant Xt_N_Resource_String;
- 
-@@ -170,16 +170,16 @@
-    Xm_N_No_Font_Callback              : constant Xt_N_Resource_String;
-    Xm_N_No_Rendition_Callback         : constant Xt_N_Resource_String;
-    Xm_N_User_Data                     : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- private
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Default_Button_Emphasis_Type use
-      (External_Highlight => 0, Internal_Highlight => 1);
-    for Default_Button_Emphasis_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    for Drag_Protocol_Style_Type use
-      (None => 0, Drop_Only => 1,
-@@ -188,30 +188,30 @@
-       Prefer_Receiver => 6);
-    for Drag_Protocol_Style_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Enable_Btn1_Transfer_Type use
-      (Off => 0, Button2_Adjust => 1, Button2_Transfer => 2);
-    for Enable_Btn1_Transfer_Type'Size use Interfaces.C.unsigned_char'Size;
- 
-    for Enable_Warp_Type use (On => 0, Off => 1);
-    for Enable_Warp_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- 
-    pragma Import (C, Xm_Get_Xm_Display, "XmGetXmDisplay");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Default_Button_Emphasis       : constant Xt_N_Resource_String :=
-       To_Resource_String ("defaultButtonEmphasis");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Default_Virtual_Bindings      : constant Xt_N_Resource_String :=
-       To_Resource_String ("defaultVirtualBindings");
-    Xm_N_Drag_Initiator_Protocol_Style : constant Xt_N_Resource_String :=
-       To_Resource_String ("dragInitiatorProtocolStyle");
-    Xm_N_Drag_Receiver_Protocol_Style  : constant Xt_N_Resource_String :=
-       To_Resource_String ("dragReceiverProtocolStyle");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Drag_Start_Callback           : constant Xt_N_Resource_String :=
-       To_Resource_String ("dragStartCallback");
-    Xm_N_Enable_Btn1_Transfer          : constant Xt_N_Resource_String :=
-@@ -238,6 +238,6 @@
-       To_Resource_String ("noRenditionCallback");
-    Xm_N_User_Data                     : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_User_Data;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Display;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-column.adb ./lib/xm_widgets-manager-bulletin_board-column.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-column.adb	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_widgets-manager-bulletin_board-column.adb	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,143 @@
-+-------------------------------------------------------------------------------
-+--                                                                           --
-+--  Ada Interface to the X Window System and Motif(tm)/Lesstif               --
-+--  Copyright (c) 1996-2002 Hans-Frieder Vogt                                --
-+--  This file also copyright (c) 2002 Vadim Godunko                          --
-+--                                                                           --
-+--  Adabindx is free software; you can redistribute it and/or modify it      --
-+--  under the terms of the GNU General Public License as published by the    --
-+--  Free Software Foundation; either version 2 of the License, or (at your   --
-+--  option) any later version.                                               --
-+--                                                                           --
-+--  This program is distributed in the hope that it will be useful, but      --
-+--  WITHOUT ANY WARRANTY; without even the implied warranty of               --
-+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     --
-+--  See the GNU General Public License for more details.                     --
-+--                                                                           --
-+--  You should have received a copy of the GNU General Public License        --
-+--  along with this program; if not, write to the                            --
-+--  Free Software Foundation, Inc.,                                          --
-+--  59 Temple Place - Suite 330,                                             --
-+--  Boston, MA 02111-1307, USA.                                              --
-+--                                                                           --
-+--  As a special exception, if other files instantiate generics from this    --
-+--  unit, or you link this unit with other files to produce an executable,   --
-+--  this unit does not by itself cause the resulting executable to be        --
-+--  covered by the GNU General Public License. This exception does not       --
-+--  however invalidate any other reasons why the executable file might be    --
-+--  covered by the GNU General Public License.                               --
-+--                                                                           --
-+--  X Window System is copyrighted by the X Consortium                       --
-+--  Motif(tm)       is copyrighted by the Open Software Foundation, Inc.     --
-+--                  and by The Open Group                                    --
-+--                                                                           --
-+--                                                                           --
-+-------------------------------------------------------------------------------
-+
-+-------------------------------------------------------------------------------
-+--
-+-- HISTORY:
-+--          2002-10-20  Vadim Godunko: first definition of this file
-+--
-+-------------------------------------------------------------------------------
-+with Ada.Unchecked_Conversion;
-+
-+with X_Toolkit.Internal;
-+
-+
-+package body Xm_Widgets.Manager.Bulletin_Board.Column is
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Get
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Get (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value :    out Distribution) is
-+   begin
-+      Append_Set (List, Name, Value'Address);
-+   end Append_Get;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Get
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Get (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value :    out Fill_Style) is
-+   begin
-+      Append_Set (List, Name, Value'Address);
-+   end Append_Get;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Set
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Set (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value : in     Distribution) is
-+      function To_Integer is
-+        new Ada.Unchecked_Conversion (Distribution,
-+                                      Interfaces.C.unsigned_char);
-+   begin
-+      Append_Set (List, Name, To_Integer (Value));
-+   end Append_Set;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Append_Set
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Append_Set (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value : in     Fill_Style) is
-+      function To_Integer is
-+        new Ada.Unchecked_Conversion (Fill_Style,
-+                                      Interfaces.C.unsigned_char);
-+   begin
-+      Append_Set (List, Name, To_Integer (Value));
-+   end Append_Set;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Create_Column
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Create_Column (Parent  : in Widget;
-+                              Name    : in String;
-+                              Arglist : in Arg_List := Null_Arg_List)
-+     return Widget
-+   is
-+      function XmCreateColumn (Parent : in Widget;
-+                               Name   : in Interfaces.C.char_array;
-+                               Args   : in X_Toolkit.Internal.Arg_Rec_Access;
-+                               Count  : in Cardinal)
-+        return Widget;
-+      pragma Import (C, XmCreateColumn, "XmCreateColumn");
-+   begin
-+      return XmCreateColumn (Parent, Interfaces.C.To_C (Name),
-+                             X_Toolkit.Internal.Hook (Arglist),
-+                             Cardinal (Length (Arglist)));
-+   end Xm_Create_Column;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Is_Column
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Is_Column (W : in Widget) return Boolean is
-+   begin
-+      return Xt_Is_Subclass (W, Xm_Column_Widget_Class);
-+   end Xm_Is_Column;
-+
-+
-+end Xm_Widgets.Manager.Bulletin_Board.Column;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-column.ads ./lib/xm_widgets-manager-bulletin_board-column.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-column.ads	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_widgets-manager-bulletin_board-column.ads	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,170 @@
-+-------------------------------------------------------------------------------
-+--                                                                           --
-+--  Ada Interface to the X Window System and Motif(tm)/Lesstif               --
-+--  Copyright (c) 1996-2002 Hans-Frieder Vogt                                --
-+--  This file also copyright (c) 2002 Vadim Godunko                          --
-+--                                                                           --
-+--  Adabindx is free software; you can redistribute it and/or modify it      --
-+--  under the terms of the GNU General Public License as published by the    --
-+--  Free Software Foundation; either version 2 of the License, or (at your   --
-+--  option) any later version.                                               --
-+--                                                                           --
-+--  This program is distributed in the hope that it will be useful, but      --
-+--  WITHOUT ANY WARRANTY; without even the implied warranty of               --
-+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     --
-+--  See the GNU General Public License for more details.                     --
-+--                                                                           --
-+--  You should have received a copy of the GNU General Public License        --
-+--  along with this program; if not, write to the                            --
-+--  Free Software Foundation, Inc.,                                          --
-+--  59 Temple Place - Suite 330,                                             --
-+--  Boston, MA 02111-1307, USA.                                              --
-+--                                                                           --
-+--  As a special exception, if other files instantiate generics from this    --
-+--  unit, or you link this unit with other files to produce an executable,   --
-+--  this unit does not by itself cause the resulting executable to be        --
-+--  covered by the GNU General Public License. This exception does not       --
-+--  however invalidate any other reasons why the executable file might be    --
-+--  covered by the GNU General Public License.                               --
-+--                                                                           --
-+--  X Window System is copyrighted by the X Consortium                       --
-+--  Motif(tm)       is copyrighted by the Open Software Foundation, Inc.     --
-+--                  and by The Open Group                                    --
-+--                                                                           --
-+--                                                                           --
-+-------------------------------------------------------------------------------
-+
-+-------------------------------------------------------------------------------
-+--
-+-- HISTORY:
-+--          2002-10-20 Vadim Godunko: first definition of this file
-+--
-+-------------------------------------------------------------------------------
-+
-+package Xm_Widgets.Manager.Bulletin_Board.Column is
-+
-+--  UseOpenMotif2.2
-+
-+   Xm_Column_Widget_Class : constant Widget_Class;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Is_Column
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   function Xm_Is_Column (W : in Widget) return Boolean;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Create_Column
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   function Xm_Create_Column (Parent  : in Widget;
-+                              Name    : in String;
-+                              Arglist : in Arg_List := Null_Arg_List)
-+     return Widget;
-+
-+--   currently not implemented
-+--   function Xm_Column_Get_Child_Label () return Widget;
-+
-+
-+   Xm_N_Default_Entry_Label_Alignment : constant Xt_N_Resource_String;
-+   Xm_N_Default_Entry_Label_Font_List : constant Xt_N_Resource_String;
-+   Xm_N_Default_Fill_Style            : constant Xt_N_Resource_String;
-+   Xm_N_Distribution                  : constant Xt_N_Resource_String;
-+
-+   type Distribution is (Spread, Tight);
-+
-+   procedure Append_Set (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value : in     Distribution);
-+
-+   procedure Append_Get (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value :    out Distribution);
-+   pragma Convention (C, Append_Get);
-+
-+   Xm_N_Item_Spacing                  : constant Xt_N_Resource_String;
-+   Xm_N_Label_Spacing                 : constant Xt_N_Resource_String;
-+   Xm_N_Orientation                   : constant Xt_N_Resource_String;
-+
-+   --  constraint resources
-+
-+   Xm_N_Entry_Label_Alignment         : constant Xt_N_Resource_String;
-+   Xm_N_Entry_Label_Font_List         : constant Xt_N_Resource_String;
-+   Xm_N_Entry_Label_Pixmap            : constant Xt_N_Resource_String;
-+   Xm_N_Entry_Label_String            : constant Xt_N_Resource_String;
-+   Xm_N_Entry_Label_Type              : constant Xt_N_Resource_String;
-+   Xm_N_Fill_Style                    : constant Xt_N_Resource_String;
-+
-+   type Fill_Style is (Unspecified, Flush, Ragged);
-+
-+   procedure Append_Set (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value : in     Fill_Style);
-+
-+   procedure Append_Get (List  : in out Arg_List;
-+                         Name  : in     Xt_N_Resource_String;
-+                         Value :    out Fill_Style);
-+   pragma Convention (C, Append_Get);
-+
-+   Xm_N_Show_Entry_Label              : constant Xt_N_Resource_String;
-+   Xm_N_Stretchable                   : constant Xt_N_Resource_String;
-+
-+
-+private
-+
-+   for Distribution use (Spread => 0, Tight => 1);
-+   for Distribution'Size use Interfaces.C.unsigned_char'Size;
-+
-+   for Fill_Style use (Unspecified => 0, Flush => 1, Ragged => 2);
-+   for Fill_Style'Size use Interfaces.C.unsigned_char'Size;
-+
-+   c_const_Xm_Column_Widget_Class : Widget_Class;
-+   pragma Import (C, c_const_Xm_Column_Widget_Class, "xmColumnWidgetClass");
-+
-+   Xm_Column_Widget_Class : constant Widget_Class :=
-+     c_const_Xm_Column_Widget_Class;
-+
-+
-+   Xm_N_Default_Entry_Label_Alignment : constant Xt_N_Resource_String :=
-+     To_Resource_String("defaultEntryLabelAlignment");
-+   Xm_N_Default_Entry_Label_Font_List : constant Xt_N_Resource_String :=
-+     To_Resource_String("defaultEntryLabelFontList");
-+   Xm_N_Default_Fill_Style            : constant Xt_N_Resource_String :=
-+     To_Resource_String("defaultFillStyle");
-+   Xm_N_Distribution                  : constant Xt_N_Resource_String :=
-+     To_Resource_String("distribution");
-+   Xm_N_Item_Spacing                  : constant Xt_N_Resource_String :=
-+     To_Resource_String("itemSpacing");
-+   Xm_N_Label_Spacing                 : constant Xt_N_Resource_String :=
-+     To_Resource_String("labelSpacing");
-+   Xm_N_Orientation                   : constant Xt_N_Resource_String :=
-+     X_Toolkit.Xt_N_Orientation;
-+
-+   --  constraint resources
-+
-+   Xm_N_Entry_Label_Alignment         : constant Xt_N_Resource_String :=
-+     To_Resource_String("entryLabelAlignment");
-+   Xm_N_Entry_Label_Font_List         : constant Xt_N_Resource_String :=
-+     To_Resource_String("entryLabelFontList");
-+   Xm_N_Entry_Label_Pixmap            : constant Xt_N_Resource_String :=
-+     To_Resource_String("entryLabelPixmap");
-+   Xm_N_Entry_Label_String            : constant Xt_N_Resource_String :=
-+     To_Resource_String("entryLabelString");
-+   Xm_N_Entry_Label_Type              : constant Xt_N_Resource_String :=
-+     To_Resource_String("entryLabelType");
-+   Xm_N_Fill_Style                    : constant Xt_N_Resource_String :=
-+     To_Resource_String("fillStyle");
-+   Xm_N_Show_Entry_Label              : constant Xt_N_Resource_String :=
-+     To_Resource_String("showEntryLabel");
-+   Xm_N_Stretchable                   : constant Xt_N_Resource_String :=
-+     To_Resource_String("stretchable");
-+
-+--  EndOpenMotif2.2
-+
-+end Xm_Widgets.Manager.Bulletin_Board.Column;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb ./lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb	Thu Dec 26 13:36:40 2002
-@@ -138,7 +138,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Filter_Style_Type, Interfaces.C.unsigned_char);
- 
-@@ -164,7 +164,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function To_Integer is
-@@ -193,7 +193,7 @@
- 
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Path_Mode_Type, Interfaces.C.unsigned_char);
- 
-@@ -219,7 +219,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Xm_Qualify_Proc, Integer);
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads ./lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads	Thu Dec 26 13:36:40 2002
-@@ -170,7 +170,7 @@
-    pragma Convention (C, Append_Get);
- 
-    Xm_N_Dir_Spec               : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Dir_Text_Label_String  : constant Xt_N_Resource_String;
-    Xm_N_Filter_Label_String    : constant Xt_N_Resource_String;
-    Xm_N_Filter_Style           : constant Xt_N_Resource_String;
-@@ -187,7 +187,7 @@
-    pragma Convention (C, Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_File_List_Items        : constant Xt_N_Resource_String;
-    Xm_N_File_List_Item_Count   : constant Xt_N_Resource_String;
-    Xm_N_File_List_Label_String : constant Xt_N_Resource_String;
-@@ -207,7 +207,7 @@
- 
-    Xm_N_List_Updated           : constant Xt_N_Resource_String;
-    Xm_N_No_Match_String        : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Path_Mode              : constant Xt_N_Resource_String;
- 
-    type Path_Mode_Type is (Mode_Full, Mode_Relative);
-@@ -221,7 +221,7 @@
-                          Value :    out Path_Mode_Type);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Pattern                : constant Xt_N_Resource_String;
-    Xm_N_Qualify_Search_Data_Proc : constant Xt_N_Resource_String;
-@@ -284,16 +284,16 @@
-       Xm_Widgets.Manager.Bulletin_Board.Selection_Box.Text_Field_Name;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Filter_Style_Type use (Filter_None => 0, Filter_Hidden_Files => 1);
-    for Filter_Style_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    for File_Type_Mask use (Directory => 0, Regular => 1, Any_Type => 2);
-    for File_Type_Mask'Size use Interfaces.C.unsigned_char'Size;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Path_Mode_Type use (Mode_Full => 0, Mode_Relative => 1);
-    for Path_Mode_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    pragma Import (C, Xm_File_Selection_Box_Get_Child, "XmFileSelectionBoxGetChild");
-    pragma Import (C, Xm_File_Selection_Do_Search, "XmFileSelectionDoSearch");
-@@ -327,14 +327,14 @@
-       := To_Resource_String ("dirSearchProc");
-    Xm_N_Dir_Spec               : constant Xt_N_Resource_String
-       := To_Resource_String ("dirSpec");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Dir_Text_Label_String  : constant Xt_N_Resource_String
-       := To_Resource_String ("dirTextLabelString");
-    Xm_N_Filter_Label_String    : constant Xt_N_Resource_String
-       := To_Resource_String ("filterLabelString");
-    Xm_N_Filter_Style           : constant Xt_N_Resource_String
-       := To_Resource_String ("filterStyle");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_File_List_Items        : constant Xt_N_Resource_String
-       := To_Resource_String ("fileListItems");
-    Xm_N_File_List_Item_Count   : constant Xt_N_Resource_String
-@@ -349,10 +349,10 @@
-       := To_Resource_String ("listUpdated");
-    Xm_N_No_Match_String        : constant Xt_N_Resource_String
-       := To_Resource_String ("noMatchString");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Path_Mode              : constant Xt_N_Resource_String
-       := To_Resource_String ("pathMode");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Pattern                : constant Xt_N_Resource_String
-       := To_Resource_String ("pattern");
-    Xm_N_Qualify_Search_Data_Proc : constant Xt_N_Resource_String
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board.ads ./lib/xm_widgets-manager-bulletin_board.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-bulletin_board.ads	Sat Mar  2 12:17:14 2002
-+++ ./lib/xm_widgets-manager-bulletin_board.ads	Thu Dec 26 13:36:40 2002
-@@ -69,9 +69,9 @@
-    Xm_N_Allow_Overlap          : constant Xt_N_Resource_String;
-    Xm_N_Auto_Unmanage          : constant Xt_N_Resource_String;
-    Xm_N_Button_Font_List       : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Button_Render_Table    : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Cancel_Button          : constant Xt_N_Resource_String;
-    Xm_N_Default_Button         : constant Xt_N_Resource_String;
-@@ -95,9 +95,9 @@
-    Xm_N_Dialog_Title           : constant Xt_N_Resource_String;
-    Xm_N_Focus_Callback         : constant Xt_N_Resource_String;
-    Xm_N_Label_Font_List        : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Label_Render_Table     : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Map_Callback           : constant Xt_N_Resource_String;
-    Xm_N_Margin_Height          : constant Xt_N_Resource_String;
-    Xm_N_Margin_Width           : constant Xt_N_Resource_String;
-@@ -120,9 +120,9 @@
- 
- 
-    Xm_N_Text_Font_List         : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Text_Render_Table      : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Text_Translations      : constant Xt_N_Resource_String;
- 
-    --
-@@ -160,10 +160,10 @@
-       := To_Resource_String ("autoUnmanage");
-    Xm_N_Button_Font_List       : constant Xt_N_Resource_String
-       := To_Resource_String ("buttonFontList");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Button_Render_Table    : constant Xt_N_Resource_String
-       := To_Resource_String ("buttonRenderTable");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Cancel_Button          : constant Xt_N_Resource_String
-       := To_Resource_String ("cancelButton");
-@@ -181,10 +181,10 @@
-       := To_Resource_String ("focusCallback");
-    Xm_N_Label_Font_List        : constant Xt_N_Resource_String
-       := To_Resource_String ("labelFontList");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Label_Render_Table     : constant Xt_N_Resource_String
-       := To_Resource_String ("labelRenderTable");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Map_Callback           : constant Xt_N_Resource_String
-       := To_Resource_String ("mapCallback");
-    Xm_N_Margin_Height          : constant Xt_N_Resource_String
-@@ -200,10 +200,10 @@
- 
-    Xm_N_Text_Font_List         : constant Xt_N_Resource_String
-       := To_Resource_String ("textFontList");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Text_Render_Table      : constant Xt_N_Resource_String
-       := To_Resource_String ("textRenderTable");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Text_Translations      : constant Xt_N_Resource_String
-       := To_Resource_String ("textTranslations");
- 
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-combo_box.adb ./lib/xm_widgets-manager-combo_box.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-combo_box.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-combo_box.adb	Thu Dec 26 13:36:40 2002
-@@ -46,7 +46,7 @@
-      X_Toolkit.Internal;
- package body Xm_Widgets.Manager.Combo_Box is
-  
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    function Xm_Is_Combo_Box (W : in Widget) return Boolean is
-    begin
-@@ -141,7 +141,7 @@
-                                    Cardinal (Length (Arglist)));
-    end Xm_Create_Drop_Down_List;
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    procedure Xm_Combo_Box_Add_Item
-      (W      : in Widget;
-       Item   : in Xm_String;
-@@ -157,7 +157,7 @@
-       XmComboBoxAddItem (W, Item, Pos, To_Xt_Boolean (Unique));
-    end Xm_Combo_Box_Add_Item;
-    pragma Inline (Xm_Combo_Box_Add_Item);
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- 
-    function To_Integer is
-@@ -210,7 +210,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Position_Mode_Type, Interfaces.C.unsigned_char);
- 
-@@ -233,8 +233,8 @@
-                   Value => Value'Address);
-    end Append_Get;
- 
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Combo_Box;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-combo_box.ads ./lib/xm_widgets-manager-combo_box.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-combo_box.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-combo_box.ads	Thu Dec 26 13:36:40 2002
-@@ -46,7 +46,7 @@
- 
- package Xm_Widgets.Manager.Combo_Box is
-  
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    -- -------------------------------------------------------------------------
-    --
-@@ -99,7 +99,7 @@
-    procedure Xm_Combo_Box_Update (W : in Widget);
- 
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    procedure Xm_Combo_Box_Add_Item
-      (W      : in Widget;
-       Item   : in Xm_String;
-@@ -117,7 +117,7 @@
-    procedure Xm_Combo_Box_Set_Item
-      (W    : in Widget;
-       Item : in Xm_String);
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    -- -------------------------------------------------------------------------
-    --
-@@ -126,9 +126,9 @@
- 
-    Xm_N_Arrow_Size              : constant Xt_N_Resource_String;
-    Xm_N_Arrow_Spacing           : constant Xt_N_Resource_String;
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Columns                 : constant Xt_N_Resource_String;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Combo_Box_Type          : constant Xt_N_Resource_String;
- 
-    type Combo_Box_Type is (Combo_Box, Drop_Down_Combo_Box, Drop_Down_List);
-@@ -144,11 +144,11 @@
- 
-    Xm_N_Font_List               : constant Xt_N_Resource_String;
-    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String;
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Item_Count              : constant Xt_N_Resource_String;
-    Xm_N_Items                   : constant Xt_N_Resource_String;
-    Xm_N_List                    : constant Xt_N_Resource_String;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Margin_Height           : constant Xt_N_Resource_String;
-    Xm_N_Margin_Width            : constant Xt_N_Resource_String;
-    Xm_N_Match_Behavior          : constant Xt_N_Resource_String;
-@@ -164,7 +164,7 @@
-                          Value :    out Match_Behavior_Type);
-    pragma Convention (C, Append_Get);
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Position_Mode           : constant Xt_N_Resource_String;
-    
-    type Position_Mode_Type is (Zero_Based, One_Based);
-@@ -178,17 +178,17 @@
-                          Value :    out Position_Mode_Type);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    Xm_N_Render_Table            : constant Xt_N_Resource_String;
-    Xm_N_Selected_Item           : constant Xt_N_Resource_String;
-    Xm_N_Selected_Position       : constant Xt_N_Resource_String;
-    Xm_N_Selection_Callback      : constant Xt_N_Resource_String;
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Text_Field              : constant Xt_N_Resource_String;
-    Xm_N_Visible_Item_Count      : constant Xt_N_Resource_String;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- private
- 
-@@ -198,17 +198,17 @@
-    for Match_Behavior_Type use (None => 0, Quick_Navigate => 1, Invalid_Match_Behavior => 2);
-    for Match_Behavior_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    for Position_Mode_Type use (Zero_Based => 0, One_Based => 1);
-    for Position_Mode_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    pragma Import (C, Xm_Combo_Box_Update, "XmComboBoxUpdate");
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    pragma Import (C, Xm_Combo_Box_Delete_Pos, "XmComboBoxDeletePos");
-    pragma Import (C, Xm_Combo_Box_Select_Item, "XmComboBoxSelectItem");
-    pragma Import (C, Xm_Combo_Box_Set_Item, "XmComboBoxSetItem");
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    c_const_Xm_Combo_Box_Widget_Class           : Widget_Class;
- 
-@@ -227,10 +227,10 @@
-       := To_Resource_String ("arrowSize");
-    Xm_N_Arrow_Spacing           : constant Xt_N_Resource_String
-       := To_Resource_String ("arrowSpacing");
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Columns                 : constant Xt_N_Resource_String
-       := To_Resource_String ("columns");
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Combo_Box_Type          : constant Xt_N_Resource_String
-       := To_Resource_String ("comboBoxType");
- 
-@@ -238,24 +238,24 @@
-       := Xm_Widgets.Xm_N_Font_List;
-    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String
-       := To_Resource_String ("highlightThickness");
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Item_Count              : constant Xt_N_Resource_String
-       := To_Resource_String ("itemCount");
-    Xm_N_Items                   : constant Xt_N_Resource_String
-       := To_Resource_String ("items");
-    Xm_N_List                    : constant Xt_N_Resource_String
-       := To_Resource_String ("list");
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Margin_Height           : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Margin_Height;
-    Xm_N_Margin_Width            : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Margin_Width;
-    Xm_N_Match_Behavior          : constant Xt_N_Resource_String
-       := To_Resource_String ("matchBehavior");
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Position_Mode           : constant Xt_N_Resource_String
-       := To_Resource_String ("positionMode");
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    Xm_N_Render_Table            : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Render_Table;
-@@ -266,13 +266,13 @@
-    Xm_N_Selection_Callback      : constant Xt_N_Resource_String
-       := To_Resource_String ("selectionCallback");
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Text_Field              : constant Xt_N_Resource_String
-       := To_Resource_String ("textField");
-    Xm_N_Visible_Item_Count      : constant Xt_N_Resource_String
-       := To_Resource_String ("visibleItemCount");
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Combo_Box;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-container.adb ./lib/xm_widgets-manager-container.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-container.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-container.adb	Thu Dec 26 13:36:40 2002
-@@ -45,7 +45,7 @@
-      X_Toolkit.Internal;
- package body Xm_Widgets.Manager.Container is
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    function Xm_Is_Container (W : in Widget) return Boolean is
-    begin
-@@ -571,6 +571,6 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Container;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-container.ads ./lib/xm_widgets-manager-container.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-container.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-container.ads	Thu Dec 26 13:36:40 2002
-@@ -42,7 +42,7 @@
- 
- package Xm_Widgets.Manager.Container is
-  
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    -- -------------------------------------------------------------------------
-    --
-@@ -524,6 +524,6 @@
-    Xm_N_Position_Index          : constant Xt_N_Resource_String
-       := To_Resource_String ("positionIndex");
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Container;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-drawing_area.ads ./lib/xm_widgets-manager-drawing_area.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-drawing_area.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-drawing_area.ads	Thu Dec 26 13:36:40 2002
-@@ -83,10 +83,10 @@
-    -- resource values
-    --
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Convert_Callback        : constant Xt_N_Resource_String;
-    Xm_N_Destination_Callback    : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Expose_Callback         : constant Xt_N_Resource_String;
-    Xm_N_Input_Callback          : constant Xt_N_Resource_String;
-    Xm_N_Margin_Height           : constant Xt_N_Resource_String;
-@@ -110,12 +110,12 @@
-    -- resource values
-    --
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Convert_Callback        : constant Xt_N_Resource_String :=
-       To_Resource_String ("convertCallback");
-    Xm_N_Destination_Callback    : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Destination_Callback;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Expose_Callback         : constant Xt_N_Resource_String :=
-       To_Resource_String ("exposeCallback");
-    Xm_N_Input_Callback          : constant Xt_N_Resource_String :=
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-frame.adb ./lib/xm_widgets-manager-frame.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-frame.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-frame.adb	Thu Dec 26 13:36:40 2002
-@@ -99,7 +99,7 @@
-    end Append_Get;
-    pragma Inline (Append_Get);
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Vertical_Alignment, Interfaces.C.unsigned_char);
- 
-@@ -123,7 +123,7 @@
-                   Value  => Value'Address);
-    end Append_Get;
-    pragma Inline (Append_Get);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function To_Integer is
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-frame.ads ./lib/xm_widgets-manager-frame.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-frame.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-frame.ads	Thu Dec 26 13:36:40 2002
-@@ -90,7 +90,7 @@
-    Xm_N_Child_Horizontal_Spacing : constant Xt_N_Resource_String;
-    Xm_N_Child_Vertical_Alignment : constant Xt_N_Resource_String;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Vertical_Alignment is (Alignment_Baseline_Top,
-                                Alignment_Center,
-                                Alignment_Baseline_Bottom,
-@@ -110,7 +110,7 @@
- 
-    -- replacement for Xm_N_Child_Type
-    Xm_N_Frame_Child_Type         : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    type Frame_Child_Type is
-      (Generic_Child, Workarea_Child, Title_Child);
-@@ -134,7 +134,7 @@
-      (Generic_Child => 0, Workarea_Child => 1, Title_Child => 2);
-    for Frame_Child_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Vertical_Alignment use (Alignment_Baseline_Top => 0,
-                                Alignment_Center => 1,
-                                Alignment_Baseline_Bottom => 2,
-@@ -145,7 +145,7 @@
-       Alignment_Widget_Bottom;
-    Alignment_Child_Bottom : constant Vertical_Alignment :=
-       Alignment_Widget_Top;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    c_const_Xm_Frame_Widget_Class               : Widget_Class;
-@@ -179,10 +179,10 @@
-       To_Resource_String ("childHorizontalSpacing");
-    Xm_N_Child_Vertical_Alignment : constant Xt_N_Resource_String :=
-       To_Resource_String ("childVerticalAlignment");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    -- replacement for Xm_N_Child_Type
-    Xm_N_Frame_Child_Type         : constant Xt_N_Resource_String :=
-       To_Resource_String ("frameChildType");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Frame;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-notebook.adb ./lib/xm_widgets-manager-notebook.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-notebook.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-notebook.adb	Thu Dec 26 13:36:40 2002
-@@ -45,7 +45,7 @@
-      X_Toolkit.Internal;
- package body Xm_Widgets.Manager.Notebook is
-  
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    function To_Callback_Struct (Pointer : in Xt_Pointer)
-       return Xm_Notebook_Callback_Struct_Access is
-@@ -170,6 +170,6 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Notebook;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-notebook.ads ./lib/xm_widgets-manager-notebook.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-notebook.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-notebook.ads	Thu Dec 26 13:36:40 2002
-@@ -42,7 +42,7 @@
- 
- package Xm_Widgets.Manager.Notebook is
-  
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    -- -------------------------------------------------------------------------
-    --
-@@ -247,6 +247,6 @@
-    Xm_N_Notebook_Child_Type     : constant Xt_N_Resource_String
-       := To_Resource_String ("notebookChildType");
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Notebook;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-paned_window.ads ./lib/xm_widgets-manager-paned_window.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-paned_window.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-paned_window.ads	Thu Dec 26 13:36:40 2002
-@@ -62,12 +62,12 @@
- 
-    Xm_N_Margin_Height          : constant Xt_N_Resource_String;
-    Xm_N_Margin_Width           : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    --  use Xm_Widgets.Orientation_Type for this
-    --
-    Xm_N_Orientation            : constant Xt_N_Resource_String;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Refigure_Mode          : constant Xt_N_Resource_String;
-    Xm_N_Sash_Height            : constant Xt_N_Resource_String;
-    Xm_N_Sash_Indent            : constant Xt_N_Resource_String;
-@@ -106,9 +106,9 @@
-       := Xm_Widgets.Xm_N_Margin_Height;
-    Xm_N_Margin_Width           : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Margin_Width;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Orientation            : constant Xt_N_Resource_String := X_Toolkit.Xt_N_Orientation;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Refigure_Mode          : constant Xt_N_Resource_String := To_Resource_String ("refigureMode");
-    Xm_N_Sash_Height            : constant Xt_N_Resource_String := To_Resource_String ("sashHeight");
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-row_column.adb ./lib/xm_widgets-manager-row_column.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-row_column.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-row_column.adb	Thu Dec 26 13:36:40 2002
-@@ -319,7 +319,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Tear_Off_Model_Type, Interfaces.C.unsigned_char);
- 
-@@ -345,7 +345,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- end Xm_Widgets.Manager.Row_Column;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-row_column.ads ./lib/xm_widgets-manager-row_column.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-row_column.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-row_column.ads	Thu Dec 26 13:36:40 2002
-@@ -205,11 +205,11 @@
-    --  for Ease of usage, we define here nevertheless a different type,
-    --  consistent with Motif 2.0+
-    --
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Popup_Type is (Disabled, Keyboard, Automatic, Automatic_Recursive);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!    type Popup_Type is (Disabled, Keyboard);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    procedure Append_Set (List  : in out Arg_List;
- 			 Name  : in	Xt_N_Resource_String;
-@@ -236,7 +236,7 @@
-    pragma Convention (C, Append_Get);
- 
-    Xm_N_Sub_Menu_ID            : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Tear_Off_Menu_Activate_Callback : constant Xt_N_Resource_String;
-    Xm_N_Tear_Off_Menu_Deactivate_Callback : constant Xt_N_Resource_String;
-    Xm_N_Tear_Off_Model         : constant Xt_N_Resource_String;
-@@ -254,7 +254,7 @@
- 
- 
-    Xm_N_Tear_Off_Title         : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Unmap_Callback         : constant Xt_N_Resource_String;
-    Xm_N_Which_Button           : constant Xt_N_Resource_String;
- 
-@@ -271,21 +271,21 @@
-    for Packing_Type use (No_Packing => 0, Pack_Tight => 1, Pack_Column => 2, Pack_None => 3);
-    for Packing_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Popup_Type use (Disabled => 0, Keyboard => 1, Automatic => 2, Automatic_Recursive => 3);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!    for Popup_Type use (Disabled => 0, Keyboard => 1);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    for Popup_Type'Size use Interfaces.C.unsigned'Size;
- 
-    for Row_Column_Type use (Work_Area => 0, Menu_Bar => 1, Menu_Pulldown => 2,
-                             Menu_Popup => 3, Menu_Option => 4);
-    for Row_Column_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Tear_Off_Model_Type use (Tear_Off_Enabled => 0, Tear_Off_Disabled => 1);
-    for Tear_Off_Model_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    pragma Import (C, Xm_Menu_Position, "XmMenuPosition");
-    pragma Import (C, Xm_Option_Label_Gadget, "XmOptionLabelGadget");
-@@ -376,7 +376,7 @@
- 
-    Xm_N_Sub_Menu_ID            : constant Xt_N_Resource_String
-       := To_Resource_String ("subMenuId");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Tear_Off_Menu_Activate_Callback : constant Xt_N_Resource_String
-       := To_Resource_String ("tearOffMenuActivateCallback");
-    Xm_N_Tear_Off_Menu_Deactivate_Callback : constant Xt_N_Resource_String
-@@ -386,7 +386,7 @@
- 
-    Xm_N_Tear_Off_Title         : constant Xt_N_Resource_String
-       := To_Resource_String ("tearOffTitle");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Unmap_Callback         : constant Xt_N_Resource_String
-       := To_Resource_String ("unmapCallback");
-    Xm_N_Which_Button           : constant Xt_N_Resource_String
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scale.ads ./lib/xm_widgets-manager-scale.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scale.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-scale.ads	Thu Dec 26 13:36:40 2002
-@@ -102,14 +102,14 @@
-    --
-    package SB renames Xm_Widgets.Primitive.Scroll_Bar;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Convert_Callback        : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Decimal_Points          : constant Xt_N_Resource_String;
-    Xm_N_Drag_Callback           : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Editable                : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Font_List               : constant Xt_N_Resource_String;
-    Xm_N_Highlight_On_Enter      : constant Xt_N_Resource_String;
-    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String;
-@@ -134,13 +134,13 @@
-       renames SB.Append_Get;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Render_Table            : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Scale_Height            : constant Xt_N_Resource_String;
-    Xm_N_Scale_Multiple          : constant Xt_N_Resource_String;
-    Xm_N_Scale_Width             : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Show_Arrows             : constant Xt_N_Resource_String;
- 
-    subtype Show_Arrows_Type is SB.Show_Arrows_Type;
-@@ -154,7 +154,7 @@
-                          Value :    out SB.Show_Arrows_Type)
-       renames SB.Append_Get;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Show_Value              : constant Xt_N_Resource_String;
- 
-@@ -170,7 +170,7 @@
-                          Value :    out Show_Value_Type);
-    pragma Convention (C, Append_Get);
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Slider_Mark             : constant Xt_N_Resource_String;
- 
-    subtype Slider_Mark_Type is SB.Slider_Mark_Type;
-@@ -215,7 +215,7 @@
-                          Value :    out SB.Sliding_Mode_Type)
-    renames SB.Append_Get;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Title_String            : constant Xt_N_Resource_String;
-    Xm_N_Value                   : constant Xt_N_Resource_String;
-@@ -244,18 +244,18 @@
-    -- resource values
-    --
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Convert_Callback        : constant Xt_N_Resource_String :=
-       To_Resource_String ("convertCallback");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Decimal_Points          : constant Xt_N_Resource_String :=
-       To_Resource_String ("decimalPoints");
-    Xm_N_Drag_Callback           : constant Xt_N_Resource_String :=
-       To_Resource_String ("dragCallback");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Editable                : constant Xt_N_Resource_String :=
-       To_Resource_String ("editable");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Font_List               : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Font_List;
-    Xm_N_Highlight_On_Enter      : constant Xt_N_Resource_String :=
-@@ -272,32 +272,32 @@
-    Xm_N_Processing_Direction    : constant Xt_N_Resource_String :=
-       To_Resource_String ("processingDirection");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Render_Table            : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Render_Table;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Scale_Height            : constant Xt_N_Resource_String :=
-       To_Resource_String ("scaleHeight");
-    Xm_N_Scale_Multiple          : constant Xt_N_Resource_String :=
-       To_Resource_String ("scaleMultiple");
-    Xm_N_Scale_Width             : constant Xt_N_Resource_String :=
-       To_Resource_String ("scaleWidth");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Show_Arrows             : constant Xt_N_Resource_String :=
-       To_Resource_String ("showArrows");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Show_Value              : constant Xt_N_Resource_String :=
-       To_Resource_String ("showValue");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Slider_Mark             : constant Xt_N_Resource_String :=
-       To_Resource_String ("sliderMark");
-    Xm_N_Slider_Visual           : constant Xt_N_Resource_String :=
-       To_Resource_String ("sliderVisual");
-    Xm_N_Sliding_Mode            : constant Xt_N_Resource_String :=
-       To_Resource_String ("slidingMode");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Title_String            : constant Xt_N_Resource_String :=
-       To_Resource_String ("titleString");
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window-main_window.ads ./lib/xm_widgets-manager-scrolled_window-main_window.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window-main_window.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-scrolled_window-main_window.ads	Thu Dec 26 13:36:40 2002
-@@ -109,7 +109,7 @@
-    Xm_N_Message_Window          : constant Xt_N_Resource_String;
-    Xm_N_Show_Separator          : constant Xt_N_Resource_String;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    -- extension of the contraint resource "child type" for children of
-    -- scrolled window widget class
- 
-@@ -118,7 +118,7 @@
-    Separator      : constant Scrolled_Window_Child_Type;
-    Message_Window : constant Scrolled_Window_Child_Type;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- private
- 
-@@ -161,11 +161,11 @@
-    Xm_N_Show_Separator          : constant Xt_N_Resource_String :=
-       To_Resource_String ("showSeparator");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Menu_Bar       : constant Scrolled_Window_Child_Type := 1;
-    Command_Window : constant Scrolled_Window_Child_Type := 4;
-    Separator      : constant Scrolled_Window_Child_Type := 5;
-    Message_Window : constant Scrolled_Window_Child_Type := 6;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Scrolled_Window.Main_Window;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window.adb ./lib/xm_widgets-manager-scrolled_window.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-scrolled_window.adb	Thu Dec 26 13:36:40 2002
-@@ -89,7 +89,7 @@
- 
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Auto_Drag_Model_Type, Interfaces.C.unsigned_char);
- 
-@@ -113,7 +113,7 @@
-                   Value => Value'Address);
-    end Append_Get;
-    pragma Inline (Append_Get);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function To_Integer is
-@@ -216,7 +216,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    procedure Append_Set (List  : in out Arg_List;
-                          Name  : in     Xt_N_Resource_String;
-                          Value : in     Scrolled_Window_Child_Type) is
-@@ -239,6 +239,6 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Scrolled_Window;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window.ads ./lib/xm_widgets-manager-scrolled_window.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-scrolled_window.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-scrolled_window.ads	Thu Dec 26 13:36:40 2002
-@@ -97,7 +97,7 @@
-    -- resource values
-    --
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Auto_Drag_Model            : constant Xt_N_Resource_String;
- 
-    -- for Xm_N_Auto_Drag_Model
-@@ -114,7 +114,7 @@
-                          Value :    out Auto_Drag_Model_Type);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Clip_Window                : constant Xt_N_Resource_String;
-    Xm_N_Horizontal_Scroll_Bar      : constant Xt_N_Resource_String;
-@@ -184,7 +184,7 @@
-    Xm_N_Work_Window                : constant Xt_N_Resource_String;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    -- constraint resource for the children
-    Xm_N_Scrolled_Window_Child_Type  : constant Xt_N_Resource_String;
- 
-@@ -207,14 +207,14 @@
-                          Value :    out Scrolled_Window_Child_Type);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- private
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Auto_Drag_Model_Type use (Enabled => 0, Disabled => 1);
-    for Auto_Drag_Model_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    for Scroll_Bar_Display_Policy_Type use (Static => 0, As_Needed => 1);
-    for Scroll_Bar_Display_Policy_Type'Size use Interfaces.C.unsigned_char'Size;
-@@ -237,7 +237,7 @@
-      (Variable_Visual => 0, Constant_Visual => 1, Resize_If_Possible => 2);
-    for Visual_Policy_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Scrolled_Window_Child_Type is new Natural range 0 .. 11;
-    Work_Area      : constant Scrolled_Window_Child_Type :=  0;
-    Hor_Scrollbar  : constant Scrolled_Window_Child_Type :=  2;
-@@ -247,7 +247,7 @@
-    No_Scroll      : constant Scrolled_Window_Child_Type :=  9;
-    Clip_Window    : constant Scrolled_Window_Child_Type := 10;
-    Generic_Child  : constant Scrolled_Window_Child_Type := 11;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    pragma Import (C, Xm_Scroll_Visible, "XmScrollVisible");
-    pragma Import (C, Xm_Scrolled_Window_Set_Areas, "XmScrolledWindowSetAreas");
-@@ -266,9 +266,9 @@
-    -- resource values
-    --
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Auto_Drag_Model            : constant Xt_N_Resource_String := To_Resource_String ("autoDragModel");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Clip_Window                : constant Xt_N_Resource_String := To_Resource_String ("clipWindow");
-    Xm_N_Horizontal_Scroll_Bar      : constant Xt_N_Resource_String := To_Resource_String ("horizontalScrollBar");
-@@ -287,9 +287,9 @@
- 
-    Xm_N_Work_Window                : constant Xt_N_Resource_String := To_Resource_String ("workWindow");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    -- constraint resource for the children
-    Xm_N_Scrolled_Window_Child_Type  : constant Xt_N_Resource_String := To_Resource_String ("scrolledWindowChildType");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Scrolled_Window;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box-simple.adb ./lib/xm_widgets-manager-spin_box-simple.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box-simple.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-spin_box-simple.adb	Thu Dec 26 13:36:40 2002
-@@ -48,7 +48,7 @@
- 
- package body Xm_Widgets.Manager.Spin_Box.Simple is
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
- 
-    function To_Callback_Struct (Pointer : in Xt_Pointer)
-       return Xm_Simple_Spin_Box_Callback_Struct_Access is
-@@ -93,6 +93,6 @@
-                                     Cardinal (Length (Arglist)));
-    end Xm_Create_Simple_Spin_Box;
- 
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Spin_Box.Simple;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box-simple.ads ./lib/xm_widgets-manager-spin_box-simple.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box-simple.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-spin_box-simple.ads	Thu Dec 26 13:36:40 2002
-@@ -48,7 +48,7 @@
- 
- package Xm_Widgets.Manager.Spin_Box.Simple is
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
- 
-    Xm_Simple_Spin_Box_Widget_Class     : constant Widget_Class;
- 
-@@ -137,6 +137,6 @@
-    pragma Import (C, Xm_Simple_Spin_Box_Delete_Pos, "XmSimpleSpinBoxDeletePos");
-    pragma Import (C, Xm_Simple_Spin_Box_Set_Item, "XmSimpleSpinBoxSetItem");
- 
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Spin_Box.Simple;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box.adb ./lib/xm_widgets-manager-spin_box.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-spin_box.adb	Thu Dec 26 13:36:40 2002
-@@ -53,7 +53,7 @@
-      X_Toolkit.Internal;
- package body Xm_Widgets.Manager.Spin_Box is
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function To_Callback_Struct (Pointer : in Xt_Pointer)
-@@ -142,7 +142,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Arrow_Orientation, Interfaces.C.signed_char);
- 
-@@ -167,7 +167,7 @@
- 		  Value => Value'Address);
-    end Append_Get;
-    pragma Inline (Append_Get);
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- 
-    function To_Integer is
-@@ -245,6 +245,6 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Spin_Box;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box.ads ./lib/xm_widgets-manager-spin_box.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager-spin_box.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-manager-spin_box.ads	Thu Dec 26 13:36:40 2002
-@@ -51,7 +51,7 @@
- 
- package Xm_Widgets.Manager.Spin_Box is
-  
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_Spin_Box_Widget_Class            : constant Widget_Class;
- 
-@@ -123,7 +123,7 @@
-    pragma Convention (C, Append_Get);
- 
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    --  specifies whether arrows point horizontally or vertically
-    --  if Arrows_Vertical, then
-    --   the decrement arrow points downwards, the increment arrow upwards
-@@ -142,7 +142,7 @@
- 			 Name  : in	Xt_N_Resource_String;
- 			 Value :    out Arrow_Orientation);
-    pragma Convention (C, Append_Get);
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    Xm_N_Arrow_Size                : constant Xt_N_Resource_String;
-    Xm_N_Default_Arrow_Sensitivity : constant Xt_N_Resource_String;
-@@ -238,10 +238,10 @@
-       Arrows_Flat_End => 3, Arrows_Flat_Beginning => 4);
-    for Arrow_Layout_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    for Arrow_Orientation use (Arrows_Vertical => 0, Arrows_Horizontal => 1);
-    for Arrow_Orientation'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    for Position_Type use (Index => 0, Value => 1);
-    for Position_Type'Size use Interfaces.C.unsigned_char'Size;
-@@ -265,10 +265,10 @@
-    Xm_N_Arrow_Layout            : constant Xt_N_Resource_String :=
-       To_Resource_String ("arrowLayout");
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Arrow_Orientation       : constant Xt_N_Resource_String :=
-       To_Resource_String ("arrowOrientation");
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Arrow_Size              : constant Xt_N_Resource_String :=
-       To_Resource_String ("arrowSize");
-    Xm_N_Default_Arrow_Sensitivity : constant Xt_N_Resource_String :=
-@@ -319,6 +319,6 @@
-    Xm_N_Wrap                    : constant Xt_N_Resource_String :=
-       To_Resource_String ("wrap");
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Manager.Spin_Box;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-manager.ads ./lib/xm_widgets-manager.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-manager.ads	Sat Mar  2 12:17:14 2002
-+++ ./lib/xm_widgets-manager.ads	Thu Dec 26 13:36:40 2002
-@@ -66,9 +66,9 @@
-    Xm_N_Highlight_Color         : constant Xt_N_Resource_String;
-    Xm_N_Highlight_Pixmap        : constant Xt_N_Resource_String;
-    Xm_N_Initial_Focus           : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Layout_Direction        : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Navigation_Type         : constant Xt_N_Resource_String;
- 
-@@ -85,9 +85,9 @@
-    pragma Convention (C, Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Popup_Handler_Callback  : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Shadow_Thickness        : constant Xt_N_Resource_String;
-    Xm_N_String_Direction        : constant Xt_N_Resource_String;
-    Xm_N_Top_Shadow_Color        : constant Xt_N_Resource_String;
-@@ -148,18 +148,18 @@
-       To_Resource_String ("highlightPixmap");
-    Xm_N_Initial_Focus           : constant Xt_N_Resource_String :=
-       To_Resource_String ("initialFocus");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Layout_Direction        : constant Xt_N_Resource_String :=
-       To_Resource_String ("layoutDirection");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Navigation_Type         : constant Xt_N_Resource_String :=
-       To_Resource_String ("navigationType");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Popup_Handler_Callback  : constant Xt_N_Resource_String :=
-       To_Resource_String ("popupHandlerCallback");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Shadow_Thickness        : constant Xt_N_Resource_String :=
-       To_Resource_String ("shadowThickness");
-    Xm_N_String_Direction        : constant Xt_N_Resource_String :=
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-arrow_button.ads ./lib/xm_widgets-primitive-arrow_button.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-arrow_button.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-arrow_button.ads	Thu Dec 26 13:36:40 2002
-@@ -100,9 +100,9 @@
-    pragma Convention (C, Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Disarm_Callback         : constant Xt_N_Resource_String;
-    Xm_N_Multi_Click             : constant Xt_N_Resource_String;
- 
-@@ -136,10 +136,10 @@
-    Xm_N_Arrow_Direction         : constant Xt_N_Resource_String :=
-       To_Resource_String ("arrowDirection");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Detail_Shadow_Thickness;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Disarm_Callback         : constant Xt_N_Resource_String :=
-       Xm_Widgets.Primitive.Xm_N_Disarm_Callback;
-    Xm_N_Multi_Click             : constant Xt_N_Resource_String :=
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-icon.adb ./lib/xm_widgets-primitive-icon.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-icon.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-icon.adb	Thu Dec 26 13:36:40 2002
-@@ -45,7 +45,7 @@
-      X_Toolkit.Internal;
- package body Xm_Widgets.Primitive.Icon is
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function Xm_Is_Icon_Gadget (W : in Widget) return Boolean is
-@@ -124,6 +124,6 @@
-    pragma Inline (Append_Get);
- 
-    
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Primitive.Icon;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-icon.ads ./lib/xm_widgets-primitive-icon.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-icon.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-icon.ads	Thu Dec 26 13:36:40 2002
-@@ -42,7 +42,7 @@
- 
- package Xm_Widgets.Primitive.Icon is
-  
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_Icon_Gadget_Class                : constant Widget_Class;
- 
-@@ -62,27 +62,27 @@
-    -- resource values
-    --
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    -- use a value of Xm_Widgets.Alignment
-    --
-    Xm_N_Alignment               : constant Xt_N_Resource_String;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Detail                  : constant Xt_N_Resource_String;
-    Xm_N_Detail_Count            : constant Xt_N_Resource_String;
-    Xm_N_Font_List               : constant Xt_N_Resource_String;
-    Xm_N_Label_String            : constant Xt_N_Resource_String;
-    Xm_N_Large_Icon_Mask         : constant Xt_N_Resource_String;
-    Xm_N_Large_Icon_Pixmap       : constant Xt_N_Resource_String;
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Margin_Height           : constant Xt_N_Resource_String;
-    Xm_N_Margin_Width            : constant Xt_N_Resource_String;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Render_Table            : constant Xt_N_Resource_String;
-    Xm_N_Small_Icon_Mask         : constant Xt_N_Resource_String;
-    Xm_N_Small_Icon_Pixmap       : constant Xt_N_Resource_String;
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Spacing                 : constant Xt_N_Resource_String;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    Xm_N_View_Type               : constant Xt_N_Resource_String;
- 
-@@ -132,10 +132,10 @@
-    -- resource values
-    --
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Alignment               : constant Xt_N_Resource_String :=
-       Xm_Widgets.Primitive.Xm_N_Alignment;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Detail                  : constant Xt_N_Resource_String :=
-       To_Resource_String ("detail");
-    Xm_N_Detail_Count            : constant Xt_N_Resource_String :=
-@@ -148,12 +148,12 @@
-       To_Resource_String ("largeIconMask");
-    Xm_N_Large_Icon_Pixmap       : constant Xt_N_Resource_String :=
-       To_Resource_String ("largeIconPixmap");
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Margin_Height           : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Margin_Height;
-    Xm_N_Margin_Width            : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Margin_Width;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Render_Table            : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Render_Table;
-    Xm_N_Small_Icon_Mask         : constant Xt_N_Resource_String :=
-@@ -161,10 +161,10 @@
-    Xm_N_Small_Icon_Pixmap       : constant Xt_N_Resource_String :=
-       To_Resource_String ("smallIconPixmap");
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Spacing                 : constant Xt_N_Resource_String :=
-       Xm_Widgets.Primitive.Xm_N_Spacing;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    Xm_N_View_Type               : constant Xt_N_Resource_String :=
-       To_Resource_String ("viewType");
-@@ -172,6 +172,6 @@
-    Xm_N_Visual_Emphasis         : constant Xt_N_Resource_String :=
-       To_Resource_String ("visualEmphasis");
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Primitive.Icon;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label-toggle_button.adb ./lib/xm_widgets-primitive-label-toggle_button.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label-toggle_button.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-label-toggle_button.adb	Thu Dec 26 13:36:40 2002
-@@ -168,7 +168,7 @@
-    end Xm_Toggle_Button_Set_State;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    procedure Xm_Toggle_Button_Set_Value
-      (W      : in Widget;
-       State  : in Set_Type;
-@@ -200,7 +200,7 @@
-          raise Invalid_State_Error;
-       end if;
-    end Xm_Toggle_Button_Gadget_Set_Value;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function To_Integer is
-@@ -278,7 +278,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Toggle_Mode_Type, Interfaces.C.unsigned_char);
- 
-@@ -304,6 +304,6 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Primitive.Label.Toggle_Button;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label-toggle_button.ads ./lib/xm_widgets-primitive-label-toggle_button.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label-toggle_button.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-label-toggle_button.ads	Thu Dec 26 13:36:40 2002
-@@ -55,11 +55,11 @@
-    --  The new definition is to use the type Set_Type, which is differently
-    --  defined for Motif 1.2 and Motif 2.0+
-    --
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Set_Type is (Unset, Set, Indeterminate);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!    type Set_Type is (Unset, Set);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    type Xm_Toggle_Button_Callback_Struct is record
-@@ -120,7 +120,7 @@
-       State  : in Boolean;
-       Notify : in Boolean);  
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    --  if in two-states (On/Off) mode and Indeterminate is chosen, the exception
-    --  Invalid_State_Error is raised
-    --
-@@ -135,7 +135,7 @@
-      (W      : in Widget;
-       State  : in Set_Type;
-       Notify : in Boolean);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    -- -------------------------------------------------------------------------
-@@ -144,14 +144,14 @@
-    --
- 
-    Xm_N_Arm_Callback            : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Disarm_Callback         : constant Xt_N_Resource_String;
-    Xm_N_Fill_On_Select          : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Indeterminate_Pixmap    : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Indicator_On            : constant Xt_N_Resource_String;
- 
-    type Indicator_On_Type is (None, Fill,
-@@ -170,11 +170,11 @@
-    Xm_N_Indicator_Size          : constant Xt_N_Resource_String;
-    Xm_N_Indicator_Type          : constant Xt_N_Resource_String;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Indicator_Type is (N_Of_Many, One_Of_Many, One_Of_Many_Round);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!    type Indicator_Type is (N_Of_Many, One_Of_Many);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    procedure Append_Set (List  : in out Arg_List;
-                          Name  : in     Xt_N_Resource_String;
-@@ -200,7 +200,7 @@
-    pragma Convention (C, Append_Get);
- 
-    Xm_N_Spacing                 : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Toggle_Mode             : constant Xt_N_Resource_String;
- 
-    type Toggle_Mode_Type is (Toggle_Boolean, Toggle_Indeterminate);
-@@ -215,19 +215,19 @@
-    pragma Convention (C, Append_Get);
- 
-    Xm_N_Unselect_Color          : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Value_Changed_Callback  : constant Xt_N_Resource_String;
-    Xm_N_Visible_When_Off        : constant Xt_N_Resource_String;
- 
- private
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Set_Type use (Unset => 0, Set => 1, Indeterminate => 2);
-    for Set_Type'Size use Interfaces.C.unsigned_char'Size;
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!    for Set_Type use (Unset => 0, Set => 1);
- --!    for Set_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    XmINDICATOR_3D_BOX      : constant := 16#01#;
-    XmINDICATOR_FLAT_BOX    : constant := 16#02#;
-@@ -242,17 +242,17 @@
-       Cross_Box => XmINDICATOR_CROSS_GLYPH + XmINDICATOR_3D_BOX);
-    for Indicator_On_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Indicator_Type use (N_Of_Many => 1, One_Of_Many => 2, One_Of_Many_Round => 3);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!    for Indicator_Type use (N_Of_Many => 1, One_Of_Many => 2);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    for Indicator_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Toggle_Mode_Type use (Toggle_Boolean => 0, Toggle_Indeterminate => 1);
-    for Toggle_Mode_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    c_const_Xm_Toggle_Button_Widget_Class       : Widget_Class;
-@@ -274,18 +274,18 @@
- 
-    Xm_N_Arm_Callback            : constant Xt_N_Resource_String
-       := Xm_Widgets.Primitive.Xm_N_Arm_Callback;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Detail_Shadow_Thickness;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Disarm_Callback         : constant Xt_N_Resource_String
-       := Xm_Widgets.Primitive.Xm_N_Disarm_Callback;
-    Xm_N_Fill_On_Select          : constant Xt_N_Resource_String :=
-       To_Resource_String ("fillOnSelect");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Indeterminate_Pixmap    : constant Xt_N_Resource_String :=
-       To_Resource_String ("indeterminatePixmap");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Indicator_On            : constant Xt_N_Resource_String :=
-       To_Resource_String ("indicatorOn");
- 
-@@ -305,13 +305,13 @@
- 
-    Xm_N_Spacing                 : constant Xt_N_Resource_String :=
-       Xm_Widgets.Primitive.Xm_N_Spacing;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Toggle_Mode             : constant Xt_N_Resource_String :=
-       To_Resource_String ("toggleMode");
- 
-    Xm_N_Unselect_Color          : constant Xt_N_Resource_String :=
-       To_Resource_String ("unselectColor");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Value_Changed_Callback  : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Value_Changed_Callback;
-    Xm_N_Visible_When_Off        : constant Xt_N_Resource_String :=
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label.ads ./lib/xm_widgets-primitive-label.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-label.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-label.ads	Thu Dec 26 13:36:40 2002
-@@ -103,9 +103,9 @@
-    Xm_N_Mnemonic                : constant Xt_N_Resource_String;
-    Xm_N_Mnemonic_Char_Set       : constant Xt_N_Resource_String;
-    Xm_N_Recompute_Size          : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Render_Table            : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_String_Direction        : constant Xt_N_Resource_String;
- 
- 
-@@ -167,10 +167,10 @@
-       To_Resource_String ("mnemonicCharSet");
-    Xm_N_Recompute_Size          : constant Xt_N_Resource_String :=
-       To_Resource_String ("recomputeSize");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Render_Table            : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Render_Table;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_String_Direction        : constant Xt_N_Resource_String :=
-       To_Resource_String ("stringDirection");
- 
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-list.adb ./lib/xm_widgets-primitive-list.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-list.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-list.adb	Thu Dec 26 13:36:40 2002
-@@ -311,7 +311,7 @@
-    procedure Xm_List_Add_Item_Unselected
-      (W    : in Widget;
-       Item : in Xm_String;
--      Pos  : in Integer) is
-+      Pos  : in Integer := 0) is
-    begin
-       XmListAddItemUnselected (W, Item, Pos);
-    end Xm_List_Add_Item_Unselected;
-@@ -321,7 +321,7 @@
-    procedure Xm_List_Add_Items_Unselected
-      (W     : in Widget;
-       Items : in Xm_String_List;
--      Pos   : in Integer) is
-+      Pos   : in Integer := 0) is
-    begin
-       XmListAddItemsUnselected (W, Items (Items'First)'Address, Integer(Items'Length), Pos);
-    end Xm_List_Add_Items_Unselected;
-@@ -844,7 +844,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Match_Behavior_Type, Interfaces.C.unsigned_char);
- 
-@@ -920,7 +920,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function To_Integer is
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-list.ads ./lib/xm_widgets-primitive-list.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-list.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-list.ads	Thu Dec 26 13:36:40 2002
-@@ -55,11 +55,11 @@
-    type Selection_Type is
-      (Initial, Addition, Modification);
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Auto_Selection_Type is
-      (Auto_Unset, Auto_Begin, Auto_Motion,
-       Auto_Cancel, Auto_No_Change, Auto_Change);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    type Xm_List_Callback_Struct is record
-       Reason                 : Callback_Reason;
-@@ -71,9 +71,9 @@
-       Selected_Item_Count    : Integer;
-       Selected_Item_Position : System.Address;  -- preliminary, should be Integer_Array_Pointer_Type
-       Sel_Type               : Selection_Type;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Auto_Sel_Type          : Auto_Selection_Type;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    end record;
-    pragma Convention (C, Xm_List_Callback_Struct);
- 
-@@ -138,12 +138,12 @@
-    procedure Xm_List_Add_Item_Unselected
-      (W    : in Widget;
-       Item : in Xm_String;
--      Pos  : in Integer);
-+      Pos  : in Integer := 0);
- 
-    procedure Xm_List_Add_Items_Unselected
-      (W     : in Widget;
-       Items : in Xm_String_List;
--      Pos   : in Integer);
-+      Pos   : in Integer := 0);
- 
- 
-    -- -------------------------------------------------------------------------
-@@ -412,9 +412,9 @@
- 
-    Xm_N_Browse_Selection_Callback : constant Xt_N_Resource_String;
-    Xm_N_Default_Action_Callback   : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Destination_Callback   : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Double_Click_Interval  : constant Xt_N_Resource_String;
-    Xm_N_Extended_Selection_Callback : constant Xt_N_Resource_String;
-    Xm_N_Font_List              : constant Xt_N_Resource_String;
-@@ -437,7 +437,7 @@
-    pragma Convention (C, Append_Get);
- 
-    Xm_N_List_Spacing           : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Match_Behavior         : constant Xt_N_Resource_String;
- 
-    type Match_Behavior_Type is
-@@ -452,9 +452,9 @@
-                          Value :    out Match_Behavior_Type);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Multiple_Selection_Callback : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Primary_Ownership       : constant Xt_N_Resource_String;
- 
-    type Primary_Ownership_Type is
-@@ -470,7 +470,7 @@
-    pragma Convention (C, Append_Get);
- 
-    Xm_N_Render_Table            : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Scroll_Bar_Display_Policy : constant Xt_N_Resource_String;
- 
-    subtype Scroll_Bar_Display_Policy_Type is
-@@ -486,12 +486,12 @@
-                          Value :    out Scroll_Bar_Display_Policy_Type)
-       renames Xm_Widgets.Manager.Scrolled_Window.Append_Get;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Select_Color            : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Selected_Item_Count     : constant Xt_N_Resource_String;
-    Xm_N_Selected_Items          : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Selected_Position_Count : constant Xt_N_Resource_String;
-    Xm_N_Selected_Positions      : constant Xt_N_Resource_String;
-    Xm_N_Selection_Mode          : constant Xt_N_Resource_String;
-@@ -507,7 +507,7 @@
-                          Value :    out Selection_Mode_Type);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Selection_Policy        : constant Xt_N_Resource_String;
- 
-@@ -535,18 +535,18 @@
-      (Initial => 0, Addition => 1, Modification => 2);
-    for Selection_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Auto_Selection_Type use
-      (Auto_Unset => 0, Auto_Begin => 1, Auto_Motion => 2,
-       Auto_Cancel => 3, Auto_No_Change => 4, Auto_Change => 5);
-    for Auto_Selection_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    for List_Size_Policy_Type use
-       (Change_All => 0, Change_None => 1, Change_Width => 2, Change_Height => 3);
-    for List_Size_Policy_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Match_Behavior_Type use
-      (None => 0, Quick_Navigate => 1, Invalid_Match_Behavior => 2);
-    for Match_Behavior_Type'Size use Interfaces.C.unsigned_char'Size;
-@@ -557,7 +557,7 @@
- 
-    for Selection_Mode_Type use (Normal_Mode => 0, Add_Mode => 1);
-    for Selection_Mode_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    for Selection_Policy_Type use
-      (Single_Select => 0, Multiple_Select => 1, Extended_Select => 2, Browse_Select => 3);
-@@ -590,10 +590,10 @@
-       := To_Resource_String ("browseSelectionCallback");
-    Xm_N_Default_Action_Callback   : constant Xt_N_Resource_String
-       := To_Resource_String ("defaultActionCallback");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Destination_Callback   : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Destination_Callback;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Double_Click_Interval  : constant Xt_N_Resource_String
-       := To_Resource_String ("doubleClickInterval");
-    Xm_N_Extended_Selection_Callback : constant Xt_N_Resource_String
-@@ -613,32 +613,32 @@
- 
-    Xm_N_List_Spacing           : constant Xt_N_Resource_String
-       := To_Resource_String ("listSpacing");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Match_Behavior         : constant Xt_N_Resource_String
-       := To_Resource_String ("matchBehavior");
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Multiple_Selection_Callback : constant Xt_N_Resource_String
-       := To_Resource_String ("multipleSelectionCallback");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Primary_Ownership       : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Primary_Ownership;
- 
-    Xm_N_Render_Table            : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_Render_Table;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Scroll_Bar_Display_Policy : constant Xt_N_Resource_String :=
-       Xm_Widgets.Manager.Scrolled_Window.Xm_N_Scroll_Bar_Display_Policy;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Select_Color            : constant Xt_N_Resource_String
-       := To_Resource_String ("selectColor");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Selected_Item_Count     : constant Xt_N_Resource_String
-       := To_Resource_String ("selectedItemCount");
-    Xm_N_Selected_Items          : constant Xt_N_Resource_String
-       := To_Resource_String ("selectedItems");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Selected_Position_Count : constant Xt_N_Resource_String
-       := To_Resource_String ("selectedPositionCount");
-    Xm_N_Selected_Positions      : constant Xt_N_Resource_String
-@@ -646,7 +646,7 @@
-    Xm_N_Selection_Mode          : constant Xt_N_Resource_String
-       := To_Resource_String ("selectionMode");
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Selection_Policy        : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Selection_Policy;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-scroll_bar.adb ./lib/xm_widgets-primitive-scroll_bar.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-scroll_bar.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-scroll_bar.adb	Thu Dec 26 13:36:40 2002
-@@ -185,7 +185,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Slider_Mark_Type, Interfaces.C.unsigned_char);
- 
-@@ -261,6 +261,6 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Primitive.Scroll_Bar;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-scroll_bar.ads ./lib/xm_widgets-primitive-scroll_bar.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-scroll_bar.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-scroll_bar.ads	Thu Dec 26 13:36:40 2002
-@@ -103,9 +103,9 @@
- 
-    Xm_N_Decrement_Callback      : constant Xt_N_Resource_String;
-    Xm_N_Drag_Callback           : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Editable                : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Increment               : constant Xt_N_Resource_String;
-    Xm_N_Increment_Callback      : constant Xt_N_Resource_String;
-    Xm_N_Initial_Delay           : constant Xt_N_Resource_String;
-@@ -149,7 +149,7 @@
-                          Value :    out Show_Arrows_Type);
-    pragma Convention (C, Append_Get);
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Slider_Mark             : constant Xt_N_Resource_String;
- 
-    type Slider_Mark_Type is (None, Etched_Line, Thumb_Mark, Round_Mark);
-@@ -163,11 +163,11 @@
-                          Value :    out Slider_Mark_Type);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Slider_Size             : constant Xt_N_Resource_String;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Slider_Visual           : constant Xt_N_Resource_String;
- 
-    type Slider_Visual_Type is (Background_Color, 
-@@ -199,7 +199,7 @@
-    pragma Convention (C, Append_Get);
- 
-    Xm_N_Snap_Back_Multiple      : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_To_Bottom_Callback      : constant Xt_N_Resource_String;
-    Xm_N_To_Top_Callback         : constant Xt_N_Resource_String;
-    Xm_N_Through_Color           : constant Xt_N_Resource_String;
-@@ -217,7 +217,7 @@
-    for Show_Arrows_Type use (None => 0, Each_Side => 1, Max_Side => 2, Min_Side => 3);
-    for Show_Arrows_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Slider_Mark_Type use (None => 0, Etched_Line => 1, Thumb_Mark => 2, Round_Mark => 3);
-    for Slider_Mark_Type'Size use Interfaces.C.unsigned_char'Size;
- 
-@@ -229,7 +229,7 @@
-                                Through_Color	=> 2,
-                                Shadowed_Background => 3);
-    for Slider_Visual_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    c_const_Xm_Scroll_Bar_Widget_Class          : Widget_Class;
-@@ -249,10 +249,10 @@
-       To_Resource_String ("decrementCallback");
-    Xm_N_Drag_Callback           : constant Xt_N_Resource_String :=
-       To_Resource_String ("dragCallback");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Editable                : constant Xt_N_Resource_String :=
-       To_Resource_String ("editable");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Increment               : constant Xt_N_Resource_String :=
-       To_Resource_String ("increment");
-    Xm_N_Increment_Callback      : constant Xt_N_Resource_String :=
-@@ -280,16 +280,16 @@
-    Xm_N_Show_Arrows             : constant Xt_N_Resource_String :=
-       To_Resource_String ("showArrows");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Slider_Mark             : constant Xt_N_Resource_String :=
-       To_Resource_String ("sliderMark");
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Slider_Size             : constant Xt_N_Resource_String :=
-       To_Resource_String ("sliderSize");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Slider_Visual           : constant Xt_N_Resource_String :=
-       To_Resource_String ("sliderVisual");
-    Xm_N_Sliding_Mode            : constant Xt_N_Resource_String :=
-@@ -297,7 +297,7 @@
- 
-    Xm_N_Snap_Back_Multiple      : constant Xt_N_Resource_String :=
-       To_Resource_String ("snapBackMultiple");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_To_Bottom_Callback      : constant Xt_N_Resource_String :=
-       To_Resource_String ("toBottomCallback");
-    Xm_N_To_Top_Callback         : constant Xt_N_Resource_String :=
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text-data_field.adb ./lib/xm_widgets-primitive-text-data_field.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text-data_field.adb	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_widgets-primitive-text-data_field.adb	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,457 @@
-+-------------------------------------------------------------------------------
-+--                                                                           --
-+--  Ada Interface to the X Window System and Motif(tm)/Lesstif               --
-+--  Copyright (c) 1996-2002 Hans-Frieder Vogt                                --
-+--  This file also copyright (c) 2002 Vadim Godunko                          --
-+--                                                                           --
-+--  Adabindx is free software; you can redistribute it and/or modify it      --
-+--  under the terms of the GNU General Public License as published by the    --
-+--  Free Software Foundation; either version 2 of the License, or (at your   --
-+--  option) any later version.                                               --
-+--                                                                           --
-+--  This program is distributed in the hope that it will be useful, but      --
-+--  WITHOUT ANY WARRANTY; without even the implied warranty of               --
-+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     --
-+--  See the GNU General Public License for more details.                     --
-+--                                                                           --
-+--  You should have received a copy of the GNU General Public License        --
-+--  along with this program; if not, write to the                            --
-+--  Free Software Foundation, Inc.,                                          --
-+--  59 Temple Place - Suite 330,                                             --
-+--  Boston, MA 02111-1307, USA.                                              --
-+--                                                                           --
-+--  As a special exception, if other files instantiate generics from this    --
-+--  unit, or you link this unit with other files to produce an executable,   --
-+--  this unit does not by itself cause the resulting executable to be        --
-+--  covered by the GNU General Public License. This exception does not       --
-+--  however invalidate any other reasons why the executable file might be    --
-+--  covered by the GNU General Public License.                               --
-+--                                                                           --
-+--  X Window System is copyrighted by the X Consortium                       --
-+--  Motif(tm)       is copyrighted by the Open Software Foundation, Inc.     --
-+--                  and by The Open Group                                    --
-+--                                                                           --
-+--                                                                           --
-+-------------------------------------------------------------------------------
-+
-+-------------------------------------------------------------------------------
-+--
-+-- HISTORY:
-+--          2002-10-17  Vadim Godunko: first definition of this file
-+--
-+-------------------------------------------------------------------------------
-+with Interfaces.C;
-+with Interfaces.C.Strings;
-+with Interfaces.C.Wstrings;
-+
-+with X_Toolkit.Internal;
-+
-+
-+package body Xm_Widgets.Primitive.Text.Data_Field is
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> XtFree
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   ---------------------------------------------------------------------------
-+   procedure XtFree (Value : in Interfaces.C.Strings.chars_ptr);
-+   procedure XtFree (Value : in Interfaces.C.Wstrings.wchars_ptr);
-+   pragma Import (C, XtFree,"XtFree");
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Create_Data_Field
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Create_Data_Field (Parent  : in Widget;
-+                                  Name    : in String;
-+                                  Arglist : in Arg_List := Null_Arg_List)
-+     return Widget is
-+      function XmCreateDataField
-+         (Parent : in Widget;
-+          Name   : in Interfaces.C.char_array;
-+          Args   : in X_Toolkit.Internal.Arg_Rec_Access;
-+          Count  : in Cardinal)
-+        return Widget;
-+      pragma Import (C, XmCreateDataField, "XmCreateDataField");
-+   begin
-+      return XmCreateDataField (Parent,
-+                                Interfaces.C.To_C (Name),
-+                                X_Toolkit.Internal.Hook (Arglist),
-+                                Cardinal (Length (Arglist)));
-+   end Xm_Create_Data_Field;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Copy
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Copy (W         : in Widget;
-+                                 Clip_Time : in X_Lib.Server_Time) is
-+      function XmDataFieldCopy (W         : in Widget;
-+                                Clip_Time : in X_Lib.Server_Time)
-+        return Xt_Boolean;
-+      pragma Import (C, XmDataFieldCopy, "XmDataFieldCopy");
-+   begin
-+      if XmDataFieldCopy (W, Clip_Time) = Xt_Boolean'(False) then
-+         raise Xm_Data_Field_Dont_Own_Primary_Selection;
-+      end if;
-+   end Xm_Data_Field_Copy;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Cut
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Cut (W         : in Widget;
-+                                Clip_Time : in X_Lib.Server_Time) is
-+      function XmDataFieldCut (W         : in Widget;
-+                               Clip_Time : in X_Lib.Server_Time)
-+        return Xt_Boolean;
-+      pragma Import (C, XmDataFieldCut, "XmDataFieldCut");
-+   begin
-+      if XmDataFieldCut (W, Clip_Time) = Xt_Boolean'(False) then
-+         raise Xm_Data_Field_Dont_Own_Primary_Selection;
-+      end if;
-+   end Xm_Data_Field_Cut;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Get_Add_Mode
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Data_Field_Get_Add_Mode (W : in Widget) return Boolean is
-+      function XmDataFieldGetAddMode (W : in Widget) return Xt_Boolean;
-+      pragma Import (C, XmDataFieldGetAddMode, "XmDataFieldGetAddMode");
-+   begin
-+      return XmDataFieldGetAddMode (W) /= Xt_Boolean'(False);
-+   end Xm_Data_Field_Get_Add_Mode;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Get_Editable
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Data_Field_Get_Editable (W : in Widget) return Boolean is
-+      function XmDataFieldGetEditable (W : in Widget) return Xt_Boolean;
-+      pragma Import (C, XmDataFieldGetEditable, "XmDataFieldGetEditable");
-+   begin
-+      return XmDataFieldGetEditable (W) /= Xt_Boolean'(False);
-+   end Xm_Data_Field_Get_Editable;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Get_Selection
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Data_Field_Get_Selection (W : in Widget) return String is
-+      function XmDataFieldGetSelection (W : in Widget)
-+        return Interfaces.C.Strings.chars_ptr;
-+      pragma Import (C, XmDataFieldGetSelection, "XmDataFieldGetSelection");
-+
-+      X_S : Interfaces.C.Strings.chars_ptr;
-+   begin
-+      X_S := XmDataFieldGetSelection (W);
-+      declare
-+         Result : constant String := Interfaces.C.Strings.Value (X_S);
-+      begin
-+         XtFree (X_S);
-+         return Result;
-+      end;
-+   end Xm_Data_Field_Get_Selection;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Get_Selection
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Data_Field_Get_Selection (W : in Widget) return Wide_String is
-+      function XmDataFieldGetSelectionWcs (W : in Widget)
-+        return Interfaces.C.Wstrings.wchars_ptr;
-+      pragma Import (C, XmDataFieldGetSelectionWcs,
-+                     "XmDataFieldGetSelectionWcs");
-+
-+      X_S : Interfaces.C.Wstrings.wchars_ptr;
-+   begin
-+      X_S := XmDataFieldGetSelectionWcs (W);
-+      declare
-+         Result : constant Wide_String := Interfaces.C.Wstrings.Value (X_S);
-+      begin
-+         XtFree (X_S);
-+         return Result;
-+      end;
-+   end Xm_Data_Field_Get_Selection;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Get_String
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Data_Field_Get_String (W : in Widget) return String is
-+      function XmDataFieldGetString (W : in Widget)
-+        return Interfaces.C.Strings.chars_ptr;
-+      pragma Import (C, XmDataFieldGetString, "XmDataFieldGetString");
-+
-+      X_S : Interfaces.C.Strings.chars_ptr;
-+   begin
-+      X_S := XmDataFieldGetString (W);
-+      declare
-+         Result : constant String := Interfaces.C.Strings.Value (X_S);
-+      begin
-+         XtFree (X_S);
-+         return Result;
-+      end;
-+   end Xm_Data_Field_Get_String;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Get_String
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Data_Field_Get_String (W : in Widget) return Wide_String is
-+      function XmDataFieldGetStringWcs (W : in Widget)
-+        return Interfaces.C.Wstrings.wchars_ptr;
-+      pragma Import (C, XmDataFieldGetStringWcs, "XmDataFieldGetStringWcs");
-+
-+      X_S : Interfaces.C.Wstrings.wchars_ptr;
-+   begin
-+      X_S := XmDataFieldGetStringWcs (W);
-+      declare
-+         Result : constant Wide_String := Interfaces.C.Wstrings.Value (X_S);
-+      begin
-+         XtFree (X_S);
-+         return Result;
-+      end;
-+   end Xm_Data_Field_Get_String;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Insert
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Insert (W        : in Widget;
-+                                   Position : in Xm_Text_Position;
-+                                   Value    : in String) is
-+      procedure XmDataFieldInsert (W        : in Widget;
-+                                   Position : in Xm_Text_Position;
-+                                   Value    : in Interfaces.C.char_array);
-+      pragma Import (C, XmDataFieldInsert, "XmDataFieldInsert");
-+   begin
-+      XmDataFieldInsert (W, Position, Interfaces.C.To_C (Value));
-+   end Xm_Data_Field_Insert;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Insert
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Insert (W        : in Widget;
-+                                   Position : in Xm_Text_Position;
-+                                   Value    : in Wide_String) is
-+      procedure XmDataFieldInsertWcs (W        : in Widget;
-+                                      Position : in Xm_Text_Position;
-+                                      Value    : in Interfaces.C.wchar_array);
-+      pragma Import (C, XmDataFieldInsertWcs, "XmDataFieldInsertWcs");
-+   begin
-+      XmDataFieldInsertWcs (W, Position, Interfaces.C.To_C (Value));
-+   end Xm_Data_Field_Insert;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Paste
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Paste (W : in Widget) is
-+      function XmDataFieldPaste (W : in Widget) return Xt_Boolean;
-+      pragma Import (C, XmDataFieldPaste, "XmDataFieldPaste");
-+   begin
-+      if XmDataFieldPaste (W) = Xt_Boolean'(False) then
-+         raise Xm_Data_Field_Dont_Own_Primary_Selection;
-+      end if;
-+   end Xm_Data_Field_Paste;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Pos_To_XY
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Pos_To_XY (W        : in     Widget;
-+                                      Position : in     Xm_Text_Position;
-+                                      X        :    out X_Lib.Position;
-+                                      Y        :    out X_Lib.Position) is
-+      function XmDataFieldPosToXY (W        : in Widget;
-+                                   Position : in Xm_Text_Position;
-+                                   X        : in System.Address;
-+                                   Y        : in System.Address)
-+        return Xt_Boolean;
-+      pragma Import (C, XmDataFieldPosToXY, "XmDataFieldPosToXY");
-+   begin
-+      if XmDataFieldPosToXY (W, Position, X'Address, Y'Address) =
-+        Xt_Boolean'(False)
-+      then
-+         raise Xm_Data_Field_Not_In_Data_Field_Widget;
-+      end if;
-+   end Xm_Data_Field_Pos_To_XY;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Replace
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Replace (W             : in Widget;
-+                                    From_Position : in Xm_Text_Position;
-+                                    To_Position   : in Xm_Text_Position;
-+                                    Value         : in String) is
-+      procedure XmDataFieldReplace
-+       (W             : in Widget;
-+        From_Position : in Xm_Text_Position;
-+        To_Position   : in Xm_Text_Position;
-+        Value         : in Interfaces.C.char_array);
-+      pragma Import (C, XmDataFieldReplace, "XmDataFieldReplace");
-+   begin
-+      XmDataFieldReplace (W, From_Position, To_Position,
-+                          Interfaces.C.To_C (Value));
-+   end Xm_Data_Field_Replace;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Replace
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Replace (W             : in Widget;
-+                                    From_Position : in Xm_Text_Position;
-+                                    To_Position   : in Xm_Text_Position;
-+                                    Value         : in Wide_String) is
-+      procedure XmDataFieldReplaceWcs
-+       (W             : in Widget;
-+        From_Position : in Xm_Text_Position;
-+        To_Position   : in Xm_Text_Position;
-+        Value         : in Interfaces.C.wchar_array);
-+      pragma Import (C, XmDataFieldReplaceWcs, "XmDataFieldReplaceWcs");
-+   begin
-+      XmDataFieldReplaceWcs (W, From_Position, To_Position,
-+                             Interfaces.C.To_C (Value));
-+   end Xm_Data_Field_Replace;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Set_Add_Mode
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Set_Add_Mode (W     : in Widget;
-+                                         State : in Boolean) is
-+      procedure XmDataFieldSetAddMode (W     : in Widget;
-+                                       State : in Xt_Boolean);
-+      pragma Import (C, XmDataFieldSetAddMode, "XmDataFieldSetAddMode");
-+   begin
-+      XmDataFieldSetAddMode (W, To_Xt_Boolean (State));
-+   end Xm_Data_Field_Set_Add_Mode;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Set_Editable
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Set_Editable (W        : in Widget;
-+                                         Editable : in Boolean) is
-+      procedure XmDataFieldSetEditable (W        : in Widget;
-+                                        Editable : in Xt_Boolean);
-+      pragma Import (C, XmDataFieldSetEditable, "XmDataFieldSetEditable");
-+   begin
-+      XmDataFieldSetEditable (W, To_Xt_Boolean (Editable));
-+   end Xm_Data_Field_Set_Editable;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Set_String
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Set_String (W     : in Widget;
-+                                       Value : in String) is
-+      procedure XmDataFieldSetString(W     : in Widget;
-+                                     Value : in Interfaces.C.char_array);
-+      pragma Import (C, XmDataFieldSetString,"XmDataFieldSetString");
-+   begin
-+      XmDataFieldSetString (W, Interfaces.C.To_C (Value));
-+   end Xm_Data_Field_Set_String;
-+
-+
-+--   ---------------------------------------------------------------------------
-+--   --! <Subprogram>
-+--   --!    <Unit> Xm_Data_Field_Set_String
-+--   --!    <Implementation_Notes>
-+--   ---------------------------------------------------------------------------
-+--   procedure Xm_Data_Field_Set_String (W     : in Widget;
-+--                                       Value : in Wide_String) is
-+--      procedure XmDataFieldSetStringWcs (W     : in Widget;
-+                                     Value : in Interfaces.C.char_array);
-+      pragma Import (C, XmDataFieldSetString,"XmDataFieldSetString");
-+   begin
-+      XmDataFieldSetString (W, Interfaces.C.To_C (Value));
-+   end Xm_Data_Field_Set_String;
-+
-+
-+--   ---------------------------------------------------------------------------
-+--   --! <Subprogram>
-+--   --!    <Unit> Xm_Data_Field_Set_String
-+--   --!    <Implementation_Notes>
-+--   ---------------------------------------------------------------------------
-+--   procedure Xm_Data_Field_Set_String (W     : in Widget;
-+--                                       Value : in Wide_String) is
-+--      procedure XmDataFieldSetStringWcs (W     : in Widget;
-+--                                         Value : in Interfaces.C.wchar_array);
-+--      pragma Import (C, XmDataFieldSetStringWcs,"XmDataFieldSetStringWcs");
-+--   begin
-+---- UseGnat3.13p
-+----!       --  the GNAT 3.13p runtime (and possibly earlies ones as well) raise
-+----!       --  STORAGE_ERROR for Value with 'Length = 0
-+----!       --  This is a workaround to this problem
-+----!       --
-+----!       if Value'Length = 0 then
-+----!          declare
-+----!             Value_String : constant Interfaces.C.Wchar_Array (0 .. 0) :=
-+----!               (others => Interfaces.C.wide_nul);
-+----!          begin
-+----!             XmDataFieldSetStringWcs (W, Value_String);
-+----!          end;
-+----!       else
-+----!          XmDataFieldSetStringWcs (W, Interfaces.C.To_C (Value));
-+----!       end if;
-+---- NotGnat3.13p
-+--      XmDataFieldSetStringWcs (W, Interfaces.C.To_C (Value));
-+---- EndGnat3.13p
-+--   end Xm_Data_Field_Set_String;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Is_Data_Field
-+   --!    <Implementation_Notes>
-+   ---------------------------------------------------------------------------
-+   function Xm_Is_Data_Field (W : in Widget) return Boolean is
-+   begin
-+      return Xt_Is_Subclass (W, Xm_Data_Field_Widget_Class);
-+   end Xm_Is_Data_Field;
-+
-+
-+end Xm_Widgets.Primitive.Text.Data_Field;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text-data_field.ads ./lib/xm_widgets-primitive-text-data_field.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text-data_field.ads	Thu Jan  1 01:00:00 1970
-+++ ./lib/xm_widgets-primitive-text-data_field.ads	Thu Dec 26 13:36:40 2002
-@@ -0,0 +1,250 @@
-+-------------------------------------------------------------------------------
-+--                                                                           --
-+--  Ada Interface to the X Window System and Motif(tm)/Lesstif               --
-+--  Copyright (c) 1996-2002 Hans-Frieder Vogt                                --
-+--  This file also copyright (c) 2002 Vadim Godunko                          --
-+--                                                                           --
-+--  Adabindx is free software; you can redistribute it and/or modify it      --
-+--  under the terms of the GNU General Public License as published by the    --
-+--  Free Software Foundation; either version 2 of the License, or (at your   --
-+--  option) any later version.                                               --
-+--                                                                           --
-+--  This program is distributed in the hope that it will be useful, but      --
-+--  WITHOUT ANY WARRANTY; without even the implied warranty of               --
-+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     --
-+--  See the GNU General Public License for more details.                     --
-+--                                                                           --
-+--  You should have received a copy of the GNU General Public License        --
-+--  along with this program; if not, write to the                            --
-+--  Free Software Foundation, Inc.,                                          --
-+--  59 Temple Place - Suite 330,                                             --
-+--  Boston, MA 02111-1307, USA.                                              --
-+--                                                                           --
-+--  As a special exception, if other files instantiate generics from this    --
-+--  unit, or you link this unit with other files to produce an executable,   --
-+--  this unit does not by itself cause the resulting executable to be        --
-+--  covered by the GNU General Public License. This exception does not       --
-+--  however invalidate any other reasons why the executable file might be    --
-+--  covered by the GNU General Public License.                               --
-+--                                                                           --
-+--  X Window System is copyrighted by the X Consortium                       --
-+--  Motif(tm)       is copyrighted by the Open Software Foundation, Inc.     --
-+--                  and by The Open Group                                    --
-+--                                                                           --
-+--                                                                           --
-+-------------------------------------------------------------------------------
-+
-+-------------------------------------------------------------------------------
-+--
-+-- HISTORY:
-+--          2002-10-13  Vadim Godunko: first definition of this file
-+--
-+-------------------------------------------------------------------------------
-+
-+package Xm_Widgets.Primitive.Text.Data_Field is
-+
-+--UseOpenMotif2.2
-+
-+   Xm_Data_Field_Widget_Class : constant Widget_Class;
-+
-+   type Xm_Data_Field_Callback_Struct is record
-+      W    : Widget;
-+      Text : X_Strings.X_String;
-+      Doit : Boolean;
-+   end record;
-+   pragma Convention (C, Xm_Data_Field_Callback_Struct);
-+
-+   type Xm_Data_Field_Callback_Struct_Access is
-+     access all Xm_Data_Field_Callback_Struct;
-+
-+
-+   Xm_Data_Field_Dont_Own_Primary_Selection : exception;
-+   Xm_Data_Field_Not_In_Data_Field_Widget   : exception;
-+
-+
-+   function Xm_Is_Data_Field (W : in Widget) return Boolean;
-+
-+   function Xm_Create_Data_Field (Parent  : in Widget;
-+                                  Name    : in String;
-+                                  Arglist : in Arg_List := Null_Arg_List)
-+     return Widget;
-+
-+   procedure Xm_Data_Field_Set_String (W     : in Widget;
-+                                       Value : in String);
-+
-+   --  procedure Xm_Data_Field_Set_String (W     : in Widget;
-+   --                                      Value : in Wide_String);
-+
-+   function Xm_Data_Field_Get_String (W : in Widget) return String;
-+
-+   function Xm_Data_Field_Get_String (W : in Widget) return Wide_String;
-+
-+   --  Xm_Data_Field_Get_Substring
-+   --  Xm_Data_Field_Get_Substring_Wcs
-+
-+   function Xm_Data_Field_Get_Last_Position (W : in Widget)
-+     return Xm_Text_Position;
-+
-+   procedure Xm_Data_Field_Replace (W             : in Widget;
-+                                    From_Position : in Xm_Text_Position;
-+                                    To_Position   : in Xm_Text_Position;
-+                                    Value         : in String);
-+
-+   procedure Xm_Data_Field_Replace (W             : in Widget;
-+                                    From_Position : in Xm_Text_Position;
-+                                    To_Position   : in Xm_Text_Position;
-+                                    Value         : in Wide_String);
-+
-+   procedure Xm_Data_Field_Insert (W        : in Widget;
-+                                   Position : in Xm_Text_Position;
-+                                   Value    : in String);
-+
-+   procedure Xm_Data_Field_Insert (W        : in Widget;
-+                                   Position : in Xm_Text_Position;
-+                                   Value    : in Wide_String);
-+
-+   procedure Xm_Data_Field_Set_Add_Mode (W     : in Widget;
-+                                         State : in Boolean);
-+
-+   function Xm_Data_Field_Get_Add_Mode (W : in Widget) return Boolean;
-+
-+   procedure Xm_Data_Field_Set_Highlight (W      : in Widget;
-+                                          Left   : in Xm_Text_Position;
-+                                          Right  : in Xm_Text_Position;
-+                                          Mode   : in Xm_Highlight_Mode);
-+
-+   function Xm_Data_Field_Get_Editable (W : in Widget) return Boolean;
-+
-+   procedure Xm_Data_Field_Set_Editable (W        : in Widget;
-+                                         Editable : in Boolean);
-+
-+   function Xm_Data_Field_Get_Max_Length (W : in Widget) return Integer;
-+
-+   procedure Xm_Data_Field_Set_Max_Length (W          : in Widget;
-+                                           Max_Length : in Integer);
-+
-+   function Xm_Data_Field_Get_Cursor_Position (W : in Widget)
-+     return Xm_Text_Position;
-+
-+   function Xm_Data_Field_Get_Insertion_Position (W : in Widget)
-+     return Xm_Text_Position;
-+
-+   procedure Xm_Data_Field_Set_Insertion_Position
-+    (W        : in Widget;
-+     Position : in Xm_Text_Position);
-+
-+   function Xm_Data_Field_Get_Selection (W : in Widget) return String;
-+
-+   function Xm_Data_Field_Get_Selection (W : in Widget) return Wide_String;
-+
-+   procedure Xm_Data_Field_Set_Selection (W     : in Widget;
-+                                          First : in Xm_Text_Position;
-+                                          Last  : in Xm_Text_Position;
-+                                          Time  : in X_Lib.Server_Time);
-+
-+   procedure Xm_Data_Field_Get_Selection_Position
-+    (W     : in     Widget;
-+     Left  :    out Xm_Text_Position;
-+     Right :    out Xm_Text_Position);
-+
-+   function Xm_Data_Field_XY_To_Pos (W : in Widget;
-+                                     X : in X_Lib.Position;
-+                                     Y : in X_Lib.Position)
-+     return Xm_Text_Position;
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Pos_To_XY
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   --!       Xm_Data_Field_Not_In_Data_Field_Widget - character position
-+   --!     not displayed in widget.
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Pos_To_XY (W        : in     Widget;
-+                                      Position : in     Xm_Text_Position;
-+                                      X        :    out X_Lib.Position;
-+                                      Y        :    out X_Lib.Position);
-+
-+
-+   procedure Xm_Data_Field_Show_Position (W        : in Widget;
-+                                          Position : in Xm_Text_Position);
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Cut
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   --!       Xm_Data_Field_Donr_Own_Primary_Selection
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Cut (W         : in Widget;
-+                                Clip_Time : in X_Lib.Server_Time);
-+
-+
-+   ---------------------------------------------------------------------------
-+   --! <Subprogram>
-+   --!    <Unit> Xm_Data_Field_Copy
-+   --!    <Purpose>
-+   --!    <Exceptions>
-+   --!       Xm_Data_Field_Donr_Own_Primary_Selection
-+   ---------------------------------------------------------------------------
-+   procedure Xm_Data_Field_Copy (W         : in Widget;
-+                                 Clip_Time : in X_Lib.Server_Time);
-+
-+
-+   procedure Xm_Data_Field_Paste (W : in Widget);
-+
-+   function Xm_Data_Field_Get_Baseline (W : in Widget) return Integer;
-+
-+
-+   Xm_N_Alignment              : constant Xt_N_Resource_String;
-+   Xm_N_Auto_Fill              : constant Xt_N_Resource_String;
-+   Xm_N_Picture                : constant Xt_N_Resource_String;
-+   Xm_N_Picture_Error_Callback : constant Xt_N_Resource_String;
-+   Xm_N_Validate_Callback      : constant Xt_N_Resource_String;
-+
-+
-+private
-+
-+   c_const_Xm_Data_Field_Widget_Class : Widget_Class;
-+   pragma Import (C, c_const_Xm_Data_Field_Widget_Class,
-+                  "xmDataFieldWidgetClass");
-+
-+   Xm_Data_Field_Widget_Class : constant Widget_Class :=
-+     c_const_Xm_Data_Field_Widget_Class;
-+
-+
-+   Xm_N_Alignment              : constant Xt_N_Resource_String :=
-+     Xm_Widgets.Primitive.Xm_N_Alignment;
-+   Xm_N_Auto_Fill              : constant Xt_N_Resource_String :=
-+     To_Resource_String ("autoFill");
-+   Xm_N_Picture                : constant Xt_N_Resource_String :=
-+     To_Resource_String ("picture");
-+   Xm_N_Picture_Error_Callback : constant Xt_N_Resource_String :=
-+     To_Resource_String ("pictureErrorCallback");
-+   Xm_N_Validate_Callback      : constant Xt_N_Resource_String :=
-+     To_Resource_String ("validateCallback");
-+
-+
-+   pragma Import (C, Xm_Data_Field_Get_Baseline,"XmDataFieldGetBaseline");
-+   pragma Import (C, Xm_Data_Field_Get_Cursor_Position,
-+                  "XmDataFieldGetCursorPosition");
-+   pragma Import (C, Xm_Data_Field_Get_Insertion_Position,
-+                  "XmDataFieldGetInsertionPosition");
-+   pragma Import (C, Xm_Data_Field_Get_Last_Position,
-+                  "XmDataFieldGetLastPosition");
-+   pragma Import (C, Xm_Data_Field_Get_Max_Length, "XmDataFieldGetMaxLength");
-+   pragma Import (C, Xm_Data_Field_Get_Selection_Position,
-+                  "XmDataFieldGetSelectionPosition");
-+   pragma Import (C, Xm_Data_Field_Set_Highlight, "XmDataFieldSetHighlight");
-+   pragma Import (C, Xm_Data_Field_Set_Insertion_Position,
-+                  "XmDataFieldSetInsertionPosition");
-+   pragma Import (C, Xm_Data_Field_Set_Max_Length, "XmDataFieldSetMaxLength");
-+   pragma Import (C, Xm_Data_Field_Set_Selection, "XmDataFieldSetSelection");
-+   pragma Import (C, Xm_Data_Field_Show_Position, "XmDataFieldShowPosition");
-+   pragma Import (C, Xm_Data_Field_XY_To_Pos, "XmDataFieldXYToPos");
-+
-+--EndOpenMotif2.2
-+
-+end Xm_Widgets.Primitive.Text.Data_Field;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text.adb ./lib/xm_widgets-primitive-text.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-text.adb	Thu Dec 26 13:36:40 2002
-@@ -494,7 +494,7 @@
-       function XmTextGetAddMode (W : in Widget) return Xt_Boolean;
-       pragma Import (C, XmTextGetAddMode, "XmTextGetAddMode");
-    begin
--      return XmTextGetAddMode (W) = Xt_Boolean'(True);
-+      return XmTextGetAddMode (W) /= Xt_Boolean'(False);
-    end Xm_Text_Get_Add_Mode;
- 
- 
-@@ -502,7 +502,7 @@
-       function XmTextFieldGetAddMode (W : in Widget) return Xt_Boolean;
-       pragma Import (C, XmTextFieldGetAddMode, "XmTextFieldGetAddMode");
-    begin
--      return XmTextFieldGetAddMode (W) = Xt_Boolean'(True);
-+      return XmTextFieldGetAddMode (W) /= Xt_Boolean'(False);
-    end Xm_Text_Field_Get_Add_Mode;
- -- EndLesstif
- 
-@@ -561,7 +561,7 @@
-       function XmTextGetEditable (W : in Widget) return Xt_Boolean;
-       pragma Import (C, XmTextGetEditable, "XmTextGetEditable");
-    begin
--      return XmTextGetEditable (W) = Xt_Boolean'(True);
-+      return XmTextGetEditable (W) /= Xt_Boolean'(False);
-    end Xm_Text_Get_Editable;
- 
- 
-@@ -569,7 +569,7 @@
-       function XmTextFieldGetEditable (W : in Widget) return Xt_Boolean;
-       pragma Import (C, XmTextFieldGetEditable, "XmTextFieldGetEditable");
-    begin
--      return XmTextFieldGetEditable (W) = Xt_Boolean'(True);
-+      return XmTextFieldGetEditable (W) /= Xt_Boolean'(False);
-    end Xm_Text_Field_Get_Editable;
- 
- 
-@@ -721,7 +721,7 @@
- 
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    procedure Xm_Text_Copy_Link
-      (W         : in Widget;
-       Clip_Time : in X_Lib.Server_Time) is
-@@ -750,7 +750,7 @@
-          raise Xm_Text_Error_Dont_Own_Primary_Selection;
-       end if;
-    end Xm_Text_Field_Copy_Link;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- 
-@@ -805,7 +805,7 @@
-    end Xm_Text_Field_Paste;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    procedure Xm_Text_Paste_Link (W : in Widget) is
-       function XmTextPasteLink (W : in Widget) return Xt_Boolean;
-       pragma Import (C, XmTextPasteLink, "XmTextPasteLink");
-@@ -824,7 +824,7 @@
-          raise Xm_Text_Error_Dont_Own_Primary_Selection;
-       end if;
-    end Xm_Text_Field_Paste_Link;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- 
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text.ads ./lib/xm_widgets-primitive-text.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive-text.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive-text.ads	Thu Dec 26 13:36:40 2002
-@@ -268,14 +268,14 @@
-       Clip_Time : in X_Lib.Server_Time);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    procedure Xm_Text_Copy_Link
-      (W         : in Widget;
-       Clip_Time : in X_Lib.Server_Time);
-    procedure Xm_Text_Field_Copy_Link
-      (W         : in Widget;
-       Clip_Time : in X_Lib.Server_Time);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    procedure Xm_Text_Cut
-@@ -290,10 +290,10 @@
-    procedure Xm_Text_Field_Paste (W : in Widget);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    procedure Xm_Text_Paste_Link (W : in Widget);
-    procedure Xm_Text_Field_Paste_Link (W : in Widget);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    procedure Xm_Text_Clear_Selection
-@@ -406,9 +406,9 @@
-    --
-    Xm_N_Cursor_Position_Visible : constant Xt_N_Resource_String;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Destination_Callback    : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    -- for Xm_N_Editable use False or True
-    --
-@@ -450,9 +450,9 @@
-    --
-    Xm_N_Top_Character           : constant Xt_N_Resource_String;
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Total_Lines             : constant Xt_N_Resource_String;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    Xm_N_Value                   : constant Xt_N_Resource_String;
-    Xm_N_Value_Changed_Callback  : constant Xt_N_Resource_String;
-@@ -480,9 +480,9 @@
-    Xm_N_Blink_Rate              : constant Xt_N_Resource_String;
-    Xm_N_Columns                 : constant Xt_N_Resource_String;
-    Xm_N_Font_List               : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Render_Table            : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    -- for Xm_N_Resize_Height use False or True
-    --
-@@ -578,10 +578,10 @@
-       To_Resource_String ("cursorPosition");
-    Xm_N_Cursor_Position_Visible : constant Xt_N_Resource_String :=
-       To_Resource_String ("cursorPositionVisible");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Destination_Callback    : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Destination_Callback;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Editable                : constant Xt_N_Resource_String :=
-       To_Resource_String ("editable");
-    Xm_N_Edit_Mode               : constant Xt_N_Resource_String :=
-@@ -611,10 +611,10 @@
-       To_Resource_String ("motionVerifyCallback");
-    Xm_N_Pending_Delete          : constant Xt_N_Resource_String :=
-       To_Resource_String ("pendingDelete");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Render_Table            : constant Xt_N_Resource_String :=
-       Xm_Widgets.Xm_N_Render_Table;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Resize_Height           : constant Xt_N_Resource_String :=
-       To_Resource_String ("resizeHeight");
-    Xm_N_Resize_Width            : constant Xt_N_Resource_String :=
-@@ -639,10 +639,10 @@
-       To_Resource_String ("source");
-    Xm_N_Top_Character           : constant Xt_N_Resource_String :=
-       To_Resource_String ("topCharacter");
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    Xm_N_Total_Lines             : constant Xt_N_Resource_String :=
-       To_Resource_String ("totalLines");
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    Xm_N_Value                   : constant Xt_N_Resource_String :=
-       X_Toolkit.Xt_N_Value;
-    Xm_N_Value_Changed_Callback  : constant Xt_N_Resource_String :=
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-primitive.ads ./lib/xm_widgets-primitive.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-primitive.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-primitive.ads	Thu Dec 26 13:36:40 2002
-@@ -38,6 +38,7 @@
- -- HISTORY:
- --          June 20, 1998 begin of history
- --          06 Aug 2001 Vadim Godunko: move Xm_Change_Color to Xm_Widgets
-+--          2002-03-22 Vadim Godunko: added resource Xm_N_Tool_Tip_String
- --
- -------------------------------------------------------------------------------
- 
-@@ -76,18 +77,18 @@
- 
-    Xm_N_Bottom_Shadow_Color     : constant Xt_N_Resource_String;
-    Xm_N_Bottom_Shadow_Pixmap    : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Convert_Callback        : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Foreground              : constant Xt_N_Resource_String;
-    Xm_N_Help_Callback           : constant Xt_N_Resource_String;
-    Xm_N_Highlight_Color         : constant Xt_N_Resource_String;
-    Xm_N_Highlight_On_Enter      : constant Xt_N_Resource_String;
-    Xm_N_Highlight_Pixmap        : constant Xt_N_Resource_String;
-    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Layout_Direction        : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Navigation_Type         : constant Xt_N_Resource_String;
- 
-@@ -104,10 +105,13 @@
-    pragma Convention (C, Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Popup_Handler_Callback  : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Shadow_Thickness        : constant Xt_N_Resource_String;
-+-- UseOpenMotif2.2
-+   Xm_N_Tool_Tip_String     : constant Xt_N_Resource_String;
-+-- EndOpenMotif2.2
-    Xm_N_Top_Shadow_Color        : constant Xt_N_Resource_String;
-    Xm_N_Top_Shadow_Pixmap       : constant Xt_N_Resource_String;
-    Xm_N_Traversal_On            : constant Xt_N_Resource_String;
-@@ -161,10 +165,10 @@
-       To_Resource_String ("bottomShadowColor");
-    Xm_N_Bottom_Shadow_Pixmap    : constant Xt_N_Resource_String :=
-       To_Resource_String ("bottomShadowPixmap");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Convert_Callback        : constant Xt_N_Resource_String :=
-       To_Resource_String ("convertCallback");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Foreground              : constant Xt_N_Resource_String :=
-       To_Resource_String ("foreground");
-    Xm_N_Help_Callback           : constant Xt_N_Resource_String :=
-@@ -177,20 +181,24 @@
-       To_Resource_String ("highlightPixmap");
-    Xm_N_Highlight_Thickness     : constant Xt_N_Resource_String :=
-       To_Resource_String ("highlightThickness");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Layout_Direction        : constant Xt_N_Resource_String :=
-       To_Resource_String ("layoutDirection");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Navigation_Type         : constant Xt_N_Resource_String :=
-       To_Resource_String ("navigationType");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Popup_Handler_Callback  : constant Xt_N_Resource_String :=
-       To_Resource_String ("popupHandlerCallback");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Shadow_Thickness        : constant Xt_N_Resource_String :=
-       To_Resource_String ("shadowThickness");
-+-- UseOpenMotif2.2
-+   Xm_N_Tool_Tip_String     : constant Xt_N_Resource_String :=
-+      To_Resource_String ("toolTipString");
-+-- EndOpenMotif2.2
-    Xm_N_Top_Shadow_Color        : constant Xt_N_Resource_String :=
-       To_Resource_String ("topShadowColor");
-    Xm_N_Top_Shadow_Pixmap       : constant Xt_N_Resource_String :=
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-print.adb ./lib/xm_widgets-print.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-print.adb	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-print.adb	Thu Dec 26 13:36:40 2002
-@@ -47,7 +47,7 @@
- 
- package body Xm_Widgets.Print is
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
- 
-    function To_Callback_Struct (Pointer : in Xt_Pointer)
-       return Xm_Print_Shell_Callback_Struct_Access is
-@@ -140,6 +140,6 @@
-       end if;
-    end Xm_Print_To_File;
- 
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Print;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-print.ads ./lib/xm_widgets-print.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-print.ads	Sat Mar  2 12:17:15 2002
-+++ ./lib/xm_widgets-print.ads	Thu Dec 26 13:36:40 2002
-@@ -46,7 +46,7 @@
- 
- package Xm_Widgets.Print is
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
- 
-    --  Xm_Print_Shell is a subclass of Xt_Application_Shell
-    --
-@@ -167,6 +167,6 @@
- 
-    pragma Import (C, Xm_Redisplay_Widget, "XmRedisplayWidget");
- 
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- end Xm_Widgets.Print;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-screen.adb ./lib/xm_widgets-screen.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-screen.adb	Sat Mar  2 12:17:16 2002
-+++ ./lib/xm_widgets-screen.adb	Thu Dec 26 13:36:40 2002
-@@ -44,7 +44,7 @@
-      Interfaces.C;
- package body Xm_Widgets.Screen is
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Bitmap_Conversion_Model_Type, Interfaces.C.unsigned_char);
- 
-@@ -68,7 +68,7 @@
-                   Value => Value'Address);
-    end Append_Get;
-    pragma Inline (Append_Get);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function To_Integer is
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-screen.ads ./lib/xm_widgets-screen.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-screen.ads	Sat Mar  2 12:17:16 2002
-+++ ./lib/xm_widgets-screen.ads	Thu Dec 26 13:36:40 2002
-@@ -51,7 +51,7 @@
-    --
-    -- resources
-    --
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Bitmap_Conversion_Model       : constant Xt_N_Resource_String;
- 
-    type Bitmap_Conversion_Model_Type is (Match_Depth, Dynamic_Depth);
-@@ -67,7 +67,7 @@
-  
-    Xm_N_Color_Allocation_Proc         : constant Xt_N_Resource_String;
-    Xm_N_Color_Calculation_Proc        : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Dark_Threshold                : constant Xt_N_Resource_String;
-    Xm_N_Default_Copy_Cursor_Icon      : constant Xt_N_Resource_String;
-    Xm_N_Default_Invalid_Cursor_Icon   : constant Xt_N_Resource_String;
-@@ -79,9 +79,9 @@
-    Xm_N_Font                          : constant Xt_N_Resource_String;
-    Xm_N_Foreground_Threshold          : constant Xt_N_Resource_String;
-    Xm_N_Horizontal_Font_Unit          : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Insensitive_Stipple_Bitmap    : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Light_Threshold               : constant Xt_N_Resource_String;
-    Xm_N_Menu_Cursor                   : constant Xt_N_Resource_String;
-    Xm_N_Move_Opaque                   : constant Xt_N_Resource_String;
-@@ -98,32 +98,32 @@
-                          Value :    out Unpost_Behavior_Type);
-    pragma Convention (C, Append_Get);
-  
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Use_Color_Object              : constant Xt_N_Resource_String;
-    Xm_N_User_Data                     : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Vertical_Font_Unit            : constant Xt_N_Resource_String;
- 
- private
- 
-    pragma Import (C, Xm_Get_Xm_Screen, "XmGetXmScreen");
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Bitmap_Conversion_Model_Type use (Match_Depth => 0, Dynamic_Depth => 1);
-    for Bitmap_Conversion_Model_Type'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    for Unpost_Behavior_Type use (Unpost => 0, Unpost_And_Replay => 1);
-    for Unpost_Behavior_Type'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Bitmap_Conversion_Model       : constant Xt_N_Resource_String :=
-       To_Resource_String ("bitmapConversionModel");
-    Xm_N_Color_Allocation_Proc         : constant Xt_N_Resource_String :=
-       To_Resource_String ("colorAllocationProc");
-    Xm_N_Color_Calculation_Proc        : constant Xt_N_Resource_String :=
-       To_Resource_String ("colorCalculationProc");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Dark_Threshold                : constant Xt_N_Resource_String :=
-       To_Resource_String ("darkThreshold");
-    Xm_N_Default_Copy_Cursor_Icon      : constant Xt_N_Resource_String :=
-@@ -146,10 +146,10 @@
-       To_Resource_String ("foregroundThreshold");
-    Xm_N_Horizontal_Font_Unit          : constant Xt_N_Resource_String :=
-       To_Resource_String ("horizontalFontUnit");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Insensitive_Stipple_Bitmap    : constant Xt_N_Resource_String :=
-       To_Resource_String ("insensitiveStippleBitmap");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Light_Threshold               : constant Xt_N_Resource_String :=
-       To_Resource_String ("lightThreshold");
-    Xm_N_Menu_Cursor                   : constant Xt_N_Resource_String :=
-@@ -158,12 +158,12 @@
-       To_Resource_String ("moveOpaque");
-    Xm_N_Unpost_Behavior               : constant Xt_N_Resource_String :=
-       To_Resource_String ("unpostBehavior");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Use_Color_Object              : constant Xt_N_Resource_String :=
-       To_Resource_String ("useColorObject");
-    Xm_N_User_Data                     : constant Xt_N_Resource_String
-       := Xm_Widgets.Xm_N_User_Data;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Vertical_Font_Unit            : constant Xt_N_Resource_String :=
-       To_Resource_String ("verticalFontUnit");
- 
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-shell.adb ./lib/xm_widgets-shell.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets-shell.adb	Sat Mar  2 12:17:16 2002
-+++ ./lib/xm_widgets-shell.adb	Thu Dec 26 13:36:41 2002
-@@ -68,13 +68,13 @@
-    pragma Inline (Xm_Is_Menu_Shell);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function Xm_Is_Grab_Shell (W : in Widget) return Boolean is
-    begin
-       return Xt_Is_Subclass (W, Xm_Grab_Shell_Widget_Class);
-    end Xm_Is_Grab_Shell;
-    pragma Inline (Xm_Is_Grab_Shell);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    function Xm_Is_Vendor_Shell (W : in Widget) return Boolean is
-@@ -121,7 +121,7 @@
-    pragma Inline (Xm_Create_Dialog_Shell);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-   -- -------------------------------------------------------------------------
-   --
-   --  create Grab Shell
-@@ -147,7 +147,7 @@
-                                Cardinal (Length (Arglist)));
-   end Xm_Create_Grab_Shell;
-   pragma Inline (Xm_Create_Grab_Shell);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    -- -------------------------------------------------------------------------
-@@ -278,7 +278,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Input_Policy, Interfaces.C.unsigned_char);
- 
-@@ -304,7 +304,7 @@
-    pragma Inline (Append_Get);
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- end Xm_Widgets.Shell;
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets-shell.ads ./lib/xm_widgets-shell.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets-shell.ads	Sat Mar  2 12:17:16 2002
-+++ ./lib/xm_widgets-shell.ads	Thu Dec 26 13:36:41 2002
-@@ -39,6 +39,8 @@
- --          June 20, 1998 begin of history
- --          July 07, 1998 HFVogt: changed type names to Initial_Window_State,
- --                                Audible_Warning_Kind
-+--          2002-03-22 Vadim Godunko: added resources Xm_N_Tool_Tip_Post_Delay,
-+--                        Xm_N_Tool_Tip_Post_Duration, Xm_N_Tool_Tip_Enable
- --
- -------------------------------------------------------------------------------
- 
-@@ -54,9 +56,9 @@
- 
-    Xm_Dialog_Shell_Widget_Class        : constant Widget_Class;
-    Xm_Drag_Over_Shell_Widget_Class     : constant Widget_Class;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_Grab_Shell_Widget_Class          : constant Widget_Class;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_Menu_Shell_Widget_Class          : constant Widget_Class;
-    Xm_Vendor_Shell_Widget_Class        : constant Widget_Class;
- 
-@@ -71,13 +73,13 @@
-       Arglist  : in  Arg_List := Null_Arg_List)
-       return Widget;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function Xm_Create_Grab_Shell
-      (Parent   : in  Widget; 
-       Name     : in  String;
-       Arglist  : in  Arg_List := Null_Arg_List)
-       return Widget;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    function Xm_Create_Menu_Shell
-      (Parent   : in  Widget; 
-@@ -89,9 +91,9 @@
-    function Xm_Is_Dialog_Shell    (W : in Widget) return Boolean;
-    function Xm_Is_Drag_Over_Shell (W : in Widget) return Boolean;
-    function Xm_Is_Menu_Shell      (W : in Widget) return Boolean;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    function Xm_Is_Grab_Shell      (W : in Widget) return Boolean;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    function Xm_Is_Vendor_Shell    (W : in Widget) return Boolean;
- 
-    function Xm_Is_Motif_WM_Running (Shell : in Widget) return Boolean;
-@@ -121,15 +123,15 @@
-    --  Menu Shell
-    --
-    Xm_N_Button_Font_List       : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Button_Render_Table    : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Default_Font_List      : constant Xt_N_Resource_String;
-    Xm_N_Label_Font_List        : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Label_Render_Table     : constant Xt_N_Resource_String;
-    Xm_N_Layout_Direction       : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    -- -------------------------------------------------------------------------
-@@ -216,7 +218,7 @@
-    pragma Convention (C, Append_Get);
- 
-    Xm_N_Input_Method           : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Input_Policy           : constant Xt_N_Resource_String;
- 
-    type Input_Policy is (Per_Shell, Per_Widget, Inherit_Policy);
-@@ -230,7 +232,7 @@
-                          Value : out    Input_Policy);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    Xm_N_Keyboard_Focus_Policy  : constant Xt_N_Resource_String;
- 
-@@ -256,9 +258,14 @@
-    Xm_N_Shell_Unit_Type        : constant Xt_N_Resource_String;
-    Xm_N_Text_Font_List         : constant Xt_N_Resource_String;
-    Xm_N_Text_Render_Table      : constant Xt_N_Resource_String;
---- UseMotif2.0 Motif2.1
-+-- UseOpenMotif2.2
-+   Xm_N_Tool_Tip_Post_Delay    : constant Xt_N_Resource_String;
-+   Xm_N_Tool_Tip_Post_Duration : constant Xt_N_Resource_String;
-+   Xm_N_Tool_Tip_Enable        : constant Xt_N_Resource_String;
-+-- EndOpenMotif2.2
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Unit_Type              : constant Xt_N_Resource_String;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Use_Async_Geometry     : constant Xt_N_Resource_String;
- 
- 
-@@ -299,26 +306,26 @@
-    for Keyboard_Focus_Policy use (Explicit => 0, Pointer => 1);
-    for Keyboard_Focus_Policy'Size use Interfaces.C.unsigned_char'Size;
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Input_Policy use (Per_Shell => 0, Per_Widget => 1, Inherit_Policy => 255);
-    for Input_Policy'Size use Interfaces.C.unsigned_char'Size;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    -- a workaround for gnat apparently not (yet) being able to import
-    -- constants
-    c_const_Xm_Dialog_Shell_Widget_Class        : Widget_Class;
-    c_const_Xm_Drag_Over_Shell_Widget_Class     : Widget_Class;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    c_const_Xm_Grab_Shell_Widget_Class          : Widget_Class;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    c_const_Xm_Menu_Shell_Widget_Class          : Widget_Class;
-    c_const_Xm_Vendor_Shell_Widget_Class        : Widget_Class;
- 
-    pragma Import (C, c_const_Xm_Dialog_Shell_Widget_Class, "xmDialogShellWidgetClass");
-    pragma Import (C, c_const_Xm_Drag_Over_Shell_Widget_Class, "xmDragOverShellWidgetClass");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    pragma Import (C, c_const_Xm_Grab_Shell_Widget_Class, "xmGrabShellWidgetClass");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    pragma Import (C, c_const_Xm_Menu_Shell_Widget_Class, "xmMenuShellWidgetClass");
-    pragma Import (C, c_const_Xm_Vendor_Shell_Widget_Class, "vendorShellWidgetClass");
- 
-@@ -326,10 +333,10 @@
-     c_const_Xm_Dialog_Shell_Widget_Class;
-    Xm_Drag_Over_Shell_Widget_Class     : constant Widget_Class :=
-     c_const_Xm_Drag_Over_Shell_Widget_Class;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_Grab_Shell_Widget_Class          : constant Widget_Class :=
-     c_const_Xm_Grab_Shell_Widget_Class;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_Menu_Shell_Widget_Class          : constant Widget_Class :=
-     c_const_Xm_Menu_Shell_Widget_Class;
-    Xm_Vendor_Shell_Widget_Class        : constant Widget_Class :=
-@@ -371,20 +378,20 @@
-    --
-    Xm_N_Button_Font_List       : constant Xt_N_Resource_String
-                                := To_Resource_String ("buttonFontList");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Button_Render_Table    : constant Xt_N_Resource_String
-                                := To_Resource_String ("buttonRenderTable");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Default_Font_List      : constant Xt_N_Resource_String
-                                := To_Resource_String ("defaultFontList");
-    Xm_N_Label_Font_List        : constant Xt_N_Resource_String
-                                := To_Resource_String ("labelFontList");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Label_Render_Table     : constant Xt_N_Resource_String
-                                := To_Resource_String ("labelRenderTable");
-    Xm_N_Layout_Direction       : constant Xt_N_Resource_String
-                                := To_Resource_String ("layoutDirection");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    -- -------------------------------------------------------------------------
-@@ -464,11 +471,11 @@
- 
-    Xm_N_Input_Method           : constant Xt_N_Resource_String
-                                := To_Resource_String ("inputMethod");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Input_Policy           : constant Xt_N_Resource_String
-                                := To_Resource_String ("inputPolicy");
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    -- Xm_N_Label_Font_List        : constant Xt_N_Resource_String := To_Resource_String ("labelFontList");
-    -- Xm_N_Label_Render_Table     : constant Xt_N_Resource_String := To_Resource_String ("labelRenderTable");
-@@ -489,10 +496,18 @@
-                                := To_Resource_String ("textFontList");
-    Xm_N_Text_Render_Table      : constant Xt_N_Resource_String
-                                := To_Resource_String ("textRenderTable");
---- UseMotif2.0 Motif2.1
-+-- UseOpenMotif2.2
-+   Xm_N_Tool_Tip_Post_Delay    : constant Xt_N_Resource_String :=
-+      To_Resource_String ("toolTipPostDelay");
-+   Xm_N_Tool_Tip_Post_Duration : constant Xt_N_Resource_String :=
-+      To_Resource_String ("toolTipPostDuration");
-+   Xm_N_Tool_Tip_Enable        : constant Xt_N_Resource_String :=
-+      To_Resource_String ("toolTipEnable");
-+-- EndOpenMotif2.2
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Unit_Type              : constant Xt_N_Resource_String
-                                := Xm_Widgets.Xm_N_Unit_Type;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Use_Async_Geometry     : constant Xt_N_Resource_String
-                                := To_Resource_String ("useAsyncGeometry");
- 
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets.adb ./lib/xm_widgets.adb
---- ../adabindx-0.7.2.orig/lib/xm_widgets.adb	Sat Mar  2 12:22:57 2002
-+++ ./lib/xm_widgets.adb	Thu Dec 26 13:36:41 2002
-@@ -230,7 +230,7 @@
-    end Xm_Get_Pixmap_By_Depth;
- 
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    function Xm_Get_Scaled_Pixmap
-      (Wid           : in Widget;
-       Image_Name    : in String;
-@@ -256,7 +256,7 @@
-                                 Foreground, Background, Depth,
- 				Interfaces.C.double (Scaling_Ratio));
-    end Xm_Get_Scaled_Pixmap;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
-    procedure Xm_Destroy_Pixmap
-      (Screen      : in X_Lib.Screen_Pointer;
-@@ -277,7 +277,7 @@
-       new Ada.Unchecked_Conversion (Unit_Type, Interfaces.C.unsigned_char);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- -- ----------------------------------------------------------------------------
- --
- --                                 T A B
-@@ -785,7 +785,7 @@
-       end loop;
-    end Xm_Parse_Table_Free;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    -- -------------------------------------------------------------------------
-    --
-@@ -801,7 +801,7 @@
-    pragma Inline (Xm_Font_List_Free);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- -- ----------------------------------------------------------------------------
- --
- --                            X M _ S T R I N G
-@@ -824,8 +824,8 @@
- 
-    function Xm_String_Generate
-      (Text           : in String;
--      Font_Or_Locale : in Xm_String_Tag;
--      Rendition_Tag  : in Xm_String_Tag)
-+      Font_Or_Locale : in Xm_String_Tag := Null_String_Tag;
-+      Rendition_Tag  : in Xm_String_Tag := Null_String_Tag)
-       return Xm_String is
- 
-       Text_String   : constant Interfaces.C.Char_Array
-@@ -841,8 +841,8 @@
- 
-    function Xm_String_Generate
-      (Text           : in Wide_String;
--      Font_Or_Locale : in Xm_String_Tag;
--      Rendition_Tag  : in Xm_String_Tag)
-+      Font_Or_Locale : in Xm_String_Tag := Null_String_Tag;
-+      Rendition_Tag  : in Xm_String_Tag := Null_String_Tag)
-       return Xm_String is
-       W_String   : constant Interfaces.C.Wchar_Array
-                  := Interfaces.C.To_C (Text, Append_Nul => True);
-@@ -941,7 +941,7 @@
-       Wide_S : Interfaces.C.Wstrings.wchars_ptr;
-    begin
-       Wide_S := XmStringUnparse (Str, Tag, Tag_Type,
--	                         Multibyte_Text,
-+                                 Widechar_Text,
- 			         Parse_Table'Address,
- 			         X_Toolkit.Cardinal (Parse_Table'Length),
- 			         Parse_Model);
-@@ -954,7 +954,7 @@
-    end Xm_String_Unparse;
- 
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- -- ----------------------------------------------------------------------------
- --
-@@ -1236,7 +1236,7 @@
-    end Xm_String_Empty;
-       
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    -- -------------------------------------------------------------------------
-    --
-    --  Xm_String_Is_Void
-@@ -1247,7 +1247,7 @@
-    begin
-       return XmStringIsVoid (Str) = Xt_Boolean'(True);
-    end Xm_String_Is_Void;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    -- -------------------------------------------------------------------------
-@@ -1304,11 +1304,11 @@
-    procedure Xm_String_Draw
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1320,11 +1320,11 @@
-       procedure XmStringDraw
-         (Display      : in X_Lib.Display_Pointer;
-          W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-          Str          : in Xm_String;
-          GC           : in X_Lib.GC_Pointer;
-          X,
-@@ -1335,24 +1335,24 @@
-          Clip         : in System.Address);
-       pragma Import (C, XmStringDraw, "XmStringDraw");
-    begin
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       XmStringDraw (Display, W, Render_Table, Str, GC, X, Y, Width,
-                     Align, Lay_Dir, Clip'Address);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       XmStringDraw (Display, W, Fontlist, Str, GC, X, Y, Width,
- --!                     Align, Lay_Dir, Clip'Address);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    end Xm_String_Draw;
- 
- 
-    procedure Xm_String_Draw
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1363,11 +1363,11 @@
-       procedure XmStringDraw
-         (Display      : in X_Lib.Display_Pointer;
-          W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-          Str          : in Xm_String;
-          GC           : in X_Lib.GC_Pointer;
-          X,
-@@ -1378,13 +1378,13 @@
-          Clip         : in System.Address);
-       pragma Import (C, XmStringDraw, "XmStringDraw");
-    begin
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       XmStringDraw (Display, W, Render_Table, Str, GC, X, Y, Width,
-                     Align, Lay_Dir, System.Null_Address);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       XmStringDraw (Display, W, Fontlist, Str, GC, X, Y, Width,
- --!                     Align, Lay_Dir, System.Null_Address);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    end Xm_String_Draw;
- 
- 
-@@ -1392,11 +1392,11 @@
-    procedure Xm_String_Draw_Image
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1408,11 +1408,11 @@
-       procedure XmStringDrawImage
-         (Display      : in X_Lib.Display_Pointer;
-          W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-          Str          : in Xm_String;
-          GC           : in X_Lib.GC_Pointer;
-          X,
-@@ -1423,24 +1423,24 @@
-          Clip         : in System.Address);
-       pragma Import (C, XmStringDrawImage, "XmStringDrawImage");
-    begin
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       XmStringDrawImage (Display, W, Render_Table, Str, GC, X, Y, Width,
-                          Align, Lay_Dir, Clip'Address);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       XmStringDrawImage (Display, W, Fontlist, Str, GC, X, Y, Width,
- --!                          Align, Lay_Dir, Clip'Address);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    end Xm_String_Draw_Image;
- 
- 
-    procedure Xm_String_Draw_Image
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1451,11 +1451,11 @@
-       procedure XmStringDrawImage
-         (Display      : in X_Lib.Display_Pointer;
-          W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-          Str          : in Xm_String;
-          GC           : in X_Lib.GC_Pointer;
-          X,
-@@ -1466,13 +1466,13 @@
-          Clip         : in System.Address);
-       pragma Import (C, XmStringDrawImage, "XmStringDrawImage");
-    begin
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       XmStringDrawImage (Display, W, Render_Table, Str, GC, X, Y, Width,
-                          Align, Lay_Dir, System.Null_Address);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       XmStringDrawImage (Display, W, Fontlist, Str, GC, X, Y, Width,
- --!                          Align, Lay_Dir, System.Null_Address);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    end Xm_String_Draw_Image;
- 
- 
-@@ -1480,11 +1480,11 @@
-    procedure Xm_String_Draw_Underline
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1497,11 +1497,11 @@
-       procedure XmStringDrawUnderline
-         (Display      : in X_Lib.Display_Pointer;
-          W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-          Str          : in Xm_String;
-          GC           : in X_Lib.GC_Pointer;
-          X,
-@@ -1513,24 +1513,24 @@
-          Underline    : in Xm_String);
-       pragma Import (C, XmStringDrawUnderline, "XmStringDrawUnderline");
-    begin
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       XmStringDrawUnderline (Display, W, Render_Table, Str, GC, X, Y, Width,
-                              Align, Lay_Dir, Clip'Address, Underline);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       XmStringDrawUnderline (Display, W, Fontlist, Str, GC, X, Y, Width,
- --!                              Align, Lay_Dir, Clip'Address, Underline);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    end Xm_String_Draw_Underline;
- 
- 
-    procedure Xm_String_Draw_Underline
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1542,11 +1542,11 @@
-       procedure XmStringDrawUnderline
-         (Display      : in X_Lib.Display_Pointer;
-          W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-          Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!          Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-          Str          : in Xm_String;
-          GC           : in X_Lib.GC_Pointer;
-          X,
-@@ -1558,13 +1558,13 @@
-          Underline    : in Xm_String);
-       pragma Import (C, XmStringDrawUnderline, "XmStringDrawUnderline");
-    begin
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       XmStringDrawUnderline (Display, W, Render_Table, Str, GC, X, Y, Width,
-                              Align, Lay_Dir, System.Null_Address, Underline);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       XmStringDrawUnderline (Display, W, Fontlist, Str, GC, X, Y, Width,
- --!                              Align, Lay_Dir, System.Null_Address, Underline);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    end Xm_String_Draw_Underline;
- 
- 
-@@ -1705,7 +1705,7 @@
-    function To_Integer is
-       new Ada.Unchecked_Conversion (Orientation_Type, Interfaces.C.unsigned_char);
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- 
-    --  if unsuccessful, raise Xm_Error_Conversion_Failed
-    -- 
-@@ -1747,7 +1747,7 @@
-       end if;
-    end Xm_Convert_String_To_Units;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- --
-@@ -1855,7 +1855,7 @@
-    end Append_Get;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    procedure Append_Set (List  : in out Arg_List;
-                          Name  : in     Xt_N_Resource_String;
-                          Value : in     Xm_Render_Table) is
-@@ -1876,7 +1876,7 @@
-                   Value => Value'Address);
-    end Append_Get;
-    pragma Inline (Append_Get);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-  
-    function To_Int is
-diff -Naur ../adabindx-0.7.2.orig/lib/xm_widgets.ads ./lib/xm_widgets.ads
---- ../adabindx-0.7.2.orig/lib/xm_widgets.ads	Sat Mar  2 12:20:31 2002
-+++ ./lib/xm_widgets.ads	Thu Dec 26 13:36:41 2002
-@@ -105,7 +105,7 @@
-    Component_Direction  	  : constant Xm_String_Component_Type := 3;
-    Component_Separator  	  : constant Xm_String_Component_Type := 4;
-    Component_Locale_Text	  : constant Xm_String_Component_Type := 5;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Component_Locale		  : constant Xm_String_Component_Type := 6;
-    Component_Widechar_Text	  : constant Xm_String_Component_Type := 7;
-    Component_Layout_Push	  : constant Xm_String_Component_Type := 8;
-@@ -113,7 +113,7 @@
-    Component_Rendition_Begin	  : constant Xm_String_Component_Type := 10;
-    Component_Rendition_End	  : constant Xm_String_Component_Type := 11;
-    Component_Tab		  : constant Xm_String_Component_Type := 12;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    -- Elements 13 to 126 are reserved
-    Component_End		  : constant Xm_String_Component_Type := 126;
-    Component_User_Begin 	  : constant Xm_String_Component_Type := 128;
-@@ -181,6 +181,8 @@
- 
-    Motif_Default_Locale : constant Xm_String_Tag
-       := X_Strings.To_X_String ("_MOTIF_DEFAULT_LOCALE");
-+   Xm_Fontlist_Default_Tag : constant Xm_String_Tag
-+      := X_Strings.To_X_String ("FONTLIST_DEFAULT_TAG_STRING");
- 
- 
-    type Xm_String_Tag_Array is array (Natural range <>) of Xm_String_Tag;
-@@ -281,23 +283,23 @@
-    --
-    -- Merge Mode
-    --
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    type Xm_Merge_Mode is (Skip,      Merge_Replace,     Merge_Old,
-                           Merge_New, Duplicate);
-    for Xm_Merge_Mode use (Skip => 0,      Merge_Replace => 1, Merge_Old => 2,
-                           Merge_New => 3, Duplicate => 4);
---- NotMotif2.1
-+-- NotMotif2.1 OpenMotif2.2
- --!    type Xm_Merge_Mode is (Skip,      Replace,     Merge_Old,
- --!                           Merge_New, Duplicate);
- --!    for Xm_Merge_Mode use (Skip => 0,      Replace => 1,     Merge_Old => 2,
- --!                           Merge_New => 3, Duplicate => 4);
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
-    for Xm_Merge_Mode'Size use Interfaces.C.unsigned_char'Size;
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    -- for compatibility with M*tif versions < 2.1
-    --
-    Replace : constant Xm_Merge_Mode := Merge_Replace;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- 
-    --
-@@ -437,17 +439,17 @@
-    type Xm_String_Ptr is access Xm_String; 
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Unit_Type is (Pixels,           Centi_Millimeters,
-                       Milli_Inches,     Centi_Points,
-                       Centi_Font_Units, Inches,
-                       Centimeters,      Millimeters,
-                       Points,           Font_Units);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!    type Unit_Type is (Pixels,           Centi_Millimeters,
- --!                       Milli_Inches,     Centi_Points,
- --!                       Centi_Font_Units);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    type Orientation_Type is (No_Orientation, Vertical, Horizontal);
- 
-@@ -514,7 +516,7 @@
-       Depth       : in X_Lib.Color_Depth)
-       return X_Lib.Pixmap_ID;
- 
---- UseMotif2.1
-+-- UseMotif2.1 OpenMotif2.2
-    function Xm_Get_Scaled_Pixmap
-      (Wid           : in Widget;
-       Image_Name    : in String;
-@@ -523,7 +525,7 @@
-       Depth         : in X_Lib.Color_Depth;
-       Scaling_Ratio : in Long_Float)
-       return X_Lib.Pixmap_ID;
---- EndMotif2.1
-+-- EndMotif2.1 OpenMotif2.2
- 
- 
-    -- remove the given pixmap from the pixmap cache
-@@ -533,7 +535,7 @@
-       Pixmap      : in X_Lib.Pixmap_ID);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- -- ----------------------------------------------------------------------------
- --
- --                                 T A B
-@@ -808,7 +810,7 @@
- 
-    procedure Xm_Parse_Table_Free   (Parse_Table   : in out Xm_Parse_Table);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
- -- ----------------------------------------------------------------------------
-@@ -855,7 +857,7 @@
- 
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
- -- ----------------------------------------------------------------------------
- --
- --                            X M _ S T R I N G
-@@ -877,14 +879,14 @@
-    --
-    function Xm_String_Generate
-      (Text           : in String;
--      Font_Or_Locale : in Xm_String_Tag;
--      Rendition_Tag  : in Xm_String_Tag)
-+      Font_Or_Locale : in Xm_String_Tag := Null_String_Tag;
-+      Rendition_Tag  : in Xm_String_Tag := Null_String_Tag)
-       return Xm_String;
- 
-    function Xm_String_Generate
-      (Text           : in Wide_String;
--      Font_Or_Locale : in Xm_String_Tag;
--      Rendition_Tag  : in Xm_String_Tag)
-+      Font_Or_Locale : in Xm_String_Tag := Null_String_Tag;
-+      Rendition_Tag  : in Xm_String_Tag := Null_String_Tag)
-       return Xm_String;
- 
- --   function Xm_String_Generate
-@@ -947,7 +949,7 @@
-    --
-    function Xm_String_Is_Void (Str : in Xm_String) return Boolean;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- -- ----------------------------------------------------------------------------
- --
-@@ -1160,11 +1162,11 @@
-    --  Xm_String_Width
-    --
-    function Xm_String_Width
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-      (Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!      (Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str      : in Xm_String)
-       return X_Lib.Dimension;
- 
-@@ -1174,11 +1176,11 @@
-    --  Xm_String_Height
-    --
-    function Xm_String_Height
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-      (Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!      (Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str      : in Xm_String)
-       return X_Lib.Dimension;
- 
-@@ -1188,11 +1190,11 @@
-    --  Xm_String_Extent
-    --
-    procedure Xm_String_Extent
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-      (Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!      (Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str       : in     Xm_String;
-       Width     :    out X_Lib.Dimension;
-       Height    :    out X_Lib.Dimension);
-@@ -1203,11 +1205,11 @@
-    --  Xm_String_Baseline
-    --
-    function Xm_String_Baseline
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-      (Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!      (Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str      : in Xm_String)
-       return X_Lib.Dimension;
- 
-@@ -1219,11 +1221,11 @@
-    procedure Xm_String_Draw
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1236,11 +1238,11 @@
-    procedure Xm_String_Draw
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1257,11 +1259,11 @@
-    procedure Xm_String_Draw_Image
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1274,11 +1276,11 @@
-    procedure Xm_String_Draw_Image
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1295,11 +1297,11 @@
-    procedure Xm_String_Draw_Underline
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1313,11 +1315,11 @@
-    procedure Xm_String_Draw_Underline
-      (Display      : in X_Lib.Display_Pointer;
-       W            : in X_Lib.Window_ID;
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-       Render_Table : in Xm_Render_Table;     -- NEW in Motif 2.0
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!       Fontlist     : in Xm_Font_List;     -- Motif 1.2
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-       Str          : in Xm_String;
-       GC           : in X_Lib.GC_Pointer;
-       X,
-@@ -1457,7 +1459,7 @@
-    Xm_Error_Invalid_Callback_Reason    : exception;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_Error_Conversion_Failed          : exception;
- 
-    --  if unsuccessful, raise Xm_Error_Conversion_Failed
-@@ -1468,7 +1470,7 @@
-       Orientation : in Orientation_Type;
-       To_Unit     : in Unit_Type)
-       return Integer;
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
- 
-    -- -------------------------------------------------------------------------
-@@ -1559,7 +1561,7 @@
-    pragma Convention (C, Append_Get);
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    procedure Append_Set (List  : in out Arg_List;
-                          Name  : in     Xt_N_Resource_String;
-                          Value : in     Xm_Render_Table);
-@@ -1569,7 +1571,7 @@
-                          Value : out    Xm_Render_Table);
-    pragma Convention (C, Append_Get);
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    procedure Append_Set (List  : in out Arg_List;
-                          Name  : in     Xt_N_Resource_String;
-@@ -1658,7 +1660,7 @@
-    for Xm_Text_Scan_Type'Size use Interfaces.C.unsigned_char'Size;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    type Xm_Tab is new System.Address;
-    Null_Tab : constant Xm_Tab := Xm_Tab (System.Null_Address);
- 
-@@ -1693,7 +1695,7 @@
-                            Output_Both => 4);
-    for Xm_Parse_Model'Size use Interfaces.C.unsigned_char'Size;
- 
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
- 
-    type Xm_Font_List  is new System.Address;
-    Null_Font_List : constant Xm_Font_List := Xm_Font_List (System.Null_Address);
-@@ -1747,17 +1749,17 @@
-       return Callback_Struct_Access;
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    for Unit_Type use (Pixels => 0,           Centi_Millimeters => 1,
-                       Milli_Inches => 2,     Centi_Points => 3,
-                       Centi_Font_Units => 4, Inches => 5,
-                       Centimeters => 6,      Millimeters => 7,
-                       Points => 8,           Font_Units => 9);
---- NotMotif2.0 Motif2.1
-+-- NotMotif2.0 Motif2.1 OpenMotif2.2
- --!    for Unit_Type use (Pixels => 0,           Centi_Millimeters => 1,
- --!                       Milli_Inches => 2,     Centi_Points => 3,
- --!                       Centi_Font_Units => 4);
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    for Unit_Type'Size use Interfaces.C.unsigned_char'Size;
- 
-    for Orientation_Type use (No_Orientation => 0, Vertical => 1, Horizontal => 2);
-@@ -1830,20 +1832,20 @@
- -- End64Bit
- 
- 
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    pragma Import (C, Xm_Tab_Set_Value, "XmTabSetValue");
-    pragma Import (C, Xm_Tab_List_Tab_Copy, "XmTabListTabCopy");
-    pragma Import (C, Xm_Tab_List_Get_Tab, "XmTabListGetTab");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    pragma Import (C, Xm_Font_List_Add, "XmFontListAdd");
-    pragma Import (C, Xm_Font_List_Copy, "XmFontListCopy");
-    pragma Import (C, Xm_Font_List_Create, "XmFontListCreate");
-    pragma Import (C, Xm_String_Direction_Create, "XmStringDirectionCreate");
-    pragma Import (C, Xm_String_Peek_Next_Component,"XmStringPeekNextComponent");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    pragma Import (C, Xm_String_Put_Rendition, "XmStringPutRendition");
-    pragma Import (C, Xm_Render_Table_Get_Rendition, "XmRenderTableGetRendition");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    pragma Import (C, Xm_String_Copy, "XmStringCopy");
-    pragma Import (C, Xm_String_N_Copy, "XmStringNCopy");
-    pragma Import (C, Xm_String_Concat, "XmStringConcat");
-@@ -1930,12 +1932,12 @@
-    --
-    -- resource strings of subpackages of xm_widgets
-    --
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Destination_Callback    : constant Xt_N_Resource_String :=
-       To_Resource_String ("destinationCallback");
-    Xm_N_Detail_Shadow_Thickness : constant Xt_N_Resource_String :=
-       To_Resource_String ("detailShadowThickness");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Font_List               : constant Xt_N_Resource_String :=
-       To_Resource_String ("fontList");
-    Xm_N_Label_String            : constant Xt_N_Resource_String :=
-@@ -1946,12 +1948,12 @@
-       To_Resource_String ("marginWidth");
-    Xm_N_Modify_Verify_Callback  : constant Xt_N_Resource_String :=
-       To_Resource_String ("modifyVerifyCallback");
---- UseMotif2.0 Motif2.1
-+-- UseMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Primary_Ownership       : constant Xt_N_Resource_String :=
-       To_Resource_String ("primaryOwnership");
-    Xm_N_Render_Table            : constant Xt_N_Resource_String :=
-       To_Resource_String ("renderTable");
---- EndMotif2.0 Motif2.1
-+-- EndMotif2.0 Motif2.1 OpenMotif2.2
-    Xm_N_Select_Color            : constant Xt_N_Resource_String :=
-       To_Resource_String ("selectColor");
-    Xm_N_Selection_Policy        : constant Xt_N_Resource_String :=
-diff -Naur ../adabindx-0.7.2.orig/utils/Makefile ./utils/Makefile
---- ../adabindx-0.7.2.orig/utils/Makefile	Mon Apr 27 00:40:57 1998
-+++ ./utils/Makefile	Thu Dec 26 13:36:41 2002
-@@ -28,6 +28,10 @@
- islittleend: islittleend.adb
- 	$(ADA_MAKE) $(ADA_MAKE_FLAGS) -I../lib $@ -largs $(ADA_LINK_FLAGS)
- 
-+install:
-+	cp makefallb $(PREFIX)/bin
-+	cp xpm2axpm $(PREFIX)/bin
-+
- clean:
- 	$(RM) *.ali *.o
- 
diff --git a/devel/adabindx/pkg-descr b/devel/adabindx/pkg-descr
deleted file mode 100644
index d406976..0000000
--- a/devel/adabindx/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-This is a binding of Ada to the C-Libraries of the X Window system and the
-Motif(tm) or Lesstif widget set.
-
-Programmers used to write X Window programs will easily use this binding. Most
-of the names for functions and procedures resemble the equivalent C interface
-names, e.g.
-   XGetRGBColormaps (C interface) <-> X_Get_RGB_Colormaps (Ada binding).
-
-"While retaining familiarity to the C interface, I tried to include the
-security of Ada by controlling the creation and release of pointer types
-wherever possible."
-
-Patch supplied by Vadim Godunko
-
-It adds support for OpenMotif 2.2 to configuration as well as support for
-XmColumn, XmDataField and widgets from OpenMotif2.2.
-
-WWW: http://home.arcor.de/hfvogt/programming.html
diff --git a/devel/adabindx/pkg-plist b/devel/adabindx/pkg-plist
deleted file mode 100644
index a869471..0000000
--- a/devel/adabindx/pkg-plist
+++ /dev/null
@@ -1,248 +0,0 @@
-lib/adabindx/generic_list_access_types.adb
-lib/adabindx/xpm_lib.adb
-lib/adabindx/xm_widgets.ads
-lib/adabindx/xm_widgets.adb
-lib/adabindx/xm_widgets-transfer.ads
-lib/adabindx/xm_widgets-transfer.adb
-lib/adabindx/xm_widgets-shell.ads
-lib/adabindx/xm_widgets-shell.adb
-lib/adabindx/xm_widgets-screen.ads
-lib/adabindx/xm_widgets-screen.adb
-lib/adabindx/xm_widgets-protocols.ads
-lib/adabindx/xm_widgets-protocols.adb
-lib/adabindx/xm_widgets-print.ads
-lib/adabindx/xm_widgets-print.adb
-lib/adabindx/xm_widgets-primitive.ads
-lib/adabindx/xm_widgets-primitive.adb
-lib/adabindx/xm_widgets-primitive-text.ads
-lib/adabindx/xm_widgets-primitive-text.adb
-lib/adabindx/xm_widgets-primitive-text-data_field.ads
-lib/adabindx/xm_widgets-primitive-text-data_field.adb
-lib/adabindx/xm_widgets-primitive-separator.ads
-lib/adabindx/xm_widgets-primitive-separator.adb
-lib/adabindx/xm_widgets-primitive-scroll_bar.ads
-lib/adabindx/xm_widgets-primitive-scroll_bar.adb
-lib/adabindx/xm_widgets-primitive-list.ads
-lib/adabindx/xm_widgets-primitive-list.adb
-lib/adabindx/xm_widgets-manager.ads
-lib/adabindx/xm_widgets-primitive-label.ads
-lib/adabindx/xm_widgets-primitive-label.adb
-lib/adabindx/xm_widgets-primitive-label-toggle_button.ads
-lib/adabindx/xm_widgets-primitive-label-toggle_button.adb
-lib/adabindx/xm_widgets-primitive-label-push_button.ads
-lib/adabindx/xm_widgets-primitive-label-push_button.adb
-lib/adabindx/xm_widgets-primitive-label-drawn_button.ads
-lib/adabindx/xm_widgets-primitive-label-drawn_button.adb
-lib/adabindx/xm_widgets-primitive-label-cascade_button.ads
-lib/adabindx/xm_widgets-primitive-label-cascade_button.adb
-lib/adabindx/xm_widgets-primitive-icon.ads
-lib/adabindx/xm_widgets-primitive-icon.adb
-lib/adabindx/xm_widgets-primitive-cs_text.ads
-lib/adabindx/xm_widgets-primitive-cs_text.adb
-lib/adabindx/xm_widgets-primitive-arrow_button.ads
-lib/adabindx/xm_widgets-primitive-arrow_button.adb
-lib/adabindx/xm_widgets-manager.adb
-lib/adabindx/xm_widgets-manager-spin_box.ads
-lib/adabindx/xm_widgets-manager-spin_box.adb
-lib/adabindx/xm_widgets-manager-spin_box-simple.ads
-lib/adabindx/xm_widgets-manager-spin_box-simple.adb
-lib/adabindx/xm_widgets-manager-scale.ads
-lib/adabindx/xm_widgets-manager-scrolled_window.ads
-lib/adabindx/xm_widgets-manager-scrolled_window.adb
-lib/adabindx/xm_widgets-manager-scrolled_window-main_window.ads
-lib/adabindx/xm_widgets-manager-scrolled_window-main_window.adb
-lib/adabindx/xm_widgets-manager-scale.adb
-lib/adabindx/xm_widgets-manager-row_column.ads
-lib/adabindx/xm_widgets-manager-row_column.adb
-lib/adabindx/xm_widgets-manager-row_column-simple.ads
-lib/adabindx/xm_widgets-manager-row_column-simple.adb
-lib/adabindx/xm_widgets-manager-paned_window.ads
-lib/adabindx/x_lib.ads
-lib/adabindx/xm_widgets-manager-paned_window.adb
-lib/adabindx/xm_widgets-manager-notebook.ads
-lib/adabindx/xm_widgets-manager-notebook.adb
-lib/adabindx/xm_widgets-manager-frame.ads
-lib/adabindx/xm_widgets-manager-frame.adb
-lib/adabindx/xm_widgets-manager-drawing_area.ads
-lib/adabindx/xm_widgets-manager-drawing_area.adb
-lib/adabindx/xm_widgets-manager-container.ads
-lib/adabindx/xm_widgets-manager-container.adb
-lib/adabindx/xm_widgets-manager-combo_box.ads
-lib/adabindx/xm_widgets-manager-combo_box.adb
-lib/adabindx/xm_widgets-drop_transfer.ads
-lib/adabindx/xm_widgets-manager-bulletin_board.ads
-lib/adabindx/xm_widgets-manager-bulletin_board.adb
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box.ads
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box.adb
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ads
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.adb
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box-command.ads
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box-command.adb
-lib/adabindx/xm_widgets-manager-bulletin_board-message_box.ads
-lib/adabindx/xm_widgets-manager-bulletin_board-message_box.adb
-lib/adabindx/xm_widgets-manager-bulletin_board-form.ads
-lib/adabindx/xm_widgets-manager-bulletin_board-form.adb
-lib/adabindx/xm_widgets-manager-bulletin_board-column.ads
-lib/adabindx/xm_widgets-manager-bulletin_board-column.adb
-lib/adabindx/xm_widgets-drop_transfer.adb
-lib/adabindx/xm_widgets-drop_site_manager.ads
-lib/adabindx/xm_widgets-drop_site_manager.adb
-lib/adabindx/xm_widgets-drag_over_shell.ads
-lib/adabindx/xm_widgets-drag_icon.ads
-lib/adabindx/xm_widgets-drag_icon.adb
-lib/adabindx/xm_widgets-drag_context.ads
-lib/adabindx/xm_widgets-drag_context.adb
-lib/adabindx/xm_widgets-display.ads
-lib/adabindx/xm_widgets-display.adb
-lib/adabindx/xm_widgets-clipboard.ads
-lib/adabindx/xm_widgets-clipboard.adb
-lib/adabindx/xm_widgets-atom_manager.ads
-lib/adabindx/xm_utilities.ads
-lib/adabindx/xm_utilities-xm_strings.adb
-lib/adabindx/xm_utilities-strings.ads
-lib/adabindx/xm_utilities-protocols.ads
-lib/adabindx/xm_utilities-protocols.adb
-lib/adabindx/x_toolkit.ads
-lib/adabindx/xm_utilities-list.ads
-lib/adabindx/xm_utilities-list.adb
-lib/adabindx/xm_utilities-form.ads
-lib/adabindx/xm_utilities-form.adb
-lib/adabindx/x_wide_strings.ads
-lib/adabindx/x_wide_strings.adb
-lib/adabindx/x_toolkit.adb
-lib/adabindx/x_toolkit-shell.ads
-lib/adabindx/x_toolkit-resource.ads
-lib/adabindx/x_toolkit-resource.adb
-lib/adabindx/x_toolkit-internal.ads
-lib/adabindx/x_toolkit-internal.adb
-lib/adabindx/x_strings.ads
-lib/adabindx/x_strings.adb
-lib/adabindx/x_misc_utils.ads
-lib/adabindx/x_misc_utils.adb
-lib/adabindx/x_lib.adb
-lib/adabindx/x_auth.ads
-lib/adabindx/x_lib-tasking.ads
-lib/adabindx/x_lib-tasking.adb
-lib/adabindx/x_lib-std_colormap.ads
-lib/adabindx/x_lib-std_colormap.adb
-lib/adabindx/x_lib-screen_saver.ads
-lib/adabindx/x_lib-resource.ads
-lib/adabindx/x_lib-resource.adb
-lib/adabindx/x_lib-resource-internal.ads
-lib/adabindx/x_lib-resource-internal.adb
-lib/adabindx/x_lib-property.ads
-lib/adabindx/x_lib-property.adb
-lib/adabindx/x_lib-predefined_atoms.ads
-lib/adabindx/x_lib-key_syms.ads
-lib/adabindx/x_lib-key_syms.adb
-lib/adabindx/x_lib-key_syms-latin1.ads
-lib/adabindx/x_lib-key_syms-iso9995.ads
-lib/adabindx/x_lib-host_access.ads
-lib/adabindx/x_lib-host_access.adb
-lib/adabindx/x_lib-extensions.ads
-lib/adabindx/x_lib-extensions.adb
-lib/adabindx/x_lib-extensions-print.ads
-lib/adabindx/x_lib-extensions-print.adb
-lib/adabindx/x_lib-cursor.ads
-lib/adabindx/x_lib-cursor.adb
-lib/adabindx/x_connection.ads
-lib/adabindx/x_command_line.ads
-lib/adabindx/x_command_line.adb
-lib/adabindx/x_command_line-internal.ads
-lib/adabindx/x_command_line-internal.adb
-lib/adabindx/x_auth.adb
-lib/adabindx/string_list_conversion.ads
-lib/adabindx/string_list_conversion.adb
-lib/adabindx/string_list.ads
-lib/adabindx/resource_strings.ads
-lib/adabindx/resource_strings.adb
-lib/adabindx/i-cwstri.ads
-lib/adabindx/i-cwstri.adb
-lib/adabindx/i-csstli.ads
-lib/adabindx/i-csstli.adb
-lib/adabindx/generic_list_types.ads
-lib/adabindx/generic_list_types.adb
-lib/adabindx/generic_list_access_types.ads
-lib/adabindx/xpm_lib.ads
-lib/adabindx/generic_list_access_types.ali
-lib/adabindx/xm_widgets.ali
-lib/adabindx/xm_widgets-transfer.ali
-lib/adabindx/xm_widgets-shell.ali
-lib/adabindx/xm_widgets-screen.ali
-lib/adabindx/xm_widgets-protocols.ali
-lib/adabindx/xm_widgets-print.ali
-lib/adabindx/xm_widgets-primitive.ali
-lib/adabindx/xm_widgets-primitive-text.ali
-lib/adabindx/xm_widgets-primitive-separator.ali
-lib/adabindx/xm_widgets-primitive-scroll_bar.ali
-lib/adabindx/xm_widgets-primitive-list.ali
-lib/adabindx/xm_widgets-primitive-label.ali
-lib/adabindx/xm_widgets-primitive-label-toggle_button.ali
-lib/adabindx/xm_widgets-primitive-label-push_button.ali
-lib/adabindx/xm_widgets-primitive-label-drawn_button.ali
-lib/adabindx/xm_widgets-primitive-label-cascade_button.ali
-lib/adabindx/x_lib.ali
-lib/adabindx/xm_widgets-primitive-icon.ali
-lib/adabindx/xm_widgets-primitive-arrow_button.ali
-lib/adabindx/xm_widgets-manager.ali
-lib/adabindx/xm_widgets-manager-spin_box.ali
-lib/adabindx/xm_widgets-manager-spin_box-simple.ali
-lib/adabindx/xm_widgets-manager-scrolled_window.ali
-lib/adabindx/xm_widgets-manager-scrolled_window-main_window.ali
-lib/adabindx/xm_widgets-manager-scale.ali
-lib/adabindx/xm_widgets-manager-row_column.ali
-lib/adabindx/xm_widgets-manager-row_column-simple.ali
-lib/adabindx/xm_widgets-manager-paned_window.ali
-lib/adabindx/xm_widgets-manager-notebook.ali
-lib/adabindx/xm_widgets-manager-frame.ali
-lib/adabindx/xm_widgets-manager-drawing_area.ali
-lib/adabindx/xm_widgets-manager-container.ali
-lib/adabindx/xm_widgets-manager-combo_box.ali
-lib/adabindx/xm_widgets-manager-bulletin_board.ali
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box.ali
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box-file_selection_box.ali
-lib/adabindx/xm_widgets-manager-bulletin_board-selection_box-command.ali
-lib/adabindx/xm_widgets-drop_transfer.ali
-lib/adabindx/xm_widgets-manager-bulletin_board-message_box.ali
-lib/adabindx/xm_widgets-manager-bulletin_board-form.ali
-lib/adabindx/xm_widgets-drop_site_manager.ali
-lib/adabindx/xm_widgets-drag_over_shell.ali
-lib/adabindx/xm_widgets-drag_icon.ali
-lib/adabindx/xm_widgets-drag_context.ali
-lib/adabindx/xm_widgets-display.ali
-lib/adabindx/xm_widgets-clipboard.ali
-lib/adabindx/xm_widgets-atom_manager.ali
-lib/adabindx/x_wide_strings.ali
-lib/adabindx/x_toolkit.ali
-lib/adabindx/x_toolkit-shell.ali
-lib/adabindx/x_toolkit-resource.ali
-lib/adabindx/x_strings.ali
-lib/adabindx/x_toolkit-internal.ali
-lib/adabindx/x_misc_utils.ali
-lib/adabindx/x_lib-tasking.ali
-lib/adabindx/x_lib-std_colormap.ali
-lib/adabindx/x_lib-screen_saver.ali
-lib/adabindx/x_lib-resource.ali
-lib/adabindx/x_lib-resource-internal.ali
-lib/adabindx/x_lib-property.ali
-lib/adabindx/x_lib-predefined_atoms.ali
-lib/adabindx/x_lib-key_syms.ali
-lib/adabindx/x_lib-key_syms-latin1.ali
-lib/adabindx/x_lib-key_syms-iso9995.ali
-lib/adabindx/x_lib-host_access.ali
-lib/adabindx/x_lib-extensions.ali
-lib/adabindx/x_lib-extensions-print.ali
-lib/adabindx/x_lib-cursor.ali
-lib/adabindx/x_connection.ali
-lib/adabindx/x_command_line.ali
-lib/adabindx/x_command_line-internal.ali
-lib/adabindx/x_auth.ali
-lib/adabindx/string_list_conversion.ali
-lib/adabindx/string_list.ali
-lib/adabindx/resource_strings.ali
-lib/adabindx/i-cwstri.ali
-lib/adabindx/i-csstli.ali
-lib/adabindx/generic_list_types.ali
-lib/adabindx/xpm_lib.ali
-lib/libadabindx.a
-@dirrm lib/adabindx
diff --git a/devel/agide/Makefile b/devel/agide/Makefile
deleted file mode 100644
index 277b92e..0000000
--- a/devel/agide/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for:	A-A-P GUI IDE: agide
-# Date created:				26 August 2003
-# Whom:					Rui Lopes <rui@ruilopes.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	agide
-PORTVERSION=	0.124
-PORTREVISION=	2
-CATEGORIES=	devel
-MASTER_SITES=	SF/a-a-p/Agide/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A-A-P GUI IDE: a framework for software development
-
-RUN_DEPENDS=	${LOCALBASE}/bin/aap:${PORTSDIR}/devel/aap \
-		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 6 months
-EXPIRATION_DATE=2010-01-08
-
-MAN1=		agide.1
-
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-
-USE_ZIP=	yes
-USE_PYTHON=	yes
-USE_WX=		2.4
-WX_COMPS=	python
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-IGNORE=		triggers python crash on startup. 
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e "s,share/man,man," ${WRKSRC}/main.aap
-
-pre-install:
-	@${SH} ${FILESDIR}/check_vim
-
-do-install:
-	@cd ${WRKSRC} && \
-		${PREFIX}/bin/aap PREFIX="${PREFIX}" install
-
-.include <bsd.port.post.mk>
diff --git a/devel/agide/distinfo b/devel/agide/distinfo
deleted file mode 100644
index fed5552..0000000
--- a/devel/agide/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (agide-0.124.zip) = 2deef3ddfbca7a60078b8ef6a2bb35a2
-SHA256 (agide-0.124.zip) = b7a7a8bb9a0efae3e8e5e1d4a63d4851058efc152bae561d43d758dcc26c5936
-SIZE (agide-0.124.zip) = 99172
diff --git a/devel/agide/files/check_vim b/devel/agide/files/check_vim
deleted file mode 100644
index 04bdfa9..0000000
--- a/devel/agide/files/check_vim
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# This script detects if installed vim has our required options.
-# -- Rui Lopes <rui@ruilopes.com>
-
-check() {
-	str=`{ vim --version|grep "$1";} 2>/dev/null`
-	if test "x$str" != x; then 
-		return 0
-	fi
-	return 1
-}
-
-no_gui() {
-	echo
-	echo "The installed Vim does not have GUI support, please install Vim with"
-	echo "GUI support.  You can install it with:"
-	echo
-	echo "# cd /usr/ports/editors/vim && make -DWITH_GTK2 install"
-	echo "NOTE: You should consult the vim port for more options."
-	echo
-	exit 1
-}
-
-check ' with .* GUI\.' || no_gui
diff --git a/devel/agide/pkg-descr b/devel/agide/pkg-descr
deleted file mode 100644
index 0e4fbf6..0000000
--- a/devel/agide/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-The A-A-P GUI IDE is a framework in which separate tools can work
-together.  Like any other Integrated Development Environment it
-supports:
-
-  * Creating a project
-  * Building and executing a program
-  * Browsing files
-  * Debugging a program while displaying source code
-
-Instead of forming a monolithic application Agide provides
-interfaces to plugin existing tools.  Currently plugins for Vim
-and gdb are operational.  You can add your own plugins.
-
-WWW: http://www.agide.org/
diff --git a/devel/agide/pkg-plist b/devel/agide/pkg-plist
deleted file mode 100644
index db25f3e..0000000
--- a/devel/agide/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-bin/agide
-lib/aap/Agide-%%PORTVERSION%%/AGIDE.txt
-lib/aap/Agide-%%PORTVERSION%%/Activities/AapProject.py
-lib/aap/Agide-%%PORTVERSION%%/Activities/AapProject.pyc
-lib/aap/Agide-%%PORTVERSION%%/Activities/DebugProgram.py
-lib/aap/Agide-%%PORTVERSION%%/Activities/DebugProgram.pyc
-lib/aap/Agide-%%PORTVERSION%%/Activities/Makefile.py
-lib/aap/Agide-%%PORTVERSION%%/Activities/Makefile.pyc
-lib/aap/Agide-%%PORTVERSION%%/Activities/File.py
-lib/aap/Agide-%%PORTVERSION%%/Activities/File.pyc
-lib/aap/Agide-%%PORTVERSION%%/Activities/PythonShell.py
-lib/aap/Agide-%%PORTVERSION%%/Activities/PythonShell.pyc
-lib/aap/Agide-%%PORTVERSION%%/Activities/README.txt
-lib/aap/Agide-%%PORTVERSION%%/Activity.py
-lib/aap/Agide-%%PORTVERSION%%/Activity.pyc
-lib/aap/Agide-%%PORTVERSION%%/ActyListView.py
-lib/aap/Agide-%%PORTVERSION%%/ActyListView.pyc
-lib/aap/Agide-%%PORTVERSION%%/AgideVersion.py
-lib/aap/Agide-%%PORTVERSION%%/AgideVersion.pyc
-lib/aap/Agide-%%PORTVERSION%%/COPYING
-lib/aap/Agide-%%PORTVERSION%%/Config.py
-lib/aap/Agide-%%PORTVERSION%%/Config.pyc
-lib/aap/Agide-%%PORTVERSION%%/Console.py
-lib/aap/Agide-%%PORTVERSION%%/Console.pyc
-lib/aap/Agide-%%PORTVERSION%%/GUItop.py
-lib/aap/Agide-%%PORTVERSION%%/GUItop.pyc
-lib/aap/Agide-%%PORTVERSION%%/Images/DebugFullSpeed.png
-lib/aap/Agide-%%PORTVERSION%%/Images/Out.png
-lib/aap/Agide-%%PORTVERSION%%/Images/Over.png
-lib/aap/Agide-%%PORTVERSION%%/Images/Run.png
-lib/aap/Agide-%%PORTVERSION%%/Images/Step.png
-lib/aap/Agide-%%PORTVERSION%%/Images/Out.xpm
-lib/aap/Agide-%%PORTVERSION%%/Images/Over.xpm
-lib/aap/Agide-%%PORTVERSION%%/Images/DebugFullSpeed.xpm
-lib/aap/Agide-%%PORTVERSION%%/Images/Run.xpm
-lib/aap/Agide-%%PORTVERSION%%/Images/Step.xpm
-lib/aap/Agide-%%PORTVERSION%%/NavTree.py
-lib/aap/Agide-%%PORTVERSION%%/NavTree.pyc
-lib/aap/Agide-%%PORTVERSION%%/Navigator.py
-lib/aap/Agide-%%PORTVERSION%%/Navigator.pyc
-lib/aap/Agide-%%PORTVERSION%%/NodeListView.py
-lib/aap/Agide-%%PORTVERSION%%/NodeListView.pyc
-lib/aap/Agide-%%PORTVERSION%%/Realpath.py
-lib/aap/Agide-%%PORTVERSION%%/Realpath.pyc
-lib/aap/Agide-%%PORTVERSION%%/Tool.py
-lib/aap/Agide-%%PORTVERSION%%/Tool.pyc
-lib/aap/Agide-%%PORTVERSION%%/ToolListView.py
-lib/aap/Agide-%%PORTVERSION%%/ToolListView.pyc
-lib/aap/Agide-%%PORTVERSION%%/Tools/ActionViewerTool.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/ActionViewerTool.pyc
-lib/aap/Agide-%%PORTVERSION%%/Tools/BoaTool.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/BoaTool.pyc
-lib/aap/Agide-%%PORTVERSION%%/Tools/DebugTool.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/DebugTool.pyc
-lib/aap/Agide-%%PORTVERSION%%/Tools/GrepTool.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/GrepTool.pyc
-lib/aap/Agide-%%PORTVERSION%%/Tools/GrepToolUtil/GrepToolDialog.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/GrepToolUtil/GrepToolWindow.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/GrepToolUtil/__init__.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/GvimTool.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/GvimTool.pyc
-lib/aap/Agide-%%PORTVERSION%%/Tools/PythonShellTool.py
-lib/aap/Agide-%%PORTVERSION%%/Tools/PythonShellTool.pyc
-lib/aap/Agide-%%PORTVERSION%%/Tools/README.txt
-lib/aap/Agide-%%PORTVERSION%%/Xterm.py
-lib/aap/Agide-%%PORTVERSION%%/Xterm.pyc
-lib/aap/Agide-%%PORTVERSION%%/agide
-lib/aap/Agide-%%PORTVERSION%%/agide.bat
-lib/aap/Agide-%%PORTVERSION%%/agide.py
-lib/aap/Agide-%%PORTVERSION%%/agide.pyc
-lib/aap/Agide-%%PORTVERSION%%/check.py
-lib/aap/Agide-%%PORTVERSION%%/check.pyc
-lib/aap/Agide-%%PORTVERSION%%/filelist.aap
-lib/aap/Agide-%%PORTVERSION%%/main.aap
-lib/aap/Agide-%%PORTVERSION%%/startup.vim
-lib/aap/Agide-%%PORTVERSION%%/lang/ja.po
-lib/aap/Agide-%%PORTVERSION%%/lang/nl.po
-lib/aap/Agide-%%PORTVERSION%%/lang/main.aap
-lib/aap/Agide-%%PORTVERSION%%/lang/ja/LC_MESSAGES/agide.mo
-lib/aap/Agide-%%PORTVERSION%%/lang/nl/LC_MESSAGES/agide.mo
-@dirrm lib/aap/Agide-%%PORTVERSION%%/Activities
-@dirrm lib/aap/Agide-%%PORTVERSION%%/Images
-@dirrm lib/aap/Agide-%%PORTVERSION%%/Tools/GrepToolUtil
-@dirrm lib/aap/Agide-%%PORTVERSION%%/Tools
-@dirrm lib/aap/Agide-%%PORTVERSION%%/lang/ja/LC_MESSAGES
-@dirrm lib/aap/Agide-%%PORTVERSION%%/lang/ja
-@dirrm lib/aap/Agide-%%PORTVERSION%%/lang/nl/LC_MESSAGES
-@dirrm lib/aap/Agide-%%PORTVERSION%%/lang/nl
-@dirrm lib/aap/Agide-%%PORTVERSION%%/lang
-@dirrm lib/aap/Agide-%%PORTVERSION%%
-@dirrmtry lib/aap
diff --git a/devel/asis/Makefile b/devel/asis/Makefile
deleted file mode 100644
index 580ab50..0000000
--- a/devel/asis/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# New ports collection makefile for:	asis
-# Date created:				11 Jul 2000
-# Whom:					Thomas Quinot <thomas@cuivre.fr.eu.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	asis
-PORTVERSION=	3.15p
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	http://gd.tuwien.ac.at/languages/ada/gnat/3.15p/asis/ \
-		ftp://ftp.cs.kuleuven.ac.be/pub/Ada-Belgium/mirrors/gnu-ada/3.15p/asis/
-DISTNAME=	asis-${PORTVERSION}-src
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GNAT implementation of the Ada Semantic Interface Specification
-
-BUILD_DEPENDS=	gnatgcc:${PORTSDIR}/lang/gnat
-
-USE_LDCONFIG=	yes
-
-.include <bsd.port.pre.mk>
-
-BROKEN= 	Does not build after gpl 2009 update to lang/gnat
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-WITHOUT_CPU_CFLAGS=	yes
-CFLAGS=		-O2 -pipe
-USE_GMAKE=	yes
-MAKEFILE=	"${FILESDIR}/Makefile.bsd"
-MAKE_ARGS=	GMAKE=${GMAKE} PORTVERSION=${PORTVERSION} \
-		LN=${LN}
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/asis
-	@${INSTALL_DATA} ${WRKSRC}/asis/*.ad? ${WRKSRC}/gnat/*.ad? ${WRKSRC}/obj/*.ali ${PREFIX}/lib/asis
-	@${INSTALL_DATA} ${WRKSRC}/obj/libasis.a ${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/libasis-${PORTVERSION}.so.1 ${PREFIX}/lib
-	@${LN} -sf ${PREFIX}/lib/libasis-${PORTVERSION}.so.1 ${PREFIX}/lib/libasis-${PORTVERSION}.so
-
-	@${INSTALL_PROGRAM} ${WRKSRC}/asistant.prg ${PREFIX}/bin/asistant
-	@${INSTALL_PROGRAM} ${WRKSRC}/display_source ${WRKSRC}/gnatelim ${WRKSRC}/gnatstub ${PREFIX}/bin
-
-post-install:
-	@${LDCONFIG} -m ${PREFIX}/lib
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/documentation/* ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/ds/README ${DOCSDIR}/README.ds
-	@${INSTALL_DATA} ${WRKSRC}/tools/asistant/asistant.ug ${DOCSDIR}/README.asistant
-	@${INSTALL_DATA} ${WRKSRC}/tools/gnatelim/README ${DOCSDIR}/README.gnatelim
-	@${INSTALL_DATA} ${WRKSRC}/tools/gnatstub/README ${DOCSDIR}/README.gnatstub
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/asis/distinfo b/devel/asis/distinfo
deleted file mode 100644
index 56d8e55..0000000
--- a/devel/asis/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (asis-3.15p-src.tgz) = 649f92bca189da5c35d6c1af8d833c2f
-SHA256 (asis-3.15p-src.tgz) = f354edd8260c890e16eec694cf77df858c080ff0aa2302b876491dea4a168151
-SIZE (asis-3.15p-src.tgz) = 1401350
diff --git a/devel/asis/files/Makefile.bsd b/devel/asis/files/Makefile.bsd
deleted file mode 100644
index eff7305..0000000
--- a/devel/asis/files/Makefile.bsd
+++ /dev/null
@@ -1,22 +0,0 @@
-ASISPROGFLAGS=-I../../asis -I../../gnat -I../../obj -largs -L../.. -lasis-${PORTVERSION}
-
-all:
-	${GMAKE} -C obj clean bld-objs CFLAGS="${CFLAGS} -fPIC" CC=adagcc RM="rm -f"
-	adagcc -shared -Wl,-soname,libasis-${PORTVERSION}.so.1 \
-	  -o libasis-${PORTVERSION}.so.1 obj/*.o -lc
-	${LN} -sf libasis-${PORTVERSION}.so.1 libasis-${PORTVERSION}.so
-	${GMAKE} -C obj clean libasis.a CFLAGS="${CFLAGS}" CC=adagcc
-	chmod a-w obj/*.ali
-	cd examples/ds && \
-	gnatmake ${CFLAGS} -o ../../display_source display_source ${ASISPROGFLAGS}
-	cd tools/asistant && \
-	gnatmake ${CFLAGS} -o ../../asistant.prg asistant-driver ${ASISPROGFLAGS}
-	cd tools/gnatelim && \
-	gnatmake ${CFLAGS} -o ../../gnatelim gnatelim-driver ${ASISPROGFLAGS}
-	cd tools/gnatstub && \
-	gnatmake ${CFLAGS} -o ../../gnatstub gnatstub-driver ${ASISPROGFLAGS}
-
-clean:
-	${GMAKE} clean
-	rm -f asistant.prg display_source gnatelim gnatstub libasis*.so.*
-	rm -f libasis*.so
diff --git a/devel/asis/files/patch-aa b/devel/asis/files/patch-aa
deleted file mode 100644
index 55cc39c..0000000
--- a/devel/asis/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-#PATCHOPTIONS: -p0
---- asis/a4g-gnat_int.ads.orig	Wed Oct 27 15:06:50 1999
-+++ asis/a4g-gnat_int.ads	Wed Oct 27 15:06:57 1999
-@@ -67,7 +67,7 @@
-    -- Compiler Variables & Routines --
-    -----------------------------------
- 
--   Gcc      : constant String := "gcc";
-+   Gcc      : constant String := "adagcc";
- 
-    Nul_Argument_List : constant Argument_List (1 .. 0) := (others => null);
- 
diff --git a/devel/asis/pkg-descr b/devel/asis/pkg-descr
deleted file mode 100644
index 3bdf294f..0000000
--- a/devel/asis/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-ASIS is an ISO standard API for the extraction of syntactic
-and semantic information from an Ada compilation environment.
-This is the implementation of ASIS for GNAT, the GNU Ada compiler.
-
-WWW: http://www.gnat.com/
diff --git a/devel/asis/pkg-plist b/devel/asis/pkg-plist
deleted file mode 100644
index a5c1dc2..0000000
--- a/devel/asis/pkg-plist
+++ /dev/null
@@ -1,317 +0,0 @@
-bin/asistant
-bin/display_source
-bin/gnatelim
-bin/gnatstub
-lib/asis/a4g-a_alloc.ads
-lib/asis/a4g-a_alloc.ali
-lib/asis/a4g-a_debug.adb
-lib/asis/a4g-a_debug.ads
-lib/asis/a4g-a_debug.ali
-lib/asis/a4g-a_elists.adb
-lib/asis/a4g-a_elists.ads
-lib/asis/a4g-a_elists.ali
-lib/asis/a4g-a_opt.adb
-lib/asis/a4g-a_opt.ads
-lib/asis/a4g-a_opt.ali
-lib/asis/a4g-a_osint.adb
-lib/asis/a4g-a_osint.ads
-lib/asis/a4g-a_osint.ali
-lib/asis/a4g-a_output.adb
-lib/asis/a4g-a_output.ads
-lib/asis/a4g-a_output.ali
-lib/asis/a4g-a_sem.adb
-lib/asis/a4g-a_sem.ads
-lib/asis/a4g-a_sem.ali
-lib/asis/a4g-a_sinput.adb
-lib/asis/a4g-a_sinput.ads
-lib/asis/a4g-a_sinput.ali
-lib/asis/a4g-a_types.adb
-lib/asis/a4g-a_types.ads
-lib/asis/a4g-a_types.ali
-lib/asis/a4g-asis_tables.adb
-lib/asis/a4g-asis_tables.ads
-lib/asis/a4g-asis_tables.ali
-lib/asis/a4g-contt-dp.adb
-lib/asis/a4g-contt-dp.ads
-lib/asis/a4g-contt-dp.ali
-lib/asis/a4g-contt-sd.adb
-lib/asis/a4g-contt-sd.ads
-lib/asis/a4g-contt-sd.ali
-lib/asis/a4g-contt-tt.adb
-lib/asis/a4g-contt-tt.ads
-lib/asis/a4g-contt-tt.ali
-lib/asis/a4g-contt-ut.adb
-lib/asis/a4g-contt-ut.ads
-lib/asis/a4g-contt-ut.ali
-lib/asis/a4g-contt.adb
-lib/asis/a4g-contt.ads
-lib/asis/a4g-contt.ali
-lib/asis/a4g-cu_info2.adb
-lib/asis/a4g-cu_info2.ads
-lib/asis/a4g-cu_info2.ali
-lib/asis/a4g-dda_aux.adb
-lib/asis/a4g-dda_aux.ads
-lib/asis/a4g-dda_aux.ali
-lib/asis/a4g-decl_sem.adb
-lib/asis/a4g-decl_sem.ads
-lib/asis/a4g-decl_sem.ali
-lib/asis/a4g-defaults.adb
-lib/asis/a4g-defaults.ads
-lib/asis/a4g-defaults.ali
-lib/asis/a4g-encl_el.adb
-lib/asis/a4g-encl_el.ads
-lib/asis/a4g-encl_el.ali
-lib/asis/a4g-encl_el_old.adb
-lib/asis/a4g-encl_el_old.ads
-lib/asis/a4g-encl_el_old.ali
-lib/asis/a4g-expr_sem.adb
-lib/asis/a4g-expr_sem.ads
-lib/asis/a4g-expr_sem.ali
-lib/asis/a4g-get_unit.adb
-lib/asis/a4g-get_unit.ads
-lib/asis/a4g-get_unit.ali
-lib/asis/a4g-gnat_int.adb
-lib/asis/a4g-gnat_int.ads
-lib/asis/a4g-gnat_int.ali
-lib/asis/a4g-int_knds.ads
-lib/asis/a4g-int_knds.ali
-lib/asis/a4g-itests.adb
-lib/asis/a4g-itests.ads
-lib/asis/a4g-itests.ali
-lib/asis/a4g-knd_conv.adb
-lib/asis/a4g-knd_conv.ads
-lib/asis/a4g-knd_conv.ali
-lib/asis/a4g-mapping.adb
-lib/asis/a4g-mapping.ads
-lib/asis/a4g-mapping.ali
-lib/asis/a4g-nencl_el.adb
-lib/asis/a4g-nencl_el.ads
-lib/asis/a4g-nencl_el.ali
-lib/asis/a4g-norm.adb
-lib/asis/a4g-norm.ads
-lib/asis/a4g-norm.ali
-lib/asis/a4g-queries.adb
-lib/asis/a4g-queries.ads
-lib/asis/a4g-queries.ali
-lib/asis/a4g-skip_tb.adb
-lib/asis/a4g-skip_tb.ads
-lib/asis/a4g-skip_tb.ali
-lib/asis/a4g-span_beginning.adb
-lib/asis/a4g-span_beginning.ads
-lib/asis/a4g-span_beginning.ali
-lib/asis/a4g-span_end.adb
-lib/asis/a4g-span_end.ads
-lib/asis/a4g-span_end.ali
-lib/asis/a4g-stand.adb
-lib/asis/a4g-stand.ads
-lib/asis/a4g-stand.ali
-lib/asis/a4g-tree_rec.ads
-lib/asis/a4g-tree_rec.ali
-lib/asis/a4g-u_conv.adb
-lib/asis/a4g-u_conv.ads
-lib/asis/a4g-u_conv.ali
-lib/asis/a4g-unit_rec.ads
-lib/asis/a4g-unit_rec.ali
-lib/asis/a4g-vcheck.adb
-lib/asis/a4g-vcheck.ads
-lib/asis/a4g-vcheck.ali
-lib/asis/a4g.ads
-lib/asis/a4g.ali
-lib/asis/alloc.ads
-lib/asis/alloc.ali
-lib/asis/asis-ada_environments-containers.adb
-lib/asis/asis-ada_environments-containers.ads
-lib/asis/asis-ada_environments-containers.ali
-lib/asis/asis-ada_environments.adb
-lib/asis/asis-ada_environments.ads
-lib/asis/asis-ada_environments.ali
-lib/asis/asis-clauses.adb
-lib/asis/asis-clauses.ads
-lib/asis/asis-clauses.ali
-lib/asis/asis-compilation_units-relations.adb
-lib/asis/asis-compilation_units-relations.ads
-lib/asis/asis-compilation_units-relations.ali
-lib/asis/asis-compilation_units-times.adb
-lib/asis/asis-compilation_units-times.ads
-lib/asis/asis-compilation_units-times.ali
-lib/asis/asis-compilation_units.adb
-lib/asis/asis-compilation_units.ads
-lib/asis/asis-compilation_units.ali
-lib/asis/asis-data_decomposition-aux.adb
-lib/asis/asis-data_decomposition-aux.ads
-lib/asis/asis-data_decomposition-aux.ali
-lib/asis/asis-data_decomposition-debug.adb
-lib/asis/asis-data_decomposition-debug.ads
-lib/asis/asis-data_decomposition-extensions.adb
-lib/asis/asis-data_decomposition-extensions.ads
-lib/asis/asis-data_decomposition-extensions.ali
-lib/asis/asis-data_decomposition-set_get.adb
-lib/asis/asis-data_decomposition-set_get.ads
-lib/asis/asis-data_decomposition-set_get.ali
-lib/asis/asis-data_decomposition-vcheck.adb
-lib/asis/asis-data_decomposition-vcheck.ads
-lib/asis/asis-data_decomposition-vcheck.ali
-lib/asis/asis-data_decomposition.adb
-lib/asis/asis-data_decomposition.ads
-lib/asis/asis-data_decomposition.ali
-lib/asis/asis-declarations.adb
-lib/asis/asis-declarations.ads
-lib/asis/asis-declarations.ali
-lib/asis/asis-definitions.adb
-lib/asis/asis-definitions.ads
-lib/asis/asis-definitions.ali
-lib/asis/asis-elements.adb
-lib/asis/asis-elements.ads
-lib/asis/asis-elements.ali
-lib/asis/asis-errors.ads
-lib/asis/asis-errors.ali
-lib/asis/asis-exceptions.ads
-lib/asis/asis-exceptions.ali
-lib/asis/asis-expressions.adb
-lib/asis/asis-expressions.ads
-lib/asis/asis-expressions.ali
-lib/asis/asis-extensions-flat_kinds.adb
-lib/asis/asis-extensions-flat_kinds.ads
-lib/asis/asis-extensions-flat_kinds.ali
-lib/asis/asis-extensions.adb
-lib/asis/asis-extensions.ads
-lib/asis/asis-extensions.ali
-lib/asis/asis-ids.adb
-lib/asis/asis-ids.ads
-lib/asis/asis-ids.ali
-lib/asis/asis-implementation-permissions.adb
-lib/asis/asis-implementation-permissions.ads
-lib/asis/asis-implementation-permissions.ali
-lib/asis/asis-implementation.adb
-lib/asis/asis-implementation.ads
-lib/asis/asis-implementation.ali
-lib/asis/asis-iterator.adb
-lib/asis/asis-iterator.ads
-lib/asis/asis-iterator.ali
-lib/asis/asis-set_get.adb
-lib/asis/asis-set_get.ads
-lib/asis/asis-set_get.ali
-lib/asis/asis-statements.adb
-lib/asis/asis-statements.ads
-lib/asis/asis-statements.ali
-lib/asis/asis-text-set_get.adb
-lib/asis/asis-text-set_get.ads
-lib/asis/asis-text-set_get.ali
-lib/asis/asis-text.adb
-lib/asis/asis-text.ads
-lib/asis/asis-text.ali
-lib/asis/asis.ads
-lib/asis/asis.ali
-lib/asis/atree.adb
-lib/asis/atree.ads
-lib/asis/atree.ali
-lib/asis/casing.adb
-lib/asis/casing.ads
-lib/asis/casing.ali
-lib/asis/csets.adb
-lib/asis/csets.ads
-lib/asis/csets.ali
-lib/asis/debug.adb
-lib/asis/debug.ads
-lib/asis/debug.ali
-lib/asis/einfo.adb
-lib/asis/einfo.ads
-lib/asis/einfo.ali
-lib/asis/elists.adb
-lib/asis/elists.ads
-lib/asis/elists.ali
-lib/asis/fname.adb
-lib/asis/fname.ads
-lib/asis/fname.ali
-lib/asis/gnatvsn.ads
-lib/asis/gnatvsn.ali
-lib/asis/hostparm.ads
-lib/asis/hostparm.ali
-lib/asis/krunch.adb
-lib/asis/krunch.ads
-lib/asis/krunch.ali
-lib/asis/lib-list.adb
-lib/asis/lib-sort.adb
-lib/asis/lib.adb
-lib/asis/lib.ads
-lib/asis/lib.ali
-lib/asis/namet.adb
-lib/asis/namet.ads
-lib/asis/namet.ali
-lib/asis/nlists.adb
-lib/asis/nlists.ads
-lib/asis/nlists.ali
-lib/asis/opt.adb
-lib/asis/opt.ads
-lib/asis/opt.ali
-lib/asis/output.adb
-lib/asis/output.ads
-lib/asis/output.ali
-lib/asis/repinfo.adb
-lib/asis/repinfo.ads
-lib/asis/repinfo.ali
-lib/asis/scans.adb
-lib/asis/scans.ads
-lib/asis/sinfo.adb
-lib/asis/sinfo.ads
-lib/asis/sinfo.ali
-lib/asis/sinput.adb
-lib/asis/sinput.ads
-lib/asis/sinput.ali
-lib/asis/snames.adb
-lib/asis/snames.ads
-lib/asis/snames.ali
-lib/asis/stand.adb
-lib/asis/stand.ads
-lib/asis/stand.ali
-lib/asis/stringt.adb
-lib/asis/stringt.ads
-lib/asis/stringt.ali
-lib/asis/table.adb
-lib/asis/table.ads
-lib/asis/table.ali
-lib/asis/tree_in.adb
-lib/asis/tree_in.ads
-lib/asis/tree_in.ali
-lib/asis/tree_io.adb
-lib/asis/tree_io.ads
-lib/asis/tree_io.ali
-lib/asis/types.adb
-lib/asis/types.ads
-lib/asis/types.ali
-lib/asis/uintp.adb
-lib/asis/uintp.ads
-lib/asis/uintp.ali
-lib/asis/uname.adb
-lib/asis/uname.ads
-lib/asis/uname.ali
-lib/asis/urealp.adb
-lib/asis/urealp.ads
-lib/asis/urealp.ali
-lib/asis/widechar.adb
-lib/asis/widechar.ads
-lib/asis/widechar.ali
-lib/libasis-3.15p.so
-lib/libasis-3.15p.so.1
-lib/libasis.a
-%%PORTDOCS%%%%DOCSDIR%%/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/README.asistant
-%%PORTDOCS%%%%DOCSDIR%%/README.ds
-%%PORTDOCS%%%%DOCSDIR%%/README.gnatelim
-%%PORTDOCS%%%%DOCSDIR%%/README.gnatstub
-%%PORTDOCS%%%%DOCSDIR%%/asis_rm.html
-%%PORTDOCS%%%%DOCSDIR%%/asis_rm.info
-%%PORTDOCS%%%%DOCSDIR%%/asis_rm.ps
-%%PORTDOCS%%%%DOCSDIR%%/asis_rm.texi
-%%PORTDOCS%%%%DOCSDIR%%/asis_rm.txt
-%%PORTDOCS%%%%DOCSDIR%%/asis_ug.html
-%%PORTDOCS%%%%DOCSDIR%%/asis_ug.info
-%%PORTDOCS%%%%DOCSDIR%%/asis_ug.info-1
-%%PORTDOCS%%%%DOCSDIR%%/asis_ug.info-2
-%%PORTDOCS%%%%DOCSDIR%%/asis_ug.ps
-%%PORTDOCS%%%%DOCSDIR%%/asis_ug.texi
-%%PORTDOCS%%%%DOCSDIR%%/asis_ug.txt
-%%PORTDOCS%%%%DOCSDIR%%/asisinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/non_implemented.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/asis
diff --git a/devel/callgrind/Makefile b/devel/callgrind/Makefile
deleted file mode 100644
index 184eaec..0000000
--- a/devel/callgrind/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	calltree
-# Date created:				Jun 3 2004
-# Whom:					Simon Barner <barner@gmx.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	callgrind
-PORTVERSION=	0.9.8
-CATEGORIES=	devel
-MASTER_SITES=	http://kcachegrind.sourceforge.net/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Valgrind skin for cache simulation and call tracing
-
-# see http://lists.freebsd.org/pipermail/cvs-ports/2006-December/112797.html
-#IGNORE=	Dumps core \(SIGBUS\). \(Also v. 0.9.10\!\)
-
-BROKEN=		does not build
-DEPRECATED=	Included in devel/valgrind
-EXPIRATION_DATE=	2009-10-30
-
-ONLY_FOR_ARCHS=	i386
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
-OPTIONS=	VALGRIND_SNAPSHOT	"Depend on snapshot version of valgrind" off
-.include <bsd.port.pre.mk>
-
-.if defined (WITH_VALGRIND_SNAPSHOT)
-RUN_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind-snapshot
-BUILD_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind-snapshot
-.else
-RUN_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind
-BUILD_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind
-.endif
-
-pre-patch:
-.ifdef(NOPORTDOCS)
-	${FIND} ${WRKSRC} -name "Makefile.in" -exec \
-	${REINPLACE_CMD} -e "s/docs//g" {} \;
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/callgrind/distinfo b/devel/callgrind/distinfo
deleted file mode 100644
index 031ba23..0000000
--- a/devel/callgrind/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (callgrind-0.9.8.tar.gz) = 5d98a82128b66a8ad4a931b728db420b
-SHA256 (callgrind-0.9.8.tar.gz) = bb9caa3f94e71f6e90fe6f747471e52a0a8da86f4f8772bb3536b68b14d3468b
-SIZE (callgrind-0.9.8.tar.gz) = 178524
diff --git a/devel/callgrind/files/patch-configure b/devel/callgrind/files/patch-configure
deleted file mode 100644
index 3846a60..0000000
--- a/devel/callgrind/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Sat Jul 31 20:09:02 2004
-+++ configure	Sat Jul 31 20:09:18 2004
-@@ -3212,16 +3212,9 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--int
--main ()
--{
--
- #include "vg_skin.h"
- int main() { return 0 ; }
- 
--  ;
--  return 0;
--}
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
diff --git a/devel/callgrind/files/patch-src::Makefile.in b/devel/callgrind/files/patch-src::Makefile.in
deleted file mode 100644
index 58ba034..0000000
--- a/devel/callgrind/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig	Thu Aug 19 22:46:55 2004
-+++ src/Makefile.in	Wed Aug 25 10:07:20 2004
-@@ -167,8 +167,8 @@
- target_alias = @target_alias@
- SUBDIRS = .
- AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
-- -Winline -Wall -Wshadow -O2 -fomit-frame-pointer \
-- @PREFERRED_STACK_BOUNDARY@ -g
-+ -fomit-frame-pointer \
-+ @PREFERRED_STACK_BOUNDARY@
- 
- valdir = $(libdir)/valgrind
- incincdir = $(includedir)/valgrind
diff --git a/devel/callgrind/files/patch-src::ct_main.c b/devel/callgrind/files/patch-src::ct_main.c
deleted file mode 100644
index 02d6611..0000000
--- a/devel/callgrind/files/patch-src::ct_main.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ct_main.c.orig	Wed Aug 25 10:10:18 2004
-+++ src/ct_main.c	Wed Aug 25 10:13:36 2004
-@@ -32,6 +32,7 @@
- */
- 
- #include "vg_skin.h"
-+#include "vg_unistd.h"
- #include "callgrind.h"
- #include "ct_include.h"
- #include "ct_events.h"
diff --git a/devel/callgrind/files/patch-src::ct_sim.c b/devel/callgrind/files/patch-src::ct_sim.c
deleted file mode 100644
index b02a548..0000000
--- a/devel/callgrind/files/patch-src::ct_sim.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ct_sim.c.orig	Tue Aug 31 13:05:51 2004
-+++ src/ct_sim.c	Tue Aug 31 13:06:00 2004
-@@ -537,7 +537,7 @@
-    /* Install own SIGILL handler */
-    sigill_new.ksa_handler  = cpuid_SIGILL_handler;
-    sigill_new.ksa_flags    = 0;
--   sigill_new.ksa_restorer = NULL;
-+   //sigill_new.ksa_restorer = NULL;
-    res = VG_(ksigemptyset)( &sigill_new.ksa_mask );
-    CT_ASSERT(res == 0);
- 
diff --git a/devel/callgrind/pkg-descr b/devel/callgrind/pkg-descr
deleted file mode 100644
index 02eb05b..0000000
--- a/devel/callgrind/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Callgrind uses runtime instrumentation via the Valgrind framework for its
-cache simulation and call tracing. This way, even shared libraries and
-dynamically opened plugins can be profiled. The data files generated by
-Callgrind can be loaded into KCachegrind for browsing the performance results.
-
-But there is also a command line tool in the Callgrind package to get ASCII
-reports from Callgrind data files without the need to use KCachegrind.
-
-WWW: http://kcachegrind.sourceforge.net
diff --git a/devel/callgrind/pkg-plist b/devel/callgrind/pkg-plist
deleted file mode 100644
index 665c73c..0000000
--- a/devel/callgrind/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/callgrind
-bin/callgrind_annotate
-bin/callgrind_control
-include/valgrind/callgrind.h
-lib/valgrind/vgskin_callgrind.so
-%%PORTDOCS%%share/doc/valgrind/ct_main.html
-%%PORTDOCS%%share/doc/valgrind/ct_techdocs.html
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
deleted file mode 100644
index 21467b1..0000000
--- a/devel/florist/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	florist
-# Date created:		1 Sep 2002
-# Whom:			Vadim Godunko <vgodunko@vipmail.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	florist
-PORTVERSION=	3.15p
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	http://www.cs.fsu.edu/~baker/ftp/
-DISTNAME=	florist-${PORTVERSION}-src
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	FSU implementation of POSIX.5, the POSIX Ada binding
-
-BUILD_DEPENDS=	gnatgcc:${PORTSDIR}/lang/gnat
-
-USE_AUTOTOOLS=	autoconf:213
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	--enable-threads
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
-		LIBS="${LIBS} ${PTHREAD_LIBS}"
-MAKEFILE=	"${FILESDIR}/Makefile.bsd"
-MAKE_ARGS=	GMAKE=${GMAKE} PORTVERSION=${PORTVERSION} LN=${LN} \
-		RM=${RM}
-USE_LDCONFIG=	yes
-
-BROKEN= 	Does not build after gpl 2009 update to lang/gnat
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-post-extract:
-# add FreeBSD configuration
-	@${CP} ${FILESDIR}/pconfig.FreeBSD \
-		${WRKSRC}/configs
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/florist
-	@${INSTALL_DATA} ${WRKSRC}/floristlib/*.ad[sb] \
-		${WRKSRC}/floristlib/*.ali \
-		${PREFIX}/lib/florist
-	@${INSTALL_DATA} ${WRKSRC}/floristlib/libflorist.a ${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/libflorist-${PORTVERSION}.so.1 ${PREFIX}/lib
-	@${LN} -sf ${PREFIX}/lib/libflorist-${PORTVERSION}.so.1 \
-		${PREFIX}/lib/libflorist-${PORTVERSION}.so
-
-.include <bsd.port.mk>
diff --git a/devel/florist/distinfo b/devel/florist/distinfo
deleted file mode 100644
index f9ecca6..0000000
--- a/devel/florist/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (florist-3.15p-src.tgz) = 988e08ee86e022249fed79345b25921f
-SHA256 (florist-3.15p-src.tgz) = 0333a6f27c85ed387912ec661bfc96399c4433fa60639bff5a7d9643efd76a7c
-SIZE (florist-3.15p-src.tgz) = 264898
diff --git a/devel/florist/files/Makefile.bsd b/devel/florist/files/Makefile.bsd
deleted file mode 100644
index 3414af1..0000000
--- a/devel/florist/files/Makefile.bsd
+++ /dev/null
@@ -1,7 +0,0 @@
-all:
-	@${GMAKE} GNATMAKEFLAGS1B="-O2 -fPIC"
-	@${LOCALBASE}/bin/adagcc -shared -Wl,-soname,libflorist-${PORTVERSION}.so.1 \
-	 	-o libflorist-${PORTVERSION}.so.1 *.o
-	@${LN} -sf libflorist-${PORTVERSION}.so.1 \
-		libflorist-${PORTVERSION}.so
-	@${RM} -f floristlib/deps* floristlib/gnatprep*
diff --git a/devel/florist/files/patch-c-posix.c b/devel/florist/files/patch-c-posix.c
deleted file mode 100644
index 679dc1a..0000000
--- a/devel/florist/files/patch-c-posix.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- c-posix.c.orig	Thu Oct 24 01:03:51 2002
-+++ c-posix.c	Fri Sep 26 23:38:36 2003
-@@ -2788,7 +2788,11 @@
- #endif
- 
- #ifdef SEM_VALUE_MAX
-+#if SEM_VALUE_MAX > INT_MAX
-+  gmaxnn("Semaphores_Value",INT_MAX);
-+#else
-   gmaxnn("Semaphores_Value",SEM_VALUE_MAX);
-+#endif
- #else
- #ifdef _POSIX_SEM_VALUE_MAX
-   gmaxn("Semaphores_Value",_POSIX_SEM_VALUE_MAX);
-@@ -6344,7 +6348,7 @@
-   g_struct_msghdr();
-   gcmnt("local socket address");
-   { struct sockaddr_un DUMMY;
--    ifprintf(fp,"   subtype sun_path_string is
-+    ifprintf(fp,"   subtype sun_path_string is \
-       POSIX_String (1 .. %d);\n", sizeof (DUMMY.sun_path));
-   }
-   g_struct_sockaddr_un();
diff --git a/devel/florist/files/patch-configure.in b/devel/florist/files/patch-configure.in
deleted file mode 100644
index e5a0ac5..0000000
--- a/devel/florist/files/patch-configure.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.in.orig	Tue Jun  3 03:55:13 2003
-+++ configure.in	Tue Jun  3 03:58:10 2003
-@@ -104,6 +104,10 @@
-     echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-     cp ./configs/pconfig.LynxOS ./pconfig.h.in;
-     ;;
-+ FreeBSD)
-+    echo "Using Configuration for" ${UNAME_SYSTEM} ${UNAME_RELEASE};
-+    cp ./configs/pconfig.FreeBSD ./pconfig.h.in;
-+    ;;
-  *)
-    echo "No Configuration for ${UNAME_SYSTEM}. Using default.";
-    cp ./configs/pconfig.Default ./pconfig.h.in;
-@@ -177,7 +181,8 @@
-   AC_POSIX_LIB(pthreads, pthread_self,,
-   AC_POSIX_LIB(cma, pthread_self,,
-   AC_POSIX_LIB(:libcma.a, pthread_self,,
--  AC_POSIX_LIB(thread, pthread_self))))))
-+  AC_POSIX_LIB(thread, pthread_self,,
-+  AC_POSIX_LIB(c_r, pthread_self)))))))
- fi
- 
- AC_POSIX_LIB(aio, aio_read)
diff --git a/devel/florist/files/pconfig.FreeBSD b/devel/florist/files/pconfig.FreeBSD
deleted file mode 100644
index 96a460f..0000000
--- a/devel/florist/files/pconfig.FreeBSD
+++ /dev/null
@@ -1,5 +0,0 @@
-#define _POSIX_C_SOURCE 199506L
-#define _XOPEN_SOURCE
-#define _XOPEN_SOURCE_EXTENDED 1
-#define _REENTRANT
-#define _P1003_1B_VISIBLE
diff --git a/devel/florist/pkg-descr b/devel/florist/pkg-descr
deleted file mode 100644
index a0b31e7..0000000
--- a/devel/florist/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-FLORIST is a FSU implementation of POSIX.5, the POSIX Ada binding.
-
-WWW: http://www.cs.fsu.edu/~baker/florist.html
diff --git a/devel/florist/pkg-plist b/devel/florist/pkg-plist
deleted file mode 100644
index fdb631f..0000000
--- a/devel/florist/pkg-plist
+++ /dev/null
@@ -1,187 +0,0 @@
-lib/florist/ada_streams.ads
-lib/florist/ada_streams.ali
-lib/florist/ada_task_identification.ads
-lib/florist/posix-asynchronous_io.adb
-lib/florist/posix-asynchronous_io.ads
-lib/florist/posix-c.adb
-lib/florist/posix-c.ads
-lib/florist/posix-c.ali
-lib/florist/posix-calendar.adb
-lib/florist/posix-calendar.ads
-lib/florist/posix-calendar.ali
-lib/florist/posix-condition_variables.adb
-lib/florist/posix-condition_variables.ads
-lib/florist/posix-configurable_file_limits.adb
-lib/florist/posix-configurable_file_limits.ads
-lib/florist/posix-configurable_file_limits.ali
-lib/florist/posix-configurable_system_limits.adb
-lib/florist/posix-configurable_system_limits.ads
-lib/florist/posix-configurable_system_limits.ali
-lib/florist/posix-error_codes.ads
-lib/florist/posix-event_management.adb
-lib/florist/posix-event_management.ads
-lib/florist/posix-file_locking.adb
-lib/florist/posix-file_locking.ads
-lib/florist/posix-file_locking.ali
-lib/florist/posix-file_status.adb
-lib/florist/posix-file_status.ads
-lib/florist/posix-file_status.ali
-lib/florist/posix-files.adb
-lib/florist/posix-files.ads
-lib/florist/posix-files.ali
-lib/florist/posix-generic_shared_memory.adb
-lib/florist/posix-generic_shared_memory.ads
-lib/florist/posix-generic_shared_memory.ali
-lib/florist/posix-group_database.adb
-lib/florist/posix-group_database.ads
-lib/florist/posix-group_database.ali
-lib/florist/posix-implementation.adb
-lib/florist/posix-implementation.ads
-lib/florist/posix-implementation.ali
-lib/florist/posix-io.adb
-lib/florist/posix-io.ads
-lib/florist/posix-io.ali
-lib/florist/posix-limits.ads
-lib/florist/posix-limits.ali
-lib/florist/posix-memory_locking.adb
-lib/florist/posix-memory_locking.ads
-lib/florist/posix-memory_locking.ali
-lib/florist/posix-memory_mapping.adb
-lib/florist/posix-memory_mapping.ads
-lib/florist/posix-memory_mapping.ali
-lib/florist/posix-memory_range_locking.adb
-lib/florist/posix-memory_range_locking.ads
-lib/florist/posix-memory_range_locking.ali
-lib/florist/posix-message_queues.adb
-lib/florist/posix-message_queues.ads
-lib/florist/posix-mutexes.adb
-lib/florist/posix-mutexes.ads
-lib/florist/posix-options.ads
-lib/florist/posix-options.ali
-lib/florist/posix-page_alignment.adb
-lib/florist/posix-page_alignment.ads
-lib/florist/posix-page_alignment.ali
-lib/florist/posix-permissions-implementation.adb
-lib/florist/posix-permissions-implementation.ads
-lib/florist/posix-permissions-implementation.ali
-lib/florist/posix-permissions.adb
-lib/florist/posix-permissions.ads
-lib/florist/posix-permissions.ali
-lib/florist/posix-process_environment.adb
-lib/florist/posix-process_environment.ads
-lib/florist/posix-process_environment.ali
-lib/florist/posix-process_identification.adb
-lib/florist/posix-process_identification.ads
-lib/florist/posix-process_identification.ali
-lib/florist/posix-process_primitives.adb
-lib/florist/posix-process_primitives.ads
-lib/florist/posix-process_scheduling.adb
-lib/florist/posix-process_scheduling.ads
-lib/florist/posix-process_scheduling.ali
-lib/florist/posix-process_times.adb
-lib/florist/posix-process_times.ads
-lib/florist/posix-process_times.ali
-lib/florist/posix-semaphores.adb
-lib/florist/posix-semaphores.ads
-lib/florist/posix-semaphores.ali
-lib/florist/posix-shared_memory_objects.adb
-lib/florist/posix-shared_memory_objects.ads
-lib/florist/posix-shared_memory_objects.ali
-lib/florist/posix-signals.adb
-lib/florist/posix-signals.ads
-lib/florist/posix-sockets-internet.adb
-lib/florist/posix-sockets-internet.ads
-lib/florist/posix-sockets-iso.ads
-lib/florist/posix-sockets-local.adb
-lib/florist/posix-sockets-local.ads
-lib/florist/posix-sockets.adb
-lib/florist/posix-sockets.ads
-lib/florist/posix-supplement_to_ada_io.adb
-lib/florist/posix-supplement_to_ada_io.ads
-lib/florist/posix-supplement_to_ada_io.ali
-lib/florist/posix-terminal_functions.adb
-lib/florist/posix-terminal_functions.ads
-lib/florist/posix-terminal_functions.ali
-lib/florist/posix-timers.adb
-lib/florist/posix-timers.ads
-lib/florist/posix-unsafe_process_primitives.adb
-lib/florist/posix-unsafe_process_primitives.ads
-lib/florist/posix-unsafe_process_primitives.ali
-lib/florist/posix-user_database.adb
-lib/florist/posix-user_database.ads
-lib/florist/posix-user_database.ali
-lib/florist/posix-xti-internet.adb
-lib/florist/posix-xti-internet.ads
-lib/florist/posix-xti-iso.ads
-lib/florist/posix-xti-mosi.ads
-lib/florist/posix-xti.adb
-lib/florist/posix-xti.ads
-lib/florist/posix.adb
-lib/florist/posix.ads
-lib/florist/posix.ali
-lib/florist/posix_asynchronous_io.ads
-lib/florist/posix_c.ads
-lib/florist/posix_calendar.ads
-lib/florist/posix_calendar.ali
-lib/florist/posix_condition_variables.ads
-lib/florist/posix_configurable_file_limits.ads
-lib/florist/posix_configurable_file_limits.ali
-lib/florist/posix_configurable_system_limits.ads
-lib/florist/posix_configurable_system_limits.ali
-lib/florist/posix_error_codes.ads
-lib/florist/posix_file_locking.ads
-lib/florist/posix_file_locking.ali
-lib/florist/posix_file_status.ads
-lib/florist/posix_file_status.ali
-lib/florist/posix_files.ads
-lib/florist/posix_files.ali
-lib/florist/posix_generic_shared_memory.ads
-lib/florist/posix_generic_shared_memory.ali
-lib/florist/posix_group_database.ads
-lib/florist/posix_group_database.ali
-lib/florist/posix_io.ads
-lib/florist/posix_io.ali
-lib/florist/posix_limits.ads
-lib/florist/posix_limits.ali
-lib/florist/posix_memory_locking.ads
-lib/florist/posix_memory_locking.ali
-lib/florist/posix_memory_mapping.ads
-lib/florist/posix_memory_mapping.ali
-lib/florist/posix_memory_range_locking.ads
-lib/florist/posix_memory_range_locking.ali
-lib/florist/posix_message_queues.ads
-lib/florist/posix_mutexes.ads
-lib/florist/posix_options.ads
-lib/florist/posix_options.ali
-lib/florist/posix_page_alignment.ads
-lib/florist/posix_page_alignment.ali
-lib/florist/posix_permissions.ads
-lib/florist/posix_permissions.ali
-lib/florist/posix_process_environment.ads
-lib/florist/posix_process_environment.ali
-lib/florist/posix_process_identification.ads
-lib/florist/posix_process_identification.ali
-lib/florist/posix_process_primitives.ads
-lib/florist/posix_process_scheduling.ads
-lib/florist/posix_process_scheduling.ali
-lib/florist/posix_process_times.ads
-lib/florist/posix_process_times.ali
-lib/florist/posix_semaphores.ads
-lib/florist/posix_semaphores.ali
-lib/florist/posix_shared_memory_objects.ads
-lib/florist/posix_shared_memory_objects.ali
-lib/florist/posix_signals.ads
-lib/florist/posix_supplement_to_ada_io.ads
-lib/florist/posix_supplement_to_ada_io.ali
-lib/florist/posix_terminal_functions.ads
-lib/florist/posix_terminal_functions.ali
-lib/florist/posix_timers.ads
-lib/florist/posix_unsafe_process_primitives.ads
-lib/florist/posix_unsafe_process_primitives.ali
-lib/florist/posix_user_database.ads
-lib/florist/posix_user_database.ali
-lib/florist/system_storage_elements.ads
-lib/libflorist-3.15p.so
-lib/libflorist-3.15p.so.1
-lib/libflorist.a
-@dirrm lib/florist
diff --git a/editors/Makefile b/editors/Makefile
index 968c738..d8272b0 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -258,7 +258,6 @@
     SUBDIR += xemacs-packages
     SUBDIR += xemacs21-mule
     SUBDIR += xenon
-    SUBDIR += xml2rfc-xxe
     SUBDIR += xmlcopyeditor
     SUBDIR += xmleditor
     SUBDIR += xvile
diff --git a/editors/xml2rfc-xxe/Makefile b/editors/xml2rfc-xxe/Makefile
deleted file mode 100644
index bd0a947..0000000
--- a/editors/xml2rfc-xxe/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	xml2rfc-xxe
-# Date created:		9 December 2005
-# Whom:			Bill Fenner
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xml2rfc-xxe
-PORTVERSION=	0.7.1
-PORTREVISION=	2
-CATEGORIES=	editors
-MASTER_SITES=	http://www.fenron.com/~fenner/ietf/
-PKGNAMESUFFIX=	-${XXE_VERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An xml2rfc configuration for XMLMind XML Editor
-
-RUN_DEPENDS=	xxe:${PORTSDIR}/editors/xxe
-
-USE_ZIP=	YES
-NO_BUILD=	YES
-
-PLIST_SUB=	XXE_DIR=${XXE_DIR}
-
-do-install:
-	@cd ${WRKDIR} && tar cf - xml2rfc | \
-		tar -C ${PREFIX}/lib/${XXE_DIR}/addon -xf -
-
-BROKEN=	does not compile
-DEPRECATED=	has been broken for 4 months
-EXPIRATION_DATE=2010-01-08
-
-#.include "${.CURDIR}/../xxe/Makefile.inc"
-
-.include <bsd.port.mk>
diff --git a/editors/xml2rfc-xxe/distinfo b/editors/xml2rfc-xxe/distinfo
deleted file mode 100644
index 95bc081..0000000
--- a/editors/xml2rfc-xxe/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xml2rfc-xxe-0.7.1.zip) = 0afd72afeac9101cf13aab20e1bc56b5
-SHA256 (xml2rfc-xxe-0.7.1.zip) = 4b57617c3e3017494eae1c8d66c3b5c632c7a52541c46b08a985f44824de315d
-SIZE (xml2rfc-xxe-0.7.1.zip) = 125612
diff --git a/editors/xml2rfc-xxe/pkg-descr b/editors/xml2rfc-xxe/pkg-descr
deleted file mode 100644
index d26a9c1..0000000
--- a/editors/xml2rfc-xxe/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-xml2rfc-xxe is a configuration for the XMLMind XML Editor
-to assist in editing RFCs in RFC2629 format.  It includes
-WYSIWYG formatting, conversion using the web form or a
-locally-installed xml2rfc, conversion to HTML using XSL-FO,
-and more.
-
-WWW:	http://rtg.ietf.org/~fenner/ietf/xml2rfc-xxe/
diff --git a/editors/xml2rfc-xxe/pkg-plist b/editors/xml2rfc-xxe/pkg-plist
deleted file mode 100644
index 027c2e4..0000000
--- a/editors/xml2rfc-xxe/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-lib/%%XXE_DIR%%/addon/xml2rfc/css/xml2rfc.css
-lib/%%XXE_DIR%%/addon/xml2rfc/dtd/rfc2629-other.ent
-lib/%%XXE_DIR%%/addon/xml2rfc/dtd/rfc2629-xhtml.ent
-lib/%%XXE_DIR%%/addon/xml2rfc/dtd/rfc2629.dtd
-lib/%%XXE_DIR%%/addon/xml2rfc/empty-draft.xml
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/decrsectlevel.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/emphasis_menu.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/figure.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/incrsectlevel.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/itemizedlist.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/list_menu.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/navigate2.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/navigateNext2.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/navigatePrevious2.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/orderedlist.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/para.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/plain.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/section.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/icons/table.gif
-lib/%%XXE_DIR%%/addon/xml2rfc/new-draft.xml
-lib/%%XXE_DIR%%/addon/xml2rfc/version.txt
-lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc.jar
-lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc.xxe
-lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc_catalog.xml
-lib/%%XXE_DIR%%/addon/xml2rfc/xml2rfc_help.jar
-lib/%%XXE_DIR%%/addon/xml2rfc/xsl/check-ietf-references.xslt
-lib/%%XXE_DIR%%/addon/xml2rfc/xsl/expand-pi-rfc-include.xslt
-lib/%%XXE_DIR%%/addon/xml2rfc/xsl/rfc2629.xslt
-lib/%%XXE_DIR%%/addon/xml2rfc/xsl/rfc2629toFO.xslt
-lib/%%XXE_DIR%%/addon/xml2rfc/xsl/xsl11toFop.xslt
-lib/%%XXE_DIR%%/addon/xml2rfc/xsl/xsl11toXep.xslt
-@dirrm lib/%%XXE_DIR%%/addon/xml2rfc/css
-@dirrm lib/%%XXE_DIR%%/addon/xml2rfc/dtd
-@dirrm lib/%%XXE_DIR%%/addon/xml2rfc/icons
-@dirrm lib/%%XXE_DIR%%/addon/xml2rfc/xsl
-@dirrm lib/%%XXE_DIR%%/addon/xml2rfc
diff --git a/graphics/Makefile b/graphics/Makefile
index 5e7d681..40c0985 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -222,7 +222,6 @@
     SUBDIR += geomview
     SUBDIR += geos
     SUBDIR += geoserver
-    SUBDIR += gephex
     SUBDIR += gfont
     SUBDIR += giblib
     SUBDIR += gif2png
@@ -342,7 +341,6 @@
     SUBDIR += intergif
     SUBDIR += inventor
     SUBDIR += ipe
-    SUBDIR += irit
     SUBDIR += isreal
     SUBDIR += iulib
     SUBDIR += ivtools
@@ -694,7 +692,6 @@
     SUBDIR += pixelize
     SUBDIR += pixen
     SUBDIR += pixie
-    SUBDIR += pixieplus
     SUBDIR += pixmap
     SUBDIR += plasma-kmod
     SUBDIR += plotmtv
diff --git a/graphics/gephex/Makefile b/graphics/gephex/Makefile
deleted file mode 100644
index 43eb5bf..0000000
--- a/graphics/gephex/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-# New ports collection makefile for: gephex
-# Date created:		25 Jan 2005
-# Whom:			Igor Pokrovsky <ip@doom.homeunix.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gephex
-PORTVERSION=	0.4.4
-PORTREVISION=	1
-CATEGORIES=	graphics
-MASTER_SITES=	http://www.gephex.org/download/src/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Software-based interactive video-effect system
-
-LIB_DEPENDS=	jpeg.10:${PORTSDIR}/graphics/jpeg
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-OPTIONS=	SDL	"Turn on SDL support"		on \
-		AALIB	"Turn on AALIB support"		on \
-		FFMPEG	"Turn on FFMPEG support"	on \
-		MPEG3	"Turn on MPEG3 support"		off \
-		PNG	"Turn on PNG support"		off \
-		GL	"Turn on GL support"		off
-
-ONLY_FOR_ARCHS=	i386
-
-USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	corelib gui moc_build uic_build
-USE_XORG=	xv
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:18 autoconf:262 libtool:22
-AUTOMAKE_ARGS=	--foreign
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--without-ASOUNDLIB --without-AVIFILE \
-		--without-LINUX_JOYSTICK --without-V4L \
-		--disable-static
-
-MAN1=		gephex-engine.1 gephex-gui.1 gephex.1
-
-PLIST_SUB=	VERSION="${PORTVERSION:R}"
-PORTREVISION=	1
-
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386"
-CONFIGURE_ARGS+=	--disable-mmx
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
-.endif
-
-.if defined(WITHOUT_SDL)
-CONFIGURE_ARGS+=	--without-SDL --without-SDL_IMAGE --without-SDL_TTF
-PLIST_SUB+=	SDL="@comment "
-.else
-CONFIGURE_ARGS+=	--with-SDL --with-SDL_IMAGE --with-SDL_TTF
-USE_SDL=	sdl image ttf
-PLIST_SUB+=	SDL=""
-.endif
-
-.if defined(WITHOUT_AALIB)
-CONFIGURE_ARGS+=	--without-AALIB
-PLIST_SUB+=	AALIB="@comment "
-.else
-CONFIGURE_ARGS+=	--with-AALIB
-LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
-PLIST_SUB+=	AALIB=""
-.endif
-
-.if defined(WITHOUT_FFMPEG)
-CONFIGURE_ARGS+=	--without-FFMPEG
-PLIST_SUB+=	FFMPEG="@comment "
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=	--with-FFMPEG
-PLIST_SUB+=	FFMPEG=""
-.endif
-
-.if defined(WITH_MPEG3)
-CONFIGURE_ARGS+=	--with-MPEG3
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmpeg3.a:${PORTSDIR}/multimedia/libmpeg3
-PLIST_SUB+=	MPEG3=""
-.else
-CONFIGURE_ARGS+=	--without-MPEG3
-PLIST_SUB+=	MPEG3="@comment "
-.endif
-
-.if defined(WITH_PNG)
-CONFIGURE_ARGS+=	--with-LIBPNG
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
-PLIST_SUB+=	PNG=""
-.else
-CONFIGURE_ARGS+=	--without-LIBPNG
-PLIST_SUB+=	PNG="@comment "
-.endif
-
-.if defined(WITH_GL)
-CONFIGURE_ARGS+=	--with-GL
-USE_GL=		gl
-PLIST_SUB+=	GL=""
-.else
-CONFIGURE_ARGS+=	--without-GL
-PLIST_SUB+=	GL="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|$$QTDIR/include |${QT_INCDIR} |g ; \
-		 s|$$QTDIR/lib |${QT_LIBDIR} |g ; \
-		 s|$$QTDIR/bin |${QT_PREFIX}/bin |g ; \
-		 s|/moc|/${MOC:T}|g ; \
-		 s|/uic|/${UIC:T}|g' ${WRKSRC}/acinclude.m4
-	@${REINPLACE_CMD} -e \
-		's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure.ac
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/gephex/distinfo b/graphics/gephex/distinfo
deleted file mode 100644
index a82f67c..0000000
--- a/graphics/gephex/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gephex-0.4.4.tar.bz2) = 5cde05a6c8396fabdaba2efc77731590
-SHA256 (gephex-0.4.4.tar.bz2) = a5a221036b5ae72cd5c8bedaac83f857c979ed6b8c932be897bdf19a4578d685
-SIZE (gephex-0.4.4.tar.bz2) = 4204313
diff --git a/graphics/gephex/files/patch-Makefile.am b/graphics/gephex/files/patch-Makefile.am
deleted file mode 100644
index 4b4a531..0000000
--- a/graphics/gephex/files/patch-Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.am.orig	2007-04-29 23:53:38.000000000 +0900
-+++ Makefile.am	2008-08-08 23:24:21.000000000 +0900
-@@ -1,5 +1,5 @@
- AUTOMAKE_OPTIONS = 1.6
--SUBDIRS = contrib base build engine types util modules effectvmodules qtgui data examples doc
-+SUBDIRS = base build engine types util modules effectvmodules qtgui data examples doc
- EXTRA_DIST = BUGS NEWS README COPYING README.win32 README.macosx config_h.win32
- 
- # Strip binaries
diff --git a/graphics/gephex/files/patch-base_src_utils_sharedlibrary.cpp b/graphics/gephex/files/patch-base_src_utils_sharedlibrary.cpp
deleted file mode 100644
index 7af5396..0000000
--- a/graphics/gephex/files/patch-base_src_utils_sharedlibrary.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/src/utils/sharedlibrary.cpp.orig
-+++ base/src/utils/sharedlibrary.cpp
-@@ -73,7 +73,7 @@
- #elif defined(OS_LINUX)
-     m_impl->handle = dlopen(path.c_str(), RTLD_NOW);
- #elif defined(OS_BSD)
--    m_impl->handle = dlopen(path.c_str(), DL_LAZY);
-+    m_impl->handle = dlopen(path.c_str(), RTLD_LAZY);
- #elif defined(OS_POSIX)
-     m_impl->handle = dlopen(path.c_str(), 0);
- #endif
diff --git a/graphics/gephex/files/patch-configure.ac b/graphics/gephex/files/patch-configure.ac
deleted file mode 100644
index 1ff6da7..0000000
--- a/graphics/gephex/files/patch-configure.ac
+++ /dev/null
@@ -1,91 +0,0 @@
---- configure.ac.orig	2007-04-29 23:53:44.000000000 +0900
-+++ configure.ac	2008-08-08 23:06:42.000000000 +0900
-@@ -290,7 +290,7 @@
- 
- # ffmpeg
- CHECK_EXTRA_LIB([FFMPEG],
--                [if test -d $srcdir/contrib/ffmpeg; then have_ffmpeg=yes; else have_ffmpeg=no; fi],
-+                [have_ffmpeg=yes],
-                 [yes], [with_ffmpeg], [have_ffmpeg], [use_ffmpeg])
- AM_CONDITIONAL([WITH_FFMPEG], test "x$use_ffmpeg" = "xyes")
- 
-@@ -366,48 +366,48 @@
- AC_DEFINE_UNQUOTED([FRBINMODULE_CACHE_SIZE], $FRBINCACHE, [Size of the cache the frbinmodule uses (in MB)])
- fi;
- 
--if test "x$use_ffmpeg" = "xyes"; then
-- FFMPEG_CONFIGURE_FLAGS="--prefix=$prefix --disable-ffserver --disable-ffplay --enable-shared --enable-memalign-hack" 
-+#if test "x$use_ffmpeg" = "xyes"; then
-+# FFMPEG_CONFIGURE_FLAGS="--prefix=$prefix --disable-ffserver --disable-ffplay --enable-shared --enable-memalign-hack" 
- #--disable-risky"
- 
-- echo Preparing ffmpeg configure call...
-+# echo Preparing ffmpeg configure call...
-  
-  # If building with builddir != srcdir, ffmpegs configure wants to be
-  # called with an absolute path.
-  # Also, we have to do some workarounds (doc dir is missing for example).
-- if test "x${srcdir}" != x.; then
--   pwd
--   (mkdir contrib && mkdir contrib/ffmpeg) || true
--    
--   if ! test -e contrib/ffmpeg/doc
--   then
--      mkdir contrib/ffmpeg/doc
--      echo "all:" > contrib/ffmpeg/doc/Makefile
--   fi
--
--   TMPDIR=`pwd` && cd ${srcdir} && absolute_srcdir=`pwd` && cd $TMPDIR
--
--   FFMPEG_CONFIG_DIR="${absolute_srcdir}/contrib/ffmpeg"
--
--   AC_SUBST(FFMPEG_DIR,"${absolute_srcdir}/contrib/ffmpeg") #TODO
-- else
--   FFMPEG_CONFIG_DIR="."
--   AC_SUBST(FFMPEG_DIR,"../../../contrib/ffmpeg") #TODO
-- fi
-+# if test "x${srcdir}" != x.; then
-+#   pwd
-+#   (mkdir contrib && mkdir contrib/ffmpeg) || true
-+#    
-+#   if ! test -e contrib/ffmpeg/doc
-+#   then
-+#      mkdir contrib/ffmpeg/doc
-+#      echo "all:" > contrib/ffmpeg/doc/Makefile
-+#   fi
-+#
-+#   TMPDIR=`pwd` && cd ${srcdir} && absolute_srcdir=`pwd` && cd $TMPDIR
-+#
-+#   FFMPEG_CONFIG_DIR="${absolute_srcdir}/contrib/ffmpeg"
-+#
-+#   AC_SUBST(FFMPEG_DIR,"${absolute_srcdir}/contrib/ffmpeg") #TODO
-+# else
-+#   FFMPEG_CONFIG_DIR="."
-+#   AC_SUBST(FFMPEG_DIR,"../../../contrib/ffmpeg") #TODO
-+# fi
- 
-  # get absolute path of builddir
-- abs_builddir=`pwd`
-+# abs_builddir=`pwd`
- 
-- AC_SUBST(FFMPEG_LDFLAGS,"${abs_builddir}/contrib/ffmpeg/libavformat/libavformat.a ${abs_builddir}/contrib/ffmpeg/libavcodec/libavcodec.a ${abs_builddir}/contrib/ffmpeg/libavutil/libavutil.a -lz")
-+ AC_SUBST(FFMPEG_LDFLAGS,"%%LOCALBASE%%/lib/libavformat.a %%LOCALBASE%%/lib/libavcodec.a %%LOCALBASE%%/lib/libavutil.a -lz")
- # AC_SUBST(FFMPEG_LDFLAGS,"-L${abs_builddir}/contrib/ffmpeg/libavcodec -lavcodec -lz -L${abs_builddir}/contrib/ffmpeg/libavformat -lavformat")
-- AC_SUBST(FFMPEG_CFLAGS,"-I${FFMPEG_DIR}/libavcodec -I${FFMPEG_DIR}/libavformat -I${FFMPEG_DIR}/libavutil")
-+ AC_SUBST(FFMPEG_CFLAGS,"-I%%LOCALBASE%%/include/ffmpeg")
- 
-- echo Calling ffmpeg configure with flags:
-- echo "${FFMPEG_CONFIG_DIR}/configure $FFMPEG_CONFIGURE_FLAGS"
-- cd contrib/ffmpeg/ || exit 1
-- ${FFMPEG_CONFIG_DIR}/configure $FFMPEG_CONFIGURE_FLAGS
-- cd ../..
--fi
-+# echo Calling ffmpeg configure with flags:
-+# echo "${FFMPEG_CONFIG_DIR}/configure $FFMPEG_CONFIGURE_FLAGS"
-+# cd contrib/ffmpeg/ || exit 1
-+# ${FFMPEG_CONFIG_DIR}/configure $FFMPEG_CONFIGURE_FLAGS
-+# cd ../..
-+#fi
- 
- # set gphx_module_lib_dir and gphx_type_lib_dir
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
diff --git a/graphics/gephex/files/patch-data__Makefile.am b/graphics/gephex/files/patch-data__Makefile.am
deleted file mode 100644
index 20bfd1f..0000000
--- a/graphics/gephex/files/patch-data__Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
---- data/Makefile.am.orig	2007-04-29 23:53:38.000000000 +0900
-+++ data/Makefile.am	2008-08-08 23:12:37.000000000 +0900
-@@ -1,8 +1,7 @@
--datadir = $(prefix)/share/gephex/
--icondir = $(prefix)/share/gephex/icon
-+icondir = $(pkgdatadir)/icon
- 
- icon_DATA    = gephex-gui.xpm gephex-engine.xpm
--data_DATA    = gephex.conf.default run_in_terminal.sh
-+pkgdata_DATA = gephex.conf.default run_in_terminal.sh
- bin_SCRIPTS  = gephex-wrapper
- 
- EXTRA_DIST = $(icon_DATA) run_in_terminal.sh gephex-wrapper.in gephex.conf.default.in gephexw.conf.default
-@@ -17,9 +16,9 @@
- 	ln -s $(DESTDIR)$(bindir)/gephex-wrapper $(DESTDIR)$(bindir)/gephex
- 
- install-data-hook:
--	chmod u+x $(DESTDIR)$(datadir)/run_in_terminal.sh
--	sed -e "s,\$$(prefix),@prefix@," < $(DESTDIR)$(datadir)/gephex.conf.default > $(DESTDIR)$(datadir)/gephex.conf.default.tmp
--	mv $(DESTDIR)$(datadir)/gephex.conf.default.tmp	$(DESTDIR)$(datadir)/gephex.conf.default
-+	chmod u+x $(DESTDIR)$(pkgdatadir)/run_in_terminal.sh
-+	sed -e "s,\$$(prefix),@prefix@," < $(DESTDIR)$(pkgdatadir)/gephex.conf.default > $(DESTDIR)$(pkgdatadir)/gephex.conf.default.tmp
-+	mv $(DESTDIR)$(pkgdatadir)/gephex.conf.default.tmp	$(DESTDIR)$(pkgdatadir)/gephex.conf.default
- 
- uninstall-hook:
- 	rm -rf $(DESTDIR)$(bindir)/gephex-engine
diff --git a/graphics/gephex/files/patch-doc__Makefile.am b/graphics/gephex/files/patch-doc__Makefile.am
deleted file mode 100644
index 939c06c..0000000
--- a/graphics/gephex/files/patch-doc__Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
---- doc/Makefile.am.orig	2007-04-29 23:53:38.000000000 +0900
-+++ doc/Makefile.am	2008-08-08 23:20:20.000000000 +0900
-@@ -1,7 +1,7 @@
- SUBDIRS = images
- 
--htmldir = $(prefix)/share/doc/gephex/html
--html_DATA = documentation.html
-+#htmldir = $(prefix)/share/doc/gephex/html
-+#html_DATA = documentation.html
- 
- man_MANS = gephex.1 gephex-engine.1 gephex-gui.1
- 
-@@ -10,7 +10,7 @@
- 
- # include this prebuild stuff (and its sources) in the dist
- EXTRA_DIST     =  \
--	$(html_DATA)                \
-+	$(srcdir)/documentation.html \
- 	$(man_MANS)                 \
- 	$(srcdir)/documentation.xml \
- 	$(srcdir)/module-api*.xml   \
diff --git a/graphics/gephex/files/patch-modules__src__ffmpegoutmodule__ffmpegwriter.cpp b/graphics/gephex/files/patch-modules__src__ffmpegoutmodule__ffmpegwriter.cpp
deleted file mode 100644
index 8ce68eb..0000000
--- a/graphics/gephex/files/patch-modules__src__ffmpegoutmodule__ffmpegwriter.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/src/ffmpegoutmodule/ffmpegwriter.cpp.orig	2007-04-29 23:53:40.000000000 +0900
-+++ modules/src/ffmpegoutmodule/ffmpegwriter.cpp	2008-08-09 19:33:29.000000000 +0900
-@@ -175,7 +175,7 @@
-   if (!(fmt->flags & AVFMT_NOFILE)) 
-   {
-     /* close the output file */
--    url_fclose(&oc->pb);
-+    url_fclose(oc->pb);
-   }
- 
-   /* free the stream */
diff --git a/graphics/gephex/files/patch-modules__src__ffmpegoutmodule__ffmpegwriter.h b/graphics/gephex/files/patch-modules__src__ffmpegoutmodule__ffmpegwriter.h
deleted file mode 100644
index 229976a..0000000
--- a/graphics/gephex/files/patch-modules__src__ffmpegoutmodule__ffmpegwriter.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- modules/src/ffmpegoutmodule/ffmpegwriter.h.orig	2007-04-29 23:53:40.000000000 +0900
-+++ modules/src/ffmpegoutmodule/ffmpegwriter.h	2008-08-09 19:44:12.000000000 +0900
-@@ -24,10 +24,16 @@
- #include <iostream>
- #include <map>
- 
-+#if defined _MSC_VER
- #define EMULATE_INTTYPES
-+#endif
-+
-+extern "C"
-+{
- #include "avformat.h"
- #include "avcodec.h"
- #include "avutil.h"
-+}
- 
- 
- class FFMpegWriter
diff --git a/graphics/gephex/files/patch-modules__src__frbinmodule__ffmpegdriver.cpp b/graphics/gephex/files/patch-modules__src__frbinmodule__ffmpegdriver.cpp
deleted file mode 100644
index 23a9e84..0000000
--- a/graphics/gephex/files/patch-modules__src__frbinmodule__ffmpegdriver.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
---- modules/src/frbinmodule/ffmpegdriver.cpp.orig	2007-04-29 23:53:43.000000000 +0900
-+++ modules/src/frbinmodule/ffmpegdriver.cpp	2008-08-09 19:14:24.000000000 +0900
-@@ -20,6 +20,8 @@
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.*/
- 
-+#define __STDC_CONSTANT_MACROS
-+
- #include "ffmpegdriver.h"
- 
- #include <string>
-@@ -35,9 +37,12 @@
- #define EMULATE_INTTYPES
- #endif
- 
--#include "avformat.h"
--#include "avcodec.h"
--#include "avutil.h"
-+extern "C"
-+{
-+#include "avformat.h"
-+#include "avcodec.h"
-+#include "avutil.h"
-+}
- 
- #include "libscale.h"
- 
-@@ -239,7 +244,6 @@
-     AVFormatParameters params;
-     
-     memset(&params, 0, sizeof(params));
--    params.image_format  = 0;
-     params.initial_pause = 1;
- 
-     // open input file without format or bufffer size
diff --git a/graphics/gephex/files/patch-modules__src__frbinmodule__mpeg3driver.cpp b/graphics/gephex/files/patch-modules__src__frbinmodule__mpeg3driver.cpp
deleted file mode 100644
index ef287f5..0000000
--- a/graphics/gephex/files/patch-modules__src__frbinmodule__mpeg3driver.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- modules/src/frbinmodule/mpeg3driver.cpp.orig	2007-04-29 23:53:40.000000000 +0900
-+++ modules/src/frbinmodule/mpeg3driver.cpp	2008-08-08 22:32:25.000000000 +0900
-@@ -82,7 +82,9 @@
- 
-   if(mpeg3_check_sig(const_cast<char*>(m_impl->file_name.c_str()))==1)
-     {
--      m_impl->file=mpeg3_open(const_cast<char*>(m_impl->file_name.c_str()));
-+      int retcode = 0;
-+
-+      m_impl->file=mpeg3_open(const_cast<char*>(m_impl->file_name.c_str()), &retcode);
- 	  
-       try
-         {
diff --git a/graphics/gephex/files/patch-modules__src__frboutmodule__Makefile.am b/graphics/gephex/files/patch-modules__src__frboutmodule__Makefile.am
deleted file mode 100644
index 1e03e16..0000000
--- a/graphics/gephex/files/patch-modules__src__frboutmodule__Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- modules/src/frboutmodule/Makefile.am.orig	2007-04-29 23:53:40.000000000 +0900
-+++ modules/src/frboutmodule/Makefile.am	2008-08-08 23:14:02.000000000 +0900
-@@ -80,8 +80,8 @@
- 	slist.c $(X11_sOURCES) $(V4L_sOURCES) $(AALIB_sOURCES) $(SDL_sOURCES) $(GL_sOURCES) $(PLT_sOURCES)
- 
- 
--frboutmodule_la_LDFLAGS = -module -avoid-version -no-undefined -L/usr/X11R6/lib -L@builddir@/../libscale -L/usr/X11R6/lib -L@builddir@/../libcolorconv
--frboutmodule_la_LIBADD = -lscale -lcolorconv -lX11 -lXext -lXv $(AALIB_lDFLAGS) $(SDL_lD_FLAGS) $(GLLIBS)
-+frboutmodule_la_LDFLAGS = -module -avoid-version -no-undefined -L@builddir@/../libscale -L@builddir@/../libcolorconv
-+frboutmodule_la_LIBADD = -lscale -lcolorconv -lX11 -lXext -lXv $(AALIB_lDFLAGS) $(SDL_lD_FLAGS) $(GLLIBS) $(X_LIBS)
- 
- frboutmodule_la_DEPENDENCIES = @builddir@/../libscale/libscale.a \
- 			       @builddir@/../libcolorconv/libcolorconv.a
-@@ -92,7 +92,7 @@
- 	   -I@srcdir@/../libcolorconv \
-            -I@srcdir@/../../../types/src/stringtype \
-            -I@srcdir@/../../../types/src/framebuffertype \
--           -I@srcdir@/../../../types/src/numbertype $(SDL_cFLAGS)
-+           -I@srcdir@/../../../types/src/numbertype $(SDL_cFLAGS) $(X_CFLAGS)
- 
- 
- DISTCLEANFILES = frboutmodule.h frboutmodule_auto.c
diff --git a/graphics/gephex/files/patch-types_src_osctype_osctype.h b/graphics/gephex/files/patch-types_src_osctype_osctype.h
deleted file mode 100644
index 712ea1a..0000000
--- a/graphics/gephex/files/patch-types_src_osctype_osctype.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- types/src/osctype/osctype.h.orig
-+++ types/src/osctype/osctype.h
-@@ -60,7 +60,7 @@
- 
- static __inline void osc_resize(OscType* dst, int newSize)
- {
--  assert( osc_invariant(dst) );
-+//  assert( osc_invariant(dst) );
-   unsigned char* newData;
-   
-   if (newSize < dst->len)
diff --git a/graphics/gephex/pkg-descr b/graphics/gephex/pkg-descr
deleted file mode 100644
index f6063cb..0000000
--- a/graphics/gephex/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-GePhex is an interactive effect system for video jockeys. The effects
-can be controlled with external devices like joysticks, web-cams, or
-midi-devices. New effects can be designed in a GUI (Graphical User
-Interface) by composing basic effects into more complex ones.
-
-WWW:	http://www.gephex.org/
diff --git a/graphics/gephex/pkg-plist b/graphics/gephex/pkg-plist
deleted file mode 100644
index 67534a1..0000000
--- a/graphics/gephex/pkg-plist
+++ /dev/null
@@ -1,170 +0,0 @@
-bin/gephex
-bin/gephex-engine
-bin/gephex-engine-real
-bin/gephex-gui
-bin/gephex-gui-real
-bin/gephex-wrapper
-%%SDL%%bin/joystick_midi_net
-include/gephex/basic_types.h
-include/gephex/dllmodule.h
-include/gephex/dlltype.h
-include/gephex/dllutils.h
-include/gephex/types/audiotype.h
-include/gephex/types/envtype.h
-include/gephex/types/framebuffertype.h
-include/gephex/types/ifstype.h
-include/gephex/types/lfotype.h
-include/gephex/types/miditype.h
-include/gephex/types/numbertype.h
-include/gephex/types/osctype.h
-include/gephex/types/positiontype.h
-include/gephex/types/rgbtype.h
-include/gephex/types/stringtype.h
-lib/gephex-%%VERSION%%/modules/audioaddmodule.so
-lib/gephex-%%VERSION%%/modules/audiobdmodule.so
-lib/gephex-%%VERSION%%/modules/audioenergymodule.so
-lib/gephex-%%VERSION%%/modules/audioinmodule.so
-lib/gephex-%%VERSION%%/modules/audiooutmodule.so
-lib/gephex-%%VERSION%%/modules/audiospecmodule.so
-lib/gephex-%%VERSION%%/modules/audiosynthmodule.so
-lib/gephex-%%VERSION%%/modules/audiovismodule.so
-lib/gephex-%%VERSION%%/modules/audiowavegenmodule.so
-lib/gephex-%%VERSION%%/modules/blurmodule.so
-lib/gephex-%%VERSION%%/modules/bwmodule.so
-lib/gephex-%%VERSION%%/modules/centermodule.so
-lib/gephex-%%VERSION%%/modules/chromakeymodule.so
-lib/gephex-%%VERSION%%/modules/color2numbermodule.so
-lib/gephex-%%VERSION%%/modules/colorizemodule.so
-lib/gephex-%%VERSION%%/modules/diffmodule.so
-lib/gephex-%%VERSION%%/modules/doepfermodule.so
-lib/gephex-%%VERSION%%/modules/dplmodule.so
-lib/gephex-%%VERSION%%/modules/effectv1dmodule.so
-lib/gephex-%%VERSION%%/modules/effectvagingmodule.so
-lib/gephex-%%VERSION%%/modules/effectvbaltanmodule.so
-lib/gephex-%%VERSION%%/modules/effectvblurzoommodule.so
-lib/gephex-%%VERSION%%/modules/effectvburnmodule.so
-lib/gephex-%%VERSION%%/modules/effectvchameleonmodule.so
-lib/gephex-%%VERSION%%/modules/effectvcyclemodule.so
-lib/gephex-%%VERSION%%/modules/effectvdicemodule.so
-lib/gephex-%%VERSION%%/modules/effectvdiffmodule.so
-lib/gephex-%%VERSION%%/modules/effectvdizzymodule.so
-lib/gephex-%%VERSION%%/modules/effectvdotmodule.so
-lib/gephex-%%VERSION%%/modules/effectvedgemodule.so
-lib/gephex-%%VERSION%%/modules/effectvfiremodule.so
-lib/gephex-%%VERSION%%/modules/effectvholomodule.so
-lib/gephex-%%VERSION%%/modules/effectvlensmodule.so
-lib/gephex-%%VERSION%%/modules/effectvlifemodule.so
-lib/gephex-%%VERSION%%/modules/effectvmatrixmodule.so
-lib/gephex-%%VERSION%%/modules/effectvmosaicmodule.so
-lib/gephex-%%VERSION%%/modules/effectvnervousmodule.so
-lib/gephex-%%VERSION%%/modules/effectvnoisemodule.so
-lib/gephex-%%VERSION%%/modules/effectvpredatormodule.so
-lib/gephex-%%VERSION%%/modules/effectvpupmodule.so
-lib/gephex-%%VERSION%%/modules/effectvpuzzlemodule.so
-lib/gephex-%%VERSION%%/modules/effectvquarkmodule.so
-lib/gephex-%%VERSION%%/modules/effectvrdsmodule.so
-lib/gephex-%%VERSION%%/modules/effectvrevmodule.so
-lib/gephex-%%VERSION%%/modules/effectvripplemodule.so
-lib/gephex-%%VERSION%%/modules/effectvrndmmodule.so
-lib/gephex-%%VERSION%%/modules/effectvscrollmodule.so
-lib/gephex-%%VERSION%%/modules/effectvshagadelicmodule.so
-lib/gephex-%%VERSION%%/modules/effectvsimuramodule.so
-lib/gephex-%%VERSION%%/modules/effectvsparkmodule.so
-lib/gephex-%%VERSION%%/modules/effectvspiralmodule.so
-lib/gephex-%%VERSION%%/modules/effectvstreakmodule.so
-lib/gephex-%%VERSION%%/modules/effectvtransformmodule.so
-lib/gephex-%%VERSION%%/modules/effectvwarholmodule.so
-lib/gephex-%%VERSION%%/modules/effectvwarpmodule.so
-%%FFMPEG%%lib/gephex-%%VERSION%%/modules/ffmpegoutmodule.so
-lib/gephex-%%VERSION%%/modules/flashmodule.so
-lib/gephex-%%VERSION%%/modules/flipflopmodule.so
-lib/gephex-%%VERSION%%/modules/fpsmodule.so
-lib/gephex-%%VERSION%%/modules/frbinmodule.so
-lib/gephex-%%VERSION%%/modules/frboutmodule.so
-lib/gephex-%%VERSION%%/modules/funparsemodule.so
-lib/gephex-%%VERSION%%/modules/gradnormmodule.so
-lib/gephex-%%VERSION%%/modules/ifsgenmodule.so
-lib/gephex-%%VERSION%%/modules/ifsmodule.so
-lib/gephex-%%VERSION%%/modules/ifsxfadermodule.so
-lib/gephex-%%VERSION%%/modules/imagebuffermodule.so
-%%PNG%%lib/gephex-%%VERSION%%/modules/imagewritermodule.so
-lib/gephex-%%VERSION%%/modules/imgarithmodule.so
-lib/gephex-%%VERSION%%/modules/isingnoizemodule.so
-%%SDL%%lib/gephex-%%VERSION%%/modules/joystickmodule.so
-lib/gephex-%%VERSION%%/modules/jumpmodule.so
-lib/gephex-%%VERSION%%/modules/midiccdecmodule.so
-lib/gephex-%%VERSION%%/modules/midiinmodule.so
-lib/gephex-%%VERSION%%/modules/midikeyrangedecmodule.so
-lib/gephex-%%VERSION%%/modules/midinotedecmodule.so
-lib/gephex-%%VERSION%%/modules/midipitchwdecmodule.so
-lib/gephex-%%VERSION%%/modules/midiprgchdecmodule.so
-lib/gephex-%%VERSION%%/modules/mirrormodule.so
-lib/gephex-%%VERSION%%/modules/netcontrolmodule.so
-lib/gephex-%%VERSION%%/modules/noisemodule.so
-lib/gephex-%%VERSION%%/modules/numarithmodule.so
-lib/gephex-%%VERSION%%/modules/number2colormodule.so
-lib/gephex-%%VERSION%%/modules/numbermodule.so
-lib/gephex-%%VERSION%%/modules/numenvmodule.so
-lib/gephex-%%VERSION%%/modules/numlfomodule.so
-lib/gephex-%%VERSION%%/modules/numoscmodule.so
-lib/gephex-%%VERSION%%/modules/numposmodule.so
-lib/gephex-%%VERSION%%/modules/numxfadermodule.so
-lib/gephex-%%VERSION%%/modules/oscinmodule.so
-lib/gephex-%%VERSION%%/modules/oscmergemodule.so
-lib/gephex-%%VERSION%%/modules/oscnummodule.so
-lib/gephex-%%VERSION%%/modules/oscoutmodule.so
-lib/gephex-%%VERSION%%/modules/overlaymodule.so
-lib/gephex-%%VERSION%%/modules/pixelizemodule.so
-lib/gephex-%%VERSION%%/modules/planemodule.so
-lib/gephex-%%VERSION%%/modules/plasmamodule.so
-lib/gephex-%%VERSION%%/modules/pongmodule.so
-lib/gephex-%%VERSION%%/modules/posnummodule.so
-lib/gephex-%%VERSION%%/modules/rangeconvertmodule.so
-lib/gephex-%%VERSION%%/modules/resultmodule.so
-lib/gephex-%%VERSION%%/modules/rotozoommodule.so
-%%SDL%%lib/gephex-%%VERSION%%/modules/sdlfontmodule.so
-lib/gephex-%%VERSION%%/modules/signalgenmodule.so
-lib/gephex-%%VERSION%%/modules/signalplotmodule.so
-lib/gephex-%%VERSION%%/modules/staticcolormodule.so
-lib/gephex-%%VERSION%%/modules/stringtokenizermodule.so
-lib/gephex-%%VERSION%%/modules/timesourcemodule.so
-lib/gephex-%%VERSION%%/modules/tunnelmodule.so
-lib/gephex-%%VERSION%%/modules/twolayermodule.so
-lib/gephex-%%VERSION%%/modules/xfademodule.so
-lib/gephex-%%VERSION%%/modules/y4minmodule.so
-lib/gephex-%%VERSION%%/modules/y4moutputmodule.so
-lib/gephex-%%VERSION%%/types/audiotype.so
-lib/gephex-%%VERSION%%/types/envtype.so
-lib/gephex-%%VERSION%%/types/framebuffertype.so
-lib/gephex-%%VERSION%%/types/ifstype.so
-lib/gephex-%%VERSION%%/types/lfotype.so
-lib/gephex-%%VERSION%%/types/miditype.so
-lib/gephex-%%VERSION%%/types/numbertype.so
-lib/gephex-%%VERSION%%/types/osctype.so
-lib/gephex-%%VERSION%%/types/positiontype.so
-lib/gephex-%%VERSION%%/types/rgbtype.so
-lib/gephex-%%VERSION%%/types/stringtype.so
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
-%%DATADIR%%/gephex.conf.default
-%%DATADIR%%/graphs/example1
-%%DATADIR%%/graphs/example2
-%%DATADIR%%/graphs/example3
-%%DATADIR%%/graphs/fzcam4
-%%DATADIR%%/graphs/gephexwin32
-%%DATADIR%%/graphs/noise
-%%DATADIR%%/icon/gephex-engine.xpm
-%%DATADIR%%/icon/gephex-gui.xpm
-%%DATADIR%%/img/033.jpg
-%%DATADIR%%/img/huebsch.jpg
-%%DATADIR%%/run_in_terminal.sh
-@dirrm %%DATADIR%%/img
-@dirrm %%DATADIR%%/icon
-@dirrm %%DATADIR%%/graphs
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/gephex-%%VERSION%%/types
-@dirrm lib/gephex-%%VERSION%%/modules
-@dirrm lib/gephex-%%VERSION%%
-@dirrm include/gephex/types
-@dirrm include/gephex
diff --git a/graphics/irit/Makefile b/graphics/irit/Makefile
deleted file mode 100644
index 7feee20..0000000
--- a/graphics/irit/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# New ports collection makefile for:	irit
-# Date created:		6 August 2002
-# Whom:			Igor Pokrovsky <tiamat@telegraph.spb.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	irit
-PORTVERSION=	9.5
-PORTREVISION=	3
-CATEGORIES=	graphics
-MASTER_SITES=	http://www.cs.technion.ac.il/~irit/
-DISTNAME=	${PORTNAME}-sm
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Solid modeling system
-
-LIB_DEPENDS=	rle.1:${PORTSDIR}/graphics/urt
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png \
-		${LOCALBASE}/lib/libungif.a:${PORTSDIR}/graphics/libungif
-
-BROKEN=		checksum mismatch
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_ZIP=	yes
-USE_GMAKE=	yes
-.ifdef (WITH_MOTIF)
-USE_MOTIF=	yes
-USE_GL=		gl
-.endif
-USE_LDCONFIG=	yes
-NO_WRKSUBDIR=	yes
-MAKEFILE=	makefile.gnux
-MAKE_ARGS=	"CFG=Rel"
-MAKE_ENV=	WRKSRC=${WRKSRC} \
-		ECHO_CMD=${ECHO_CMD} \
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${WRKSRC}/lib
-NOT_FOR_ARCHS=	sparc64
-.ifdef (WITH_MOTIF)
-MAKE_ENV+=	WITH_MOTIF_DEF=yes
-.endif
-
-SUB_FILES=	pkg-message
-SUB_LIST=	"DATADIR=${DATADIR}"
-
-PORTDOCS=	irit.doc prog_man.html general.inf technion.inf update.new \
-		coding.std coding.hints
-
-.if !defined(WITH_MOTIF)
-PLIST_SUB=	WITH_MOTIF="@comment "
-.else
-PLIST_SUB=	WITH_MOTIF=""
-.endif
-
-.ifndef (WITH_MOTIF)
-pre-everything::
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Define WITH_MOTIF=yes to build X11/Motif and OpenGL display drivers"
-	@${ECHO_CMD} ""
-.endif
-
-pre-build:
-	@${CP} ${WRKSRC}/makefile.gnux ${WRKSRC}/makefile.unx
-	@${CP} ${WRKSRC}/makeflag.gnux ${WRKSRC}/makeflag.unx
-
-do-install:
-	FILES="`${FIND} ${WRKSRC}/bin -type f`";			\
-	for i in $${FILES}; do						\
-		if [ "`${FILE} -b $$i | ${GREP} LSB`" ]; then		\
-			${INSTALL_PROGRAM} $$i ${PREFIX}/bin;		\
-		fi;							\
-	done
-
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libIrit*.so ${PREFIX}/lib/
-	@${MKDIR} ${PREFIX}/include/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/${PORTNAME}
-
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/bin/*.cfg ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/bin/iritfont.itd ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/bin/iritinit.irt ${DATADIR}
-
-	@${MKDIR} ${EXAMPLESDIR}
-	@${MKDIR} ${EXAMPLESDIR}/data
-	${INSTALL_DATA} ${WRKSRC}/data/* ${EXAMPLESDIR}/data
-	@${MKDIR} ${EXAMPLESDIR}/emacs
-	${INSTALL_DATA} ${WRKSRC}/emacs/irit.el ${EXAMPLESDIR}/emacs
-	@${MKDIR} ${EXAMPLESDIR}/scripts
-	${INSTALL_DATA} ${WRKSRC}/scripts/*.irt ${EXAMPLESDIR}/scripts
-
-.ifndef (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/graphics/irit/distinfo b/graphics/irit/distinfo
deleted file mode 100644
index d9530e7..0000000
--- a/graphics/irit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (irit-sm.zip) = 347f09a7d139c4d7bbd0da474000e8af
-SHA256 (irit-sm.zip) = a72c0a1dab411a1c30240709d3d3d3f639684dc0dd830dd96106f10e8d46d2de
-SIZE (irit-sm.zip) = 3515025
diff --git a/graphics/irit/files/patch-makefile.gnux b/graphics/irit/files/patch-makefile.gnux
deleted file mode 100644
index 8abcfaa..0000000
--- a/graphics/irit/files/patch-makefile.gnux
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.gnux.orig
-+++ makefile.gnux
-@@ -28,7 +28,7 @@
- 
- SHELL = /bin/sh
- 
--all: 	binaries doc init
-+all: 	binaries doc #init
- 
- #
- # Print info regarding initialization.
diff --git a/graphics/irit/files/patch-makeflag.gnux b/graphics/irit/files/patch-makeflag.gnux
deleted file mode 100644
index de21885..0000000
--- a/graphics/irit/files/patch-makeflag.gnux
+++ /dev/null
@@ -1,146 +0,0 @@
---- makeflag.gnux.orig
-+++ makeflag.gnux
-@@ -9,7 +9,7 @@
- # be simple wrong.
- #
- 
--SRC_DIR = /home/gershon/irit/sun
-+SRC_DIR = ${WRKSRC}
- 
- #
- # All libraries created will be installed into the LIB_DIR directory.
-@@ -34,7 +34,7 @@
- 	IRITOBJPF =
- 	IRITLIBPF =
- 	IRITEXEPF = 
--	STRIPEXE = strip
-+	STRIPEXE = ${ECHO_CMD}	# ${INSTALL_PROGRAM} takes care of stripping
- 
- else
- 	IRITOBJPF = D
-@@ -54,27 +54,27 @@
- #
- #   Make these empty if you would like to give up on irender's compilation.
- #
--#URT = /b/d2/gershon/urt/onyx64
--#URT_INC = -I$(URT)/include
--#URT_LIB = -L$(URT)/lib -lrle
--#URT_FLAGS = -DHAVE_URT_RLE -DURT_OLD_COMPAT
-+URT = ${LOCALBASE}
-+URT_INC = -I$(URT)/include
-+URT_LIB = -L$(URT)/lib -lrle
-+URT_FLAGS = -DHAVE_URT_RLE -DURT_OLD_COMPAT
- 
- #
- # Support for GIF image read/write using the giflib toolkit library.
- # You can ftp it from 
- #
--#GIF = /b/d2/gershon/gif_lib
--#GIF_INC = -I$(GIF)/lib
--#GIF_LIB = $(GIF)/onyx64/lib/libgif.a
--#GIF_FLAGS = -DHAVE_GIF_LIB
-+GIF = ${LOCALBASE}
-+GIF_INC = -I$(GIF)/include
-+GIF_LIB = $(GIF)/lib/libungif.a
-+GIF_FLAGS = -DHAVE_GIF_LIB
- 
- #
- # If you would like to use Mesa emulation of Open GL and compile Open GL
- # code using it (see http://www.ssec.wisc.edu/~brianp/Mesa.html for info
- # on Mesa), define the following:
- #
--# MESA_INC = -I/mach/emc2-32/isl/gershon/c/mesa/MesaLib-2.4/include -D__MESA__ -D__OPENGL__
--# MESA_LIB = -L/mach/emc2-32/isl/gershon/c/mesa/MesaLib-2.4/lib -lGLU -lGL
-+MESA_INC = -I${LOCALBASE}/include -D__MESA__ -D__OPENGL__
-+MESA_LIB = -L${LOCALBASE}/lib -lGLU -lGL
- 
- #
- # Support of (shared) libraries.  You will need to set the proper suffix
-@@ -340,25 +340,25 @@
- # Note you cannot use SUN's native cc compiler since it does not support
- # Ansi C. If you use mesa emulation of Open GL, uncomment xogldrvs 
- #
--CC = gcc
--DFLAGS = -DSUN4 -DTIMES -DRAND48 -DNANOSLEEP -D__UNIX__ -D__X11__ -I/usr/openwin/share/include -I/opt/SUNWmotif/share/include $(MESA_INC)
--ifeq ($(CFG), Rel)
--    CFLAGS = -O2 $(DFLAGS)
--else
--    CFLAGS = -g -DDEBUG $(DFLAGS)
--endif
--MORELIBS = -lsocket -lnsl -lposix4
--GRAPX11LIBS = -L/usr/openwin/lib -lX11
--GRAPXMTLIBS = -L/opt/SUNWmotif/lib -L/usr/ccs/lib -lXm -L/usr/openwin/lib -lXt -lX11 -lgen
-+#CC = gcc
-+#DFLAGS = -DSUN4 -DTIMES -DRAND48 -DNANOSLEEP -D__UNIX__ -D__X11__ -I/usr/openwin/share/include -I/opt/SUNWmotif/share/include $(MESA_INC)
-+#ifeq ($(CFG), Rel)
-+#    CFLAGS = -O2 $(DFLAGS)
-+#else
-+#    CFLAGS = -g -DDEBUG $(DFLAGS)
-+#endif
-+#MORELIBS = -lsocket -lnsl -lposix4
-+#GRAPX11LIBS = -L/usr/openwin/lib -lX11
-+#GRAPXMTLIBS = -L/opt/SUNWmotif/lib -L/usr/ccs/lib -lXm -L/usr/openwin/lib -lXt -lX11 -lgen
- # GRAPOGLLIBS = $(MESA_LIB) -lXext $(GRAPXMTLIBS)
- # GRAPOGLLIBS = -lGLU -lGL $(GRAPXMTLIBS)
--GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) # xogldrvs$(IRITEXEPF)
-+#GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF) # xogldrvs$(IRITEXEPF)
- #
- # For shared libraries add:
- #
--LIB_SUFFIX = so
--LIB_MAKE = ld -G -o 
--LIB_RAN = echo
-+#LIB_SUFFIX = so
-+#LIB_MAKE = ld -G -o 
-+#LIB_RAN = echo
- 
- #
- # Flags for SUN Solaris 5.3 using cc SC3.0.1 and X11 (uncomment xogldrvs if
-@@ -570,23 +570,33 @@
- #
- # Flags for i386 FreeBSD using X11R6
- #
--# DFLAGS = -D__UNIX__ -DX11R6 -D__X11__ -DTIMES -DRAND48 -DUSLEEP
-+DFLAGS = -D__UNIX__ -DX11R6 -D__X11__ -DTIMES -DRAND48 -DUSLEEP
-+ifeq ($(WITH_MOTIF_DEF),yes)
-+DFLAGS+=	${MESA_INC}
-+else
-+DFLAGS+=	-D__X11__ -I${LOCALBASE}/include
-+endif
-+CFLAGS += -fPIC $(DFLAGS)
- # ifeq ($(CFG), Rel)
- #     CFLAGS = -O2 -pipe -m486 -fomit-frame-pointer $(DFLAGS)
- # else
- #     CFLAGS = -g -DDEBUG $(DFLAGS) 
- # endif
--# MORELIBS =  -lc
--# GRAPX11LIBS = -L/usr/X11R6/lib -lX11
--# GRAPXMTLIBS = -L/usr/X11R6/lib -lXm -lXt -lX11
--# GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF) xmtdrvs$(IRITEXEPF)
-+MORELIBS =  -lc
-+GRAPX11LIBS = -L${LOCALBASE}/lib -lX11
-+GRAPDRVS = nuldrvs$(IRITEXEPF) x11drvs$(IRITEXEPF)
-+ifeq ($(WITH_MOTIF_DEF),yes)
-+GRAPXMTLIBS = -L${LOCALBASE}/lib -lXm -lXt -lX11
-+GRAPOGLLIBS = ${MESA_LIB} ${GRAPXMTLIBS}
-+GRAPDRVS+= xmtdrvs$(IRITEXEPF) xogldrvs$(IRITEXEPF)
-+endif
- #
- #
- # For shared libraries add:
- #
--# LIB_SUFFIX = so
--# LIB_MAKE = cc -shared -o 
--# LIB_RAN = ranlib
-+LIB_SUFFIX = so
-+LIB_MAKE = ${LD} -shared -o 
-+LIB_RAN = ${ECHO_CMD}
- 
- #
- # Default rule for compilation.
-@@ -612,4 +622,4 @@
- 	-lIritCagd$(IRITLIBPF) \
- 	-lIritGeom$(IRITLIBPF) \
- 	-lIritMisc$(IRITLIBPF) \
--	-lIritXtra$(IRITLIBPF) $(URT_LIB) $(GIF_LIB) # -l gif
-+	-lIritXtra$(IRITLIBPF) $(URT_LIB) $(GIF_LIB) $(GRAPOGLLIBS) # -l gif
diff --git a/graphics/irit/files/patch-prsr__lib_ipc__loc.h b/graphics/irit/files/patch-prsr__lib_ipc__loc.h
deleted file mode 100644
index 4b81e7b..0000000
--- a/graphics/irit/files/patch-prsr__lib_ipc__loc.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- prsr_lib/ipc_loc.h.orig
-+++ prsr_lib/ipc_loc.h
-@@ -338,7 +338,7 @@
- /* General file pointer for varios compression tools. */ 
- typedef gzFile IpcFile; 
- #define _IPC_OPEN_FILE(FileName, Mode) (gzopen(FileName, Mode)) 
--#define _IPC_DOPEN_FILE(f, Mode)       (gzdopen(_fileno(f), Mode))
-+#define _IPC_DOPEN_FILE(f, Mode)       (gzdopen(fileno(f), Mode))
- #define _IPC_INIT(f) { \
-           if (gzsetparams(f, IPC_COMPRESS_LEVEL, Z_DEFAULT_STRATEGY) != Z_OK) \
- 	                   return IPC_ERROR_ZLIB;}
-@@ -353,7 +353,7 @@
- /* General file pointer for varios compression tools. */ 
- typedef FILE IpcFile; 
- #define _IPC_OPEN_FILE(FileName, Mode) (fopen(FileName, Mode))
--#define _IPC_DOPEN_FILE(f, Mode)       (fdopen(_fileno(f), Mode))
-+#define _IPC_DOPEN_FILE(f, Mode)       (fdopen(fileno(f), Mode))
- #define _IPC_INIT(f)
- #define _IPC_CLOSE_FILE(f) fclose(f)
- /* In Debug mode if used extern console compressor, */
diff --git a/graphics/irit/files/pkg-message.in b/graphics/irit/files/pkg-message.in
deleted file mode 100644
index 5809c2d..0000000
--- a/graphics/irit/files/pkg-message.in
+++ /dev/null
@@ -1,20 +0,0 @@
-*******************************************************************************
-In order to use IRIT you should set the following environment variables:
-
-IRIT_PATH=%%DATADIR%%
-IRIT_DISPLAY="${DRV} -s-"
-
-where DRV is one of the following:
-	x11drvs -	X11 display driver
-and if IRIT has been built with Motif support:
-	xmtdrvs -	X11/Motif display driver
-	xogldrvs -	OpenGL/Motif display driver		
-
-and optionally:
-
-IRIT_BIN_IPC=1
-IRIT_SERVER_HOST=`hostname`
-IRIT_SERVER_PORT=5432
-
-For more information please consult IRIT documentation
-*******************************************************************************
diff --git a/graphics/irit/pkg-descr b/graphics/irit/pkg-descr
deleted file mode 100644
index d606e83..0000000
--- a/graphics/irit/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-The IRIT solid modeling system is a simple environment that allows
-one to model basic, primitive based, models using Boolean operations
-as well as freeform surface's based models.
-
-The system is designed for simplicity and is geared toward research.
-As such, no graphical user interface (GUI) exists or is planned in
-the near future. The modeling is performed using the main
-module/executable of the system which is called (surprise!) IRIT.
-A textual interface (or PUI for programmable user interface) is
-available which provides the interaction interface. An interpreter
-processes the user's command and executes them. This interpreter
-includes general mechanisms that are common in high level programming
-languages such as loops, conditional sentences, and functions. In
-addition, features that can be found in modern languages such as
-operator overloading and object oriented design are extensively
-used.
-
-WWW: http://www.cs.technion.ac.il/~irit/
diff --git a/graphics/irit/pkg-plist b/graphics/irit/pkg-plist
deleted file mode 100644
index b845e2e..0000000
--- a/graphics/irit/pkg-plist
+++ /dev/null
@@ -1,367 +0,0 @@
-bin/3ds2irit
-bin/aisoshad
-bin/dat2bin
-bin/dat2irit
-bin/dxf2irit
-bin/igs2irit
-bin/ihidden
-bin/illustrt
-bin/irender
-bin/irit
-bin/irit2dxf
-bin/irit2hgl
-bin/irit2igs
-bin/irit2iv
-bin/irit2nff
-bin/irit2off
-bin/irit2plg
-bin/irit2pov
-bin/irit2ps
-bin/irit2ray
-bin/irit2scn
-bin/irit2stl
-bin/irit2wrl
-bin/irit2xfg
-bin/izebra
-bin/lineshad
-bin/nuldrvs
-bin/obj2irit
-bin/off2irit
-bin/poly3d-h
-bin/skeletn1
-bin/stl2irit
-bin/x11drvs
-%%WITH_MOTIF%%bin/xmtdrvs
-%%WITH_MOTIF%%bin/xogldrvs
-include/irit/allocate.h
-include/irit/attribut.h
-include/irit/bool_lib.h
-include/irit/cagd_lib.h
-include/irit/extra_fn.h
-include/irit/filt.h
-include/irit/geom_lib.h
-include/irit/ip_cnvrt.h
-include/irit/irit_sm.h
-include/irit/iritgrap.h
-include/irit/iritprsr.h
-include/irit/irt_clr.h
-include/irit/mdl_lib.h
-include/irit/misc_lib.h
-include/irit/miscattr.h
-include/irit/mrchcube.h
-include/irit/mvar_lib.h
-include/irit/obj_dpnd.h
-include/irit/rndr_lib.h
-include/irit/symb_lib.h
-include/irit/trim_lib.h
-include/irit/triv_lib.h
-include/irit/trng_lib.h
-include/irit/user_lib.h
-lib/libIritBool.so
-lib/libIritCagd.so
-lib/libIritGeom.so
-lib/libIritMdl.so
-lib/libIritMisc.so
-lib/libIritMvar.so
-lib/libIritPrsr.so
-lib/libIritRndr.so
-lib/libIritSymb.so
-lib/libIritTrim.so
-lib/libIritTriv.so
-lib/libIritTrng.so
-lib/libIritUser.so
-lib/libIritXtra.so
-%%EXAMPLESDIR%%/data/3dhead.32
-%%EXAMPLESDIR%%/data/3dhead.inf
-%%EXAMPLESDIR%%/data/ai_b58.itd
-%%EXAMPLESDIR%%/data/ai_dinnr.itd
-%%EXAMPLESDIR%%/data/ai_glass.itd
-%%EXAMPLESDIR%%/data/ai_tea.itd
-%%EXAMPLESDIR%%/data/ai_wiggl.itd
-%%EXAMPLESDIR%%/data/fltrtest.itd
-%%EXAMPLESDIR%%/data/ih_alpha.itd
-%%EXAMPLESDIR%%/data/ih_glass.itd
-%%EXAMPLESDIR%%/data/ih_pawns.itd
-%%EXAMPLESDIR%%/data/ih_tpot.itd
-%%EXAMPLESDIR%%/data/ih_trim.itd
-%%EXAMPLESDIR%%/data/ih_wiggl.itd
-%%EXAMPLESDIR%%/data/ihaglsum.itd
-%%EXAMPLESDIR%%/data/il_b58.itd
-%%EXAMPLESDIR%%/data/il_dish.itd
-%%EXAMPLESDIR%%/data/il_icsdr.itd
-%%EXAMPLESDIR%%/data/il_icsdt.itd
-%%EXAMPLESDIR%%/data/il_sld1t.itd
-%%EXAMPLESDIR%%/data/il_sold1.itd
-%%EXAMPLESDIR%%/data/il_wgglt.itd
-%%EXAMPLESDIR%%/data/il_wiggl.itd
-%%EXAMPLESDIR%%/data/ir1eggs.itd
-%%EXAMPLESDIR%%/data/ir2eggs.itd
-%%EXAMPLESDIR%%/data/ir3eggs.itd
-%%EXAMPLESDIR%%/data/ir_b58.itd
-%%EXAMPLESDIR%%/data/ir_chckr.irt
-%%EXAMPLESDIR%%/data/ir_chckr.itd
-%%EXAMPLESDIR%%/data/ir_cube.itd
-%%EXAMPLESDIR%%/data/ir_eggs.itd
-%%EXAMPLESDIR%%/data/ir_isogls.itd
-%%EXAMPLESDIR%%/data/ir_l3ort.itd
-%%EXAMPLESDIR%%/data/ir_mrbgl.itd
-%%EXAMPLESDIR%%/data/ir_ornge.itd
-%%EXAMPLESDIR%%/data/ir_pawn.itd
-%%EXAMPLESDIR%%/data/ir_tpot1.itd
-%%EXAMPLESDIR%%/data/ir_tpot2.itd
-%%EXAMPLESDIR%%/data/ir_tpot3.itd
-%%EXAMPLESDIR%%/data/ir_tpot4.itd
-%%EXAMPLESDIR%%/data/ir_tpot5.itd
-%%EXAMPLESDIR%%/data/ir_walls.itd
-%%EXAMPLESDIR%%/data/ir_wdcub.itd
-%%EXAMPLESDIR%%/data/ir_wdgls.itd
-%%EXAMPLESDIR%%/data/ir_wiggl.itd
-%%EXAMPLESDIR%%/data/iz_pawn.itd
-%%EXAMPLESDIR%%/data/iz_tpot.itd
-%%EXAMPLESDIR%%/data/pl_cncyl.itd
-%%EXAMPLESDIR%%/data/pl_cube.itd
-%%EXAMPLESDIR%%/data/pl_saddl.itd
-%%EXAMPLESDIR%%/data/pl_sold1.itd
-%%EXAMPLESDIR%%/data/pl_sold3.itd
-%%EXAMPLESDIR%%/data/pl_wiggl.itd
-%%EXAMPLESDIR%%/data/plystrip.itd
-%%EXAMPLESDIR%%/data/sphere16.itd
-%%EXAMPLESDIR%%/data/sphere8.itd
-%%EXAMPLESDIR%%/emacs/irit.el
-%%EXAMPLESDIR%%/scripts/adap_iso.irt
-%%EXAMPLESDIR%%/scripts/algsum.irt
-%%EXAMPLESDIR%%/scripts/alphsec2.irt
-%%EXAMPLESDIR%%/scripts/alphsect.irt
-%%EXAMPLESDIR%%/scripts/ambiguit.irt
-%%EXAMPLESDIR%%/scripts/analyfit.irt
-%%EXAMPLESDIR%%/scripts/animball.irt
-%%EXAMPLESDIR%%/scripts/animdemo.irt
-%%EXAMPLESDIR%%/scripts/ant.irt
-%%EXAMPLESDIR%%/scripts/arc_len.irt
-%%EXAMPLESDIR%%/scripts/art_glry.irt
-%%EXAMPLESDIR%%/scripts/aspct_gr.irt
-%%EXAMPLESDIR%%/scripts/b58.irt
-%%EXAMPLESDIR%%/scripts/bed.irt
-%%EXAMPLESDIR%%/scripts/bez_clip.irt
-%%EXAMPLESDIR%%/scripts/bezier.irt
-%%EXAMPLESDIR%%/scripts/biarc.irt
-%%EXAMPLESDIR%%/scripts/bisectrs.irt
-%%EXAMPLESDIR%%/scripts/blending.irt
-%%EXAMPLESDIR%%/scripts/blossom.irt
-%%EXAMPLESDIR%%/scripts/box-box.irt
-%%EXAMPLESDIR%%/scripts/bsc_geom.irt
-%%EXAMPLESDIR%%/scripts/bsct_smp.irt
-%%EXAMPLESDIR%%/scripts/bspline.irt
-%%EXAMPLESDIR%%/scripts/bulb.irt
-%%EXAMPLESDIR%%/scripts/cbi2anim.irt
-%%EXAMPLESDIR%%/scripts/cbi_anim.irt
-%%EXAMPLESDIR%%/scripts/cbisec3d.irt
-%%EXAMPLESDIR%%/scripts/cbisect.irt
-%%EXAMPLESDIR%%/scripts/cbisect2.irt
-%%EXAMPLESDIR%%/scripts/cenvoff.irt
-%%EXAMPLESDIR%%/scripts/chess.irt
-%%EXAMPLESDIR%%/scripts/client2.irt
-%%EXAMPLESDIR%%/scripts/clients.irt
-%%EXAMPLESDIR%%/scripts/clntcrsr.irt
-%%EXAMPLESDIR%%/scripts/closloop.irt
-%%EXAMPLESDIR%%/scripts/cmorph.irt
-%%EXAMPLESDIR%%/scripts/cmorph2.irt
-%%EXAMPLESDIR%%/scripts/cmp_itd.irt
-%%EXAMPLESDIR%%/scripts/colors.irt
-%%EXAMPLESDIR%%/scripts/cone-cyl.irt
-%%EXAMPLESDIR%%/scripts/cone2cyl.irt
-%%EXAMPLESDIR%%/scripts/cone3cyl.irt
-%%EXAMPLESDIR%%/scripts/conicdst.irt
-%%EXAMPLESDIR%%/scripts/conics.irt
-%%EXAMPLESDIR%%/scripts/contours.irt
-%%EXAMPLESDIR%%/scripts/coords.irt
-%%EXAMPLESDIR%%/scripts/coplanar.irt
-%%EXAMPLESDIR%%/scripts/corkplug.irt
-%%EXAMPLESDIR%%/scripts/cort_map.irt
-%%EXAMPLESDIR%%/scripts/cos_sphr.irt
-%%EXAMPLESDIR%%/scripts/crosplug.irt
-%%EXAMPLESDIR%%/scripts/crv_dist.irt
-%%EXAMPLESDIR%%/scripts/crv_krnl.irt
-%%EXAMPLESDIR%%/scripts/crv_tan.irt
-%%EXAMPLESDIR%%/scripts/crvarrng.irt
-%%EXAMPLESDIR%%/scripts/crvdecmp.irt
-%%EXAMPLESDIR%%/scripts/crvtrrec.irt
-%%EXAMPLESDIR%%/scripts/cslogo.irt
-%%EXAMPLESDIR%%/scripts/cube.irt
-%%EXAMPLESDIR%%/scripts/cube2.irt
-%%EXAMPLESDIR%%/scripts/cube3cut.irt
-%%EXAMPLESDIR%%/scripts/cubes.irt
-%%EXAMPLESDIR%%/scripts/cup.irt
-%%EXAMPLESDIR%%/scripts/curvatur.irt
-%%EXAMPLESDIR%%/scripts/cvisible.irt
-%%EXAMPLESDIR%%/scripts/cylin3.irt
-%%EXAMPLESDIR%%/scripts/decimate.irt
-%%EXAMPLESDIR%%/scripts/demo.irt
-%%EXAMPLESDIR%%/scripts/demo2.irt
-%%EXAMPLESDIR%%/scripts/depend.irt
-%%EXAMPLESDIR%%/scripts/dinner.irt
-%%EXAMPLESDIR%%/scripts/disjoint.irt
-%%EXAMPLESDIR%%/scripts/disp_map.irt
-%%EXAMPLESDIR%%/scripts/dist2ff.irt
-%%EXAMPLESDIR%%/scripts/distmtch.irt
-%%EXAMPLESDIR%%/scripts/domino.irt
-%%EXAMPLESDIR%%/scripts/duality.irt
-%%EXAMPLESDIR%%/scripts/duck.irt
-%%EXAMPLESDIR%%/scripts/ellipses.irt
-%%EXAMPLESDIR%%/scripts/escher.irt
-%%EXAMPLESDIR%%/scripts/f16.irt
-%%EXAMPLESDIR%%/scripts/facemask.irt
-%%EXAMPLESDIR%%/scripts/ffcmpcrv.irt
-%%EXAMPLESDIR%%/scripts/ffcnvhul.irt
-%%EXAMPLESDIR%%/scripts/ffloops.irt
-%%EXAMPLESDIR%%/scripts/ffmatch4.irt
-%%EXAMPLESDIR%%/scripts/ffptdist.irt
-%%EXAMPLESDIR%%/scripts/flecnodl.irt
-%%EXAMPLESDIR%%/scripts/flippage.irt
-%%EXAMPLESDIR%%/scripts/freeform.irt
-%%EXAMPLESDIR%%/scripts/function.irt
-%%EXAMPLESDIR%%/scripts/gamakrnl.irt
-%%EXAMPLESDIR%%/scripts/gearbox.irt
-%%EXAMPLESDIR%%/scripts/gersktch.irt
-%%EXAMPLESDIR%%/scripts/glocal.irt
-%%EXAMPLESDIR%%/scripts/gpolylin.irt
-%%EXAMPLESDIR%%/scripts/handset.irt
-%%EXAMPLESDIR%%/scripts/hermite.irt
-%%EXAMPLESDIR%%/scripts/interpol.irt
-%%EXAMPLESDIR%%/scripts/isocline.irt
-%%EXAMPLESDIR%%/scripts/knight.irt
-%%EXAMPLESDIR%%/scripts/knotrmvl.irt
-%%EXAMPLESDIR%%/scripts/knots.irt
-%%EXAMPLESDIR%%/scripts/lightmil.irt
-%%EXAMPLESDIR%%/scripts/lj8000.irt
-%%EXAMPLESDIR%%/scripts/ln2circ.irt
-%%EXAMPLESDIR%%/scripts/loffset.irt
-%%EXAMPLESDIR%%/scripts/loffset2.irt
-%%EXAMPLESDIR%%/scripts/logos.irt
-%%EXAMPLESDIR%%/scripts/loops.irt
-%%EXAMPLESDIR%%/scripts/macros.irt
-%%EXAMPLESDIR%%/scripts/make_spr.irt
-%%EXAMPLESDIR%%/scripts/mbisect.irt
-%%EXAMPLESDIR%%/scripts/molecule.irt
-%%EXAMPLESDIR%%/scripts/moments.irt
-%%EXAMPLESDIR%%/scripts/mrchcube.irt
-%%EXAMPLESDIR%%/scripts/mrescrv.irt
-%%EXAMPLESDIR%%/scripts/msc_ch.irt
-%%EXAMPLESDIR%%/scripts/multivar.irt
-%%EXAMPLESDIR%%/scripts/multivr2.irt
-%%EXAMPLESDIR%%/scripts/mvexplct.irt
-%%EXAMPLESDIR%%/scripts/nc5axis.irt
-%%EXAMPLESDIR%%/scripts/ofstmtch.irt
-%%EXAMPLESDIR%%/scripts/orthotmc.irt
-%%EXAMPLESDIR%%/scripts/platonic.irt
-%%EXAMPLESDIR%%/scripts/playgrnd.irt
-%%EXAMPLESDIR%%/scripts/plotter.irt
-%%EXAMPLESDIR%%/scripts/plycrvtr.irt
-%%EXAMPLESDIR%%/scripts/pmorph.irt
-%%EXAMPLESDIR%%/scripts/polygons.irt
-%%EXAMPLESDIR%%/scripts/polypris.irt
-%%EXAMPLESDIR%%/scripts/polyprop.irt
-%%EXAMPLESDIR%%/scripts/polytrnc.irt
-%%EXAMPLESDIR%%/scripts/pp_apprx.irt
-%%EXAMPLESDIR%%/scripts/prim_fit.irt
-%%EXAMPLESDIR%%/scripts/primitiv.irt
-%%EXAMPLESDIR%%/scripts/primsrfs.irt
-%%EXAMPLESDIR%%/scripts/print_it.irt
-%%EXAMPLESDIR%%/scripts/printf.irt
-%%EXAMPLESDIR%%/scripts/prisa.irt
-%%EXAMPLESDIR%%/scripts/prisanim.irt
-%%EXAMPLESDIR%%/scripts/prismovi.irt
-%%EXAMPLESDIR%%/scripts/puz12pcs.irt
-%%EXAMPLESDIR%%/scripts/puz3cube.irt
-%%EXAMPLESDIR%%/scripts/puz4pcs.irt
-%%EXAMPLESDIR%%/scripts/puz_anim.irt
-%%EXAMPLESDIR%%/scripts/puz_crnr.irt
-%%EXAMPLESDIR%%/scripts/puz_cube.irt
-%%EXAMPLESDIR%%/scripts/puz_dvd.irt
-%%EXAMPLESDIR%%/scripts/puz_snak.irt
-%%EXAMPLESDIR%%/scripts/puzcubes.irt
-%%EXAMPLESDIR%%/scripts/puzzles.irt
-%%EXAMPLESDIR%%/scripts/quadric.irt
-%%EXAMPLESDIR%%/scripts/ray_trap.irt
-%%EXAMPLESDIR%%/scripts/rbt_hand.irt
-%%EXAMPLESDIR%%/scripts/register.irt
-%%EXAMPLESDIR%%/scripts/rflct_ln.irt
-%%EXAMPLESDIR%%/scripts/ringring.irt
-%%EXAMPLESDIR%%/scripts/rrinter.irt
-%%EXAMPLESDIR%%/scripts/rvrs_eng.irt
-%%EXAMPLESDIR%%/scripts/saccess.irt
-%%EXAMPLESDIR%%/scripts/saloon2.irt
-%%EXAMPLESDIR%%/scripts/sbisect.irt
-%%EXAMPLESDIR%%/scripts/sbisect2.irt
-%%EXAMPLESDIR%%/scripts/scnvhull.irt
-%%EXAMPLESDIR%%/scripts/selfintr.irt
-%%EXAMPLESDIR%%/scripts/silh.irt
-%%EXAMPLESDIR%%/scripts/skel2d.irt
-%%EXAMPLESDIR%%/scripts/smorph.irt
-%%EXAMPLESDIR%%/scripts/smorph2.irt
-%%EXAMPLESDIR%%/scripts/snakanim.irt
-%%EXAMPLESDIR%%/scripts/solid0.irt
-%%EXAMPLESDIR%%/scripts/solid1.irt
-%%EXAMPLESDIR%%/scripts/solid2.irt
-%%EXAMPLESDIR%%/scripts/solid2h.irt
-%%EXAMPLESDIR%%/scripts/solid3.irt
-%%EXAMPLESDIR%%/scripts/solid3h.irt
-%%EXAMPLESDIR%%/scripts/solid4.irt
-%%EXAMPLESDIR%%/scripts/solid4h.irt
-%%EXAMPLESDIR%%/scripts/solid5.irt
-%%EXAMPLESDIR%%/scripts/solid6.irt
-%%EXAMPLESDIR%%/scripts/solid6h.irt
-%%EXAMPLESDIR%%/scripts/solid7.irt
-%%EXAMPLESDIR%%/scripts/solid7h.irt
-%%EXAMPLESDIR%%/scripts/solid8.irt
-%%EXAMPLESDIR%%/scripts/solid8h.irt
-%%EXAMPLESDIR%%/scripts/solid9.irt
-%%EXAMPLESDIR%%/scripts/sphercon.irt
-%%EXAMPLESDIR%%/scripts/srf_dist.irt
-%%EXAMPLESDIR%%/scripts/srf_krnl.irt
-%%EXAMPLESDIR%%/scripts/srf_ssi.irt
-%%EXAMPLESDIR%%/scripts/srf_tan.irt
-%%EXAMPLESDIR%%/scripts/srfray.irt
-%%EXAMPLESDIR%%/scripts/ssi-test.irt
-%%EXAMPLESDIR%%/scripts/surfrev.irt
-%%EXAMPLESDIR%%/scripts/symbolic.irt
-%%EXAMPLESDIR%%/scripts/tea-bool.irt
-%%EXAMPLESDIR%%/scripts/teacrvtr.irt
-%%EXAMPLESDIR%%/scripts/teapot.irt
-%%EXAMPLESDIR%%/scripts/teapot2.irt
-%%EXAMPLESDIR%%/scripts/techlogo.irt
-%%EXAMPLESDIR%%/scripts/test_all.irt
-%%EXAMPLESDIR%%/scripts/testmost.irt
-%%EXAMPLESDIR%%/scripts/textgeom.irt
-%%EXAMPLESDIR%%/scripts/textwarp.irt
-%%EXAMPLESDIR%%/scripts/tmorph.irt
-%%EXAMPLESDIR%%/scripts/trees.irt
-%%EXAMPLESDIR%%/scripts/triang.irt
-%%EXAMPLESDIR%%/scripts/trim_off.irt
-%%EXAMPLESDIR%%/scripts/trimsrfs.irt
-%%EXAMPLESDIR%%/scripts/trisrfs.irt
-%%EXAMPLESDIR%%/scripts/trivars.irt
-%%EXAMPLESDIR%%/scripts/turbine.irt
-%%EXAMPLESDIR%%/scripts/tvcover.irt
-%%EXAMPLESDIR%%/scripts/warp2trv.irt
-%%EXAMPLESDIR%%/scripts/warp_tea.irt
-%%EXAMPLESDIR%%/scripts/warptriv.irt
-%%EXAMPLESDIR%%/scripts/weights.irt
-%%EXAMPLESDIR%%/scripts/wheel.irt
-%%DATADIR%%/aisoshad.cfg
-%%DATADIR%%/ihidden.cfg
-%%DATADIR%%/illustrt.cfg
-%%DATADIR%%/irender.cfg
-%%DATADIR%%/irit.cfg
-%%DATADIR%%/iritfont.itd
-%%DATADIR%%/iritinit.irt
-%%DATADIR%%/izebra.cfg
-%%DATADIR%%/lineshad.cfg
-%%DATADIR%%/poly3d-h.cfg
-%%DATADIR%%/x11drvs.cfg
-@dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/scripts
-@dirrm %%EXAMPLESDIR%%/emacs
-@dirrm %%EXAMPLESDIR%%/data
-@dirrm %%EXAMPLESDIR%%
-@dirrm include/irit
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
deleted file mode 100644
index 2a7d11c..0000000
--- a/graphics/pixieplus/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	pixieplus
-# Date created: 			3 March 2003
-# Whom:					Arjan van Leeuwen <avleeuwen@piwebs.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	pixieplus
-PORTVERSION=	0.5.4.1
-PORTREVISION=	13
-CATEGORIES=	graphics kde
-MASTER_SITES=	http://people.fruitsalad.org/avleeuwen/distfiles/${PORTNAME}/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A free, fast, and feature packed image browser and viewer for KDE
-
-PATCH_DEPENDS=	GraphicsMagick-config:${PORTSDIR}/graphics/GraphicsMagick
-LIB_DEPENDS=	GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \
-		ungif:${PORTSDIR}/graphics/libungif
-
-BROKEN=		does not compile
-DEPRECATED=	has been broken for 6 months
-EXPIRATION_DATE=2010-01-08
-
-USE_AUTOTOOLS=	libtool:22
-USE_KDELIBS_VER=3
-USE_LDCONFIG=	yes
-USE_BZIP2=	yes
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	# Massaging to use GraphicsMagick
-	${REINPLACE_CMD} -e	\
-	    "s,INCLUDES =.*,INCLUDES=`${LOCALBASE}/bin/GraphicsMagick-config \
-		--cppflags` -I${LOCALBASE}/include," -e	\
-	    "s|-lMagick -ltiff|`${LOCALBASE}/bin/GraphicsMagick-config \
-		--libs`|" ${WRKSRC}/app/Makefile.in
-	${REINPLACE_CMD} -e 's,<api.h>,<magick/api.h>,'	\
-	    ${WRKSRC}/app/*.h ${WRKSRC}/app/*.cpp
-	${REINPLACE_CMD} -e s,Magick-config,GraphicsMagick-config,g -e s,6.0.0,1.1.10, \
-	    ${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
diff --git a/graphics/pixieplus/distinfo b/graphics/pixieplus/distinfo
deleted file mode 100644
index 30b8c73..0000000
--- a/graphics/pixieplus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pixieplus-0.5.4.1.tar.bz2) = 5a7b98acef2af9cdf6a0b546cada562a
-SHA256 (pixieplus-0.5.4.1.tar.bz2) = dc6849fda69135c084f1a50ebf814a16755fe6476e8573e82af2690dc36c0ccb
-SIZE (pixieplus-0.5.4.1.tar.bz2) = 2126186
diff --git a/graphics/pixieplus/files/patch-app_compressedgif.cpp b/graphics/pixieplus/files/patch-app_compressedgif.cpp
deleted file mode 100644
index 4a7bc12..0000000
--- a/graphics/pixieplus/files/patch-app_compressedgif.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- app/compressedgif.cpp	2004-05-22 10:02:26.000000000 -0400
-+++ app/compressedgif.cpp	2007-11-08 08:44:00.000000000 -0500
-@@ -7,5 +7,5 @@
- #include <time.h>
- #include <sys/types.h>
--#include <api.h>
-+#include <magick/api.h>
- #include <assert.h>
- 
-@@ -28,5 +28,6 @@
- #endif
- 
--#if (MagickLibVersion < 0x0554)
-+/* GraphicsMagick uses much higher "base" for version numbers: */
-+#if (MagickLibVersion < 0x0554) || (MagickLibVersion > 0x0100000)
- #warning Using pre-ImageMagick 5.5.4 tags
- #define SaveImageTag SaveImageText
-@@ -360,5 +361,9 @@
-   status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
-   if (status == false)
-+#if (MagickLibVersion > 0x0100000) /* GraphicsMagick - must pass image */
-+    ThrowWriterException(FileOpenError,"Unable to open file", image);
-+#else
-     ThrowWriterException(FileOpenError,"Unable to open file");
-+#endif
-   /*
-     Determine image bounding box.
-@@ -385,5 +390,9 @@
-   if ((global_colormap == (unsigned char *) NULL) ||
-       (colormap == (unsigned char *) NULL))
-+#if (MagickLibVersion > 0x0100000) /* GraphicsMagick - must pass image */
-+    ThrowWriterException(ResourceLimitError,"Memory allocation failed", image);
-+#else
-     ThrowWriterException(ResourceLimitError,"Memory allocation failed");
-+#endif
-   for (i=0; i < 768; i++)
-     colormap[i]=0;
-@@ -437,6 +446,11 @@
-                 LiberateMemory((void **) &global_colormap);
-                 LiberateMemory((void **) &colormap);
-+#if (MagickLibVersion > 0x0100000) /* GraphicsMagick - must pass image */
-+                ThrowWriterException(ResourceLimitError,
-+                  "Memory allocation failed", image);
-+#else
-                 ThrowWriterException(ResourceLimitError,
-                   "Memory allocation failed")
-+#endif
-               }
-             image->colormap[opacity]=image->background_color;
-@@ -615,5 +629,9 @@
-         LiberateMemory((void **) &global_colormap);
-         LiberateMemory((void **) &colormap);
-+#if (MagickLibVersion > 0x0100000) /* GraphicsMagick - must pass image */
-+        ThrowWriterException(ResourceLimitError,"Memory allocation failed", image);
-+#else
-         ThrowWriterException(ResourceLimitError,"Memory allocation failed")
-+#endif
-       }
-     (void) WriteBlobByte(image,0x0);
diff --git a/graphics/pixieplus/files/patch-app_ifapp.cpp b/graphics/pixieplus/files/patch-app_ifapp.cpp
deleted file mode 100644
index b6a6878..0000000
--- a/graphics/pixieplus/files/patch-app_ifapp.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- app/ifapp.cpp	2004-05-22 10:02:26.000000000 -0400
-+++ app/ifapp.cpp	2007-11-08 08:51:37.000000000 -0500
-@@ -34,6 +34,7 @@
- // ImageMagick message and progress stubs
- extern "C"{
--    unsigned int magickMonitor(const char *msg, const off_t value,
--                               const long long unsigned int span, ExceptionInfo *)
-+    static unsigned int
-+    magickMonitor(const char *msg, const magick_int64_t value,
-+                  const magick_uint64_t span, ExceptionInfo *)
-     {
-         if(!appPtr)
-@@ -48,6 +49,7 @@
-     }
- 
--    void magickWarning(const ExceptionType /*warning*/, const char *reason,
--                       const char *description)
-+    static void
-+    magickWarning(const ExceptionType /*warning*/, const char *reason,
-+                  const char *description)
-     {
-         QString str(reason);
-@@ -58,6 +60,7 @@
-     }
- 
--    void magickError(const ExceptionType /*error*/, const char *reason,
--                     const char *description)
-+    static void
-+    magickError(const ExceptionType /*error*/, const char *reason,
-+                const char *description)
-     {
-         QString str(reason);
-@@ -68,6 +71,7 @@
-     }
- 
--    void magickFatalError(const ExceptionType /*error*/, const char *reason,
--                          const char *description)
-+    static void
-+    magickFatalError(const ExceptionType /*error*/, const char *reason,
-+                     const char *description)
-     {
-         QString str(reason);
diff --git a/graphics/pixieplus/files/patch-app_rightclick.cpp b/graphics/pixieplus/files/patch-app_rightclick.cpp
deleted file mode 100644
index 6379405..0000000
--- a/graphics/pixieplus/files/patch-app_rightclick.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- app/rightclick.cpp.orig	Sat Sep 18 22:05:03 2004
-+++ app/rightclick.cpp	Sat Sep 18 22:05:36 2004
-@@ -220,7 +220,7 @@
-             idx = -1;
-     }
-     if(idx != -1){
--        QStringList itemList(view->itemCatagories(&itemList[idx]));
-+        QStringList itemList(view->itemCatagories((Thumbnail*)&itemList[idx]));
-         for(it=catList.begin(), i=1000; it != catList.end(); ++it, ++i){
-             if(itemList.findIndex((*it)) == -1)
-                 addMnu->insertItem((*it), i);
diff --git a/graphics/pixieplus/files/patch-misc_qxcfi.cpp b/graphics/pixieplus/files/patch-misc_qxcfi.cpp
deleted file mode 100644
index 1602b63..0000000
--- a/graphics/pixieplus/files/patch-misc_qxcfi.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/qxcfi.cpp.orig	Sat Sep 18 21:59:48 2004
-+++ misc/qxcfi.cpp	Sat Sep 18 22:00:16 2004
-@@ -1342,7 +1342,7 @@
- bool XCFImageFormat::loadProperty ( QDataStream& xcf_io, PropType& type,
- 				    QByteArray& bytes )
- {
--  xcf_io >> (Q_UINT32)type;
-+  xcf_io >> (Q_UINT32&)type;
- 
-   if ( xcf_io.device()->status() != IO_Ok ) {
-     qDebug( "XCF: read failure on property type" );
diff --git a/graphics/pixieplus/files/patch-warnings b/graphics/pixieplus/files/patch-warnings
deleted file mode 100644
index 6aa6143..0000000
--- a/graphics/pixieplus/files/patch-warnings
+++ /dev/null
@@ -1,27 +0,0 @@
---- app/htmlexport.cpp	2004-05-22 10:02:26.000000000 -0400
-+++ app/htmlexport.cpp	2007-11-08 08:59:28.000000000 -0500
-@@ -26,6 +26,4 @@
-     pages = (int)ceil(((float)fileList.count())/imagesPerPage);
- 
--    qWarning("Total images: %d, images per page %d, pages: %d",
--             fileList.count(), imagesPerPage, pages);
- 
-     it = fileList.begin();
---- app/browser.cpp	2004-05-22 10:02:26.000000000 -0400
-+++ app/browser.cpp	2007-11-08 09:05:39.000000000 -0500
-@@ -2013,5 +2013,4 @@
-     p.begin(tmpIconPix);
- 
--    qWarning("KIO handlers: %d", kioHandlers->count());
-     if(kioHandlers->count()){
-         QStringList::Iterator it;
---- mimetypes/Makefile.in	2004-05-23 07:00:55.000000000 -0400
-+++ mimetypes/Makefile.in	2007-11-08 09:32:52.000000000 -0500
-@@ -276,6 +276,5 @@
- xdg_menudir = @xdg_menudir@
- 
--mime_DATA = x-pcx.desktop x-xwd.desktop x-miff.desktop x-tga.desktop \
--	x-pict.desktop
-+mime_DATA = x-xwd.desktop x-miff.desktop x-pict.desktop
- 
- 
diff --git a/graphics/pixieplus/pkg-descr b/graphics/pixieplus/pkg-descr
deleted file mode 100644
index bee0ae9..0000000
--- a/graphics/pixieplus/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-PixiePlus is a free, fast, and feature packed image browser, viewer, and 
-image/photo editor for Unix/Linux/X11 systems that run KDE.
-
-Features:
-- Fast, flexible thumbnail preview generation
-- Embedded JPEG and TIFF thumbnail support
-- Lossless JPEG transformations
-- Supports many image formats
-- Highly configurable HTML export
-- Batch conversion and effects
-- Animated slideshows
-- Similiar image finding
-- File management optimized for images 
-
-WWW: http://www.mosfet.org/pixie/
diff --git a/graphics/pixieplus/pkg-plist b/graphics/pixieplus/pkg-plist
deleted file mode 100644
index dafb633..0000000
--- a/graphics/pixieplus/pkg-plist
+++ /dev/null
@@ -1,274 +0,0 @@
-bin/pixie
-lib/libpixie_misc.a
-lib/libpixie_misc.la
-lib/libpixie_misc.so.1
-lib/libpixie_misc.so
-lib/pixie.a
-lib/pixie.la
-lib/pixie.so
-share/applnk/Graphics/pixie.desktop
-share/applnk/Graphics/pixie-mini.desktop
-share/apps/konqueror/servicemenus/konqPixie.desktop
-share/apps/pixie/doc/en/basic/basic.html
-share/apps/pixie/doc/en/basic/thb_addtext.jpg.png
-share/apps/pixie/doc/en/basic/thb_htmllogo.jpg.png
-share/apps/pixie/doc/en/basic/thb_back.png
-share/apps/pixie/doc/en/basic/thb_layout2.jpg.png
-share/apps/pixie/doc/en/basic/thb_borders.jpg.png
-share/apps/pixie/doc/en/basic/thb_lowquality.jpg.png
-share/apps/pixie/doc/en/basic/thb_browser.jpg.png
-share/apps/pixie/doc/en/basic/thb_noembedthumbnail.jpg.png
-share/apps/pixie/doc/en/basic/thb_catagoryadd.jpg.png
-share/apps/pixie/doc/en/basic/thb_nothumb.jpg.png
-share/apps/pixie/doc/en/basic/thb_catagoryselect.jpg.png
-share/apps/pixie/doc/en/basic/thb_pixielogo.jpg.png
-share/apps/pixie/doc/en/basic/thb_comparison.jpg.png
-share/apps/pixie/doc/en/basic/thb_scale.jpg.png
-share/apps/pixie/doc/en/basic/thb_embedthumbnail.jpg.png
-share/apps/pixie/doc/en/basic/thb_screenshot.jpg.png
-share/apps/pixie/doc/en/basic/thb_filelist.jpg.png
-share/apps/pixie/doc/en/basic/thb_similarprogress.jpg.png
-share/apps/pixie/doc/en/basic/thb_format.jpg.png
-share/apps/pixie/doc/en/basic/thb_slideshow.jpg.png
-share/apps/pixie/doc/en/basic/thb_forward.png
-share/apps/pixie/doc/en/basic/thb_stop.png
-share/apps/pixie/doc/en/basic/thb_fullscreentb.jpg.png
-share/apps/pixie/doc/en/basic/thb_thumbnailed.jpg.png
-share/apps/pixie/doc/en/basic/thb_gohome.png
-share/apps/pixie/doc/en/basic/thb_thumb.png
-share/apps/pixie/doc/en/basic/thb_grayscalepreview.jpg.png
-share/apps/pixie/doc/en/basic/thb_tooltip.jpg.png
-share/apps/pixie/doc/en/basic/thb_hi16-action-catagory.png
-share/apps/pixie/doc/en/basic/thb_up.png
-share/apps/pixie/doc/en/basic/thb_hotlist.jpg.png
-share/apps/pixie/doc/en/framed/framed2.html
-share/apps/pixie/doc/en/framed/framed4.html
-share/apps/pixie/doc/en/framed/framed6.html
-share/apps/pixie/doc/en/framed/framed3.html
-share/apps/pixie/doc/en/framed/framed5.html
-share/apps/pixie/doc/en/framed/framed.html
-share/apps/pixie/doc/en/framed/thb_addtext.jpg.png
-share/apps/pixie/doc/en/framed/thb_htmllogo.jpg.png
-share/apps/pixie/doc/en/framed/thb_back.png
-share/apps/pixie/doc/en/framed/thb_layout2.jpg.png
-share/apps/pixie/doc/en/framed/thb_borders.jpg.png
-share/apps/pixie/doc/en/framed/thb_lowquality.jpg.png
-share/apps/pixie/doc/en/framed/thb_browser.jpg.png
-share/apps/pixie/doc/en/framed/thb_noembedthumbnail.jpg.png
-share/apps/pixie/doc/en/framed/thb_catagoryadd.jpg.png
-share/apps/pixie/doc/en/framed/thb_nothumb.jpg.png
-share/apps/pixie/doc/en/framed/thb_catagoryselect.jpg.png
-share/apps/pixie/doc/en/framed/thb_pixielogo.jpg.png
-share/apps/pixie/doc/en/framed/thb_comparison.jpg.png
-share/apps/pixie/doc/en/framed/thb_scale.jpg.png
-share/apps/pixie/doc/en/framed/thb_embedthumbnail.jpg.png
-share/apps/pixie/doc/en/framed/thb_screenshot.jpg.png
-share/apps/pixie/doc/en/framed/thb_filelist.jpg.png
-share/apps/pixie/doc/en/framed/thb_similarprogress.jpg.png
-share/apps/pixie/doc/en/framed/thb_format.jpg.png
-share/apps/pixie/doc/en/framed/thb_slideshow.jpg.png
-share/apps/pixie/doc/en/framed/thb_forward.png
-share/apps/pixie/doc/en/framed/thb_stop.png
-share/apps/pixie/doc/en/framed/thb_fullscreentb.jpg.png
-share/apps/pixie/doc/en/framed/thb_thumbnailed.jpg.png
-share/apps/pixie/doc/en/framed/thb_gohome.png
-share/apps/pixie/doc/en/framed/thb_thumb.png
-share/apps/pixie/doc/en/framed/thb_grayscalepreview.jpg.png
-share/apps/pixie/doc/en/framed/thb_up.png
-share/apps/pixie/doc/en/framed/thb_tooltip.jpg.png
-share/apps/pixie/doc/en/framed/thb_hi16-action-catagory.png
-share/apps/pixie/doc/en/framed/thb_hotlist.jpg.png
-share/apps/pixie/doc/en/liquid/liquid.html
-share/apps/pixie/doc/en/liquid/thb_addtext.jpg.png
-share/apps/pixie/doc/en/liquid/thb_htmllogo.jpg.png
-share/apps/pixie/doc/en/liquid/thb_back.png
-share/apps/pixie/doc/en/liquid/thb_layout2.jpg.png
-share/apps/pixie/doc/en/liquid/thb_borders.jpg.png
-share/apps/pixie/doc/en/liquid/thb_lowquality.jpg.png
-share/apps/pixie/doc/en/liquid/thb_browser.jpg.png
-share/apps/pixie/doc/en/liquid/thb_noembedthumbnail.jpg.png
-share/apps/pixie/doc/en/liquid/thb_catagoryadd.jpg.png
-share/apps/pixie/doc/en/liquid/thb_nothumb.jpg.png
-share/apps/pixie/doc/en/liquid/thb_catagoryselect.jpg.png
-share/apps/pixie/doc/en/liquid/thb_pixielogo.jpg.png
-share/apps/pixie/doc/en/liquid/thb_comparison.jpg.png
-share/apps/pixie/doc/en/liquid/thb_scale.jpg.png
-share/apps/pixie/doc/en/liquid/thb_embedthumbnail.jpg.png
-share/apps/pixie/doc/en/liquid/thb_screenshot.jpg.png
-share/apps/pixie/doc/en/liquid/thb_filelist.jpg.png
-share/apps/pixie/doc/en/liquid/thb_similarprogress.jpg.png
-share/apps/pixie/doc/en/liquid/thb_format.jpg.png
-share/apps/pixie/doc/en/liquid/thb_slideshow.jpg.png
-share/apps/pixie/doc/en/liquid/thb_forward.png
-share/apps/pixie/doc/en/liquid/thb_stop.png
-share/apps/pixie/doc/en/liquid/thb_fullscreentb.jpg.png
-share/apps/pixie/doc/en/liquid/thb_thumbnailed.jpg.png
-share/apps/pixie/doc/en/liquid/thb_gohome.png
-share/apps/pixie/doc/en/liquid/thb_thumb.png
-share/apps/pixie/doc/en/liquid/thb_grayscalepreview.jpg.png
-share/apps/pixie/doc/en/liquid/thb_tooltip.jpg.png
-share/apps/pixie/doc/en/liquid/thb_hi16-action-catagory.png
-share/apps/pixie/doc/en/liquid/thb_up.png
-share/apps/pixie/doc/en/liquid/thb_hotlist.jpg.png
-share/apps/pixie/doc/en/list/list2.html
-share/apps/pixie/doc/en/list/list3.html
-share/apps/pixie/doc/en/list/list.html
-share/apps/pixie/doc/en/roundcorner/roundcorner.html
-share/apps/pixie/doc/en/roundcorner/thb_addtext.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_htmllogo.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_back.png
-share/apps/pixie/doc/en/roundcorner/thb_layout2.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_borders.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_lowquality.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_browser.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_noembedthumbnail.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_catagoryadd.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_nothumb.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_catagoryselect.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_pixielogo.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_comparison.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_scale.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_screenshot.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_embedthumbnail.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_filelist.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_similarprogress.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_format.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_slideshow.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_forward.png
-share/apps/pixie/doc/en/roundcorner/thb_stop.png
-share/apps/pixie/doc/en/roundcorner/thb_fullscreentb.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_thumbnailed.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_gohome.png
-share/apps/pixie/doc/en/roundcorner/thb_thumb.png
-share/apps/pixie/doc/en/roundcorner/thb_grayscalepreview.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_tooltip.jpg.png
-share/apps/pixie/doc/en/roundcorner/thb_hi16-action-catagory.png
-share/apps/pixie/doc/en/roundcorner/thb_up.png
-share/apps/pixie/doc/en/roundcorner/thb_hotlist.jpg.png
-share/apps/pixie/doc/en/batch.html
-share/apps/pixie/doc/en/galleryexample.html
-share/apps/pixie/doc/en/previewoptions.html
-share/apps/pixie/doc/en/categories.html
-share/apps/pixie/doc/en/hotlist.html
-share/apps/pixie/doc/en/rightclick.html
-share/apps/pixie/doc/en/comparison.html
-share/apps/pixie/doc/en/htmlexport.html
-share/apps/pixie/doc/en/screenshot.html
-share/apps/pixie/doc/en/contents.html
-share/apps/pixie/doc/en/index.html
-share/apps/pixie/doc/en/slideshow.html
-share/apps/pixie/doc/en/convert.html
-share/apps/pixie/doc/en/layout.html
-share/apps/pixie/doc/en/viewingimages.html
-share/apps/pixie/doc/en/filelist.html
-share/apps/pixie/doc/en/back.png
-share/apps/pixie/doc/en/navigate.html
-share/apps/pixie/doc/en/viewingthumbnails.html
-share/apps/pixie/doc/en/gohome.png
-share/apps/pixie/doc/en/stop.png
-share/apps/pixie/doc/en/up.png
-share/apps/pixie/doc/en/forward.png
-share/apps/pixie/doc/en/hi16-action-catagory.png
-share/apps/pixie/doc/en/thumb.png
-share/apps/pixie/doc/en/addtext.jpg
-share/apps/pixie/doc/en/hotlist.jpg
-share/apps/pixie/doc/en/lowquality.jpg
-share/apps/pixie/doc/en/borders.jpg
-share/apps/pixie/doc/en/html1.jpg
-share/apps/pixie/doc/en/noembedthumbnail.jpg
-share/apps/pixie/doc/en/browser.jpg
-share/apps/pixie/doc/en/html2.jpg
-share/apps/pixie/doc/en/nothumb.jpg
-share/apps/pixie/doc/en/catagoryadd.jpg
-share/apps/pixie/doc/en/html3.jpg
-share/apps/pixie/doc/en/pixielogo.jpg
-share/apps/pixie/doc/en/catagoryselect.jpg
-share/apps/pixie/doc/en/html4.jpg
-share/apps/pixie/doc/en/scale.jpg
-share/apps/pixie/doc/en/comparison.jpg
-share/apps/pixie/doc/en/html5.jpg
-share/apps/pixie/doc/en/screenshot.jpg
-share/apps/pixie/doc/en/embedthumbnail.jpg
-share/apps/pixie/doc/en/html6.jpg
-share/apps/pixie/doc/en/similarprogress.jpg
-share/apps/pixie/doc/en/filelist.jpg
-share/apps/pixie/doc/en/html7.jpg
-share/apps/pixie/doc/en/slideshow.jpg
-share/apps/pixie/doc/en/format.jpg
-share/apps/pixie/doc/en/html8.jpg
-share/apps/pixie/doc/en/thumbnailed.jpg
-share/apps/pixie/doc/en/fullscreentb.jpg
-share/apps/pixie/doc/en/htmllogo.jpg
-share/apps/pixie/doc/en/tooltip.jpg
-share/apps/pixie/doc/en/grayscalepreview.jpg
-share/apps/pixie/doc/en/layout2.jpg
-share/apps/pixie/pixielogo.jpg
-share/apps/pixie/toolbar/mini-run.png
-share/apps/pixie/toolbar/mini-ray.png
-share/apps/pixie/toolbar/kwin.png
-share/mimelnk/image/x-xwd.desktop
-share/mimelnk/image/x-miff.desktop
-share/mimelnk/image/x-pict.desktop
-share/icons/locolor/22x22/actions/thumb.png
-share/icons/locolor/16x16/apps/run.png
-share/icons/locolor/16x16/apps/ray.png
-share/icons/locolor/16x16/actions/thumb.png
-share/icons/locolor/16x16/actions/hotlistadd.png
-share/icons/locolor/16x16/actions/hotlistdel.png
-share/icons/locolor/32x32/actions/thumb.png
-share/icons/hicolor/16x16/actions/catagory.png
-share/icons/hicolor/16x16/actions/prevfilelist.png
-share/icons/hicolor/16x16/actions/forwardimage.png
-share/icons/hicolor/16x16/actions/brightness.png
-share/icons/hicolor/16x16/actions/hotlistdel.png
-share/icons/hicolor/16x16/actions/thumb.png
-share/icons/hicolor/16x16/actions/dim.png
-share/icons/hicolor/16x16/actions/backimage.png
-share/icons/hicolor/16x16/actions/contrast+.png
-share/icons/hicolor/16x16/actions/contrast-.png
-share/icons/hicolor/16x16/actions/nextfilelist.png
-share/icons/hicolor/16x16/actions/hotlistadd.png
-share/icons/hicolor/16x16/apps/pixie.png
-share/icons/hicolor/48x48/apps/pixie.png
-share/icons/hicolor/22x22/actions/thumb.png
-share/icons/hicolor/22x22/actions/catagory.png
-share/icons/hicolor/32x32/apps/pixie.png
-share/icons/hicolor/32x32/actions/thumb.png
-share/icons/hicolor/32x32/actions/window_new.png
-share/icons/hicolor/32x32/actions/catagory.png
-@dirrmtry share/applnk/Graphics
-@dirrmtry share/applnk
-@dirrmtry share/apps/konqueror/servicemenus
-@dirrmtry share/apps/konqueror
-@dirrm share/apps/pixie/doc/en/basic
-@dirrm share/apps/pixie/doc/en/framed
-@dirrm share/apps/pixie/doc/en/liquid
-@dirrm share/apps/pixie/doc/en/list
-@dirrm share/apps/pixie/doc/en/roundcorner
-@dirrm share/apps/pixie/doc/en
-@dirrm share/apps/pixie/doc
-@dirrm share/apps/pixie/toolbar
-@dirrm share/apps/pixie
-@dirrmtry share/apps
-@dirrmtry share/mimelnk/image
-@dirrmtry share/mimelnk
-@dirrmtry share/icons/locolor/22x22/actions
-@dirrmtry share/icons/locolor/22x22
-@dirrmtry share/icons/locolor/16x16/apps
-@dirrmtry share/icons/locolor/16x16/actions
-@dirrmtry share/icons/locolor/16x16
-@dirrmtry share/icons/locolor/32x32/actions
-@dirrmtry share/icons/locolor/32x32
-@dirrmtry share/icons/locolor
-@dirrmtry share/icons/hicolor/16x16/actions
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/22x22/actions
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32/actions
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
diff --git a/japanese/Makefile b/japanese/Makefile
index b1dbf6e..842f78d 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -71,7 +71,6 @@
     SUBDIR += eterm
     SUBDIR += ewipe
     SUBDIR += exmh2
-    SUBDIR += expect
     SUBDIR += flex-sdk
     SUBDIR += flower-fpw
     SUBDIR += foldoc-fpw
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
deleted file mode 100644
index bbc620d..0000000
--- a/japanese/expect/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	expect
-# Date created:		17 Oct 1997
-# Whom:			taguchi
-#
-# $FreeBSD$
-#
-
-PORTNAME=	expect
-PORTVERSION=	5.30
-PORTREVISION=	2
-CATEGORIES=	japanese lang tk
-MASTER_SITES=	ftp://ftp.nist.gov/mel/div826/subject/expect/old/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A sophisticated scripter based on Japanized tcl/tk
-
-LIB_DEPENDS=	tk80jp.1:${PORTSDIR}/japanese/tk80
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_AUTOTOOLS=	autoconf:213
-CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-    		CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \
-		--with-tkconfig=${PREFIX}/lib/tk8.0jp \
-		--with-tclinclude=${PREFIX}/include/tcl8.0jp \
-		--with-tkinclude=${PREFIX}/include/tk8.0jp
-
-NO_MAN_INSTALL=	yes
-USE_LDCONFIG=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-BROKEN=		Incomplete pkg-plist
-.endif
-
-test:
-	cd ${WRKSRC} && ${MAKE} test
-
-.include <bsd.port.post.mk>
diff --git a/japanese/expect/distinfo b/japanese/expect/distinfo
deleted file mode 100644
index 41764d6..0000000
--- a/japanese/expect/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (expect-5.30.tar.gz) = 73bf1f347dde3c2b2cd04b344c6769df
-SHA256 (expect-5.30.tar.gz) = 0d4b33e83c09ee3912d36017cd6f33578f40293f148e1dd62bf47e54cb646f80
-SIZE (expect-5.30.tar.gz) = 462787
diff --git a/japanese/expect/files/patch-aa b/japanese/expect/files/patch-aa
deleted file mode 100644
index 43b5317..0000000
--- a/japanese/expect/files/patch-aa
+++ /dev/null
@@ -1,275 +0,0 @@
---- Makefile.in.orig	Wed Aug 18 18:52:07 1999
-+++ Makefile.in	Sat Jan 27 01:48:56 2007
-@@ -24,7 +24,7 @@
- TCL_LIBRARY = @TCL_LIBRARY@
- 
- # Tcl library uninstalled.  Should be something like -ltcl or ../tcl/libtcl.a
--TCLLIB = @TCL_BUILD_LIB_SPEC@
-+TCLLIB = @TCL_LIB_SPEC@
- # Tcl library installed.  Should be something like -ltcl or ../tcl/libtcl.a
- TCLLIB_INSTALLED = @TCL_LIB_SPEC@
- 
-@@ -32,7 +32,7 @@
- # Tk include files
- TKHDIRDASHI = @TKHDIRDASHI@
- # Tk library
--TKLIB = @TK_BUILD_LIB_SPEC@
-+TKLIB = @TK_LIB_SPEC@
- TKLIB_INSTALLED = @TK_LIB_SPEC@
- # X11 include files and other flags to compiler
- X11_CFLAGS = @TK_XINCLUDES@
-@@ -57,7 +57,7 @@
- # your Expect scripts.
- # Note: On Linux systems which only have dynamic X libraries, the -g prevents
- # the linker from using them.  So do not use -g on such systems.
--CFLAGS = @CFLAGS@
-+CFLAGS += @CFLAGS@ -DKANJI -DKINPUT2
- #XCFLAGS = @CFLAGS@ @EXP_CFLAGS@ @EXP_SHLIB_CFLAGS@ 
- XCFLAGS = @CFLAGS@ @EXP_CFLAGS@
- 
-@@ -179,7 +179,7 @@
- man1dir = $(mandir)/man1
- man3dir = $(mandir)/man3
- infodir = $(INSTALL_ROOT)@infodir@
--includedir = $(INSTALL_ROOT)@includedir@
-+includedir = $(INSTALL_ROOT)@includedir@/expect$(VERSION)
- 
- # Expect's utility script directories - arch-independent and arch-non-
- # independent.  These correspond to the variables "exp_library" and
-@@ -191,12 +191,13 @@
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- AR = ar
- ARFLAGS = cr
- 
--LOCAL_EXPECT=LD_LIBRARY_PATH=.:@TCL_EXEC_PREFIX@/lib:$(tcl_libdir):$$LD_LIBRARY_PATH ./expect
-+LOCAL_EXPECT=LD_LIBRARY_PATH=.:@TCL_EXEC_PREFIX@/lib:$(tcl_libdir):$$LD_LIBRARY_PATH ./expectjp
- 
- # These definitions are used by the "subdirs_do" target to pass
- # the compile flags down recursively.
-@@ -207,6 +208,7 @@
- 	"HDEFS=$(HDEFS)" \
- 	"INSTALL=$(INSTALL)" \
- 	"INSTALL_DATA=$(INSTALL_DATA)" \
-+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
- 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
- 	"LDFLAGS=$(LDFLAGS)" \
- 	"RUNTEST=$(RUNTEST)" \
-@@ -222,9 +224,9 @@
- # These let the DejaGnu test suite run when DejaGnu isn't 
- # installed yet, so run it from the srcdir and objdir.
- EXPECT = ` \
--  if [ -f $${rootme}/expect ] ; then \
--    echo $${rootme}/expect ; \
--  else echo expect ; fi`
-+  if [ -f $${rootme}/expectjp ] ; then \
-+    echo $${rootme}/expectjp ; \
-+  else echo expectjp ; fi`
- 
- RUNTESTFLAGS =
- RUNTEST = ` \
-@@ -324,7 +326,7 @@
- 	   $(CC) -c $(CFLAGS_INT) @EXP_SHLIB_CFLAGS@ $(STTY) $(HDEFS) $< -o shared/$@ ; \
- 	fi
- 
--all: expect $(EXP_LIB_FILES) ${X11_PROGS}
-+all: expectjp $(EXP_LIB_FILES) ${X11_PROGS}
- 	@$(MAKE) subdir_do DO=$@  $(FLAGS_TO_PASS)
- 
- info:
-@@ -332,9 +334,9 @@
- 
- # build expect binary that does not depend on Expect's shared libs
- # IFF static Tcl/Tk libraries are available.
--expect:	exp_main_exp.o $(EXP_UNSHARED_LIB_FILE)
--	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
--	$(SETUID) expect
-+expectjp:	exp_main_exp.o $(EXP_UNSHARED_LIB_FILE)
-+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectjp exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
-+	$(SETUID) expectjp
- 
- # install Expect library
- # This is done before the install target because the libraries have to be
-@@ -347,21 +349,23 @@
- #   Local copy is pkgIndex rather than pkgIndex.tcl because pkgIndex.tcl.in
- #   is too long for some filesystems, sigh.
- install_shared_lib: $(EXP_LIB_FILES)
-+	${srcdir}/mkinstalldirs $(tcl_libdir)
- 	${srcdir}/mkinstalldirs $(libdir)
- 	if [ -s $(EXP_UNSHARED_LIB_FILE) ] ; then \
--	  $(INSTALL_DATA) $(EXP_UNSHARED_LIB_FILE) $(libdir)/$(EXP_UNSHARED_LIB_FILE) ; \
--	  $(UNSHARED_RANLIB) $(libdir)/$(EXP_UNSHARED_LIB_FILE) ; \
--	  $(INSTALL_DATA) $(EXP_UNSHARED_LIB_FILE) $(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) ; \
--	  $(UNSHARED_RANLIB) $(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) ; \
-+	  $(INSTALL_DATA) $(EXP_UNSHARED_LIB_FILE) $(LIB_INSTALL_DIR)/$(EXP_UNSHARED_LIB_FILE) ; \
-+	  $(UNSHARED_RANLIB) $(LIB_INSTALL_DIR)/$(EXP_UNSHARED_LIB_FILE) ; \
-+	  $(INSTALL_DATA) $(EXP_UNSHARED_LIB_FILE) $(LIB_INSTALL_DIR)/$(EXP_UNSHARED_LIB_FILE) ; \
-+	  $(UNSHARED_RANLIB) $(LIB_INSTALL_DIR)/$(EXP_UNSHARED_LIB_FILE) ; \
- 	else true; fi
- 	if [ -s $(EXP_SHARED_LIB_FILE) ] ; then \
--	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \
--	  $(INSTALL_PROGRAM) pkgIndex $(libdir)/pkgIndex.tcl ; \
-+	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(LIB_INSTALL_DIR)/$(EXP_SHARED_LIB_FILE) ; \
-+	  (cd $(LIB_INSTALL_DIR) ; ln -sf $(EXP_SHARED_LIB_FILE) `echo $(EXP_SHARED_LIB_FILE) | sed 's/\.so.*$$/.so/'`) ; \
-+	  $(INSTALL_SCRIPT) pkgIndex $(libdir)/pkgIndex.tcl ; \
- 	else true; fi
- 
--expect_installed:	exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
--	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
--	$(SETUID) expect_installed
-+expectjp_installed:	exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
-+	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectjp_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
-+	$(SETUID) expectjp_installed
- 
- # Build Expect with TestCenter
- expect.tc: exp_main_exp.o $(OFILES) 
-@@ -375,13 +379,13 @@
- # together.  I could fix it by testing all the libraries (again, in Expect's
- # configure) separately for Expectk, but as far as I know, it doesn't hurt
- # anything here, so I'm not worrying about it.
--expectk: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE)
--	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
--	$(SETUID) expectk
--
--expectk_installed: exp_main_tk.o $(EXP_LIB_FILE)
--	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
--	$(SETUID) expectk_installed
-+expectkjp: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE)
-+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectkjp exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
-+	$(SETUID) expectkjp
-+
-+expectkjp_installed: exp_main_tk.o $(EXP_LIB_FILE)
-+	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectkjp_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
-+	$(SETUID) expectkjp_installed
- 
- # Build Expectk with TestCenter
- expectk.tc: exp_main_tk.o $(OFILES) 
-@@ -401,24 +405,24 @@
- expect-shared-lib-file :: $(EXP_SHARED_LIB_FILE)
- $(EXP_SHARED_LIB_FILE): $(OFILES)
- 	-rm -f $(EXP_SHARED_LIB_FILE)
--	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
-+	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) -Wl,-soname,$(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
-+	ln -sf $(EXP_SHARED_LIB_FILE) `echo $(EXP_SHARED_LIB_FILE) | sed 's/\.so.*$$/.so/'`
- 
- .PHONY: install-info install info
- install-info:
- 
--install:	expect expect_installed ${X11_PROGS_INSTALLED} $(SCRIPTS)
--	${srcdir}/mkinstalldirs $(man1dir) $(man3dir) $(bindir) $(tcl_libdir) $(includedir)
-+install:	expectjp expectjp_installed ${X11_PROGS_INSTALLED} $(SCRIPTS)
-+	${srcdir}/mkinstalldirs $(bindir) $(tcl_libdir) $(includedir)
- # install Expect
--	$(INSTALL_PROGRAM) expect_installed $(bindir)/expect
-+	$(INSTALL_PROGRAM) expectjp_installed $(bindir)/expectjp
- # install Expectk (and man page) if present
--	-if [ -s expectk_installed ] ; then \
--	  $(INSTALL_PROGRAM) expectk_installed $(bindir)/expectk ; \
--	  $(INSTALL_DATA) $(srcdir)/expectk.man $(man1dir)/expectk.1 ; \
-+	-if [ -s expectkjp_installed ] ; then \
-+	  $(INSTALL_PROGRAM) expectkjp_installed $(bindir)/expectkjp ; \
- 	else true; fi
- # install Expect man page
--	$(INSTALL_DATA) $(srcdir)/expect.man $(man1dir)/expect.1
-+#	$(INSTALL_DATA) $(srcdir)/expect.man $(man1dir)/expect.1
- # install man page for Expect and Expectk libraries
--	$(INSTALL_DATA) $(srcdir)/libexpect.man $(man3dir)/libexpect.3
-+#	$(INSTALL_DATA) $(srcdir)/libexpect.man $(man3dir)/libexpect.3
- # install Expect's public include files
- #	$(INSTALL_DATA) expect_cf.h $(includedir)
- 	$(INSTALL_DATA) $(srcdir)/expect.h $(includedir)
-@@ -433,21 +437,16 @@
- 	TCL_LIBRARY=$(TCL_LIBRARY) ; \
- 	export TCL_LIBRARY ; \
- 	   if $(LOCAL_EXPECT) $(srcdir)/fixcat ; then \
--	      $(INSTALL_DATA) $(srcdir)/fixcat $(EXECSCRIPTDIR)/cat-buffers ; \
-+	      $(INSTALL_DATA) $(srcdir)/fixcat $(EXECSCRIPTDIR)/cat-buffers-jp ; \
- 	   else true; fi
- # install standalone scripts and their man pages, if requested
- 	${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
- 	-for i in $(SCRIPT_LIST) ; do \
- 	  if [ -f $$i ] ; then \
--	    $(INSTALL_PROGRAM) $$i $(bindir_arch_indep)/$$i ; \
-+	    $(INSTALL_SCRIPT) $$i $(bindir_arch_indep)/$$i-jp ; \
- 	    rm -f $$i ; \
- 	  else true; fi ; \
- 	done
--	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
--	  if [ -f $(srcdir)/example/$$i.man ] ; then \
--	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(man1dir)/$$i.1 ; \
--	  else true; fi ; \
--	done
- 
- $(SCRIPT_LIST):
- 	TCL_LIBRARY=$(TCL_LIBRARY) ; \
-@@ -457,27 +456,21 @@
- # Delete all the installed files that the `install' target creates
- # (but not the noninstalled files such as `make all' creates)
- uninstall:
--	-rm -f  $(bindir)/expectk \
--		$(man1dir)/expect.1 \
--		$(man1dir)/expectk.1 \
-+	-rm -f  $(bindir)/expectkjp \
- 		$(libdir)/$(EXP_SHARED_LIB_FILE) \
- 		$(tcl_libdir)/$(EXP_SHARED_LIB_FILE) \
- 		$(libdir)/$(EXP_UNSHARED_LIB_FILE) \
- 		$(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) \
- 		$(libdir)/pkgIndex.tcl \
--		$(man3dir)/libexpect.3 \
- 		$(includedir)/expect_cf.h \
- 		$(includedir)/expect.h \
- 		$(includedir)/expect_tcl.h \
- 		$(includedir)/expect_comm.h \
--		$(EXECSCRIPTDIR)/cat-buffers
-+		$(EXECSCRIPTDIR)/cat-buffers-jp
- # debugger is not removed, since other things could depend on it
- # remove standalone scripts and man pages
- 	-for i in $(SCRIPT_LIST) ; do \
--	  rm -f $(bindir_arch_indep)/$$i ; \
--	done
--	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
--	  rm -f $(man1dir)/$$i.1 ; \
-+	  rm -f $(bindir_arch_indep)/$$i-jp ; \
- 	done
- 
- ###################################
-@@ -528,7 +521,7 @@
- # delete all files from current directory that are created by "make"
- clean:
- 	-rm -rf *~ *.o shared core \
--		expect expect_installed expectk expectk_installed \
-+		expectjp expectjp_installed expectkjp expectkjp_installed \
- 		dumb exho devtty \
- 		$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \
- 		$(SCRIPT_LIST)
-@@ -544,7 +537,7 @@
- # because most people don't have to worry about them
- mostlyclean:
- 	-rm -rf *~ *.o shared core \
--		expect expect_installed expectk expectk_installed \
-+		expectjp expectjp_installed expectkjp expectkjp_installed \
- 		$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE)
- 	@$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS)
- 
-@@ -685,7 +678,7 @@
- expect-$(VERSION).tar.gz:	expect-$(VERSION).tar
- 	gzip -fc expect-$(VERSION).tar > $@
- 
--test:   expect
-+test:   expectjp
- 	rm -f .tmp
- 	echo "set objdir" `pwd` > .tmp
- 	if [ "$(srcdir)" = "." ] ; then \
-@@ -695,7 +688,7 @@
- 	echo "source all" >> .tmp
- 	rootme=`pwd`; export rootme; \
- 	srcdir=${srcdir} ; export srcdir ; \
--	if [ -f ./expect ] ; then  \
-+	if [ -f ./expectjp ] ; then  \
- 	   TCL_LIBRARY=$(TCL_LIBRARY) ; \
- 	   export TCL_LIBRARY ; fi ; \
- 	$(LOCAL_EXPECT) -f .tmp
diff --git a/japanese/expect/files/patch-ab b/japanese/expect/files/patch-ab
deleted file mode 100644
index 0e05789..0000000
--- a/japanese/expect/files/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.in.orig	Fri Oct  8 06:49:57 1999
-+++ configure.in	Fri Dec 10 16:25:19 1999
-@@ -10,11 +10,14 @@
- # note when updating version numbers here, also update pkgIndex.in (see
- # comments in Makefile)
- EXP_MAJOR_VERSION=5
--EXP_MINOR_VERSION=30
-+EXP_MINOR_VERSION_PREFIX=30
-+EXP_MINOR_VERSION_L10N=jp
-+EXP_MINOR_VERSION=$EXP_MINOR_VERSION_PREFIX$EXP_MINOR_VERSION_L10N
- EXP_MICRO_VERSION=1
- EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION
- EXP_VERSION_NODOTS=$EXP_MAJOR_VERSION$EXP_MINOR_VERSION
- EXP_VERSION_FULL=$EXP_VERSION.$EXP_MICRO_VERSION
-+EXP_VERSION_PKG=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION_PREFIX.$EXP_MICRO_VERSION
- # Tcl's handling of shared_lib_suffix requires this symbol exist
- VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION
- 
-@@ -24,7 +27,6 @@
- 
- dnl AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
- AC_CANONICAL_SYSTEM
--
- AC_CONFIG_HEADER(expect_cf.h)
- 
- # /bin/sh on some systems is too deficient (in particular, Ultrix 4.3
-@@ -1042,9 +1044,9 @@
- if test x"$no_tk" != x"true" ; then
- # libexpectk no longer exists
- #  X_PROGS="expectk \$(LIBEXPECTK)"
--  X_PROGS=expectk
-+  X_PROGS=expectkjp
- # should really generate following symbol, but I'm hitting configure's limit on substs.
--  X_PROGS_INSTALLED=expectk_installed
-+  X_PROGS_INSTALLED=expectkjp_installed
- else
-   X_PROGS="# no X support on this system"
-   AC_MSG_WARN([No X based programs will be built])
-@@ -1183,6 +1185,7 @@
- AC_SUBST(EXP_MINOR_VERSION)
- AC_SUBST(EXP_MICRO_VERSION)
- AC_SUBST(EXP_VERSION_FULL)
-+AC_SUBST(EXP_VERSION_PKG)
- AC_SUBST(EXP_VERSION)
- AC_SUBST(CC)
- AC_SUBST(EXP_CONFIG_SHELL)
-@@ -1206,4 +1209,5 @@
- AC_SUBST(SETUID)
- AC_SUBST(UNSHARED_RANLIB)
- AC_SUBST(DEFAULT_STTY_ARGS)
-+AC_SUBST(INSTALL_SCRIPT)
- AC_OUTPUT(Makefile pkgIndex)
diff --git a/japanese/expect/files/patch-ac b/japanese/expect/files/patch-ac
deleted file mode 100644
index 3c336da..0000000
--- a/japanese/expect/files/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- fixcat.ORIG	Fri Oct 17 10:08:26 1997
-+++ fixcat	Fri Oct 17 10:08:38 1997
-@@ -1,4 +1,4 @@
--#!expect --
-+#!expectjp --
- # Synopsis: fixcat
- # Author: Don Libes
- 
diff --git a/japanese/expect/files/patch-ad b/japanese/expect/files/patch-ad
deleted file mode 100644
index 06aa1f4..0000000
--- a/japanese/expect/files/patch-ad
+++ /dev/null
@@ -1,8 +0,0 @@
---- fixline1.ORIG	Fri Oct 17 10:10:12 1997
-+++ fixline1	Fri Oct 17 10:10:41 1997
-@@ -1,4 +1,4 @@
--#!expect --
-+#!expectjp --
- # Synopsis: fixline1 newpath < input > output
- # Author: Don Libes
- 
diff --git a/japanese/expect/files/patch-ae b/japanese/expect/files/patch-ae
deleted file mode 100644
index e2803e3..0000000
--- a/japanese/expect/files/patch-ae
+++ /dev/null
@@ -1,8 +0,0 @@
---- pkgIndex.in.ORIG	Wed Jul  8 09:44:14 1998
-+++ pkgIndex.in	Wed Jul  8 09:49:02 1998
-@@ -7,4 +7,4 @@
- # script is sourced, the variable $dir must contain the
- # full path name of this file's directory.
- 
--package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
-+package ifneeded Expect @EXP_VERSION_PKG@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
diff --git a/japanese/expect/files/patch-af b/japanese/expect/files/patch-af
deleted file mode 100644
index 9e228b4..0000000
--- a/japanese/expect/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.ORIG	Tue Jul 21 09:53:21 1998
-+++ aclocal.m4	Tue Jul 21 09:55:25 1998
-@@ -149,7 +149,7 @@
-     # this hack is cause the TCLHDIR won't print if there is a "-I" in it.
-     TCLHDIR="${ac_cv_c_tclh}"
-     TCLHDIRDASHI="-I${ac_cv_c_tclh}"
--    TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`library
-+    TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/include/lib/' | sed -e s/generic//'`
-   fi
- fi
- 
diff --git a/japanese/expect/pkg-descr b/japanese/expect/pkg-descr
deleted file mode 100644
index 751627f..0000000
--- a/japanese/expect/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Expect is a program that performs programmed dialogue with other
-interactive programs.  It is briefly described by its man page, expect(1).
-
-This version is based on Japanized Tcl/Tk, so it has 'kanji' command.
-
-It uses pseudo-tty's to control the child processes, so it is not affected
-by programs that refuse to read from stdin or pipes. (eg: passwd(1) etc).
-
-WWW: http://expect.nist.gov/
-FAQ: http://expect.nist.gov/FAQ.html
diff --git a/japanese/expect/pkg-plist b/japanese/expect/pkg-plist
deleted file mode 100644
index ce37519..0000000
--- a/japanese/expect/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/expectjp
-bin/expectkjp
-bin/autoexpect-jp
-bin/autopasswd-jp
-bin/cryptdir-jp
-bin/decryptdir-jp
-bin/dislocate-jp
-bin/ftp-rfc-jp
-bin/kibitz-jp
-bin/lpunlock-jp
-bin/mkpasswd-jp
-bin/passmass-jp
-bin/rftp-jp
-bin/rlogin-cwd-jp
-bin/timed-read-jp
-bin/timed-run-jp
-bin/tknewsbiff-jp
-bin/tkpasswd-jp
-bin/unbuffer-jp
-bin/weather-jp
-bin/xkibitz-jp
-bin/xpstat-jp
-include/expect5.30jp/tclRegexp.h
-include/expect5.30jp/expect.h
-include/expect5.30jp/expect_comm.h
-include/expect5.30jp/expect_tcl.h
-include/expect5.30jp/tcldbg.h
-@dirrm include/expect5.30jp
-lib/expect5.30jp/pkgIndex.tcl
-@dirrm lib/expect5.30jp
-lib/libexpect530jp.a
-lib/libexpect530jp.so.1
-lib/libexpect530jp.so
diff --git a/lang/Makefile b/lang/Makefile
index ef8995d..0b28b5c 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -257,7 +257,6 @@
     SUBDIR += plt-scheme
     SUBDIR += pnet
     SUBDIR += pnet-base
-    SUBDIR += pnetc
     SUBDIR += pnetlib
     SUBDIR += polyml
     SUBDIR += ptoc
diff --git a/lang/pnetc/Makefile b/lang/pnetc/Makefile
deleted file mode 100644
index 8ff83b4..0000000
--- a/lang/pnetc/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Ports collection makefile for:  treecc
-# Date created:			  Wed Jul 11 00:45:15 EDT 2001
-# Whom:				  Michael Johnson <ahze@ahze.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	pnetC
-PORTVERSION=	${PNET_VERSION}
-PORTREVISION=	1
-CATEGORIES=	lang
-MASTER_SITES=	${PNET_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${PNET_MASTER_SITE_SUBDIR}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	ANSI-compatible C library for pnet's cscc compiler
-
-BUILD_DEPENDS=	cscc:${PORTSDIR}/lang/pnet-base \
-		${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
-RUN_DEPENDS=	${LOCALBASE}/lib/cscc/lib/libXsharpSupport.so.0:${PORTSDIR}/lang/pnetlib
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 5 months
-EXPIRATION_DATE=2010-01-08
-
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
-.include "${.CURDIR}/../pnet/Makefile.pnet"
-.include <bsd.port.mk>
diff --git a/lang/pnetc/distinfo b/lang/pnetc/distinfo
deleted file mode 100644
index 61842c0..0000000
--- a/lang/pnetc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pnetC-0.7.4.tar.gz) = 9aacffc4e11b8f6ad1ed425c794bb01a
-SHA256 (pnetC-0.7.4.tar.gz) = c7b1afa122572977fa5220b9340a4670f08944a264bb4463b35e8ba21d72acae
-SIZE (pnetC-0.7.4.tar.gz) = 373882
diff --git a/lang/pnetc/pkg-descr b/lang/pnetc/pkg-descr
deleted file mode 100644
index 22c932b..0000000
--- a/lang/pnetc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This is the "pnetC" project.  The goal of the project is to create
-an ANSI-compatible C library, that can be compiled down to IL using
-Portable.NET's "cscc" compiler.
-
-WWW: http://www.southern-storm.com.au/portable_net.html
diff --git a/lang/pnetc/pkg-plist b/lang/pnetc/pkg-plist
deleted file mode 100644
index ce28763..0000000
--- a/lang/pnetc/pkg-plist
+++ /dev/null
@@ -1,131 +0,0 @@
-lib/cscc/lib/2.0.0.0/libc.dll
-lib/cscc/lib/2.0.0.0/libm.dll
-lib/cscc/lib/2.0.0.0/libpthread.dll
-lib/cscc/lib/libc.dll
-lib/cscc/lib/libm.dll
-lib/cscc/lib/libpthread.dll
-share/cscc/include/alloca.h
-share/cscc/include/arpa/inet.h
-share/cscc/include/arpa/nameser.h
-share/cscc/include/assembly/Accessibility.h
-share/cscc/include/assembly/Commons.Xml.Relaxng.h
-share/cscc/include/assembly/Custommarshalers.h
-share/cscc/include/assembly/DotGNU.Images.h
-share/cscc/include/assembly/DotGNU.SSL.h
-share/cscc/include/assembly/DotGNU.Terminal.h
-share/cscc/include/assembly/ICSharpCode.SharpZipLib.h
-share/cscc/include/assembly/ISymWrapper.h
-share/cscc/include/assembly/Microsoft.JScript.h
-share/cscc/include/assembly/Microsoft.VisualBasic.h
-share/cscc/include/assembly/Microsoft.VisualC.h
-share/cscc/include/assembly/Microsoft.Vsa.h
-share/cscc/include/assembly/Microsoft.Web.Services.h
-share/cscc/include/assembly/OpenSystem.C.h
-share/cscc/include/assembly/OpenSystem.Platform.h
-share/cscc/include/assembly/PEAPI.h
-share/cscc/include/assembly/System.Configuration.Install.h
-share/cscc/include/assembly/System.Data.ObjectSpaces.h
-share/cscc/include/assembly/System.Data.OracleClient.h
-share/cscc/include/assembly/System.Data.SqlXml.h
-share/cscc/include/assembly/System.Data.h
-share/cscc/include/assembly/System.Design.h
-share/cscc/include/assembly/System.DirectoryServices.h
-share/cscc/include/assembly/System.Drawing.Design.h
-share/cscc/include/assembly/System.Drawing.h
-share/cscc/include/assembly/System.EnterpriseServices.h
-share/cscc/include/assembly/System.Management.h
-share/cscc/include/assembly/System.Messaging.h
-share/cscc/include/assembly/System.Net.IrDA.h
-share/cscc/include/assembly/System.Runtime.Remoting.h
-share/cscc/include/assembly/System.Runtime.Serialization.Formatters.Soap.h
-share/cscc/include/assembly/System.Security.h
-share/cscc/include/assembly/System.ServiceProcess.h
-share/cscc/include/assembly/System.Web.Mobile.h
-share/cscc/include/assembly/System.Web.Services.h
-share/cscc/include/assembly/System.Web.h
-share/cscc/include/assembly/System.Windows.Forms.h
-share/cscc/include/assembly/System.Xml.h
-share/cscc/include/assembly/System.h
-share/cscc/include/assembly/Xsharp.h
-share/cscc/include/assembly/cscompmgd.h
-share/cscc/include/assembly/mscorlib.h
-share/cscc/include/assert.h
-share/cscc/include/bits/in.h
-share/cscc/include/bits/libc-lock.h
-share/cscc/include/bits/local_lim.h
-share/cscc/include/bits/mman.h
-share/cscc/include/bits/netdb.h
-share/cscc/include/bits/posix1_lim.h
-share/cscc/include/bits/posix2_lim.h
-share/cscc/include/bits/sockaddr.h
-share/cscc/include/bits/socket.h
-share/cscc/include/bits/stat.h
-share/cscc/include/bits/stdio_lim.h
-share/cscc/include/bits/types.h
-share/cscc/include/bits/uio.h
-share/cscc/include/bits/waitflags.h
-share/cscc/include/bits/waitstatus.h
-share/cscc/include/bits/wchar.h
-share/cscc/include/bits/wordsize.h
-share/cscc/include/bits/xopen_lim.h
-share/cscc/include/csharp.h
-share/cscc/include/ctype.h
-share/cscc/include/dirent.h
-share/cscc/include/errno.h
-share/cscc/include/fcntl.h
-share/cscc/include/features.h
-share/cscc/include/gmp-mparam.h
-share/cscc/include/gmp.h
-share/cscc/include/gnu/stubs.h
-share/cscc/include/grp.h
-share/cscc/include/ieee754.h
-share/cscc/include/inttypes.h
-share/cscc/include/langinfo.h
-share/cscc/include/limits.h
-share/cscc/include/locale.h
-share/cscc/include/malloc.h
-share/cscc/include/math.h
-share/cscc/include/netdb.h
-share/cscc/include/netinet/in.h
-share/cscc/include/pthread.h
-share/cscc/include/pwd.h
-share/cscc/include/semaphore.h
-share/cscc/include/setjmp.h
-share/cscc/include/signal.h
-share/cscc/include/stdarg.h
-share/cscc/include/stdbool.h
-share/cscc/include/stddef.h
-share/cscc/include/stdint.h
-share/cscc/include/stdio.h
-share/cscc/include/stdio_ext.h
-share/cscc/include/stdlib.h
-share/cscc/include/string.h
-share/cscc/include/strings.h
-share/cscc/include/sys/cdefs.h
-share/cscc/include/sys/errno.h
-share/cscc/include/sys/mman.h
-share/cscc/include/sys/param.h
-share/cscc/include/sys/select.h
-share/cscc/include/sys/socket.h
-share/cscc/include/sys/stat.h
-share/cscc/include/sys/sysmacros.h
-share/cscc/include/sys/time.h
-share/cscc/include/sys/types.h
-share/cscc/include/sys/uio.h
-share/cscc/include/time.h
-share/cscc/include/unistd.h
-share/cscc/include/varargs.h
-share/cscc/include/wchar.h
-share/cscc/include/wctype.h
-share/cscc/include/xlocale.h
-@dirrmtry share/cscc/include/sys
-@dirrmtry share/cscc/include/netinet
-@dirrmtry share/cscc/include/gnu
-@dirrmtry share/cscc/include/bits
-@dirrmtry share/cscc/include/assembly
-@dirrmtry share/cscc/include/arpa
-@dirrmtry share/cscc/include
-@dirrmtry share/cscc
-@dirrmtry lib/cscc/lib/2.0.0.0
-@dirrmtry lib/cscc/lib
-@dirrmtry lib/cscc
diff --git a/mail/Makefile b/mail/Makefile
index 0aa8d31..0e6439a 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -216,7 +216,6 @@
     SUBDIR += libesmtp
     SUBDIR += libetpan
     SUBDIR += libmapi
-    SUBDIR += libnewmail
     SUBDIR += libpst
     SUBDIR += librfc822
     SUBDIR += libsieve
diff --git a/mail/libnewmail/Makefile b/mail/libnewmail/Makefile
deleted file mode 100644
index 859145f..0000000
--- a/mail/libnewmail/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:  		libnewmail
-# Date created:        				05.06.2003
-# Whom:               				Kirill Ponomarew <ponomarew@oberon.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libnewmail
-PORTVERSION=	0.3
-PORTREVISION=	16
-CATEGORIES=	mail
-MASTER_SITES=	http://0pointer.de/lennart/projects/libnewmail/ \
-		http://www.stud.uni-hamburg.de/~lennart/projects/libnewmail/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Generic mail checking library
-
-LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls \
-		oop.4:${PORTSDIR}/devel/liboop
-
-BROKEN=		does not configure
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_AUTOTOOLS=	libltdl:22 libtool:22
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--disable-doxygen --disable-lynx
-
-DOC_FILES=	README \
-		README.html \
-		doxygen.conf
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-	's|#include <wait.h>|#include <sys/wait.h>|g' \
-		${WRKSRC}/src/imap.c
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCSDIR}
-.endfor
-	@${CP} -R ${WRKSRC}/doc/reference/html/ ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/mail/libnewmail/distinfo b/mail/libnewmail/distinfo
deleted file mode 100644
index fa4d42b..0000000
--- a/mail/libnewmail/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libnewmail-0.3.tar.gz) = ff4359627069d5a3ad2b614354dc886f
-SHA256 (libnewmail-0.3.tar.gz) = 821e00585334e8e0676579b1bae61a38e98472b1012cb34dab2ff2e10df1ee57
-SIZE (libnewmail-0.3.tar.gz) = 378431
diff --git a/mail/libnewmail/files/patch-configure b/mail/libnewmail/files/patch-configure
deleted file mode 100644
index 84fc566..0000000
--- a/mail/libnewmail/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sun Jul  6 11:12:57 2003
-+++ configure	Sun Jul  6 11:13:10 2003
-@@ -7844,6 +7844,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/mail/libnewmail/pkg-descr b/mail/libnewmail/pkg-descr
deleted file mode 100644
index dab3e53..0000000
--- a/mail/libnewmail/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-libnewmail is a generic mail checking library for Unix/Linux
-and other operating systems. It supports a simple API, an
-extensible plugin architecture and asynchronous queries among
-other features. Applications linking to libnewmail may enumerate
-configured mailboxes, query mail box information and status and
-request a mail spool auto-detection for users without any
-libnewmail specific configuration. The library offers a clean
-API to implement your own mail checking plugins.
-
-WWW: http://0pointer.de/lennart/projects/libnewmail/
diff --git a/mail/libnewmail/pkg-plist b/mail/libnewmail/pkg-plist
deleted file mode 100644
index 61598fc..0000000
--- a/mail/libnewmail/pkg-plist
+++ /dev/null
@@ -1,73 +0,0 @@
-bin/nm-spoolhack
-bin/nmail
-bin/nmail-async
-include/libnewmail/config.h
-include/libnewmail/module.h
-include/libnewmail/newmail.h
-include/libnewmail/util.h
-lib/libnewmail.a
-lib/libnewmail.la
-lib/libnewmail.so
-lib/libnewmail.so.0
-lib/libnewmail/libimap.a
-lib/libnewmail/libimap.la
-lib/libnewmail/libimap.so
-lib/libnewmail/libimap.so.0
-lib/libnewmail/libmaildir.a
-lib/libnewmail/libmaildir.la
-lib/libnewmail/libmaildir.so
-lib/libnewmail/libmaildir.so.0
-lib/libnewmail/libpop3.a
-lib/libnewmail/libpop3.la
-lib/libnewmail/libpop3.so
-lib/libnewmail/libpop3.so.0
-lib/libnewmail/libunix.a
-lib/libnewmail/libunix.la
-lib/libnewmail/libunix.so
-lib/libnewmail/libunix.so.0
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.conf
-%%PORTDOCS%%%%DOCSDIR%%/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/config_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/config_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/easy_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%/examples.html
-%%PORTDOCS%%%%DOCSDIR%%/files.html
-%%PORTDOCS%%%%DOCSDIR%%/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2doc.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2folderclosed.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2folderopen.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2lastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2link.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2mlastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2plastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2pnode.png
-%%PORTDOCS%%%%DOCSDIR%%/ftv2vertline.png
-%%PORTDOCS%%%%DOCSDIR%%/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/main.html
-%%PORTDOCS%%%%DOCSDIR%%/module_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/module_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/newmail_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/newmail_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/nm-spoolhack_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%/nmail-async_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%/nmail_8c-example.html
-%%PORTDOCS%%%%DOCSDIR%%/structconfig__t.html
-%%PORTDOCS%%%%DOCSDIR%%/structnm__info.html
-%%PORTDOCS%%%%DOCSDIR%%/structnm__spool.html
-%%PORTDOCS%%%%DOCSDIR%%/structnm__status.html
-%%PORTDOCS%%%%DOCSDIR%%/tree.html
-%%PORTDOCS%%%%DOCSDIR%%/tree.js
-%%PORTDOCS%%%%DOCSDIR%%/treeview.js
-%%PORTDOCS%%%%DOCSDIR%%/util_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/util_8h.html
-@dirrm include/libnewmail
-@dirrm lib/libnewmail
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index ee61060..107787a 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -68,7 +68,6 @@
     SUBDIR += flow-tools
     SUBDIR += flow-tools-ng
     SUBDIR += flowd
-    SUBDIR += flowscan
     SUBDIR += flowviewer
     SUBDIR += fprobe
     SUBDIR += fruity
diff --git a/net-mgmt/flowscan/Makefile b/net-mgmt/flowscan/Makefile
deleted file mode 100644
index d0c8a94..0000000
--- a/net-mgmt/flowscan/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# New ports collection makefile for:    flowscan
-# Date created:         Di  13 M�r 2001 08:23:55 CET
-# Whom:                 andreas@freebsd.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	flowscan
-PORTVERSION=	1.006
-PORTREVISION=	9
-CATEGORIES=	net-mgmt
-MASTER_SITES=	http://net.doit.wisc.edu/~plonka/FlowScan/
-DISTFILES=	FlowScan-${PORTVERSION}.tar.gz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Processes IP flows recorded in cflowd-format raw flow files
-
-BUILD_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh \
-		rrdtool:${PORTSDIR}/databases/rrdtool \
-		${LOCALBASE}/sbin/cflowd:${PORTSDIR}/net-mgmt/cflowd \
-		${SITE_PERL}/Boulder/Stream.pm:${PORTSDIR}/converters/p5-Boulder \
-		${SITE_PERL}/ConfigReader/DirectiveStyle.pm:${PORTSDIR}/devel/p5-ConfigReader \
-		${SITE_PERL}/HTML/Table.pm:${PORTSDIR}/www/p5-HTML-Table \
-		${SITE_PERL}/${PERL_ARCH}/Cflow.pm:${PORTSDIR}/net-mgmt/p5-Cflow \
-		${SITE_PERL}/${PERL_ARCH}/Net/Patricia.pm:${PORTSDIR}/net/p5-Net-Patricia
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 5 months
-EXPIRATION_DATE=2010-01-08
-
-CFLOWD_FLOWSCAN_PATCH=	yes
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX}/var/db/flows
-USE_PERL5=		yes
-WRKSRC=			${WRKDIR}/FlowScan-${PORTVERSION}
-
-pre-install:
-	@ ${MKDIR} ${PREFIX}/var/db/flows/bin
-	@ ${MKDIR} ${PREFIX}/var/db/flows/graphs
-
-post-install:
-	# sample startup script
-	@ ${INSTALL_SCRIPT} ${FILESDIR}/flowscan.sh \
-		 ${PREFIX}/etc/rc.d/cflowd-flowscan.sh.sample
-	# overwrite cflowd startup script, since we need some additional
-	# parameters !
-	@ ${INSTALL_SCRIPT} ${FILESDIR}/cflowd.sh \
-		${PREFIX}/etc/rc.d/cflowd-base.sh.sample
-	# sample Makefile to generate graphs
-	@ ${INSTALL_DATA} ${WRKSRC}/graphs.mf \
-		${PREFIX}/var/db/flows/graphs/Makefile.sample
-	# sample config files
-.for i in	CampusIO.cf Napster_subnets.boulder SubNetIO.cf flowscan.cf \
-		local_nets.boulder our_subnets.boulder
-	@ ${INSTALL_DATA} ${WRKSRC}/cf/${i} \
-		${PREFIX}/var/db/flows/bin/${i}.sample
-.endfor
-	# important docu files
-	@ ${MKDIR} ${PREFIX}/share/doc/flowscan
-	@ ${INSTALL_DATA} ${WRKSRC}/example/crontab \
-		${PREFIX}/share/doc/flowscan/crontab.sample
-	@ ${INSTALL_DATA} ${WRKSRC}/rc/linux/cflowd \
-		${PREFIX}/share/doc/flowscan/cflowd.sample
-	@ ${INSTALL_DATA} ${WRKSRC}/rc/linux/flowscan \
-		${PREFIX}/share/doc/flowscan/flowscan.sample
-	@ ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/flowscan
-	# less important docu files
-.if !defined(NOPORTDOCS)
-	@ ${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-.for i in	README README.html INSTALL.html TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/flowscan
-.endfor
-.endif
-	# info
-	@ ${CAT} ${.CURDIR}/pkg-message
-
-.include <bsd.port.mk>
diff --git a/net-mgmt/flowscan/distinfo b/net-mgmt/flowscan/distinfo
deleted file mode 100644
index 321d0ea..0000000
--- a/net-mgmt/flowscan/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (FlowScan-1.006.tar.gz) = 3c687ae0ffab82dadeb4086f122bcee5
-SHA256 (FlowScan-1.006.tar.gz) = 279562cef77ae0b51f49d115309277f360516d15eae6802cd2182cee17154e44
-SIZE (FlowScan-1.006.tar.gz) = 149514
diff --git a/net-mgmt/flowscan/files/cflowd.sh b/net-mgmt/flowscan/files/cflowd.sh
deleted file mode 100644
index ae9b46a..0000000
--- a/net-mgmt/flowscan/files/cflowd.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-# rc script for cflowd
-# modified to use proper commandline options for flowscan
-# Andreas Klemm <andreas@FreeBSD.org>, So  25 M�r 2001 12:46:10 CEST
-# $FreeBSD$
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-'start')
-	[ -x $PREFIX/sbin/cflowdmux -a -s $PREFIX/etc/cflowd.conf ] \
-	&& $PREFIX/sbin/cflowdmux $PREFIX/etc/cflowd.conf \
-	&& echo -n " cflowdmux"
-	sleep 2
-	[ -x $PREFIX/sbin/cflowd -a -s $PREFIX/etc/cflowd.conf ] \
-	&& $PREFIX/sbin/cflowd -s 300 -O 0 -m $PREFIX/etc/cflowd.conf \
-	&& echo -n " cflowd"
-	sleep 2
-	[ -x $PREFIX/sbin/cfdcollect -a -s $PREFIX/etc/cfdcollect.conf ] \
-	&& $PREFIX/sbin/cfdcollect $PREFIX/etc/cfdcollect.conf \
-	&& echo -n " cfdcollect"
-	;;
- 
-'stop')
-	for i in cfdcollect cflowd cflowdmux
-	do
-		sleep 2
-		killall -15 $i && echo "graceful shutdown of $i"
-	done
-	;;
-esac
-
-exit 0
diff --git a/net-mgmt/flowscan/files/flowscan.sh b/net-mgmt/flowscan/files/flowscan.sh
deleted file mode 100644
index 08e88d0..0000000
--- a/net-mgmt/flowscan/files/flowscan.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-
-# rc script for flowscan
-# Andreas Klemm <andreas@FreeBSD.org>, So  25 M�r 2001 12:46:10 CEST
-# $FreeBSD$
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-awk=/usr/bin/awk
-bindir=$PREFIX/var/db/flows/bin
-grep=/usr/bin/grep
-kill=/bin/kill
-logfile=$PREFIX/var/db/flows/flowscan.log
-perl=/usr/bin/perl
-scandir=$PREFIX/var/db/flows
-
-case "$1" in
-'start')
-	[ -x $bindir/flowscan ] \
-	&& ( cd $scandir \
-	&& $perl $bindir/flowscan \
-		>> $logfile 2>&1 </dev/null \
-		> /dev/null & ) \
-	&& echo -n " flowscan"
-	;;
- 
-'stop')
-	pid=`ps -ax | $grep "$perl $bindir/flowscan" | $awk '{ print $1 }'`
-	if [ -n "$pid" ]; then
-		echo "killing flowscan"
-		$kill $pid
-	fi
-	;;
-esac
-
-exit 0
diff --git a/net-mgmt/flowscan/pkg-descr b/net-mgmt/flowscan/pkg-descr
deleted file mode 100644
index a45b99b..0000000
--- a/net-mgmt/flowscan/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-FlowScan is a tool to monitor and graph flow information from 
-Cisco, Juniper and Riverstone routers in near real-time. 
-
-Amonst many other things, FlowScan can measure and graph traffic
-for applications such as Napster.
-
-A sample of what FlowScan can do is at: http://wwwstats.net.wisc.edu
-
-WWW: http://net.doit.wisc.edu/~plonka/FlowScan/
diff --git a/net-mgmt/flowscan/pkg-message b/net-mgmt/flowscan/pkg-message
deleted file mode 100644
index f7709b2..0000000
--- a/net-mgmt/flowscan/pkg-message
+++ /dev/null
@@ -1,35 +0,0 @@
-This is not an "easy" port. You have to take many things into consideration,
-what flow data to collect (disk space, etc), how and when to remove unneeded
-flow files. And you have to know, what it is all about. If you don't know 
-Cisco NetFlow switching and its data export feature, then I recommend you
-to deinstall this port.
-
-Prerequisites:
-A) You need to read the installation instructions closely, see:
-	${PREFIX}/share/doc/flowscan/INSTALL
-
-B) You need to configure your Cisco Router, to enable Netflow Switching
-   and Netflow data export (version 5 flow export format).
-
-PLEASE NOTE, YOU HAVE TO KNOW EXACTLY, IF YOU REALLY WANT TO ENABLE NETFLOW
-SWITCHING ON YOUR CISCO CORE OR DISTRIBUTION ROUTERS, WHAT PERFORMANCE IMPACT
-MIGHT BE INVOLVED WHEN DOING THIS, WITH THE GOAL, NOT TO LOOSE YOUR ROUTING/
-SWITCHING PERFORMANCE. BE WARNED !!!
-
-C) You need to configure SNMP on your Cisco Router.
-
-Post-installation tasks involve:
-a)	Configure cflowd properly for your needs, see above mentioned docu !
-	Example files reside in ${PREFIX}/etc, files:
-		cflowd.conf.example and cfdcollect.conf
-b)	Configure flowscan, see above mentioned docu !
-	Example files reside in ${PREFIX}/var/db/flows/bin, files:
-		"foo".sample ...
-c)	Customize and install crontab file, example see:
-		${PREFIX}/share/doc/flowscan/crontab.sample
-d)	Activate flowscan startscript by renaming it as usual, see example in:
-		${PREFIX}/etc/rc.d/flowscan.sh.sample
-e)	Create graphs using make by customizing the sample Makefile, see docu !
-		${PREFIX}/var/db/flows/graphs/Makefile.sample
-	Please note, that the Makefile has to be reconfigured if you add
-	or remove protocols in ${PREFIX}/var/db/flows/bin/CampusIO.cf !
diff --git a/net-mgmt/flowscan/pkg-plist b/net-mgmt/flowscan/pkg-plist
deleted file mode 100644
index e1d25fd..0000000
--- a/net-mgmt/flowscan/pkg-plist
+++ /dev/null
@@ -1,31 +0,0 @@
-etc/rc.d/cflowd-flowscan.sh.sample
-var/db/flows/bin/flowscan
-var/db/flows/bin/FlowScan.pm
-var/db/flows/bin/CampusIO.pm
-var/db/flows/bin/SubNetIO.pm
-var/db/flows/bin/locker
-var/db/flows/bin/add_ds.pl
-var/db/flows/bin/add_txrx
-var/db/flows/bin/event2vrule
-var/db/flows/bin/ip2hostname
-var/db/flows/bin/CampusIO.cf.sample
-var/db/flows/bin/Napster_subnets.boulder.sample
-var/db/flows/bin/SubNetIO.cf.sample
-var/db/flows/bin/flowscan.cf.sample
-var/db/flows/bin/local_nets.boulder.sample
-var/db/flows/bin/our_subnets.boulder.sample
-var/db/flows/graphs/Makefile.sample
-%%PORTDOCS%%share/doc/flowscan/README
-%%PORTDOCS%%share/doc/flowscan/README.html
-%%PORTDOCS%%share/doc/flowscan/INSTALL.html
-%%PORTDOCS%%share/doc/flowscan/TODO
-share/doc/flowscan/crontab.sample
-share/doc/flowscan/cflowd.sample
-share/doc/flowscan/flowscan.sample
-share/doc/flowscan/INSTALL
-@dirrm var/db/flows/graphs
-@dirrm var/db/flows/bin
-@dirrm var/db/flows
-@dirrmtry var/db
-@dirrmtry var
-@dirrm share/doc/flowscan
diff --git a/net/Makefile b/net/Makefile
index 6a4f989..14b3e91 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -38,7 +38,6 @@
     SUBDIR += asterisk16
     SUBDIR += asterisk16-addons
     SUBDIR += astfax
-    SUBDIR += astmanproxy
     SUBDIR += atmsupport
     SUBDIR += avahi
     SUBDIR += avahi-app
diff --git a/net/astmanproxy/Makefile b/net/astmanproxy/Makefile
deleted file mode 100644
index d51fa0f..0000000
--- a/net/astmanproxy/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for:	astmanproxy
-# Date created:		1 November 2007
-# Whom:			ditesh@gathani.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	astmanproxy
-PORTVERSION=	1.21
-PORTREVISION=	6
-CATEGORIES=	net
-MASTER_SITES=	http://www.popvox.com/
-DISTFILES=	astmanproxy-latest.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A multi-threaded proxy server for Asterisk
-
-RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
-
-BROKEN=		does not fetch
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_OPENSSL=	yes
-USE_GMAKE=	yes
-
-ALL_TARGET=	astmanproxy
-
-post-patch:
-	${REINPLACE_CMD} -e 's|^CONFDIR:.*|CONFDIR := ${PREFIX}/etc/asterisk|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|^CONFDIR_REAL.*|CONFDIR_REAL := ${PREFIX}/etc/asterisk|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|^PERMDIR:.*|PERMDIR:= ${PREFIX}/etc/asterisk|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|^PERMDIR_REAL.*|PERMDIR_REAL := ${PREFIX}/etc/asterisk|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|^LIBDIR.*|LIBDIR := ${PREFIX}/lib/asterisk|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|^BINDIR.*|BINDIR := ${PREFIX}/sbin|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|MKTEMP=.*|MKTEMP=/usr/bin/mktemp|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|LOGDIR=/var/log/asterisk|LOGDIR=/var/log|' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|-ldl ||' ${WRKSRC}/Makefile
-
-pre-install:
-	@${MKDIR} ${PREFIX}/etc/asterisk
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/configs/astmanproxy.conf ${PREFIX}/etc/asterisk/astmanproxy.conf.sample
-	@[ -f ${PREFIX}/etc/asterisk/astmanproxy.conf ] || \
-	 ${INSTALL_DATA} ${WRKSRC}/configs/astmanproxy.conf ${PREFIX}/etc/asterisk/astmanproxy.conf
-	@${INSTALL_DATA} ${WRKSRC}/configs/astmanproxy.users ${PREFIX}/etc/asterisk/astmanproxy.users.sample
-	@[ -f ${PREFIX}/etc/asterisk/astmanproxy.users ] || \
-	 ${INSTALL_DATA} ${WRKSRC}/configs/astmanproxy.users ${PREFIX}/etc/asterisk/astmanproxy.users
-	@${INSTALL_DATA} ${WRKSRC}/configs/ssl.conf ${PREFIX}/etc/asterisk/proxy-ssl.conf.sample
-	@[ -f ${PREFIX}/etc/asterisk/proxy-ssl.conf ] || \
-	 ${INSTALL_DATA} ${WRKSRC}/configs/ssl.conf ${PREFIX}/etc/asterisk/proxy-ssl.conf
-
-.include <bsd.port.mk>
diff --git a/net/astmanproxy/distinfo b/net/astmanproxy/distinfo
deleted file mode 100644
index 5221762..0000000
--- a/net/astmanproxy/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (astmanproxy-latest.tgz) = d1b018bd5446514cd8bd1c337b98069f
-SHA256 (astmanproxy-latest.tgz) = d909dc57eb949700e620439f64dd95c183a3c654abd3ac37fba67966486b8e7e
-SIZE (astmanproxy-latest.tgz) = 56081
diff --git a/net/astmanproxy/pkg-descr b/net/astmanproxy/pkg-descr
deleted file mode 100644
index a3c9898..0000000
--- a/net/astmanproxy/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-AstManProxy is a multi-threaded proxy server for Asterisk written in
-C/P-threads. It is designed to handle communication with multiple
-Asterisk servers. It also acts as a single point of contact for
-applications. AstManProxy supports multiple input/output formats,
-including Standard, XML, CSV, and HTTP, HTTPS and SSL.
-
-WWW:		http://www.popvox.com/astmanproxy/
diff --git a/net/astmanproxy/pkg-plist b/net/astmanproxy/pkg-plist
deleted file mode 100644
index 538d45a..0000000
--- a/net/astmanproxy/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-@unexec if cmp -s %%PREFIX%%/etc/asterisk/astmanproxy.conf %%PREFIX%%/etc/asterisk/astmanproxy.conf.sample; then rm %%PREFIX%%/etc/asterisk/astmanproxy.conf; fi
-@unexec if cmp -s %%PREFIX%%/etc/asterisk/astmanproxy.users %%PREFIX%%/etc/asterisk/astmanproxy.users.sample; then rm %%PREFIX%%/etc/asterisk/astmanproxy.users; fi
-@unexec if cmp -s %%PREFIX%%/etc/asterisk/proxy-ssl.conf %%PREFIX%%/etc/asterisk/proxy-ssl.conf.sample; then rm %%PREFIX%%/etc/asterisk/proxy-ssl.conf; fi
-etc/asterisk/astmanproxy.conf.sample
-etc/asterisk/astmanproxy.users.sample
-etc/asterisk/proxy-ssl.conf.sample
-lib/asterisk/modules/csv.so
-lib/asterisk/modules/http.so
-lib/asterisk/modules/standard.so
-lib/asterisk/modules/xml.so
-sbin/astmanproxy
-@dirrmtry lib/asterisk/modules
-@dirrmtry lib/asterisk
-@dirrmtry etc/asterisk
diff --git a/palm/Makefile b/palm/Makefile
index 5da4da8..8cbe180 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -29,7 +29,6 @@
     SUBDIR += plucker
     SUBDIR += pose
     SUBDIR += ppmtoTbmp
-    SUBDIR += prc-tools
     SUBDIR += py-synce-librapi2
     SUBDIR += py-synce-librra
     SUBDIR += romeo
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
deleted file mode 100644
index 2c80536..0000000
--- a/palm/prc-tools/Makefile
+++ /dev/null
@@ -1,149 +0,0 @@
-# New ports collection makefile for:	Palm OS PRC-tools
-# Date created:		Mar 22 2000
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	prc-tools
-PORTVERSION=	2.3
-PORTREVISION=	5
-CATEGORIES=	palm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/prc-tools/:S/$/:prc/} \
-		${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	binutils/releases \
-		gcc/releases/gcc-2.95.3 gdb/old-releases gcc/releases/gcc-3.3.1
-DISTNAME=	prc-tools-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.gz:prc \
-		binutils-2.14.tar.bz2 gdb-5.3.tar.bz2 gcc-2.95.3.tar.bz2 \
-		gcc-3.3.1.tar.bz2
-EXTRACT_ONLY=	binutils-2.14.tar.bz2 gdb-5.3.tar.bz2 gcc-2.95.3.tar.bz2 \
-		gcc-3.3.1.tar.bz2
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Collection of tools supporting C and C++ programming for Palm OS
-
-# it is unknown whether it could actually be made to work elsewhere,
-# but right now it does not.
-ONLY_FOR_ARCHS=	i386
-BROKEN=		does not build
-DEPRECATED=	has been broken for 4 months
-EXPIRATION_DATE=2010-01-08
-
-USE_AUTOTOOLS=	autoconf:262:env
-USE_BZIP2=	YES
-USE_BISON=	build
-USE_GMAKE=	YES
-WRKSRC=		${WRKDIR}/build
-HAS_CONFIGURE=	YES
-CONFIGURE_SCRIPT=	../prc-tools-${PORTVERSION}/configure
-CONFIGURE_ARGS=	--enable-targets=m68k-palmos,arm-palmos \
-		--enable-languages=c,c++ \
-		--sharedstatedir=${LOCALBASE}/palmdev --prefix=${PREFIX}/pilot \
-		--with-headers=${WRKSRC}/empty --disable-nls
-CONFIGURE_ENV=	PATH=${PATH}:${PREFIX}/pilot/bin
-MAKE_ENV=	PATH=${PATH}:${PREFIX}/pilot/bin
-
-MANPREFIX=	${PREFIX}/pilot
-MAN1=		cccp.1 m68k-palmos-g++.1 m68k-palmos-gcc.1 \
-		m68k-palmos-addr2line.1 m68k-palmos-ar.1 \
-		m68k-palmos-as.1 m68k-palmos-c++filt.1 \
-		m68k-palmos-ld.1 m68k-palmos-nlmconv.1 \
-		m68k-palmos-nm.1 m68k-palmos-objcopy.1 \
-		m68k-palmos-objdump.1 m68k-palmos-ranlib.1 \
-		m68k-palmos-size.1 m68k-palmos-strings.1 \
-		m68k-palmos-strip.1 m68k-palmos-dlltool.1 \
-		m68k-palmos-readelf.1 m68k-palmos-windres.1 \
-		m68k-palmos-gdb.1 build-prc.1 palmdev-prep.1 \
-		arm-palmos-addr2line.1 arm-palmos-ar.1 \
-		arm-palmos-as.1 arm-palmos-c++filt.1 \
-		arm-palmos-dlltool.1 arm-palmos-g++.1 \
-		arm-palmos-gcc.1 arm-palmos-ld.1 \
-		arm-palmos-nlmconv.1 arm-palmos-nm.1 \
-		arm-palmos-objcopy.1 arm-palmos-objdump.1 \
-		arm-palmos-ranlib.1 arm-palmos-readelf.1 \
-		arm-palmos-size.1 arm-palmos-strings.1 \
-		arm-palmos-strip.1 arm-palmos-windres.1 \
-		cpp.1 gcov.1
-MAN7=		fsf-funding.7 gfdl.7 gpl.7
-
-CFLAGS:=	${CFLAGS:C/-m[-=0-9a-z]*//g}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800000
-BROKEN=		does not configure
-.endif
-
-post-extract:
-	@(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}.tar.gz ${EXTRACT_AFTER_ARGS})
-
-pre-patch:
-	${MKDIR} ${WRKSRC}/empty
-
-post-patch:
-	@(cd ${WRKDIR} && \
-	 ${CAT}	prc-tools-${PORTVERSION}/binutils-2.14.palmos.diff \
-		prc-tools-${PORTVERSION}/gdb-5.3.palmos.diff \
-		prc-tools-${PORTVERSION}/gcc-2.95.3.palmos.diff \
-		prc-tools-${PORTVERSION}/gcc-3.3.1.palmos.diff | ${PATCH} -p0)
-	@${MV} ${WRKDIR}/gcc-2.95.3/gcc/config/i386/freebsd.h ${WRKDIR}/gcc-2.95.3/gcc/config/i386/freebsd-aout.h
-	@${MV} ${WRKDIR}/gcc-2.95.3/gcc/config/i386/freebsd-elf.h ${WRKDIR}/gcc-2.95.3/gcc/config/i386/freebsd.h
-	@${MV} ${WRKDIR}/gcc-2.95.3/libstdc++/stl/stl_bvector.h \
-		${WRKDIR}/gcc-2.95.3/libstdc++/stl/stl_bvector.h.orig
-	@${SED} -e "s,_WORD_BIT,_WORD_BIT_GCC295,g" \
-		< ${WRKDIR}/gcc-2.95.3/libstdc++/stl/stl_bvector.h.orig \
-		> ${WRKDIR}/gcc-2.95.3/libstdc++/stl/stl_bvector.h
-	@(cd ${WRKDIR}/gcc-2.95.3; \
-	 PATCHES_APPLIED="" ; \
-	 for i in ${PORTSDIR}/lang/gcc295/files/patch-*; do \
-		if ${PATCH} -p0 --forward --quiet -E < $$i; then \
-			PATCHES_APPLIED="$$PATCHES_APPLIED $$i"; \
-		else \
-			${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly."` ; \
-		fi; \
-	 done)
-	@(cd ${WRKDIR}/gcc-3.3.1; \
-	 PATCHES_APPLIED="" ; \
-	 for i in ${PORTSDIR}/lang/gcc33/files/patch-*; do \
-		if ${PATCH} -p0 --forward --quiet -E < $$i; then \
-			PATCHES_APPLIED="$$PATCHES_APPLIED $$i"; \
-		else \
-			${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly."` ; \
-		fi; \
-	 done)
-	@cd ${WRKDIR}/gcc-2.95.3 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc-strerror.c
-	@cd ${WRKDIR}/gcc-3.3.1 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc-Makefile.in
-	@cd ${WRKDIR}/binutils-2.14 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-binutils-configure
-	@cd ${WRKDIR}/gcc-3.3.1 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc3-configure.in
-	@cd ${WRKDIR}/gcc-2.95.3 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gcc2-configure.in
-	@cd ${WRKDIR}/gdb-5.3 && ${PATCH} -p0 --forward --quiet -E < ${FILESDIR}/post-patch-gdb-configure.in
-.if ${OSVERSION} >= 700042
-	@(cd ${WRKDIR}; \
-	 	PATCHES_APPLIED="" ; \
-		${ECHO_MSG} `${ECHO_CMD} ">>> OSVERSION=${OSVERSION}, applying gcc-42 patches."`; \
-		for i in ${FILESDIR}/gcc42-patch-*; do \
-		if ${PATCH} -p0 --forward --quiet -E < $$i; then \
-			PATCHES_APPLIED="$$PATCHES_APPLIED $$i"; \
-		else \
-			${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly."` ; \
-		fi; \
-	 	done)
-.endif
-
-pre-configure:
-	(cd ${WRKDIR}/prc-tools-${PORTVERSION} && \
-	 ${LN} -sf ../binutils-2.14 binutils; \
-	 ${LN} -sf ../gdb-5.3 gdb; \
-	 ${LN} -sf ../gcc-2.95.3 gcc295; \
-	 ${LN} -sf ../gcc-3.3.1 gcc; )
-
-post-configure:
-	${RM} ${WRKDIR}/gdb-5.3/bfd/doc/bfd.info*
-	${RM} ${WRKDIR}/binutils-2.14/bfd/doc/bfd.info*
-
-post-install:
-	${RM} ${PREFIX}/pilot/bin/m68k-palmos-c++filt
-	${RM} ${PREFIX}/pilot/lib/libiberty.a
-
-.include <bsd.port.post.mk>
diff --git a/palm/prc-tools/distinfo b/palm/prc-tools/distinfo
deleted file mode 100644
index c1ecdd6..0000000
--- a/palm/prc-tools/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 (prc-tools-2.3.tar.gz) = 038a42a71a984fee6f906abc85a032ec
-SHA256 (prc-tools-2.3.tar.gz) = 9ae076efc71eb693815cbd8177826d75bd958fef53fb5c9968511a1b2081a173
-SIZE (prc-tools-2.3.tar.gz) = 333417
-MD5 (binutils-2.14.tar.bz2) = 2da8def15d28af3ec6af0982709ae90a
-SHA256 (binutils-2.14.tar.bz2) = e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59
-SIZE (binutils-2.14.tar.bz2) = 10921504
-MD5 (gdb-5.3.tar.bz2) = 70e4ade69a2dff2c7b9af9a4ef44798f
-SHA256 (gdb-5.3.tar.bz2) = 6e559a98636a1a5d92fd8df31161ed9307eca2234ae2d783dd8c84f500cddb6c
-SIZE (gdb-5.3.tar.bz2) = 11198721
-MD5 (gcc-2.95.3.tar.bz2) = 87ee083a830683e2aaa57463940a0c3c
-SHA256 (gcc-2.95.3.tar.bz2) = cf91a6b4f41248895f06bcd0570a62d2417ee99d32e6e2c5f70490e0eb6af5e4
-SIZE (gcc-2.95.3.tar.bz2) = 9848842
-MD5 (gcc-3.3.1.tar.bz2) = 1135a104e9fa36fdf7c663598fab5c40
-SHA256 (gcc-3.3.1.tar.bz2) = e6c498d1d310de2f4e5834def91603229e089ad814ac47c8ed6dd6c191b46f35
-SIZE (gcc-3.3.1.tar.bz2) = 23544362
diff --git a/palm/prc-tools/files/gcc42-patch-binutils-2.14_gas_as.h b/palm/prc-tools/files/gcc42-patch-binutils-2.14_gas_as.h
deleted file mode 100644
index e098a7d..0000000
--- a/palm/prc-tools/files/gcc42-patch-binutils-2.14_gas_as.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- binutils-2.14/gas/as.h.ORIG	2007-10-17 11:36:16.000000000 -0400
-+++ binutils-2.14/gas/as.h	2007-10-17 11:44:10.000000000 -0400
-@@ -595,7 +595,19 @@
- struct expressionS;
- struct fix;
- typedef struct symbol symbolS;
--struct relax_type;
-+struct relax_type
-+{
-+  /* Forward reach. Signed number. > 0.  */
-+  long rlx_forward;
-+  /* Backward reach. Signed number. < 0.  */
-+  long rlx_backward;
-+ 
-+  /* Bytes length of this address.  */
-+  unsigned char rlx_length;
-+ 
-+  /* Next longer relax-state.  0 means there is no 'next' relax-state.  */
-+  relax_substateT rlx_more;
-+};
- typedef struct frag fragS;
- 
- #ifdef BFD_ASSEMBLER
diff --git a/palm/prc-tools/files/gcc42-patch-binutils-2.14_gas_tc.h b/palm/prc-tools/files/gcc42-patch-binutils-2.14_gas_tc.h
deleted file mode 100644
index 6401242..0000000
--- a/palm/prc-tools/files/gcc42-patch-binutils-2.14_gas_tc.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- binutils-2.14/gas/tc.h.ORIG	2007-10-17 11:36:37.000000000 -0400
-+++ binutils-2.14/gas/tc.h	2007-10-17 11:37:19.000000000 -0400
-@@ -24,23 +24,6 @@
- 
- extern const pseudo_typeS md_pseudo_table[];
- 
--/* JF moved this here from as.h under the theory that nobody except MACHINE.c
--   and write.c care about it anyway.  */
--
--struct relax_type
--{
--  /* Forward reach. Signed number. > 0.  */
--  long rlx_forward;
--  /* Backward reach. Signed number. < 0.  */
--  long rlx_backward;
--
--  /* Bytes length of this address.  */
--  unsigned char rlx_length;
--
--  /* Next longer relax-state.  0 means there is no 'next' relax-state.  */
--  relax_substateT rlx_more;
--};
--
- typedef struct relax_type relax_typeS;
- 
- extern const int md_reloc_size;	/* Size of a relocation record */
diff --git a/palm/prc-tools/files/gcc42-patch-gcc-3.3.1_gcc_cp_decl.c b/palm/prc-tools/files/gcc42-patch-gcc-3.3.1_gcc_cp_decl.c
deleted file mode 100644
index a1ebea1..0000000
--- a/palm/prc-tools/files/gcc42-patch-gcc-3.3.1_gcc_cp_decl.c
+++ /dev/null
@@ -1,104 +0,0 @@
---- gcc-3.3.1/gcc/cp/decl.c.ORIG	2007-10-17 11:39:05.000000000 -0400
-+++ gcc-3.3.1/gcc/cp/decl.c	2007-10-17 11:26:47.000000000 -0400
-@@ -677,6 +677,13 @@
-    ? cp_function_chain->bindings		\
-    : scope_chain->bindings)
- 
-+#define set_current_binding_level(x)            \
-+{                                               \
-+  if(cfun && cp_function_chain->bindings)       \
-+     cp_function_chain->bindings = (x);         \
-+     else scope_chain->bindings = (x);          \
-+}
-+
- /* The binding level of the current class, if any.  */
- 
- #define class_binding_level scope_chain->class_bindings
-@@ -724,7 +731,7 @@
-      are active.  */
-   memset ((char*) newlevel, 0, sizeof (struct cp_binding_level));
-   newlevel->level_chain = current_binding_level;
--  current_binding_level = newlevel;
-+  set_current_binding_level(newlevel);
-   newlevel->tag_transparent = tag_transparent;
-   newlevel->more_cleanups_ok = 1;
- 
-@@ -780,7 +787,7 @@
-     }
-   {
-     register struct cp_binding_level *level = current_binding_level;
--    current_binding_level = current_binding_level->level_chain;
-+    set_current_binding_level(current_binding_level->level_chain);
-     level->level_chain = free_binding_level;
-     if (level->parm_flag != 2)
-       binding_table_free (level->type_decls);
-@@ -797,7 +804,7 @@
- suspend_binding_level ()
- {
-   if (class_binding_level)
--    current_binding_level = class_binding_level;
-+    set_current_binding_level(class_binding_level);
- 
-   if (NAMESPACE_LEVEL (global_namespace))
-     my_friendly_assert (!global_scope_p (current_binding_level), 20030527);
-@@ -816,7 +823,7 @@
-         }
-       is_class_level = 0;
-     }
--  current_binding_level = current_binding_level->level_chain;
-+  set_current_binding_level(current_binding_level->level_chain);
-   find_class_binding_level ();
- }
- 
-@@ -829,7 +836,7 @@
-   my_friendly_assert(!class_binding_level, 386);
-   /* Also, resuming a non-directly nested namespace is a no-no.  */
-   my_friendly_assert(b->level_chain == current_binding_level, 386);
--  current_binding_level = b;
-+  set_current_binding_level(b);
-   if (ENABLE_SCOPE_CHECKING)
-     {
-       b->binding_depth = binding_depth;
-@@ -4529,9 +4536,9 @@
-   else
-     {
-       b = current_binding_level;
--      current_binding_level = level;
-+      set_current_binding_level(level);
-       x = pushdecl (x);
--      current_binding_level = b;
-+      set_current_binding_level(b);
-     }
-   current_function_decl = function_decl;
-   POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, x);
-@@ -6933,7 +6940,7 @@
-   current_lang_name = lang_name_c;
- 
-   current_function_decl = NULL_TREE;
--  current_binding_level = NULL_BINDING_LEVEL;
-+  set_current_binding_level(NULL_BINDING_LEVEL);
-   free_binding_level = NULL_BINDING_LEVEL;
- 
-   build_common_tree_nodes (flag_signed_char);
-@@ -10766,10 +10773,10 @@
-   if (decl_context == NORMAL && !toplevel_bindings_p ())
-     {
-       struct cp_binding_level *b = current_binding_level;
--      current_binding_level = b->level_chain;
-+      set_current_binding_level(b->level_chain);
-       if (current_binding_level != 0 && toplevel_bindings_p ())
- 	decl_context = PARM;
--      current_binding_level = b;
-+      set_current_binding_level(b);
-     }
- 
-   if (name == NULL)
-@@ -14406,7 +14413,7 @@
-      FIXME factor out the non-RTL stuff.  */
-   bl = current_binding_level;
-   init_function_start (decl1, input_filename, lineno);
--  current_binding_level = bl;
-+  set_current_binding_level(bl);
- 
-   /* Even though we're inside a function body, we still don't want to
-      call expand_expr to calculate the size of a variable-sized array.
diff --git a/palm/prc-tools/files/gcc42-patch-gcc-3.3.1_include_obstack.h b/palm/prc-tools/files/gcc42-patch-gcc-3.3.1_include_obstack.h
deleted file mode 100644
index 6bd3fba..0000000
--- a/palm/prc-tools/files/gcc42-patch-gcc-3.3.1_include_obstack.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc-3.3.1/include/obstack.h.ORIG	2007-10-17 11:39:14.000000000 -0400
-+++ gcc-3.3.1/include/obstack.h	2007-10-17 09:44:47.000000000 -0400
-@@ -349,7 +349,7 @@
- 
- #define obstack_memory_used(h) _obstack_memory_used (h)
- 
--#if defined __GNUC__ && defined __STDC__ && __STDC__
-+#if defined USE_OBSTACK_MACROS && defined __GNUC__ && defined __STDC__ && __STDC__
- /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
-    does not implement __extension__.  But that compiler doesn't define
-    __GNUC_MINOR__.  */
diff --git a/palm/prc-tools/files/gcc42-patch-gdb-5.3_gdb_remote-palmos.c b/palm/prc-tools/files/gcc42-patch-gdb-5.3_gdb_remote-palmos.c
deleted file mode 100644
index dfb911c..0000000
--- a/palm/prc-tools/files/gcc42-patch-gdb-5.3_gdb_remote-palmos.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- gdb-5.3/gdb/remote-palmos.c.ORIG	2007-10-17 11:46:12.000000000 -0400
-+++ gdb-5.3/gdb/remote-palmos.c	2007-10-17 11:46:44.000000000 -0400
-@@ -128,13 +128,6 @@
- 
- extern struct target_ops palmos_ops, pilot_ops;	/* Forward decl */
- 
--/* This was 5 seconds, which is a long time to sit and wait.
--   Unless this is going though some terminal server or multiplexer or
--   other form of hairy serial connection, I would think 2 seconds would
--   be plenty.  */
--
--static int remote_timeout = 2;
--
- static CORE_ADDR text_addr=0, data_addr=0, bss_addr=0;
- static CORE_ADDR save_ssp, save_usp;
- static enum target_signal wbreakpoint_signo;
diff --git a/palm/prc-tools/files/gcc42-patch-gdb-5.3_include_obstack.h b/palm/prc-tools/files/gcc42-patch-gdb-5.3_include_obstack.h
deleted file mode 100644
index fdceae6..0000000
--- a/palm/prc-tools/files/gcc42-patch-gdb-5.3_include_obstack.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdb-5.3/include/obstack.h.ORIG	2007-10-17 11:39:24.000000000 -0400
-+++ gdb-5.3/include/obstack.h	2007-10-17 11:30:02.000000000 -0400
-@@ -349,7 +349,7 @@
- 
- #define obstack_memory_used(h) _obstack_memory_used (h)
- 
--#if defined __GNUC__ && defined __STDC__ && __STDC__
-+#if defined USE_OBSTACK_MACROS && defined __GNUC__ && defined __STDC__ && __STDC__
- /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
-    does not implement __extension__.  But that compiler doesn't define
-    __GNUC_MINOR__.  */
diff --git a/palm/prc-tools/files/patch-gdb-strsignal.c b/palm/prc-tools/files/patch-gdb-strsignal.c
deleted file mode 100644
index 9c2bbfe..0000000
--- a/palm/prc-tools/files/patch-gdb-strsignal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../gdb-5.3/libiberty/strsignal.c.orig	Mon May  3 07:28:54 1999
-+++ ../gdb-5.3/libiberty/strsignal.c	Mon May  5 14:27:35 2003
-@@ -244,7 +244,7 @@
- #else
- 
- #ifdef NSIG
--static int sys_nsig = NSIG;
-+static const int sys_nsig = NSIG;
- #else
- #ifdef _NSIG
- static int sys_nsig = _NSIG;
diff --git a/palm/prc-tools/files/post-patch-binutils-configure b/palm/prc-tools/files/post-patch-binutils-configure
deleted file mode 100644
index bb278d5..0000000
--- a/palm/prc-tools/files/post-patch-binutils-configure
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.org	Tue Oct 11 22:43:01 2005
-+++ configure	Tue Oct 11 22:43:25 2005
-@@ -1609,30 +1609,30 @@
- set fnord ${copy_dirs}
- shift
- while test $# != 0 ; do
--  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
--    :
--  else
--    echo Copying $1 to $2
--
--    # Use the install script to create the directory and all required
--    # parent directories.
--    if test -d $2 ; then
--      :
--    else
--      echo >config.temp
--      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
--    fi
--
--    # Copy the directory, assuming we have tar.
--    # FIXME: Should we use B in the second tar?  Not all systems support it.
--    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
--
--    # It is the responsibility of the user to correctly adjust all
--    # symlinks.  If somebody can figure out how to handle them correctly
--    # here, feel free to add the code.
--
--    echo $1 > $2/COPIED
--  fi
-+#  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
-+#    :
-+#  else
-+#    echo Copying $1 to $2
-+#
-+#    # Use the install script to create the directory and all required
-+#    # parent directories.
-+#    if test -d $2 ; then
-+#      :
-+#    else
-+#      echo >config.temp
-+#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-+#    fi
-+#
-+#    # Copy the directory, assuming we have tar.
-+#    # FIXME: Should we use B in the second tar?  Not all systems support it.
-+#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-+#
-+#    # It is the responsibility of the user to correctly adjust all
-+#    # symlinks.  If somebody can figure out how to handle them correctly
-+#    # here, feel free to add the code.
-+#
-+#    echo $1 > $2/COPIED
-+#  fi
-   shift; shift
- done
- 
diff --git a/palm/prc-tools/files/post-patch-gcc-Makefile.in b/palm/prc-tools/files/post-patch-gcc-Makefile.in
deleted file mode 100644
index d499e41..0000000
--- a/palm/prc-tools/files/post-patch-gcc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gcc/Makefile.in.orig	Sat Feb  7 10:51:36 2004
-+++ gcc/Makefile.in	Sat Feb  7 10:50:59 2004
-@@ -659,7 +659,7 @@
- # -I$(@D) and -I$(srcdir)/$(@D) cause the subdirectory of the file
- # currently being compiled, in both source trees, to be examined as well.
- INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
--	   -I$(srcdir)/config -I$(srcdir)/../include
-+	   -I$(srcdir)/config -I$(srcdir)/../include -I/usr/include
- 
- # Always use -I$(srcdir)/config when compiling.
- .c.o:
diff --git a/palm/prc-tools/files/post-patch-gcc-strerror.c b/palm/prc-tools/files/post-patch-gcc-strerror.c
deleted file mode 100644
index 6f1cf7a..0000000
--- a/palm/prc-tools/files/post-patch-gcc-strerror.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libiberty/strerror.c.orig2	Fri Feb  6 19:04:47 2004
-+++ libiberty/strerror.c	Fri Feb  6 19:04:54 2004
-@@ -13,7 +13,6 @@
-    incompatible with our later declaration, perhaps by using const
-    attributes.  So we hide the declaration in errno.h (if any) using a
-    macro. */
--#define sys_nerr sys_nerr__
- #define sys_errlist sys_errlist__
- #endif
- 
-@@ -21,7 +20,6 @@
- #include <errno.h>
- 
- #ifdef HAVE_SYS_ERRLIST
--#undef sys_nerr
- #undef sys_errlist
- #endif
- 
diff --git a/palm/prc-tools/files/post-patch-gcc2-configure.in b/palm/prc-tools/files/post-patch-gcc2-configure.in
deleted file mode 100644
index 7272207..0000000
--- a/palm/prc-tools/files/post-patch-gcc2-configure.in
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in.org	Tue Oct 11 22:27:59 2005
-+++ configure.in	Tue Oct 11 21:33:54 2005
-@@ -474,30 +474,30 @@
- set fnord ${copy_dirs}
- shift
- while [ $# != 0 ]; do
--  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
--    :
--  else
--    echo Copying $1 to $2
--
--    # Use the install script to create the directory and all required
--    # parent directories.
--    if [ -d $2 ]; then
--      :
--    else
--      echo >config.temp
--      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
--    fi
--
--    # Copy the directory, assuming we have tar.
--    # FIXME: Should we use B in the second tar?  Not all systems support it.
--    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
--
--    # It is the responsibility of the user to correctly adjust all
--    # symlinks.  If somebody can figure out how to handle them correctly
--    # here, feel free to add the code.
--
--    echo $1 > $2/COPIED
--  fi
-+#  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
-+#    :
-+#  else
-+#    echo Copying $1 to $2
-+#
-+#    # Use the install script to create the directory and all required
-+#    # parent directories.
-+#    if [ -d $2 ]; then
-+#      :
-+#    else
-+#      echo >config.temp
-+#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-+#    fi
-+#
-+#    # Copy the directory, assuming we have tar.
-+#    # FIXME: Should we use B in the second tar?  Not all systems support it.
-+#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-+#
-+#    # It is the responsibility of the user to correctly adjust all
-+#    # symlinks.  If somebody can figure out how to handle them correctly
-+#    # here, feel free to add the code.
-+#
-+#    echo $1 > $2/COPIED
-+#  fi
-   shift; shift
- done
- 
diff --git a/palm/prc-tools/files/post-patch-gcc3-configure.in b/palm/prc-tools/files/post-patch-gcc3-configure.in
deleted file mode 100644
index 6e4bdf7..0000000
--- a/palm/prc-tools/files/post-patch-gcc3-configure.in
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in.orig	Fri Jun 27 21:44:14 2003
-+++ configure.in	Tue Oct 11 21:52:15 2005
-@@ -906,30 +909,30 @@
- set fnord ${copy_dirs}
- shift
- while test $# != 0 ; do
--  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
--    :
--  else
--    echo Copying $1 to $2
--
--    # Use the install script to create the directory and all required
--    # parent directories.
--    if test -d $2 ; then
--      :
--    else
--      echo >config.temp
--      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
--    fi
--
--    # Copy the directory, assuming we have tar.
--    # FIXME: Should we use B in the second tar?  Not all systems support it.
--    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
--
--    # It is the responsibility of the user to correctly adjust all
--    # symlinks.  If somebody can figure out how to handle them correctly
--    # here, feel free to add the code.
--
--    echo $1 > $2/COPIED
--  fi
-+#  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
-+#    :
-+#  else
-+#    echo Copying $1 to $2
-+#
-+#    # Use the install script to create the directory and all required
-+#    # parent directories.
-+#    if test -d $2 ; then
-+#      :
-+#    else
-+#      echo >config.temp
-+#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-+#    fi
-+#
-+#    # Copy the directory, assuming we have tar.
-+#    # FIXME: Should we use B in the second tar?  Not all systems support it.
-+#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-+#
-+#    # It is the responsibility of the user to correctly adjust all
-+#    # symlinks.  If somebody can figure out how to handle them correctly
-+#    # here, feel free to add the code.
-+#
-+#    echo $1 > $2/COPIED
-+#  fi
-   shift; shift
- done
- 
diff --git a/palm/prc-tools/files/post-patch-gdb-configure.in b/palm/prc-tools/files/post-patch-gdb-configure.in
deleted file mode 100644
index d9f58c7..0000000
--- a/palm/prc-tools/files/post-patch-gdb-configure.in
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in.org	Tue Oct 11 22:25:56 2005
-+++ configure.in	Tue Oct 11 21:44:36 2005
-@@ -912,30 +912,30 @@
- set fnord ${copy_dirs}
- shift
- while test $# != 0 ; do
--  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
--    :
--  else
--    echo Copying $1 to $2
--
--    # Use the install script to create the directory and all required
--    # parent directories.
--    if test -d $2 ; then
--      :
--    else
--      echo >config.temp
--      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
--    fi
--
--    # Copy the directory, assuming we have tar.
--    # FIXME: Should we use B in the second tar?  Not all systems support it.
--    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
--
--    # It is the responsibility of the user to correctly adjust all
--    # symlinks.  If somebody can figure out how to handle them correctly
--    # here, feel free to add the code.
--
--    echo $1 > $2/COPIED
--  fi
-+#  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
-+#    :
-+#  else
-+#    echo Copying $1 to $2
-+#
-+#    # Use the install script to create the directory and all required
-+#    # parent directories.
-+#    if test -d $2 ; then
-+#      :
-+#    else
-+#      echo >config.temp
-+#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-+#    fi
-+#
-+#    # Copy the directory, assuming we have tar.
-+#    # FIXME: Should we use B in the second tar?  Not all systems support it.
-+#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-+#
-+#    # It is the responsibility of the user to correctly adjust all
-+#    # symlinks.  If somebody can figure out how to handle them correctly
-+#    # here, feel free to add the code.
-+#
-+#    echo $1 > $2/COPIED
-+#  fi
-   shift; shift
- done
- 
diff --git a/palm/prc-tools/pkg-descr b/palm/prc-tools/pkg-descr
deleted file mode 100644
index 3877f3c..0000000
--- a/palm/prc-tools/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-The prc-tools package is a collection of tools supporting C and 
-C++ programming for Palm OS. It consists of:
-
-- the GNU Compiler Collection, assembler, linker, and symbolic
-  debugger;
-- modifications to these generic tools to support functionality
-  peculiar to Palm OS;
-- tools for dealing with .prc files, Palm OS's version of
-  executable applications;
-- conveniently packaged documentation for all of the above.
-
-WWW: http://prc-tools.sourceforge.net/
diff --git a/palm/prc-tools/pkg-plist b/palm/prc-tools/pkg-plist
deleted file mode 100644
index 12d0cf0..0000000
--- a/palm/prc-tools/pkg-plist
+++ /dev/null
@@ -1,283 +0,0 @@
-pilot/arm-palmos/bin/ar
-pilot/arm-palmos/bin/as
-pilot/arm-palmos/bin/c++
-pilot/arm-palmos/bin/g++
-pilot/arm-palmos/bin/gcc
-pilot/arm-palmos/bin/ld
-pilot/arm-palmos/bin/nm
-pilot/arm-palmos/bin/ranlib
-pilot/arm-palmos/bin/strip
-pilot/arm-palmos/include/errno.h
-pilot/arm-palmos/include/malloc.h
-pilot/arm-palmos/include/setjmp.h
-pilot/arm-palmos/include/stdio.h
-pilot/arm-palmos/include/sys/types.h
-pilot/arm-palmos/lib/ldscripts/armelf.x
-pilot/arm-palmos/lib/ldscripts/armelf.xbn
-pilot/arm-palmos/lib/ldscripts/armelf.xc
-pilot/arm-palmos/lib/ldscripts/armelf.xn
-pilot/arm-palmos/lib/ldscripts/armelf.xr
-pilot/arm-palmos/lib/ldscripts/armelf.xs
-pilot/arm-palmos/lib/ldscripts/armelf.xsc
-pilot/arm-palmos/lib/ldscripts/armelf.xu
-pilot/arm-palmos/lib/ldscripts/armpalmos.x
-pilot/arm-palmos/lib/ldscripts/armpalmos.xbn
-pilot/arm-palmos/lib/ldscripts/armpalmos.xc
-pilot/arm-palmos/lib/ldscripts/armpalmos.xn
-pilot/arm-palmos/lib/ldscripts/armpalmos.xr
-pilot/arm-palmos/lib/ldscripts/armpalmos.xu
-pilot/arm-palmos/lib/libc.a
-pilot/arm-palmos/lib/libstdc++.a
-pilot/bin/arm-palmos-addr2line
-pilot/bin/arm-palmos-ar
-pilot/bin/arm-palmos-as
-pilot/bin/arm-palmos-c++
-pilot/bin/arm-palmos-c++filt
-pilot/bin/arm-palmos-cpp
-pilot/bin/arm-palmos-g++
-pilot/bin/arm-palmos-gcc
-pilot/bin/arm-palmos-gcc-3.3.1
-pilot/bin/arm-palmos-gccbug
-pilot/bin/arm-palmos-gcov
-pilot/bin/arm-palmos-ld
-pilot/bin/arm-palmos-nm
-pilot/bin/arm-palmos-objcopy
-pilot/bin/arm-palmos-objdump
-pilot/bin/arm-palmos-ranlib
-pilot/bin/arm-palmos-readelf
-pilot/bin/arm-palmos-size
-pilot/bin/arm-palmos-strings
-pilot/bin/arm-palmos-strip
-pilot/bin/build-prc
-pilot/bin/m68k-palmos-addr2line
-pilot/bin/m68k-palmos-ar
-pilot/bin/m68k-palmos-as
-pilot/bin/m68k-palmos-c++
-pilot/bin/m68k-palmos-cpp
-pilot/bin/m68k-palmos-g++
-pilot/bin/m68k-palmos-gcc
-pilot/bin/m68k-palmos-gdb
-pilot/bin/m68k-palmos-ld
-pilot/bin/m68k-palmos-multigen
-pilot/bin/m68k-palmos-nm
-pilot/bin/m68k-palmos-obj-res
-pilot/bin/m68k-palmos-objcopy
-pilot/bin/m68k-palmos-objdump
-pilot/bin/m68k-palmos-ranlib
-pilot/bin/m68k-palmos-readelf
-pilot/bin/m68k-palmos-size
-pilot/bin/m68k-palmos-strings
-pilot/bin/m68k-palmos-strip
-pilot/bin/m68k-palmos-stubgen
-pilot/bin/m68k-palmos-trapfilt
-pilot/bin/palmdev-prep
-pilot/info/as.info
-pilot/info/bfd.info
-pilot/info/bfd.info-1
-pilot/info/bfd.info-2
-pilot/info/binutils.info
-pilot/info/configure.info
-pilot/info/configure.info-1
-pilot/info/configure.info-2
-pilot/info/configure.info-3
-pilot/info/cpp.info
-pilot/info/cppinternals.info
-pilot/info/dir
-pilot/info/gcc.info
-pilot/info/gccint.info
-pilot/info/gdb.info
-pilot/info/gdb.info-1
-pilot/info/gdb.info-10
-pilot/info/gdb.info-11
-pilot/info/gdb.info-12
-pilot/info/gdb.info-13
-pilot/info/gdb.info-14
-pilot/info/gdb.info-15
-pilot/info/gdb.info-2
-pilot/info/gdb.info-3
-pilot/info/gdb.info-4
-pilot/info/gdb.info-5
-pilot/info/gdb.info-6
-pilot/info/gdb.info-7
-pilot/info/gdb.info-8
-pilot/info/gdb.info-9
-pilot/info/gdbint.info
-pilot/info/gdbint.info-1
-pilot/info/gdbint.info-2
-pilot/info/gdbint.info-3
-pilot/info/gdbint.info-4
-pilot/info/gdbint.info-5
-pilot/info/gdbint.info-6
-pilot/info/gdbint.info-7
-pilot/info/ld.info
-pilot/info/mmalloc.info
-pilot/info/prc-tools.info
-pilot/info/stabs.info
-pilot/info/stabs.info-1
-pilot/info/stabs.info-2
-pilot/info/stabs.info-3
-pilot/info/stabs.info-4
-pilot/info/standards.info
-pilot/lib/gcc-lib/arm-palmos/3.3.1/cc1
-pilot/lib/gcc-lib/arm-palmos/3.3.1/cc1plus
-pilot/lib/gcc-lib/arm-palmos/3.3.1/collect2
-pilot/lib/gcc-lib/arm-palmos/3.3.1/crtbegin.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/crtend.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/crti.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/crtn.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/README
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/float.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/iso646.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/limits.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stdarg.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stdbool.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/stddef.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/syslimits.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/unwind.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/include/varargs.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/fixinc.sh
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/fixincl
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/gsyslimits.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/README
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/float.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/iso646.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/limits.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stdarg.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stdbool.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/stddef.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/unwind.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include/varargs.h
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/mkheaders
-pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/mkheaders.conf
-pilot/lib/gcc-lib/arm-palmos/3.3.1/libgcc.a
-pilot/lib/gcc-lib/arm-palmos/3.3.1/specs
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtbegin.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtend.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crti.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/crtn.o
-pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb/libgcc.a
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cc1
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cc1plus
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/collect2
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/cpp0
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/README
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/exception
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/float.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/iso646.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/limits.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/math-68881.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/new
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/new.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/proto.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdarg.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stdbool.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/stddef.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/syslimits.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/typeinfo
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-alpha.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-arc.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-c4x.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-clipper.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-h8300.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-i860.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-i960.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-m32r.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-m88k.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mips.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mn10200.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-mn10300.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-pa.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-ppc.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-pyr.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-sh.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-sparc.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-spur.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/va-v850.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include/varargs.h
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/libgcc.a
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp/libgcc.a
-pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/specs
-pilot/lib/libmmalloc.a
-pilot/m68k-palmos/bin/ar
-pilot/m68k-palmos/bin/as
-pilot/m68k-palmos/bin/gcc
-pilot/m68k-palmos/bin/ld
-pilot/m68k-palmos/bin/nm
-pilot/m68k-palmos/bin/ranlib
-pilot/m68k-palmos/bin/strip
-pilot/m68k-palmos/include/errno.h
-pilot/m68k-palmos/include/malloc.h
-pilot/m68k-palmos/include/math.h
-pilot/m68k-palmos/include/mathf.h
-pilot/m68k-palmos/include/setjmp.h
-pilot/m68k-palmos/include/stdio.h
-pilot/m68k-palmos/include/stdlib.h
-pilot/m68k-palmos/include/sys/types.h
-pilot/m68k-palmos/lib/crt0.o
-pilot/m68k-palmos/lib/gdbstub.o
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.x
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xbn
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xn
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xr
-pilot/m68k-palmos/lib/ldscripts/m68kpalmos.xu
-pilot/m68k-palmos/lib/libc.a
-pilot/m68k-palmos/lib/libcrt.a
-pilot/m68k-palmos/lib/libg.a
-pilot/m68k-palmos/lib/libm.a
-pilot/m68k-palmos/lib/libmf.a
-pilot/m68k-palmos/lib/libnfm.a
-pilot/m68k-palmos/lib/libnoexcept.a
-pilot/m68k-palmos/lib/libstdc++.a
-pilot/m68k-palmos/lib/mown-gp/crt0.o
-pilot/m68k-palmos/lib/mown-gp/gdbstub.o
-pilot/m68k-palmos/lib/mown-gp/libc.a
-pilot/m68k-palmos/lib/mown-gp/libcrt.a
-pilot/m68k-palmos/lib/mown-gp/libg.a
-pilot/m68k-palmos/lib/mown-gp/scrt0.o
-pilot/m68k-palmos/lib/text_64k
-pilot/m68k-palmos/lib/text_64k_palmos3
-pilot/share/prc-tools/include/EntryPoints.h
-pilot/share/prc-tools/include/NewTypes.h
-pilot/share/prc-tools/include/PalmOS.h
-pilot/share/prc-tools/include/Pilot.h
-pilot/share/prc-tools/include/Standalone.h
-pilot/share/prc-tools/include/ctype.h
-pilot/share/prc-tools/include/stdint.h
-pilot/share/prc-tools/include/stdlib.h
-pilot/share/prc-tools/include/string.h
-@dirrm pilot/share/prc-tools/include
-@dirrm pilot/share/prc-tools
-@dirrm pilot/share
-@dirrm pilot/man/man7
-@dirrm pilot/man/man1
-@dirrm pilot/man
-@dirrm pilot/m68k-palmos/lib/mown-gp
-@dirrm pilot/m68k-palmos/lib/ldscripts
-@dirrm pilot/m68k-palmos/lib
-@dirrm pilot/m68k-palmos/include/sys
-@dirrm pilot/m68k-palmos/include
-@dirrm pilot/m68k-palmos/bin
-@dirrm pilot/m68k-palmos
-@dirrm pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/mown-gp
-@dirrm pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd/include
-@dirrm pilot/lib/gcc-lib/m68k-palmos/2.95.3-kgpd
-@dirrm pilot/lib/gcc-lib/m68k-palmos
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/thumb
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools/include
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/install-tools
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1/include
-@dirrm pilot/lib/gcc-lib/arm-palmos/3.3.1
-@dirrm pilot/lib/gcc-lib/arm-palmos
-@dirrm pilot/lib/gcc-lib
-@dirrm pilot/lib
-@dirrm pilot/info
-@exec mkdir -p %D/pilot/include
-@dirrm pilot/include
-@dirrm pilot/bin
-@dirrm pilot/arm-palmos/lib/ldscripts
-@dirrm pilot/arm-palmos/lib
-@dirrm pilot/arm-palmos/include/sys
-@dirrm pilot/arm-palmos/include
-@dirrm pilot/arm-palmos/bin
-@dirrm pilot/arm-palmos
-@dirrm pilot
diff --git a/print/Makefile b/print/Makefile
index 380de0d..c38e437 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -154,7 +154,6 @@
     SUBDIR += latex-keystroke
     SUBDIR += latex-logpap
     SUBDIR += latex-mathabx
-    SUBDIR += latex-msc
     SUBDIR += latex-pgf
     SUBDIR += latex-prettyref
     SUBDIR += latex-resume
diff --git a/print/latex-msc/Makefile b/print/latex-msc/Makefile
deleted file mode 100644
index 7c5dd0b..0000000
--- a/print/latex-msc/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# New ports collection makefile for:	latex-msc
-# Date created:		12 Jul 2004
-# Whom:		sg-sendpr@waset.de
-#
-# $FreeBSD$
-
-PORTNAME=	latex-msc
-PORTVERSION=	1.14
-PORTREVISION=	3
-CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
-		${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	macros/latex/contrib/msc
-DISTFILES=	${CLASS_FILES} ${PORTDOCS}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	LaTeX macro package for drawing Message Sequence Charts
-
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base
-RUN_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base
-
-BROKEN=		checksum mismatch
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-NO_SIZE=	yes # Most mirrors don't provide size-data
-
-NO_BUILD=	yes
-PLIST_SUB=	MKTEXLSR="${MKTEXLSR}" CLASSDIR=${CLASSDIR}
-
-TEXMFDIR=	share/texmf
-MKTEXLSR=	${LOCALBASE}/bin/mktexlsr ${PREFIX}/${TEXMFDIR}
-CLASSDIR=	${TEXMFDIR}/tex/latex/${PORTNAME:S/^latex-//}
-WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
-
-CLASS_FILES=	msc.sty
-PLIST_FILES=	%%CLASSDIR%%/msc.sty
-PLIST_DIRS=	%%CLASSDIR%%
-PORTDOCS=	README manual.tex refman.tex biblio.bib maintenance.tex
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-	cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} ${DISTFILES} ${WRKSRC}
-
-do-install:
-	${MKDIR} ${PREFIX}/${CLASSDIR}
-	${INSTALL_DATA} ${CLASS_FILES:S@^@${WRKSRC}/@} ${PREFIX}/${CLASSDIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
-.endif
-
-post-install:
-	@${MKTEXLSR}
-
-.include <bsd.port.mk>
diff --git a/print/latex-msc/distinfo b/print/latex-msc/distinfo
deleted file mode 100644
index 7419917..0000000
--- a/print/latex-msc/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 (latex-msc/msc.sty) = ab6f489a82fd3b803222053dfb6adab2
-SHA256 (latex-msc/msc.sty) = 00eca2b44d40c50a570d5acbf44c498adabb8ec6437cfefef73cec0a6971bd3c
-MD5 (latex-msc/README) = fb142ad07f3bbb9bef398794a6f7b4d7
-SHA256 (latex-msc/README) = a07c5b39fec036eb3195f53618a68268e7c6b0c241b48dad4639585aed3476ea
-MD5 (latex-msc/manual.tex) = 25419d706f68572739d1e6d124824d96
-SHA256 (latex-msc/manual.tex) = 129c49d35f19e212d53ffb3f77682d1c06ab9a3b56fb1a649f39e004bca5714f
-MD5 (latex-msc/refman.tex) = 1bc60ef55d23ebd9317af13fc742ba3b
-SHA256 (latex-msc/refman.tex) = 5378214c5689a8c3f65acafd295b8d0d8238e74db6df2c10ed8602a4eda95bea
-MD5 (latex-msc/biblio.bib) = a8388404d3deab9d4205ecd2eb65bfde
-SHA256 (latex-msc/biblio.bib) = 38cd939cd32a386c15b6c4a89ebada2a0b9d522ac68e5812761f3ffed06e549e
-MD5 (latex-msc/maintenance.tex) = 7e19640aae179bb92f655a2e181de3ae
-SHA256 (latex-msc/maintenance.tex) = 8b05f2735127889c3c084f9b0c7622769c3993f432ab876e4fb9a120899b346e
diff --git a/print/latex-msc/pkg-descr b/print/latex-msc/pkg-descr
deleted file mode 100644
index 9c156ae..0000000
--- a/print/latex-msc/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-A LaTeX macro package for drawing Message Sequence Charts by Victor Bos 
-and Sjouke Mauw.
-This package should be useful to all people that prepare their texts with
-LaTeX and want to easily draw MSCs in their texts. This is not an MSC editor. 
-It simply takes a textual description of an MSC and draws the corresponding 
-MSC. 
-
-The current version of the MSC macro package supports the full MSC2000 
-language.
-
-WWW: http://www.win.tue.nl/~sjouke/misc/mscpackage/index.html
diff --git a/print/latex-msc/pkg-plist b/print/latex-msc/pkg-plist
deleted file mode 100644
index 9b4cb1c..0000000
--- a/print/latex-msc/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $FreeBSD$
-@exec %%MKTEXLSR%%
-@unexec %%MKTEXLSR%%
diff --git a/science/Makefile b/science/Makefile
index 9386d67..746aada 100644
--- a/science/Makefile
+++ b/science/Makefile
@@ -138,7 +138,6 @@
     SUBDIR += vis5d+
     SUBDIR += vmd
     SUBDIR += x11iraf
-    SUBDIR += xloops-ginac
     SUBDIR += xmakemol
     SUBDIR += xmds
 
diff --git a/science/xloops-ginac/Makefile b/science/xloops-ginac/Makefile
deleted file mode 100644
index d2c946f..0000000
--- a/science/xloops-ginac/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:	xloops
-# Date created:			Oct 15, 2002
-# Whom:				ijliao
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xloops-ginac
-PORTVERSION=	0.1.3
-PORTREVISION=	9
-CATEGORIES=	science
-MASTER_SITES=	http://wwwthep.physik.uni-mainz.de/~xloops/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program calculating Feynman diagrams
-
-LIB_DEPENDS=	ginac-1.5.0:${PORTSDIR}/math/GiNaC
-
-BROKEN=		does not build with latest GiNaC version.
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_GNOME=	gnometarget
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	aclocal:110 autoheader:262 autoconf:262 automake:110 \
-		libtool:22
-ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	--add-missing
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
-CFLAGS+=	-fpermissive
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.am
-
-.include <bsd.port.mk>
diff --git a/science/xloops-ginac/distinfo b/science/xloops-ginac/distinfo
deleted file mode 100644
index 656368e..0000000
--- a/science/xloops-ginac/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xloops-ginac-0.1.3.tar.gz) = 20067ef5c2145892ac349937ffb96439
-SHA256 (xloops-ginac-0.1.3.tar.gz) = bf7d07aea80afbdd45a2df26a6b932fbdb214126add5a9c0a37cbcfdca386d34
-SIZE (xloops-ginac-0.1.3.tar.gz) = 257515
diff --git a/science/xloops-ginac/files/patch-configure.ac b/science/xloops-ginac/files/patch-configure.ac
deleted file mode 100644
index 3261ab7..0000000
--- a/science/xloops-ginac/files/patch-configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig	2001-11-08 23:18:49.000000000 +0900
-+++ configure.ac	2008-04-06 20:58:27.000000000 +0900
-@@ -72,8 +72,8 @@
-     ln -fs ${with_ginac}/ginsh/ginsh_parser.yy . \
-   )
- else
--  AM_PATH_GINAC([0.9.4], , AC_MSG_ERROR([need to have GiNaC installed]))
--  CPPFLAGS="$CPPFLAGS $GINACLIB_CPPFLAGS"
-+  PKG_CHECK_MODULES(GINACLIB, ginac >= 0.9.4, , AC_MSG_ERROR([need to have GiNaC installed]))
-+  CPPFLAGS="$CPPFLAGS $GINACLIB_CFLAGS"
-   LIBS="$LIBS $GINACLIB_LIBS"
- fi
- 
diff --git a/science/xloops-ginac/files/patch-ginsh_lexer.ll b/science/xloops-ginac/files/patch-ginsh_lexer.ll
deleted file mode 100644
index bd99bda..0000000
--- a/science/xloops-ginac/files/patch-ginsh_lexer.ll
+++ /dev/null
@@ -1,11 +0,0 @@
---- ginsh/ginsh_lexer.ll.orig	Tue Oct 15 17:19:57 2002
-+++ ginsh/ginsh_lexer.ll	Tue Oct 15 17:20:27 2002
-@@ -32,6 +32,8 @@
- #include "ginsh.h"
- #include "ginsh_parser.h"
- 
-+extern YYSTYPE yylval;
-+
- #define YY_INPUT(buf, result, max_size) (result = ginsh_input(buf, max_size))
- 
- // Table of all used symbols
diff --git a/science/xloops-ginac/files/patch-ginsh_parser.yy b/science/xloops-ginac/files/patch-ginsh_parser.yy
deleted file mode 100644
index e03f32c..0000000
--- a/science/xloops-ginac/files/patch-ginsh_parser.yy
+++ /dev/null
@@ -1,68 +0,0 @@
---- ginsh/ginsh_parser.yy.orig	2001-11-01 00:46:50.000000000 +0900
-+++ ginsh/ginsh_parser.yy	2008-04-09 21:35:18.000000000 +0900
-@@ -29,6 +29,7 @@
- %{
- #include "config.h"
- 
-+#include <sys/time.h>
- #include <sys/resource.h>
- 
- #if HAVE_UNISTD_H
-@@ -50,6 +51,12 @@
- static const char *orig_basic_word_break_characters;
- #endif
- 
-+#if (GINAC_RL_VERSION_MAJOR >= 5)
-+#define GINAC_RL_COMPLETER_CAST(a) const_cast<char *>((a))
-+#else
-+#define GINAC_RL_COMPLETER_CAST(a) (a)
-+#endif
-+
- // Expression stack for ", "" and """
- static void push(const ex &e);
- static ex exstack[3];
-@@ -625,7 +632,8 @@
- }
- 
- // All registered GiNaC functions
--void GiNaC::ginsh_get_ginac_functions(void)
-+namespace GiNaC {
-+void ginsh_get_ginac_functions(void)
- {
- 	vector<function_options>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
- 	unsigned serial = 0;
-@@ -635,6 +643,7 @@
- 		serial++;
- 	}
- }
-+}
- 
- 
- /*
-@@ -764,7 +773,7 @@
- 		// For shell commands, revert back to filename completion
- 		rl_completion_append_character = orig_completion_append_character;
- 		rl_basic_word_break_characters = orig_basic_word_break_characters;
--		rl_completer_word_break_characters = rl_basic_word_break_characters;
-+		rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(rl_basic_word_break_characters);
- #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
- 		return completion_matches(const_cast<char *>(text), (CPFunction *)filename_completion_function);
- #else
-@@ -774,7 +783,7 @@
- 		// Otherwise, complete function names
- 		rl_completion_append_character = '(';
- 		rl_basic_word_break_characters = " \t\n\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~";
--		rl_completer_word_break_characters = rl_basic_word_break_characters;
-+		rl_completer_word_break_characters = GINAC_RL_COMPLETER_CAST(rl_basic_word_break_characters);
- #if (GINAC_RL_VERSION_MAJOR < 4) || (GINAC_RL_VERSION_MAJOR == 4 && GINAC_RL_VERSION_MINOR < 2)
- 		return completion_matches(const_cast<char *>(text), (CPFunction *)fcn_generator);
- #else
-@@ -797,6 +806,8 @@
-  *  Main program
-  */
- 
-+int yyparse();
-+
- int main(int argc, char **argv)
- {
- 	// Print banner in interactive mode
diff --git a/science/xloops-ginac/pkg-descr b/science/xloops-ginac/pkg-descr
deleted file mode 100644
index f5061b1..0000000
--- a/science/xloops-ginac/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A Program Package calculating One- and Two-Loop Feynman Diagrams
-
-WWW: http://wwwthep.physik.uni-mainz.de/~xloops/
diff --git a/science/xloops-ginac/pkg-plist b/science/xloops-ginac/pkg-plist
deleted file mode 100644
index 4f1fbb1..0000000
--- a/science/xloops-ginac/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/ginsh-xloops
-include/xloops/oneloop.h
-include/xloops/po_redux.h
-include/xloops/r.h
-include/xloops/twoloop.h
-include/xloops/xloops.h
-@dirrm include/xloops
-lib/libxloops.a
diff --git a/shells/Makefile b/shells/Makefile
index 27a2b9b..e3e388c 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -10,7 +10,6 @@
     SUBDIR += bash3
     SUBDIR += bash3-static
     SUBDIR += bashc
-    SUBDIR += bush
     SUBDIR += ch
     SUBDIR += dash
     SUBDIR += es
diff --git a/shells/bush/Makefile b/shells/bush/Makefile
deleted file mode 100644
index 3b1c0cd..0000000
--- a/shells/bush/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# New ports collection makefile for:    bush
-# Date created:				20 December 2004
-# Whom:					Thierry Thomas <thierry@pompo.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		bush
-PORTVERSION=		1.0.3
-PORTREVISION=	5
-CATEGORIES=		shells
-MASTER_SITES=		http://www.pegasoft.ca/downloads/	\
-			http://66.11.182.223/downloads/
-DISTNAME=		${PORTNAME}-${PORTVERSION}-src
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		The Business Shell
-
-BUILD_DEPENDS=		gnatmake:${PORTSDIR}/lang/gnat	\
-			bash:${PORTSDIR}/shells/bash
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_PGSQL=		yes
-
-HAS_CONFIGURE=		yes
-ADACFLAGS?=		${CFLAGS:N-fno-strict-aliasing}
-USE_GMAKE=		yes
-MAKE_ARGS=		GMAKE=${GMAKE} CPUTYPE=${CPUTYPE} PTHREAD_LIBS=${PTHREAD_LIBS}	\
-			SDL_CONFIG=${SDL_CONFIG}
-MAKE_ENV=		ADACFLAGS="${ADACFLAGS}"
-MAKEFILE=		GNUmakefile
-USE_SDL=		sdl image
-USE_MYSQL=		yes
-IGNORE_WITH_MYSQL=	323
-REINPLACE_ARGS=		-i ""
-
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-MAN1=			bush.1
-
-PORTDOCS=		*
-
-BASH2FIX=		examples/benchmark.bash examples/export.sh src/testsuite/test.sh
-
-pre-build:
-.for FILE in ${BASH2FIX}
-	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/${FILE}
-.endfor
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/bush ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/src/bush.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.bush ${EXAMPLESDIR}
-.endif
-
-post-install:
-	@${ECHO_CMD} ${PREFIX}/bin/bush >> /etc/shells
-	@${ECHO_MSG} "Updating /etc/shells"
-	@${CP} /etc/shells /etc/shells.bak
-	@(${GREP} -v ${PREFIX}/bin/bush /etc/shells.bak ; \
-	  ${ECHO_CMD} ${PREFIX}/bin/bush) > /etc/shells
-	@${RM} /etc/shells.bak
-
-.if defined(MAINTAINER_MODE)
-test:	build
-	@(cd ${BUILD_WRKSRC} && \
-	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
-.endif
-
-.include <bsd.port.mk>
diff --git a/shells/bush/distinfo b/shells/bush/distinfo
deleted file mode 100644
index 511bdb2..0000000
--- a/shells/bush/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (bush-1.0.3-src.tgz) = 7faae5efdd516441973acd8188be8375
-SHA256 (bush-1.0.3-src.tgz) = 9478f5a8c0bad9822fbf4efb07e356c93a85a3ddbf5b3211162c133c92ebdf84
-SIZE (bush-1.0.3-src.tgz) = 1432520
diff --git a/shells/bush/files/patch-configure b/shells/bush/files/patch-configure
deleted file mode 100644
index 6456cab..0000000
--- a/shells/bush/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Tue Aug 16 01:45:37 2005
-+++ configure	Wed Aug 31 22:12:06 2005
-@@ -321,9 +321,8 @@
- else
-       echo "no"
-       echo
--      echo "ADAVOX requires /dev/dsp.  Create a /dev/dsp symlink to your real audio device"
--      echo "(If you don't care about audio support, try ln -s /dev/null /dev/dsp)"
--      exit 1
-+      echo "ADAVOX requires /dev/dsp."
-+      echo "Note that you should enable /dev/dsp on the machine on which you will install this package."
- fi
- 
- echo "ADAVOX library is configured"
diff --git a/shells/bush/files/patch-src_GNUmakefile.diff b/shells/bush/files/patch-src_GNUmakefile.diff
deleted file mode 100644
index 499bd67..0000000
--- a/shells/bush/files/patch-src_GNUmakefile.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/GNUmakefile.orig.orig	Wed Aug 17 22:59:07 2005
-+++ src/GNUmakefile.orig	Sun Sep 11 23:17:51 2005
-@@ -11,7 +11,8 @@
- GNATMAKE=gnatmake
- SDLLIBS=SDLLIBSTYPE
- SDLINCL=SDLINCLTYPE
--CFLAGS=CFLAGSTYPE
-+CFLAGS+=CFLAGSTYPE
-+ADACFLAGS+=CFLAGSTYPE
- # For SDL, sdl_config is not always available.
- 
- # RPM Directories For Building an RPM file
-@@ -25,6 +26,7 @@
- 
- #INCLUDE=-I./adacgi-1.6/ -I./apq-2.1/ -I./ADAVOX-0.51/bc -I./ADAVOX-0.51/wc -I./ADAVOX-0.51/main -I/usr/include/SDL
- INCLUDE=-I./adacgi-1.6/ -I./apq-2.1/ -I./ADAVOX-0.51/bc -I./ADAVOX-0.51/wc -I./ADAVOX-0.51/main ${SDLINCL}
-+INCLUDEB=`echo ${INCLUDE} | sed -e 's/-D_THREAD_SAFE//'`
- #LIBS=-L`pg_config --libdir` -L./apq-1.92/ -lpq -lSDL ${PTHREAD_LIBS}
- #LIBS=-L`pg_config --libdir` -L./apq-2.1/ ./apq-2.1/c_mysql.o -l SDL -l SDL_image ${PTHREAD_LIBS}
- LIBS=-L`pg_config --libdir` -L./apq-2.1/ ./apq-2.1/c_mysql.o ${SDLLIBS}
-@@ -66,7 +68,7 @@
- 	@echo "---------------------------------------------------------------"
- 	@echo
- 	$(GNATMAKE) -c -i -O1 -march=$(CPU) -gnatfaon -fstack-check -c $(INCLUDE) bush
--	gnatbind -x $(INCLUDE) bush.ali
-+	gnatbind -x $(INCLUDEB) bush.ali
- 	gnatlink bush.ali ./ADAVOX-0.51/wc/cglue.o c_os.o $(LIBS)
- 	@echo
- 	@echo "---------------------------------------------------------------"
-@@ -75,7 +77,7 @@
- 	@echo
- 
- c_os.o:	c_os.c
--	$(CC) $(CFLAGS) $(INCLUDE) -Wall -c c_os.c
-+	$(CC) $(ADACFLAGS) $(INCLUDE) -Wall -c c_os.c
- 
- #apq-2.1/Makeincl:
- #	@echo "---------------------------------------------------------------"
-@@ -110,7 +112,7 @@
- 	@echo "---------------------------------------------------------------"
- 	@echo
- 	$(GNATMAKE) -c -i -O3 -march=$(CPU) -gnatf -gnatn -gnatp -ffast-math -c $(INCLUDE) bush
--	gnatbind -x $(INCLUDE) bush.ali
-+	gnatbind -x $(INCLUDEB) bush.ali
- 	gnatlink bush.ali ./ADAVOX-0.51/wc/cglue.o c_os.o $(LIBS)
- 
- clean:
-@@ -151,7 +153,7 @@
- rpm:	all
- 
- bintar: c_os.o all
--	gnatbind -x $(INCLUDE) bush.ali
-+	gnatbind -x $(INCLUDEB) bush.ali
- 	gnatlink bush.ali ./ADAVOX-0.51/wc/cglue.o c_os.o $(LIBS)
- 	(cd ..; rm -f bush.tgz; tar cfvz bush.tgz src/bush src/bush.1 README COPYING INSTALL examples doc GNUmakefile; rm -f bush )
- 	@echo "Don't forget to unpack and repack under a descriptive directory"
diff --git a/shells/bush/files/patch-src__parser_dirops.adb b/shells/bush/files/patch-src__parser_dirops.adb
deleted file mode 100644
index 27d3005..0000000
--- a/shells/bush/files/patch-src__parser_dirops.adb
+++ /dev/null
@@ -1,67 +0,0 @@
---- src/parser_dirops.adb.orig	Wed Aug 31 17:10:45 2005
-+++ src/parser_dirops.adb	Thu Sep  1 20:42:27 2005
-@@ -127,6 +127,7 @@
-   ParseExpression( expr_val, expr_type );
-   if baseTypesOk( expr_type, dirops_dir_name_str_t ) then
-      if token = symbol_t and identifiers( token ).value = "," then
-+        err( "second parameter not supported by the compiler that built this version of BUSH"); -- GNAT 3.15
-         expect( symbol_t, "," );
-         ParseExpression( expr_val2, expr_type2 );
-         if baseTypesOk( expr_type2, boolean_t ) then
-@@ -139,7 +140,8 @@
-     recursive : boolean := expr_val2 = to_unbounded_string( "1" );
-   begin
-     if isExecutingCommand then
--       Remove_Dir( dir_name_str( to_string( expr_val ) ), recursive);
-+       -- Remove_Dir( dir_name_str( to_string( expr_val ) ), recursive);
-+       Remove_Dir( dir_name_str( to_string( expr_val ) ) );
-     end if;
-   exception when directory_error =>
-     err( "directory cannot be removed" );
-@@ -300,6 +302,7 @@
-   ParseExpression( expr_val, expr_type );
-   if baseTypesOk( expr_type, dirops_path_name_t ) then
-      if token = symbol_t and identifiers( token ).value = "," then
-+        err( "second parameter not supported by the compiler that built this version of BUSH"); -- GNAT 3.15
-         expect( symbol_t, "," );
-         ParseExpression( expr_val2, expr_type2 );
-         if baseTypesOk( expr_type2, dirops_env_style_t ) then
-@@ -308,22 +311,23 @@
-      end if;
-   end if;
-   expect( symbol_t, ")" );
--  declare
--    style : environment_style := System_Default;
-+  -- declare
-+  --   style : environment_style := System_Default;
-   begin
--    if isExecutingCommand then
--       -- not very elegant
--       if expr_val2 = to_unbounded_string( "0" ) then
--          style := UNIX;
--       elsif expr_val2 = to_unbounded_string( "1" ) then
--          style := DOS;
--       elsif expr_val2 = to_unbounded_string( "2" ) then
--          style := Both;
--       elsif expr_val2 = to_unbounded_string( "3" ) then
--          style := System_Default;
--       end if;
--       result := to_unbounded_string( expand_path( path_name( to_string( expr_val ) ), style ) );
--    end if;
-+  --   if isExecutingCommand then
-+  --      -- not very elegant
-+  --      if expr_val2 = to_unbounded_string( "0" ) then
-+  --         style := UNIX;
-+  --      elsif expr_val2 = to_unbounded_string( "1" ) then
-+  --         style := DOS;
-+  --      elsif expr_val2 = to_unbounded_string( "2" ) then
-+  --         style := Both;
-+  --      elsif expr_val2 = to_unbounded_string( "3" ) then
-+  --         style := System_Default;
-+  --      end if;
-+  --     result := to_unbounded_string( expand_path( path_name( to_string( expr_val ) ), style ) );
-+       result := to_unbounded_string( expand_path( path_name( to_string( expr_val ) ) ) );
-+    --end if;
-   exception when directory_error =>
-     err( "directory not accessible" );
-   when others =>
diff --git a/shells/bush/pkg-descr b/shells/bush/pkg-descr
deleted file mode 100644
index 87dd699..0000000
--- a/shells/bush/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-BUSH, the Business Shell, is a powerful Linux/UNIX shell for designing
-secure, reliable scripts that can be later compiled as a fast executable
-programs.
-
-It can also be used an an interactive login shell or to generate Java
-Virtual Machine or .Net applications. BUSH is a robust and readable
-alternative to BASH, CSH, and (to a certain extent) Python and PERL.
-
-BUSH comes with many built-in packages including numerics, string processing,
-sound and database access.
-
-WWW: http://www.pegasoft.ca/bush.html
diff --git a/shells/bush/pkg-plist b/shells/bush/pkg-plist
deleted file mode 100644
index 72cbe1c..0000000
--- a/shells/bush/pkg-plist
+++ /dev/null
@@ -1,71 +0,0 @@
-bin/bush
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
-%%PORTDOCS%%%%EXAMPLESDIR%%/archive.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/archive.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/arrow.wav
-%%PORTDOCS%%%%EXAMPLESDIR%%/bats.wav
-%%PORTDOCS%%%%EXAMPLESDIR%%/benchdata.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/benchmark.adb
-%%PORTDOCS%%%%EXAMPLESDIR%%/benchmark.bash
-%%PORTDOCS%%%%EXAMPLESDIR%%/benchmark.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/benchmark.ksh
-%%PORTDOCS%%%%EXAMPLESDIR%%/benchmark.sh
-%%PORTDOCS%%%%EXAMPLESDIR%%/bjack.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/bjack.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/bjack.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/camel.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/camel.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/camel.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/chomp.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/chomp.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/chomp2.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/chomp2.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/clap.wav
-%%PORTDOCS%%%%EXAMPLESDIR%%/database.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/database.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/database.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/dos.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/dos2.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/draco_ii.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/draco_ii.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/draco_ii.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/draco_score.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/eliza.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/eliza.data
-%%PORTDOCS%%%%EXAMPLESDIR%%/eliza.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/eliza.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/export.sh
-%%PORTDOCS%%%%EXAMPLESDIR%%/files.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/game.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/game.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/game.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/hello.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/hello.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/index.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/main.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/menu.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/menu.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/menu2.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/menu2.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/minimal_cgi.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/minimal_cgi.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/pit.wav
-%%PORTDOCS%%%%EXAMPLESDIR%%/poetry.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/poetry.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/poetry.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/postgres_csv.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/postgres_csv.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/quest.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/quest.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/run.wav
-%%PORTDOCS%%%%EXAMPLESDIR%%/scream.wav
-%%PORTDOCS%%%%EXAMPLESDIR%%/scripting.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/validate_name.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/validate_name.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/web_summary.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/web_summary.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/wumpus.bush
-%%PORTDOCS%%%%EXAMPLESDIR%%/wumpus.gif
-%%PORTDOCS%%%%EXAMPLESDIR%%/wumpus.html
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/Makefile b/textproc/Makefile
index 4ba3505..0053db6 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -251,8 +251,6 @@
     SUBDIR += idnits
     SUBDIR += iiimf-client-lib
     SUBDIR += iiimf-csconv
-    SUBDIR += iiimf-gnome-im-switcher
-    SUBDIR += iiimf-gtk
     SUBDIR += iiimf-headers
     SUBDIR += iiimf-le-unit
     SUBDIR += iiimf-protocol-lib
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
deleted file mode 100644
index 4172143..0000000
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# New ports collection makefile for:	iiimf-gnome-im-switcher
-# Date created:		10 Sep 2004
-# Whom:			Kuang-che Wu <kcwu@csie.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnome-im-switcher
-PORTVERSION=	12.2
-PORTREVISION=	10
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
-PKGNAMEPREFIX=	iiimf-
-DISTNAME=	iiimf-src-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	IIIMF gnome input method switcher
-
-BROKEN=		It removes a few files in /usr/local/* during the configure. Therefore, it is not safe
-DEPRECATED=	has been broken for 4 months
-EXPIRATION_DATE=2010-01-08
-
-ONLY_FOR_ARCHS=	i386
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
-		gnomepanel gnomeprefix gnomehack
-INSTALLS_OMF=	yes
-INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
-
-GCONF_SCHEMAS=	gnome-im-properties.schemas gnome-im-switcher.schemas
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
-BUILDDIR=	${WRKSRC}/gnome-im-switcher
-
-.include <bsd.port.pre.mk>
-
-CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-post-patch:
-	${REINPLACE_CMD} \
-		-e '/^serverdir/s,$$[(]libdir[)],%%LOCALBASE%%/libdata,g' \
-		${BUILDDIR}/src/Makefile.am
-	${REINPLACE_CMD} \
-		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-		-e "s,%%PREFIX%%,${PREFIX},g" \
-		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
-		${BUILDDIR}/src/Makefile.am
-
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
-
-.include <bsd.port.post.mk>
diff --git a/textproc/iiimf-gnome-im-switcher/distinfo b/textproc/iiimf-gnome-im-switcher/distinfo
deleted file mode 100644
index ad441e7..0000000
--- a/textproc/iiimf-gnome-im-switcher/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
-SHA256 (iiimf-src-12.2.tar.bz2) = 16fc96abe6bdf7118868a51806bbe9c53e5396700398ec305f3de415fae12357
-SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
deleted file mode 100644
index da86d17..0000000
--- a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
---- Makefile.orig	Mon May  9 15:32:45 2005
-+++ Makefile	Mon May  9 15:35:03 2005
-@@ -1,29 +1,31 @@
- ## deprecated in favour of AUTORECONF
--#ACLOCAL = aclocal
--#AUTOMAKE = automake --add-missing --copy
--#LIBTOOLIZE = libtoolize --force --copy
--#AUTOHEADER = autoheader
--#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.9
-+AUTOMAKE = automake-1.9 --add-missing --copy
-+LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.62
-+AUTOCONF = autoconf-2.62
- #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
- #             $(LIBTOOLIZE) && \
- #             $(AUTOHEADER) && \
- #             $(AUTOMAKE) && \
- #             $(AUTOCONF)
- 
--AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.62
- BOOTSTRAP = $(AUTORECONF) --install --force
- INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
- 
--CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
- 
--INTLDIRS = iiimgcf gnome-im-switcher
-+INTLDIRS = gnome-im-switcher
- 
--BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
--            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
--            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
--            iiimgcf gnome-im-switcher doc
-+BUILDDIRS = gnome-im-switcher
-+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
-+#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
-+#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
-+#            iiimgcf gnome-im-switcher doc
- 
--CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
-+CONFIGDIRS = $(BUILDDIRS)
-+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
- 
- all: compile
- 
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4
deleted file mode 100644
index 44ee86c..0000000
--- a/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4
+++ /dev/null
@@ -1,40 +0,0 @@
---- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
-+++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
-@@ -203,6 +203,13 @@
- 		    CXX=${CC}
- 		fi
- 		;;
-+	    cc*:*)
-+		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
-+		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
-+		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
-+		SHLIBCFLAGS='-fpic'
-+		SHLIBLDFLAGS='-shared'
-+		;;
- 	    *)
- 		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
- 		;;
-@@ -249,8 +256,8 @@
- 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
- 		;;
- 	    *freebsd*)
--		THREAD_LDFLAGS="-pthread"
--		PTHREAD_LIBS=""
-+		THREAD_LDFLAGS=""
-+		PTHREAD_LIBS="${PTHREAD_LIBS}"
- 		;;
- 	esac
- 
-@@ -288,9 +295,9 @@
- 		THREAD_CXX_CFLAGS="-mt"
- 		HAVE_THREAD="uithread"
- 		;;
--	    *freebsd*@gcc:*)
--		THREAD_LDFLAGS="-pthread"
--		THREAD_LIBS=""
-+	    *freebsd*@cc:*|*freebsd*@gcc:*)
-+		THREAD_LDFLAGS=""
-+		THREAD_LIBS="${PTHREAD_LIBS}"
- 		HAVE_THREAD="freebsd-pthread"
- 		;;
- 	    *linux*)
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_Makefile.am b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_Makefile.am
deleted file mode 100644
index 2bc8e14..0000000
--- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-im-switcher/Makefile.am.orig	Fri May 13 17:44:10 2005
-+++ gnome-im-switcher/Makefile.am	Fri May 13 17:44:57 2005
-@@ -1,5 +1,7 @@
- SUBDIRS = src po capplet help
- 
-+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I %%PREFIX%%/share/aclocal -I ../acfiles
-+
- @INTLTOOL_DESKTOP_RULE@
- 
- EXTRA_DIST = 				\
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
deleted file mode 100644
index 78bf144..0000000
--- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
+++ /dev/null
@@ -1,24 +0,0 @@
---- gnome-im-switcher/help/omf.make.orig	Thu Sep 23 06:31:15 2004
-+++ gnome-im-switcher/help/omf.make		Sun May 29 22:04:45 2005
-@@ -45,7 +45,9 @@
- 	for file in $(omffile); do \
- 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+	-for file in $(omffile); do \
-+		scrollkeeper-install $(DESTDIR)$(omf_dest_dir)/$$file; \
-+	done
- 
- uninstall-local-omf:
- 	-for file in $(srcdir)/*.omf; do \
-@@ -53,7 +55,9 @@
- 		rm -f $(omf_dest_dir)/$$basefile; \
- 	done
- 	-rmdir $(omf_dest_dir)
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+	-for file in $(omffile); do \
-+		scrollkeeper-uninstall $(DESTDIR)$(omf_dest_dir)/$$file; \
-+	done
- 
- clean-local-omf:
- 	-for file in $(omffile); do \
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c
deleted file mode 100644
index 6e4b9f2..0000000
--- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnome-im-switcher/src/widgets.c.orig	Tue May 10 16:29:36 2005
-+++ gnome-im-switcher/src/widgets.c	Tue May 10 16:30:04 2005
-@@ -29,7 +29,11 @@
- #include <gnome.h>
- 
- #include <signal.h>
-+#ifdef __FreeBSD__
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- 
- #include "gnome-im-switcher.h"
- #include "iiim-interface.h"
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-descr b/textproc/iiimf-gnome-im-switcher/pkg-descr
deleted file mode 100644
index 3460603..0000000
--- a/textproc/iiimf-gnome-im-switcher/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-IIIMF stands for Internet/Intranet Input Method Framework.
-IIIMF is designed to be the next generation of input method framework
-
-This port provides two input method utility applications for GNOME desktop
-environments.
-
-  GIMLET - GNOME Input Method Language Enabling Tool
-
-As a gnome-panel applet, this UI is used to select input languages for IIIM
-client applications (IIIMGCF and IIIMXCF).
-
-  GIMPET - GNOME Input Method Property Edittingggg Tool
-
-As a gnome capplet, this UI is to allow user to customize input methods,
-for enabling/disabling input method infrastucuture itself, and
-enabling/disabling input method statur bar and candidate choice window.
-
-WWW: http://www.openi18n.org/subgroups/im/IIIMF/
-
-- Kuang-che Wu
-  kcwu@csie.org
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
deleted file mode 100644
index 677d42f..0000000
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-bin/gnome-im-properties
-bin/gnome-im-settings-daemon
-libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
-libexec/gnome-im-switcher-applet
-share/control-center-2.0/capplets/gnome-im-properties.desktop
-share/control-center-2.0/interfaces/gnome-im-properties.glade2
-share/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
-share/gnome/help/imswitcher/C/imswitcher.xml
-share/gnome/help/imswitcher/C/legal.xml
-share/iiimf-im-switcher/glade/gnome-im-switcher.glade2
-share/omf/iiimf-im-switcher/imswitcher-C.omf
-share/pixmaps/gimlet-disable.png
-share/pixmaps/gimlet-off.png
-share/pixmaps/gimlet-on.png
-share/pixmaps/gnome-settings-im.png
-share/icons/hicolor/48x48/apps/gnome-settings-im.png
-share/locale/bn/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/cs/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/de/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/es/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/fr/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/gu/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/hi/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/hu/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/it/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/ja/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/ko/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/pa/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/pl/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/pt_BR/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/ru/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/sv/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
-share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
-@dirrm share/omf/iiimf-im-switcher
-@dirrm share/iiimf-im-switcher/glade
-@dirrm share/iiimf-im-switcher
-@dirrm share/gnome/help/imswitcher/C
-@dirrm share/gnome/help/imswitcher
-@dirrmtry share/control-center-2.0/interfaces
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
deleted file mode 100644
index f8b384a..0000000
--- a/textproc/iiimf-gtk/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# New ports collection makefile for:	iiimf-gtk
-# Date created:		6 Dec 2003
-# Whom:			Kuang-che Wu <kcwu@csie.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gtk
-PORTVERSION=	12.2
-PORTREVISION=	10
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
-PKGNAMEPREFIX=	iiimf-
-DISTNAME=	iiimf-src-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Internet/Intranet Input Method Server Framework
-
-LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
-		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
-
-BROKEN=		It removes a few files in /usr/local/* during the configure. Therefore, it is not safe
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-ONLY_FOR_ARCHS=	i386
-
-USE_BZIP2=	yes
-USE_ICONV=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GNOME=	intltool gtk20
-USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:22:env
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
-BUILDDIR=	${WRKSRC}/iiimgcf
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_DEBUG)
-CFLAGS+=	-DDEBUG
-.endif
-
-CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv -lintl ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-
-post-patch:
-	${REINPLACE_CMD} \
-		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-		-e "s,%%PREFIX%%,${PREFIX},g" \
-		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
-
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
-
-post-install:
-	${LOCALBASE}/bin/gtk-query-immodules-2.0 > \
-		${LOCALBASE}/etc/gtk-2.0/gtk.immodules
-
-.include <bsd.port.post.mk>
diff --git a/textproc/iiimf-gtk/distinfo b/textproc/iiimf-gtk/distinfo
deleted file mode 100644
index ad441e7..0000000
--- a/textproc/iiimf-gtk/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
-SHA256 (iiimf-src-12.2.tar.bz2) = 16fc96abe6bdf7118868a51806bbe9c53e5396700398ec305f3de415fae12357
-SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-gtk/files/patch-Makefile b/textproc/iiimf-gtk/files/patch-Makefile
deleted file mode 100644
index aa1372f..0000000
--- a/textproc/iiimf-gtk/files/patch-Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.orig	Tue Apr 19 15:38:18 2005
-+++ Makefile	Fri Feb  3 20:09:51 2006
-@@ -1,7 +1,7 @@
- ## deprecated in favour of AUTORECONF
--#ACLOCAL = aclocal
--#AUTOMAKE = automake --add-missing --copy
--#LIBTOOLIZE = libtoolize --force --copy
--#AUTOHEADER = autoheader
--#AUTOCONF = autoconf
-+ACLOCAL = aclocal-1.9
-+AUTOMAKE = automake-1.9 --add-missing --copy
-+LIBTOOLIZE = libtoolize --force --copy
-+AUTOHEADER = autoheader-2.62
-+AUTOCONF = autoconf-2.62
- #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-@@ -12,3 +12,3 @@
- 
--AUTORECONF = autoreconf
-+AUTORECONF = autoreconf-2.62
- BOOTSTRAP = $(AUTORECONF) --install --force
-@@ -16,12 +16,14 @@
- 
--CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
- 
--INTLDIRS = iiimgcf gnome-im-switcher
-+INTLDIRS = iiimgcf
- 
--BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
--            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
--            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
--            iiimgcf gnome-im-switcher doc
-+BUILDDIRS = iiimgcf
-+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
-+#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
-+#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
-+#            iiimgcf gnome-im-switcher doc
- 
--CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
-+CONFIGDIRS = $(BUILDDIRS)
-+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
- 
diff --git a/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4
deleted file mode 100644
index 44ee86c..0000000
--- a/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4
+++ /dev/null
@@ -1,40 +0,0 @@
---- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
-+++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
-@@ -203,6 +203,13 @@
- 		    CXX=${CC}
- 		fi
- 		;;
-+	    cc*:*)
-+		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
-+		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
-+		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
-+		SHLIBCFLAGS='-fpic'
-+		SHLIBLDFLAGS='-shared'
-+		;;
- 	    *)
- 		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
- 		;;
-@@ -249,8 +256,8 @@
- 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
- 		;;
- 	    *freebsd*)
--		THREAD_LDFLAGS="-pthread"
--		PTHREAD_LIBS=""
-+		THREAD_LDFLAGS=""
-+		PTHREAD_LIBS="${PTHREAD_LIBS}"
- 		;;
- 	esac
- 
-@@ -288,9 +295,9 @@
- 		THREAD_CXX_CFLAGS="-mt"
- 		HAVE_THREAD="uithread"
- 		;;
--	    *freebsd*@gcc:*)
--		THREAD_LDFLAGS="-pthread"
--		THREAD_LIBS=""
-+	    *freebsd*@cc:*|*freebsd*@gcc:*)
-+		THREAD_LDFLAGS=""
-+		THREAD_LIBS="${PTHREAD_LIBS}"
- 		HAVE_THREAD="freebsd-pthread"
- 		;;
- 	    *linux*)
diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
deleted file mode 100644
index 47a39e8..0000000
--- a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
---- iiimgcf/Makefile.am.orig	Thu Apr 14 05:29:08 2005
-+++ iiimgcf/Makefile.am	Tue May 17 22:33:56 2005
-@@ -5,11 +5,11 @@
- @INTLTOOL_DESKTOP_RULE@
- 
- AUTOMAKE_OPTIONS = foreign
--ACLOCAL_AMFLAGS = -I ../acfiles
-+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I %%PREFIX%%/share/aclocal -I ../acfiles
- 
- moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
- 
--im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
-+im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -I $(CSCONV_DIR)
- im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
- 
- im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \
-@@ -18,8 +18,7 @@
-                      imswitcher.c imswitcher.h
- 
- im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
--                    $(IM_LIBDIR)/iiimcf/libiiimcf.la \
--                    $(IM_LIBDIR)/iiimp/libiiimp.la
-+		    -liiimp -liiimcf
- 
- module_LTLIBRARIES = im-iiim.la
- 
diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_gtkimcontextiiim.c b/textproc/iiimf-gtk/files/patch-iiimgcf_gtkimcontextiiim.c
deleted file mode 100644
index 7a460ff..0000000
--- a/textproc/iiimf-gtk/files/patch-iiimgcf_gtkimcontextiiim.c
+++ /dev/null
@@ -1,149 +0,0 @@
---- iiimgcf/gtkimcontextiiim.c.orig	Fri Apr 22 07:46:48 2005
-+++ iiimgcf/gtkimcontextiiim.c	Tue May 17 23:33:11 2005
-@@ -39,6 +39,7 @@
- #include "imaux.h"
- #include "imswitcher.h"
- #include "IIIMGdkEventKey.h"
-+#include "iconv.h"
- 
- #ifdef DEBUG
- #define DEBUG_DO(x) (x)
-@@ -147,6 +148,8 @@
- static GdkAtom im_settings_atom = GDK_NONE;
- static const char *_IM_SETTINGS = "_IM_SETTINGS";
- 
-+static iconv_t                 ic_u16_to_u8 = (iconv_t)-1;
-+
- static gboolean on_status_toplevel_configure (GtkWidget         *toplevel,
- 					      GdkEventConfigure *event,
- 					      StatusWindow      *status_window);
-@@ -305,6 +308,7 @@
-       return;
-     }
-   utf8 = utf16_to_utf8 (text);
-+  if (!utf8) utf8 = g_strdup("");
- 
-   if (current_setting_enabled &&
-       (current_setting.im_enabled == IM_OFF ||
-@@ -593,9 +597,12 @@
- 	    IIIMCF_text text;
- 	    gchar *utf8 = NULL;
- 	    st = iiimcf_get_committed_text (c, &text);
-+	    if (st != IIIMF_STATUS_SUCCESS) break;
- 	    utf8 = utf16_to_utf8 (text);
--	    g_signal_emit_by_name (context_iiim, "commit", utf8);
--	    g_free (utf8);
-+	    if (utf8) {
-+	      g_signal_emit_by_name (context_iiim, "commit", utf8);
-+	      g_free (utf8);
-+	    }
- 	  }
- 	  break;
- 	default:
-@@ -936,7 +943,7 @@
-       return;
-     }
- 
--  gtk_frame_set_label(GTK_FRAME (cw->frame), title_u8);
-+  gtk_frame_set_label(GTK_FRAME (cw->frame), (title_u8 ? title_u8 : ""));
- 
-   if (title_u8)
-     g_free (title_u8);
-@@ -975,6 +982,7 @@
-       if (label)
- 	label_u8 = utf16_to_utf8 (label);
-       candidate_u8 = utf16_to_utf8 (candidate);
-+      if (!candidate_u8) candidate_u8 = g_strdup("");
-       DEBUG_DO (g_message ("candidate %s", candidate_u8));
-       if (label_u8)
- 	{
-@@ -997,12 +1005,9 @@
- 	    gtk_tree_view_get_selection (GTK_TREE_VIEW (cw->tree));
- 	  gtk_tree_selection_select_iter (selection, &iter);
- 	}
--      if (result)
--	{
--	  g_free (result);
--	  g_free (label_u8);
--	}
--      g_free (candidate_u8);
-+      if (result) g_free(result);
-+      if (candidate_u8) g_free (candidate_u8);
-+      if (label_u8) g_free(label_u8);
-     }
-   gtk_widget_realize (w);
-   iiim_candidate_move (context_iiim, w);
-@@ -1187,7 +1192,7 @@
-   w->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
-   gtk_container_set_border_width (GTK_CONTAINER (w->toplevel), 2);
- 
--  w->frame = gtk_frame_new (title_u8);
-+  w->frame = gtk_frame_new (title_u8 ? title_u8 : "");
-   gtk_frame_set_shadow_type (GTK_FRAME (w->frame), GTK_SHADOW_ETCHED_OUT);
- 
-   w->tree = gtk_tree_view_new ();
-@@ -1539,14 +1544,52 @@
- }
- 
- static gchar *
-+iconv_utf16_to_utf8(const gunichar2 *utf16, int length)
-+{
-+  if (!utf16 || 0 >= length) return g_strdup("");
-+
-+  if ((iconv_t)-1 == ic_u16_to_u8) {
-+    ic_u16_to_u8 = iconv_open("UTF-8", "UTF-16");
-+
-+    if ((iconv_t)-1 == ic_u16_to_u8) {
-+      fprintf(stderr, "iiimgcf: Unable to open UTF-16 -> UTF-8 converter.");
-+      return NULL;
-+    }
-+  }
-+
-+  int inlen = length * sizeof(gunichar2);
-+  int outlen = (length +1) * 4;
-+  const char *inbuf = (char*)utf16;
-+  char *outbuf = g_malloc0(outlen + 4);
-+  gchar *utf8 = (gchar*)outbuf;
-+
-+  if (!outbuf) {
-+    fprintf(stderr, "iiimgcf: Out of memory error.");
-+    return NULL;
-+  }
-+
-+  if ((size_t)-1 == iconv(ic_u16_to_u8, &inbuf, &inlen, &outbuf, &outlen)) {
-+    fprintf(stderr, "iiimgcf: Unable to convert the string.");
-+    g_free(utf8);
-+    return NULL;
-+  }
-+
-+  return utf8;
-+}
-+
-+static gchar *
- utf16_to_utf8 (IIIMCF_text text)
- {
-   IIIMF_status st;
-+
-+  int len = 0;
-   IIIMP_card16 *u16str = NULL;
-   st = iiimcf_get_text_utf16string (text, (const IIIMP_card16 **) &u16str);
--  return (u16str != NULL ?
--	  g_utf16_to_utf8 ((const gunichar2 *) u16str, -1, NULL, NULL, NULL) :
--	  NULL);
-+  st = iiimcf_get_text_length(text, &len);
-+
-+  if (st != IIIMF_STATUS_SUCCESS) return NULL;
-+
-+  return iconv_utf16_to_utf8((const gunichar2 *)u16str, len);
- }
- 
- static void
-@@ -2094,7 +2137,7 @@
-     goto Error;
-   utf8 = utf16_to_utf8 (text);
- 
--  if (attrs)
-+  if (attrs && utf8)
-     {
-       gint i;
-       gint j;
diff --git a/textproc/iiimf-gtk/pkg-descr b/textproc/iiimf-gtk/pkg-descr
deleted file mode 100644
index ac72b20..0000000
--- a/textproc/iiimf-gtk/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-IIIMF stands for Internet/Intranet Input Method Framework.
-IIIMF is designed to be the next generation of input method framework
-which provides the following capabilities;
-
-* Multiplatform, platform independent.
-* Multlingual and Full UNICODE support, but satisfactory for native speakers.
-* Windowing System Independent.
-* Multiple language engines concurrently run.
-* Multiuser.
-* Distributed, lightweight clients and scalable server.
-* Extensible in multiple means.
-* Input method protocol efficient enough to be used over low-speed modem
-  connection.
-* Easy input method engine development with plugin API.
-* Easy input method enabling with libiiimcf, even on console apps.
-* Small core part to start from.
-
-WWW: http://www.openi18n.org/subgroups/im/IIIMF/
-
-- Kuang-che Wu
-  kcwu@csie.org
diff --git a/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist
deleted file mode 100644
index 1d954b5..0000000
--- a/textproc/iiimf-gtk/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.a
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.la
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-iiim.so
-@exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-share/locale/ja/LC_MESSAGES/iiimgcf.mo
-share/locale/ko/LC_MESSAGES/iiimgcf.mo
-share/locale/zh_CN/LC_MESSAGES/iiimgcf.mo
-share/locale/zh_TW/LC_MESSAGES/iiimgcf.mo
-share/locale/zh_HK/LC_MESSAGES/iiimgcf.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 0cf03f6..5d02389 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -63,8 +63,6 @@
     SUBDIR += gtk12
     SUBDIR += gtk20
     SUBDIR += gtk20-reference
-    SUBDIR += gtkada
-    SUBDIR += gtkada-devel
     SUBDIR += gtkada-gcc
     SUBDIR += gtkada-gps
     SUBDIR += gtkdatabox
diff --git a/x11-toolkits/gtkada-devel/Makefile b/x11-toolkits/gtkada-devel/Makefile
deleted file mode 100644
index 6b095ab..0000000
--- a/x11-toolkits/gtkada-devel/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:   gtkada
-# Date Created:			27 Nov 2000
-# Whom:				Samuel Tardieu <sam@inf.enst.fr>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gtkada
-PORTVERSION=	20060615
-PORTREVISION=	5
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://sitola.fi.muni.cz/~hopet/gtkada/
-PKGNAMESUFFIX=	-devel
-DISTNAME=	GtkAda-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gtk2 binding for Ada
-
-BUILD_DEPENDS=	gnatgcc:${PORTSDIR}/lang/gnat
-
-CONFLICTS=	gtkada-[0-9]* gtkada-gcc-[0-9]*
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-WRKSRC=		${WRKDIR}/GtkAda
-
-USE_GL=		gl
-USE_GNOME=	gtk20 libglade2 libgnomeui
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-GL=Gl
-
-EXTRA_PATCHES=	${FILESDIR}/obsolescence.patch
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/projects/Makefile
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkada-devel/distinfo b/x11-toolkits/gtkada-devel/distinfo
deleted file mode 100644
index fef102c..0000000
--- a/x11-toolkits/gtkada-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (GtkAda-20060615.tgz) = 1498860efe49d6d612cb6f2219c5ba02
-SHA256 (GtkAda-20060615.tgz) = 4f044a1e11330092c43ed4db481670ddd82d576ae385ba7702f7e414dae3034b
-SIZE (GtkAda-20060615.tgz) = 2784947
diff --git a/x11-toolkits/gtkada-devel/files/obsolescence.patch b/x11-toolkits/gtkada-devel/files/obsolescence.patch
deleted file mode 100644
index 228a390..0000000
--- a/x11-toolkits/gtkada-devel/files/obsolescence.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -ruN src/gtk-clist.ads src/gtk-clist.ads
---- src/gtk-clist.ads	Thu Jun 15 23:07:17 2006
-+++ src/gtk-clist.ads	Thu Jun 15 23:10:21 2006
-@@ -65,7 +65,7 @@
- with Unchecked_Conversion;
- 
- package Gtk.Clist is
--   pragma Obsolescent ("Use Gtk.Tree_View instead");
-+   --  pragma Obsolescent ("Use Gtk.Tree_View instead");
- 
-    type Gtk_Clist_Record is new Gtk.Container.Gtk_Container_Record
-      with private;
-diff -ruN src/gtk-combo.ads src/gtk-combo.ads
---- src/gtk-combo.ads	Thu Jun  8 18:17:54 2006
-+++ src/gtk-combo.ads	Thu Jun 15 23:10:27 2006
-@@ -66,7 +66,7 @@
- with Gtk.Enums; use Gtk.Enums;
- 
- package Gtk.Combo is
--   pragma Obsolescent;
-+   --  pragma Obsolescent;
- 
-    type Gtk_Combo_Record is new Gtk.Box.Gtk_Box_Record with private;
-    type Gtk_Combo is access all Gtk_Combo_Record'Class;
-diff -ruN src/gtk-ctree.ads src/gtk-ctree.ads
---- src/gtk-ctree.ads	Tue Jun  6 10:07:41 2006
-+++ src/gtk-ctree.ads	Thu Jun 15 23:10:41 2006
-@@ -65,7 +65,7 @@
- with Gtkada.Types;         use Gtkada.Types;
- 
- package Gtk.Ctree is
--   pragma Obsolescent ("use Gtk.Tree_View instead");
-+   --  pragma Obsolescent ("use Gtk.Tree_View instead");
-    pragma Elaborate_Body;
- 
-    pragma Warnings (Off); --  Gtk.Clist is obsolescent;
-diff -ruN src/gtk-item_factory.ads src/gtk-item_factory.ads
---- src/gtk-item_factory.ads	Tue Jun  6 10:07:41 2006
-+++ src/gtk-item_factory.ads	Thu Jun 15 23:10:46 2006
-@@ -41,7 +41,7 @@
- with Gtkada.Types;
- 
- package Gtk.Item_Factory is
--   pragma Obsolescent;
-+   --  pragma Obsolescent;
- 
-    type Gtk_Item_Factory_Record is new Object.Gtk_Object_Record with private;
-    type Gtk_Item_Factory is access all Gtk_Item_Factory_Record'Class;
-diff -ruN src/gtk-list.ads src/gtk-list.ads
---- src/gtk-list.ads	Tue Jun  6 10:07:41 2006
-+++ src/gtk-list.ads	Thu Jun 15 23:10:31 2006
-@@ -38,7 +38,7 @@
- with Gtk.Widget; use Gtk.Widget;
- 
- package Gtk.List is
--   pragma Obsolescent;  --  Gtk.List
-+   --  pragma Obsolescent;  --  Gtk.List
- 
-    type Gtk_List_Record is new Gtk.Container.Gtk_Container_Record with private;
-    type Gtk_List is access all Gtk_List_Record'Class;
-diff -ruN src/gtk-list_item.ads src/gtk-list_item.ads
---- src/gtk-list_item.ads	Mon Jun  5 17:33:34 2006
-+++ src/gtk-list_item.ads	Thu Jun 15 23:10:51 2006
-@@ -33,7 +33,7 @@
- with Gtk.Item;
- 
- package Gtk.List_Item is
--   pragma Obsolescent;
-+   --  pragma Obsolescent;
- 
-    type Gtk_List_Item_Record is new Gtk.Item.Gtk_Item_Record with private;
-    type Gtk_List_Item is access all Gtk_List_Item_Record'Class;
-diff -ruN src/gtk-option_menu.ads src/gtk-option_menu.ads
---- src/gtk-option_menu.ads	Thu Jun  8 14:35:40 2006
-+++ src/gtk-option_menu.ads	Thu Jun 15 23:10:54 2006
-@@ -42,7 +42,7 @@
- with Gtk.Widget;
- 
- package Gtk.Option_Menu is
--   pragma Obsolescent;
-+   --  pragma Obsolescent;
- 
-    type Gtk_Option_Menu_Record is new Button.Gtk_Button_Record with private;
-    type Gtk_Option_Menu is access all Gtk_Option_Menu_Record'Class;
-diff -ruN src/gtk-pixmap.ads src/gtk-pixmap.ads
---- src/gtk-pixmap.ads	Mon Jun  5 17:33:34 2006
-+++ src/gtk-pixmap.ads	Thu Jun 15 23:10:58 2006
-@@ -37,7 +37,7 @@
- with Gtkada.Types;
- 
- package Gtk.Pixmap is
--   pragma Obsolescent ("Use Gtk.Image instead");
-+   --  pragma Obsolescent ("Use Gtk.Image instead");
- 
-    type Gtk_Pixmap_Record is new Gtk.Misc.Gtk_Misc_Record with private;
-    type Gtk_Pixmap is access all Gtk_Pixmap_Record'Class;
-diff -ruN src/gtk-preview.ads src/gtk-preview.ads
---- src/gtk-preview.ads	Tue Jun  6 10:07:41 2006
-+++ src/gtk-preview.ads	Thu Jun 15 23:11:07 2006
-@@ -40,7 +40,7 @@
- with Gtk.Widget;
- 
- package Gtk.Preview is
--   pragma Obsolescent;
-+   --  pragma Obsolescent;
- 
-    type Gtk_Preview_Record is new Gtk.Widget.Gtk_Widget_Record with private;
-    type Gtk_Preview is access all Gtk_Preview_Record'Class;
-diff -ruN src/gtk-progress.ads src/gtk-progress.ads
---- src/gtk-progress.ads	Tue Jun  6 16:54:33 2006
-+++ src/gtk-progress.ads	Thu Jun 15 23:11:12 2006
-@@ -39,7 +39,7 @@
- with Glib.Properties;
- 
- package Gtk.Progress is
--   pragma Obsolescent; --  Gtk.Progress
-+   --  pragma Obsolescent; --  Gtk.Progress
- 
-    type Gtk_Progress_Record is new Gtk.Widget.Gtk_Widget_Record with private;
-    type Gtk_Progress is access all Gtk_Progress_Record'Class;
-diff -ruN src/gtk-text.ads src/gtk-text.ads
---- src/gtk-text.ads	Mon Jun  5 17:33:35 2006
-+++ src/gtk-text.ads	Thu Jun 15 23:11:16 2006
-@@ -45,7 +45,7 @@
- with Gdk.Window;
- 
- package Gtk.Text is
--   pragma Obsolescent;
-+   --  pragma Obsolescent;
- 
-    type Gtk_Text_Record is new
-      Gtk.Old_Editable.Gtk_Old_Editable_Record with private;
-diff -ruN src/gtk-tips_query.ads src/gtk-tips_query.ads
---- src/gtk-tips_query.ads	Mon Jun  5 17:33:35 2006
-+++ src/gtk-tips_query.ads	Thu Jun 15 23:11:26 2006
-@@ -35,7 +35,7 @@
- with Gtk.Widget;
- 
- package Gtk.Tips_Query is
--   pragma Obsolescent;
-+   --  pragma Obsolescent;
- 
-    type Gtk_Tips_Query_Record is new Gtk.Label.Gtk_Label_Record with private;
-    type Gtk_Tips_Query is access all Gtk_Tips_Query_Record'Class;
diff --git a/x11-toolkits/gtkada-devel/pkg-descr b/x11-toolkits/gtkada-devel/pkg-descr
deleted file mode 100644
index 8f54d79..0000000
--- a/x11-toolkits/gtkada-devel/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-GtkAda is an Ada95 graphical toolkit based on Gtk+, providing the complete set
-of Gtk+ widgets using the Object-Oriented features of this language. GtkAda
-supports the latest 2.2 and 2.4 stable releases.
-
-WWW: https://libre2.adacore.com/GtkAda/
diff --git a/x11-toolkits/gtkada-devel/pkg-plist b/x11-toolkits/gtkada-devel/pkg-plist
deleted file mode 100644
index a542e89..0000000
--- a/x11-toolkits/gtkada-devel/pkg-plist
+++ /dev/null
@@ -1,1133 +0,0 @@
-bin/gate
-bin/gate-in.exe
-bin/gdialog
-bin/generate.pl
-bin/gtkada-config
-include/gtkada/bonobo-dock.adb
-include/gtkada/bonobo-dock.ads
-include/gtkada/bonobo-dock_band.adb
-include/gtkada/bonobo-dock_band.ads
-include/gtkada/bonobo-dock_item.adb
-include/gtkada/bonobo-dock_item.ads
-include/gtkada/bonobo-dock_layout.adb
-include/gtkada/bonobo-dock_layout.ads
-include/gtkada/bonobo.ads
-include/gtkada/gdk-bitmap.adb
-include/gtkada/gdk-bitmap.ads
-include/gtkada/gdk-color.adb
-include/gtkada/gdk-color.ads
-include/gtkada/gdk-cursor.adb
-include/gtkada/gdk-cursor.ads
-include/gtkada/gdk-dnd.adb
-include/gtkada/gdk-dnd.ads
-include/gtkada/gdk-drawable.adb
-include/gtkada/gdk-drawable.ads
-include/gtkada/gdk-event.adb
-include/gtkada/gdk-event.ads
-include/gtkada/gdk-font.adb
-include/gtkada/gdk-font.ads
-include/gtkada/gdk-gc.adb
-include/gtkada/gdk-gc.ads
-include/gtkada/gdk-gl.adb
-include/gtkada/gdk-gl.ads
-include/gtkada/gdk-image.adb
-include/gtkada/gdk-image.ads
-include/gtkada/gdk-input.ads
-include/gtkada/gdk-keyval.adb
-include/gtkada/gdk-keyval.ads
-include/gtkada/gdk-main.adb
-include/gtkada/gdk-main.ads
-include/gtkada/gdk-pixbuf.adb
-include/gtkada/gdk-pixbuf.ads
-include/gtkada/gdk-pixmap.adb
-include/gtkada/gdk-pixmap.ads
-include/gtkada/gdk-property.adb
-include/gtkada/gdk-property.ads
-include/gtkada/gdk-rectangle.adb
-include/gtkada/gdk-rectangle.ads
-include/gtkada/gdk-region.adb
-include/gtkada/gdk-region.ads
-include/gtkada/gdk-rgb.adb
-include/gtkada/gdk-rgb.ads
-include/gtkada/gdk-threads.ads
-include/gtkada/gdk-types-keysyms.ads
-include/gtkada/gdk-types.ads
-include/gtkada/gdk-visual.adb
-include/gtkada/gdk-visual.ads
-include/gtkada/gdk-window.adb
-include/gtkada/gdk-window.ads
-include/gtkada/gdk-window_attr.adb
-include/gtkada/gdk-window_attr.ads
-include/gtkada/gdk.ads
-include/gtkada/glade-xml.adb
-include/gtkada/glade-xml.ads
-include/gtkada/glade.adb
-include/gtkada/glade.ads
-include/gtkada/glib-convert.adb
-include/gtkada/glib-convert.ads
-include/gtkada/glib-enums.ads
-include/gtkada/glib-error.adb
-include/gtkada/glib-error.ads
-include/gtkada/glib-generic_properties.adb
-include/gtkada/glib-generic_properties.ads
-include/gtkada/glib-glade.adb
-include/gtkada/glib-glade.ads
-include/gtkada/glib-glist.adb
-include/gtkada/glib-glist.ads
-include/gtkada/glib-gnodes.adb
-include/gtkada/glib-gnodes.ads
-include/gtkada/glib-graphs.adb
-include/gtkada/glib-graphs.ads
-include/gtkada/glib-gslist.adb
-include/gtkada/glib-gslist.ads
-include/gtkada/glib-main.adb
-include/gtkada/glib-main.ads
-include/gtkada/glib-messages.adb
-include/gtkada/glib-messages.ads
-include/gtkada/glib-module.adb
-include/gtkada/glib-module.ads
-include/gtkada/glib-object.adb
-include/gtkada/glib-object.ads
-include/gtkada/glib-properties-creation.adb
-include/gtkada/glib-properties-creation.ads
-include/gtkada/glib-properties.adb
-include/gtkada/glib-properties.ads
-include/gtkada/glib-type_conversion_hooks.adb
-include/gtkada/glib-type_conversion_hooks.ads
-include/gtkada/glib-types.adb
-include/gtkada/glib-types.ads
-include/gtkada/glib-unicode.adb
-include/gtkada/glib-unicode.ads
-include/gtkada/glib-values.adb
-include/gtkada/glib-values.ads
-include/gtkada/glib-xml.adb
-include/gtkada/glib-xml.ads
-include/gtkada/glib-xml_int.ads
-include/gtkada/glib.adb
-include/gtkada/glib.ads
-include/gtkada/gnome-about.adb
-include/gtkada/gnome-about.ads
-include/gtkada/gnome-app.adb
-include/gtkada/gnome-app.ads
-include/gtkada/gnome-app_bar.adb
-include/gtkada/gnome-app_bar.ads
-include/gtkada/gnome-app_helper.adb
-include/gtkada/gnome-app_helper.ads
-include/gtkada/gnome-client.adb
-include/gtkada/gnome-client.ads
-include/gtkada/gnome-color_picker.adb
-include/gtkada/gnome-color_picker.ads
-include/gtkada/gnome-date_edit.adb
-include/gtkada/gnome-date_edit.ads
-include/gtkada/gnome-dialog.adb
-include/gtkada/gnome-dialog.ads
-include/gtkada/gnome-druid.adb
-include/gtkada/gnome-druid.ads
-include/gtkada/gnome-druid_page.adb
-include/gtkada/gnome-druid_page.ads
-include/gtkada/gnome-druid_page_edge.adb
-include/gtkada/gnome-druid_page_edge.ads
-include/gtkada/gnome-druid_page_standard.adb
-include/gtkada/gnome-druid_page_standard.ads
-include/gtkada/gnome-file_entry.adb
-include/gtkada/gnome-file_entry.ads
-include/gtkada/gnome-font_picker.adb
-include/gtkada/gnome-font_picker.ads
-include/gtkada/gnome-gentry.adb
-include/gtkada/gnome-gentry.ads
-include/gtkada/gnome-href.adb
-include/gtkada/gnome-href.ads
-include/gtkada/gnome-ice.ads
-include/gtkada/gnome-icon_entry.adb
-include/gtkada/gnome-icon_entry.ads
-include/gtkada/gnome-icon_selection.adb
-include/gtkada/gnome-icon_selection.ads
-include/gtkada/gnome-mdi.adb
-include/gtkada/gnome-mdi.ads
-include/gtkada/gnome-mdi_child.adb
-include/gtkada/gnome-mdi_child.ads
-include/gtkada/gnome-mdi_session.adb
-include/gtkada/gnome-mdi_session.ads
-include/gtkada/gnome-message_box.adb
-include/gtkada/gnome-message_box.ads
-include/gtkada/gnome-pixmap.adb
-include/gtkada/gnome-pixmap.ads
-include/gtkada/gnome-pixmap_entry.adb
-include/gtkada/gnome-pixmap_entry.ads
-include/gtkada/gnome-property_box.adb
-include/gtkada/gnome-property_box.ads
-include/gtkada/gnome-scores.adb
-include/gtkada/gnome-scores.ads
-include/gtkada/gnome-stock.ads
-include/gtkada/gnome-ui_defs.ads
-include/gtkada/gnome-window.adb
-include/gtkada/gnome-window.ads
-include/gtkada/gnome.adb
-include/gtkada/gnome.ads
-include/gtkada/gnome_generates.adb
-include/gtkada/gnome_generates.ads
-include/gtkada/gtk-accel_group.adb
-include/gtkada/gtk-accel_group.ads
-include/gtkada/gtk-accel_label.adb
-include/gtkada/gtk-accel_label.ads
-include/gtkada/gtk-accel_map.adb
-include/gtkada/gtk-accel_map.ads
-include/gtkada/gtk-adjustment.adb
-include/gtkada/gtk-adjustment.ads
-include/gtkada/gtk-alignment.adb
-include/gtkada/gtk-alignment.ads
-include/gtkada/gtk-arguments.adb
-include/gtkada/gtk-arguments.ads
-include/gtkada/gtk-arrow.adb
-include/gtkada/gtk-arrow.ads
-include/gtkada/gtk-aspect_frame.adb
-include/gtkada/gtk-aspect_frame.ads
-include/gtkada/gtk-bin.adb
-include/gtkada/gtk-bin.ads
-include/gtkada/gtk-box.adb
-include/gtkada/gtk-box.ads
-include/gtkada/gtk-button.adb
-include/gtkada/gtk-button.ads
-include/gtkada/gtk-button_box.adb
-include/gtkada/gtk-button_box.ads
-include/gtkada/gtk-calendar.adb
-include/gtkada/gtk-calendar.ads
-include/gtkada/gtk-cell_editable.ads
-include/gtkada/gtk-cell_layout.adb
-include/gtkada/gtk-cell_layout.ads
-include/gtkada/gtk-cell_renderer.adb
-include/gtkada/gtk-cell_renderer.ads
-include/gtkada/gtk-cell_renderer_combo.adb
-include/gtkada/gtk-cell_renderer_combo.ads
-include/gtkada/gtk-cell_renderer_pixbuf.adb
-include/gtkada/gtk-cell_renderer_pixbuf.ads
-include/gtkada/gtk-cell_renderer_progress.adb
-include/gtkada/gtk-cell_renderer_progress.ads
-include/gtkada/gtk-cell_renderer_text.adb
-include/gtkada/gtk-cell_renderer_text.ads
-include/gtkada/gtk-cell_renderer_toggle.adb
-include/gtkada/gtk-cell_renderer_toggle.ads
-include/gtkada/gtk-cell_view.adb
-include/gtkada/gtk-cell_view.ads
-include/gtkada/gtk-check_button.adb
-include/gtkada/gtk-check_button.ads
-include/gtkada/gtk-check_menu_item.adb
-include/gtkada/gtk-check_menu_item.ads
-include/gtkada/gtk-clipboard.adb
-include/gtkada/gtk-clipboard.ads
-include/gtkada/gtk-clist.adb
-include/gtkada/gtk-clist.ads
-include/gtkada/gtk-color_selection.adb
-include/gtkada/gtk-color_selection.ads
-include/gtkada/gtk-color_selection_dialog.adb
-include/gtkada/gtk-color_selection_dialog.ads
-include/gtkada/gtk-combo.adb
-include/gtkada/gtk-combo.ads
-include/gtkada/gtk-combo_box.adb
-include/gtkada/gtk-combo_box.ads
-include/gtkada/gtk-combo_box_entry.adb
-include/gtkada/gtk-combo_box_entry.ads
-include/gtkada/gtk-container.adb
-include/gtkada/gtk-container.ads
-include/gtkada/gtk-ctree.adb
-include/gtkada/gtk-ctree.ads
-include/gtkada/gtk-curve.adb
-include/gtkada/gtk-curve.ads
-include/gtkada/gtk-dialog.adb
-include/gtkada/gtk-dialog.ads
-include/gtkada/gtk-dnd.adb
-include/gtkada/gtk-dnd.ads
-include/gtkada/gtk-drawing_area.adb
-include/gtkada/gtk-drawing_area.ads
-include/gtkada/gtk-editable.adb
-include/gtkada/gtk-editable.ads
-include/gtkada/gtk-entry_completion.adb
-include/gtkada/gtk-entry_completion.ads
-include/gtkada/gtk-enums.adb
-include/gtkada/gtk-enums.ads
-include/gtkada/gtk-event_box.adb
-include/gtkada/gtk-event_box.ads
-include/gtkada/gtk-expander.adb
-include/gtkada/gtk-expander.ads
-include/gtkada/gtk-extra-border_combo.adb
-include/gtkada/gtk-extra-border_combo.ads
-include/gtkada/gtk-extra-color_combo.adb
-include/gtkada/gtk-extra-color_combo.ads
-include/gtkada/gtk-extra-combo_button.adb
-include/gtkada/gtk-extra-combo_button.ads
-include/gtkada/gtk-extra-font_combo.adb
-include/gtkada/gtk-extra-font_combo.ads
-include/gtkada/gtk-extra-item_entry.adb
-include/gtkada/gtk-extra-item_entry.ads
-include/gtkada/gtk-extra-plot.adb
-include/gtkada/gtk-extra-plot.ads
-include/gtkada/gtk-extra-plot_3d.adb
-include/gtkada/gtk-extra-plot_3d.ads
-include/gtkada/gtk-extra-plot_bar.adb
-include/gtkada/gtk-extra-plot_bar.ads
-include/gtkada/gtk-extra-plot_box.adb
-include/gtkada/gtk-extra-plot_box.ads
-include/gtkada/gtk-extra-plot_canvas-ellipse.adb
-include/gtkada/gtk-extra-plot_canvas-ellipse.ads
-include/gtkada/gtk-extra-plot_canvas-line.adb
-include/gtkada/gtk-extra-plot_canvas-line.ads
-include/gtkada/gtk-extra-plot_canvas-pixmap.adb
-include/gtkada/gtk-extra-plot_canvas-pixmap.ads
-include/gtkada/gtk-extra-plot_canvas-plot.adb
-include/gtkada/gtk-extra-plot_canvas-plot.ads
-include/gtkada/gtk-extra-plot_canvas-rectangle.adb
-include/gtkada/gtk-extra-plot_canvas-rectangle.ads
-include/gtkada/gtk-extra-plot_canvas-text.adb
-include/gtkada/gtk-extra-plot_canvas-text.ads
-include/gtkada/gtk-extra-plot_canvas.adb
-include/gtkada/gtk-extra-plot_canvas.ads
-include/gtkada/gtk-extra-plot_data.adb
-include/gtkada/gtk-extra-plot_data.ads
-include/gtkada/gtk-extra-plot_polar.adb
-include/gtkada/gtk-extra-plot_polar.ads
-include/gtkada/gtk-extra-plot_ps.adb
-include/gtkada/gtk-extra-plot_ps.ads
-include/gtkada/gtk-extra-plot_surface.adb
-include/gtkada/gtk-extra-plot_surface.ads
-include/gtkada/gtk-extra-sheet.adb
-include/gtkada/gtk-extra-sheet.ads
-include/gtkada/gtk-extra.ads
-include/gtkada/gtk-file_selection.adb
-include/gtkada/gtk-file_selection.ads
-include/gtkada/gtk-fixed.adb
-include/gtkada/gtk-fixed.ads
-include/gtkada/gtk-font_selection.adb
-include/gtkada/gtk-font_selection.ads
-include/gtkada/gtk-font_selection_dialog.ads
-include/gtkada/gtk-frame.adb
-include/gtkada/gtk-frame.ads
-include/gtkada/gtk-gamma_curve.adb
-include/gtkada/gtk-gamma_curve.ads
-include/gtkada/gtk-gentry.adb
-include/gtkada/gtk-gentry.ads
-include/gtkada/gtk-glade.adb
-include/gtkada/gtk-glade.ads
-include/gtkada/gtk-glarea.adb
-include/gtkada/gtk-glarea.ads
-include/gtkada/gtk-grange.adb
-include/gtkada/gtk-grange.ads
-include/gtkada/gtk-handle_box.adb
-include/gtkada/gtk-handle_box.ads
-include/gtkada/gtk-handlers.adb
-include/gtkada/gtk-handlers.ads
-include/gtkada/gtk-hbutton_box.adb
-include/gtkada/gtk-hbutton_box.ads
-include/gtkada/gtk-icon_factory.adb
-include/gtkada/gtk-icon_factory.ads
-include/gtkada/gtk-image.adb
-include/gtkada/gtk-image.ads
-include/gtkada/gtk-image_menu_item.adb
-include/gtkada/gtk-image_menu_item.ads
-include/gtkada/gtk-input_dialog.adb
-include/gtkada/gtk-input_dialog.ads
-include/gtkada/gtk-invisible.adb
-include/gtkada/gtk-invisible.ads
-include/gtkada/gtk-item.adb
-include/gtkada/gtk-item.ads
-include/gtkada/gtk-item_factory.adb
-include/gtkada/gtk-item_factory.ads
-include/gtkada/gtk-label.adb
-include/gtkada/gtk-label.ads
-include/gtkada/gtk-layout.adb
-include/gtkada/gtk-layout.ads
-include/gtkada/gtk-list.adb
-include/gtkada/gtk-list.ads
-include/gtkada/gtk-list_item.adb
-include/gtkada/gtk-list_item.ads
-include/gtkada/gtk-list_store.adb
-include/gtkada/gtk-list_store.ads
-include/gtkada/gtk-main.adb
-include/gtkada/gtk-main.ads
-include/gtkada/gtk-marshallers.adb
-include/gtkada/gtk-marshallers.ads
-include/gtkada/gtk-menu.adb
-include/gtkada/gtk-menu.ads
-include/gtkada/gtk-menu_bar.adb
-include/gtkada/gtk-menu_bar.ads
-include/gtkada/gtk-menu_item.adb
-include/gtkada/gtk-menu_item.ads
-include/gtkada/gtk-menu_shell.adb
-include/gtkada/gtk-menu_shell.ads
-include/gtkada/gtk-menu_tool_button.adb
-include/gtkada/gtk-menu_tool_button.ads
-include/gtkada/gtk-misc.adb
-include/gtkada/gtk-misc.ads
-include/gtkada/gtk-notebook.adb
-include/gtkada/gtk-notebook.ads
-include/gtkada/gtk-object.adb
-include/gtkada/gtk-object.ads
-include/gtkada/gtk-old_editable.adb
-include/gtkada/gtk-old_editable.ads
-include/gtkada/gtk-option_menu.adb
-include/gtkada/gtk-option_menu.ads
-include/gtkada/gtk-paned.adb
-include/gtkada/gtk-paned.ads
-include/gtkada/gtk-pixmap.adb
-include/gtkada/gtk-pixmap.ads
-include/gtkada/gtk-plug.adb
-include/gtkada/gtk-plug.ads
-include/gtkada/gtk-preview.adb
-include/gtkada/gtk-preview.ads
-include/gtkada/gtk-progress.adb
-include/gtkada/gtk-progress.ads
-include/gtkada/gtk-progress_bar.adb
-include/gtkada/gtk-progress_bar.ads
-include/gtkada/gtk-radio_button.adb
-include/gtkada/gtk-radio_button.ads
-include/gtkada/gtk-radio_menu_item.adb
-include/gtkada/gtk-radio_menu_item.ads
-include/gtkada/gtk-radio_tool_button.adb
-include/gtkada/gtk-radio_tool_button.ads
-include/gtkada/gtk-rc.adb
-include/gtkada/gtk-rc.ads
-include/gtkada/gtk-ruler.adb
-include/gtkada/gtk-ruler.ads
-include/gtkada/gtk-scale.adb
-include/gtkada/gtk-scale.ads
-include/gtkada/gtk-scrollbar.adb
-include/gtkada/gtk-scrollbar.ads
-include/gtkada/gtk-scrolled_window.adb
-include/gtkada/gtk-scrolled_window.ads
-include/gtkada/gtk-selection.adb
-include/gtkada/gtk-selection.ads
-include/gtkada/gtk-separator.adb
-include/gtkada/gtk-separator.ads
-include/gtkada/gtk-separator_menu_item.adb
-include/gtkada/gtk-separator_menu_item.ads
-include/gtkada/gtk-separator_tool_item.adb
-include/gtkada/gtk-separator_tool_item.ads
-include/gtkada/gtk-settings.adb
-include/gtkada/gtk-settings.ads
-include/gtkada/gtk-size_group.adb
-include/gtkada/gtk-size_group.ads
-include/gtkada/gtk-socket.adb
-include/gtkada/gtk-socket.ads
-include/gtkada/gtk-spin_button.adb
-include/gtkada/gtk-spin_button.ads
-include/gtkada/gtk-status_bar.adb
-include/gtkada/gtk-status_bar.ads
-include/gtkada/gtk-stock.adb
-include/gtkada/gtk-stock.ads
-include/gtkada/gtk-style.adb
-include/gtkada/gtk-style.ads
-include/gtkada/gtk-table.adb
-include/gtkada/gtk-table.ads
-include/gtkada/gtk-tearoff_menu_item.adb
-include/gtkada/gtk-tearoff_menu_item.ads
-include/gtkada/gtk-text.adb
-include/gtkada/gtk-text.ads
-include/gtkada/gtk-text_attributes.adb
-include/gtkada/gtk-text_attributes.ads
-include/gtkada/gtk-text_buffer.adb
-include/gtkada/gtk-text_buffer.ads
-include/gtkada/gtk-text_child.adb
-include/gtkada/gtk-text_child.ads
-include/gtkada/gtk-text_iter.adb
-include/gtkada/gtk-text_iter.ads
-include/gtkada/gtk-text_mark.adb
-include/gtkada/gtk-text_mark.ads
-include/gtkada/gtk-text_tag.adb
-include/gtkada/gtk-text_tag.ads
-include/gtkada/gtk-text_tag_table.adb
-include/gtkada/gtk-text_tag_table.ads
-include/gtkada/gtk-text_view.adb
-include/gtkada/gtk-text_view.ads
-include/gtkada/gtk-tips_query.adb
-include/gtkada/gtk-tips_query.ads
-include/gtkada/gtk-toggle_button.adb
-include/gtkada/gtk-toggle_button.ads
-include/gtkada/gtk-toggle_tool_button.adb
-include/gtkada/gtk-toggle_tool_button.ads
-include/gtkada/gtk-tool_button.adb
-include/gtkada/gtk-tool_button.ads
-include/gtkada/gtk-tool_item.adb
-include/gtkada/gtk-tool_item.ads
-include/gtkada/gtk-toolbar.adb
-include/gtkada/gtk-toolbar.ads
-include/gtkada/gtk-tooltips.adb
-include/gtkada/gtk-tooltips.ads
-include/gtkada/gtk-tree_model.adb
-include/gtkada/gtk-tree_model.ads
-include/gtkada/gtk-tree_model_filter.adb
-include/gtkada/gtk-tree_model_filter.ads
-include/gtkada/gtk-tree_model_sort.adb
-include/gtkada/gtk-tree_model_sort.ads
-include/gtkada/gtk-tree_selection.adb
-include/gtkada/gtk-tree_selection.ads
-include/gtkada/gtk-tree_sortable.adb
-include/gtkada/gtk-tree_sortable.ads
-include/gtkada/gtk-tree_store.adb
-include/gtkada/gtk-tree_store.ads
-include/gtkada/gtk-tree_view.adb
-include/gtkada/gtk-tree_view.ads
-include/gtkada/gtk-tree_view_column.adb
-include/gtkada/gtk-tree_view_column.ads
-include/gtkada/gtk-type_conversion.adb
-include/gtkada/gtk-type_conversion.ads
-include/gtkada/gtk-vbutton_box.adb
-include/gtkada/gtk-vbutton_box.ads
-include/gtkada/gtk-viewport.adb
-include/gtkada/gtk-viewport.ads
-include/gtkada/gtk-widget.adb
-include/gtkada/gtk-widget.ads
-include/gtkada/gtk-window.adb
-include/gtkada/gtk-window.ads
-include/gtkada/gtk.ads
-include/gtkada/gtk_generates.adb
-include/gtkada/gtk_generates.ads
-include/gtkada/gtkada-canvas.adb
-include/gtkada/gtkada-canvas.ads
-include/gtkada/gtkada-dialogs.adb
-include/gtkada/gtkada-dialogs.ads
-include/gtkada/gtkada-file_selection.adb
-include/gtkada/gtkada-file_selection.ads
-include/gtkada/gtkada-handlers.ads
-include/gtkada/gtkada-intl.adb
-include/gtkada/gtkada-intl.ads
-include/gtkada/gtkada-mdi.adb
-include/gtkada/gtkada-mdi.ads
-include/gtkada/gtkada-multi_paned.adb
-include/gtkada/gtkada-multi_paned.ads
-include/gtkada/gtkada-pixmaps.ads
-include/gtkada/gtkada-types.adb
-include/gtkada/gtkada-types.ads
-include/gtkada/gtkada.ads
-include/gtkada/pango-attributes.adb
-include/gtkada/pango-attributes.ads
-include/gtkada/pango-context.adb
-include/gtkada/pango-context.ads
-include/gtkada/pango-enums.adb
-include/gtkada/pango-enums.ads
-include/gtkada/pango-font.adb
-include/gtkada/pango-font.ads
-include/gtkada/pango-layout.adb
-include/gtkada/pango-layout.ads
-include/gtkada/pango-tabs.adb
-include/gtkada/pango-tabs.ads
-include/gtkada/pango.ads
-lib/gnat/gtkada.gpr
-lib/gnat/gtkada/gtkada.lgpr
-lib/gnat/gtkada/gtkada_gl.lgpr
-lib/gnat/gtkada/gtkada_glade.lgpr
-lib/gnat/gtkada/gtkada_gnome.lgpr
-lib/gnat/gtkada_gl.gpr
-lib/gnat/gtkada_gl_relocatable.gpr
-lib/gnat/gtkada_gl_static.gpr
-lib/gnat/gtkada_glade.gpr
-lib/gnat/gtkada_glade_relocatable.gpr
-lib/gnat/gtkada_glade_static.gpr
-lib/gnat/gtkada_gnome.gpr
-lib/gnat/gtkada_gnome_relocatable.gpr
-lib/gnat/gtkada_gnome_static.gpr
-lib/gnat/gtkada_relocatable.gpr
-lib/gnat/gtkada_static.gpr
-lib/gtkada/bonobo-dock.ali
-lib/gtkada/bonobo-dock_band.ali
-lib/gtkada/bonobo-dock_item.ali
-lib/gtkada/bonobo-dock_layout.ali
-lib/gtkada/bonobo.ali
-lib/gtkada/gdk-bitmap.ali
-lib/gtkada/gdk-color.ali
-lib/gtkada/gdk-cursor.ali
-lib/gtkada/gdk-dnd.ali
-lib/gtkada/gdk-drawable.ali
-lib/gtkada/gdk-event.ali
-lib/gtkada/gdk-font.ali
-lib/gtkada/gdk-gc.ali
-lib/gtkada/gdk-gl.ali
-lib/gtkada/gdk-image.ali
-lib/gtkada/gdk-input.ali
-lib/gtkada/gdk-keyval.ali
-lib/gtkada/gdk-main.ali
-lib/gtkada/gdk-pixbuf.ali
-lib/gtkada/gdk-pixmap.ali
-lib/gtkada/gdk-property.ali
-lib/gtkada/gdk-rectangle.ali
-lib/gtkada/gdk-region.ali
-lib/gtkada/gdk-rgb.ali
-lib/gtkada/gdk-threads.ali
-lib/gtkada/gdk-types-keysyms.ali
-lib/gtkada/gdk-types.ali
-lib/gtkada/gdk-visual.ali
-lib/gtkada/gdk-window.ali
-lib/gtkada/gdk-window_attr.ali
-lib/gtkada/gdk.ali
-lib/gtkada/glade-xml.ali
-lib/gtkada/glade.ali
-lib/gtkada/glib-convert.ali
-lib/gtkada/glib-enums.ali
-lib/gtkada/glib-error.ali
-lib/gtkada/glib-generic_properties.ali
-lib/gtkada/glib-glade.ali
-lib/gtkada/glib-glist.ali
-lib/gtkada/glib-gnodes.ali
-lib/gtkada/glib-graphs.ali
-lib/gtkada/glib-gslist.ali
-lib/gtkada/glib-main.ali
-lib/gtkada/glib-messages.ali
-lib/gtkada/glib-module.ali
-lib/gtkada/glib-object.ali
-lib/gtkada/glib-properties-creation.ali
-lib/gtkada/glib-properties.ali
-lib/gtkada/glib-type_conversion_hooks.ali
-lib/gtkada/glib-types.ali
-lib/gtkada/glib-unicode.ali
-lib/gtkada/glib-values.ali
-lib/gtkada/glib-xml.ali
-lib/gtkada/glib-xml_int.ali
-lib/gtkada/glib.ali
-lib/gtkada/gnome-about.ali
-lib/gtkada/gnome-app.ali
-lib/gtkada/gnome-app_bar.ali
-lib/gtkada/gnome-app_helper.ali
-lib/gtkada/gnome-client.ali
-lib/gtkada/gnome-color_picker.ali
-lib/gtkada/gnome-date_edit.ali
-lib/gtkada/gnome-dialog.ali
-lib/gtkada/gnome-druid.ali
-lib/gtkada/gnome-druid_page.ali
-lib/gtkada/gnome-druid_page_edge.ali
-lib/gtkada/gnome-druid_page_standard.ali
-lib/gtkada/gnome-file_entry.ali
-lib/gtkada/gnome-font_picker.ali
-lib/gtkada/gnome-gentry.ali
-lib/gtkada/gnome-href.ali
-lib/gtkada/gnome-ice.ali
-lib/gtkada/gnome-icon_entry.ali
-lib/gtkada/gnome-icon_selection.ali
-lib/gtkada/gnome-mdi.ali
-lib/gtkada/gnome-mdi_child.ali
-lib/gtkada/gnome-mdi_session.ali
-lib/gtkada/gnome-message_box.ali
-lib/gtkada/gnome-pixmap.ali
-lib/gtkada/gnome-pixmap_entry.ali
-lib/gtkada/gnome-property_box.ali
-lib/gtkada/gnome-scores.ali
-lib/gtkada/gnome-stock.ali
-lib/gtkada/gnome-ui_defs.ali
-lib/gtkada/gnome-window.ali
-lib/gtkada/gnome.ali
-lib/gtkada/gtk-accel_group.ali
-lib/gtkada/gtk-accel_label.ali
-lib/gtkada/gtk-accel_map.ali
-lib/gtkada/gtk-adjustment.ali
-lib/gtkada/gtk-alignment.ali
-lib/gtkada/gtk-arguments.ali
-lib/gtkada/gtk-arrow.ali
-lib/gtkada/gtk-aspect_frame.ali
-lib/gtkada/gtk-bin.ali
-lib/gtkada/gtk-box.ali
-lib/gtkada/gtk-button.ali
-lib/gtkada/gtk-button_box.ali
-lib/gtkada/gtk-calendar.ali
-lib/gtkada/gtk-cell_editable.ali
-lib/gtkada/gtk-cell_layout.ali
-lib/gtkada/gtk-cell_renderer.ali
-lib/gtkada/gtk-cell_renderer_combo.ali
-lib/gtkada/gtk-cell_renderer_pixbuf.ali
-lib/gtkada/gtk-cell_renderer_progress.ali
-lib/gtkada/gtk-cell_renderer_text.ali
-lib/gtkada/gtk-cell_renderer_toggle.ali
-lib/gtkada/gtk-cell_view.ali
-lib/gtkada/gtk-check_button.ali
-lib/gtkada/gtk-check_menu_item.ali
-lib/gtkada/gtk-clipboard.ali
-lib/gtkada/gtk-clist.ali
-lib/gtkada/gtk-color_selection.ali
-lib/gtkada/gtk-color_selection_dialog.ali
-lib/gtkada/gtk-combo.ali
-lib/gtkada/gtk-combo_box.ali
-lib/gtkada/gtk-combo_box_entry.ali
-lib/gtkada/gtk-container.ali
-lib/gtkada/gtk-ctree.ali
-lib/gtkada/gtk-curve.ali
-lib/gtkada/gtk-dialog.ali
-lib/gtkada/gtk-dnd.ali
-lib/gtkada/gtk-drawing_area.ali
-lib/gtkada/gtk-editable.ali
-lib/gtkada/gtk-entry_completion.ali
-lib/gtkada/gtk-enums.ali
-lib/gtkada/gtk-event_box.ali
-lib/gtkada/gtk-expander.ali
-lib/gtkada/gtk-extra-border_combo.ali
-lib/gtkada/gtk-extra-color_combo.ali
-lib/gtkada/gtk-extra-combo_button.ali
-lib/gtkada/gtk-extra-font_combo.ali
-lib/gtkada/gtk-extra-item_entry.ali
-lib/gtkada/gtk-extra-plot.ali
-lib/gtkada/gtk-extra-plot_3d.ali
-lib/gtkada/gtk-extra-plot_bar.ali
-lib/gtkada/gtk-extra-plot_box.ali
-lib/gtkada/gtk-extra-plot_canvas-ellipse.ali
-lib/gtkada/gtk-extra-plot_canvas-line.ali
-lib/gtkada/gtk-extra-plot_canvas-pixmap.ali
-lib/gtkada/gtk-extra-plot_canvas-plot.ali
-lib/gtkada/gtk-extra-plot_canvas-rectangle.ali
-lib/gtkada/gtk-extra-plot_canvas-text.ali
-lib/gtkada/gtk-extra-plot_canvas.ali
-lib/gtkada/gtk-extra-plot_data.ali
-lib/gtkada/gtk-extra-plot_polar.ali
-lib/gtkada/gtk-extra-plot_ps.ali
-lib/gtkada/gtk-extra-plot_surface.ali
-lib/gtkada/gtk-extra-sheet.ali
-lib/gtkada/gtk-extra.ali
-lib/gtkada/gtk-file_selection.ali
-lib/gtkada/gtk-fixed.ali
-lib/gtkada/gtk-font_selection.ali
-lib/gtkada/gtk-font_selection_dialog.ali
-lib/gtkada/gtk-frame.ali
-lib/gtkada/gtk-gamma_curve.ali
-lib/gtkada/gtk-gentry.ali
-lib/gtkada/gtk-glarea.ali
-lib/gtkada/gtk-grange.ali
-lib/gtkada/gtk-handle_box.ali
-lib/gtkada/gtk-handlers.ali
-lib/gtkada/gtk-hbutton_box.ali
-lib/gtkada/gtk-icon_factory.ali
-lib/gtkada/gtk-image.ali
-lib/gtkada/gtk-image_menu_item.ali
-lib/gtkada/gtk-input_dialog.ali
-lib/gtkada/gtk-invisible.ali
-lib/gtkada/gtk-item.ali
-lib/gtkada/gtk-item_factory.ali
-lib/gtkada/gtk-label.ali
-lib/gtkada/gtk-layout.ali
-lib/gtkada/gtk-list.ali
-lib/gtkada/gtk-list_item.ali
-lib/gtkada/gtk-list_store.ali
-lib/gtkada/gtk-main.ali
-lib/gtkada/gtk-marshallers.ali
-lib/gtkada/gtk-menu.ali
-lib/gtkada/gtk-menu_bar.ali
-lib/gtkada/gtk-menu_item.ali
-lib/gtkada/gtk-menu_shell.ali
-lib/gtkada/gtk-menu_tool_button.ali
-lib/gtkada/gtk-misc.ali
-lib/gtkada/gtk-notebook.ali
-lib/gtkada/gtk-object.ali
-lib/gtkada/gtk-old_editable.ali
-lib/gtkada/gtk-option_menu.ali
-lib/gtkada/gtk-paned.ali
-lib/gtkada/gtk-pixmap.ali
-lib/gtkada/gtk-plug.ali
-lib/gtkada/gtk-preview.ali
-lib/gtkada/gtk-progress.ali
-lib/gtkada/gtk-progress_bar.ali
-lib/gtkada/gtk-radio_button.ali
-lib/gtkada/gtk-radio_menu_item.ali
-lib/gtkada/gtk-radio_tool_button.ali
-lib/gtkada/gtk-rc.ali
-lib/gtkada/gtk-ruler.ali
-lib/gtkada/gtk-scale.ali
-lib/gtkada/gtk-scrollbar.ali
-lib/gtkada/gtk-scrolled_window.ali
-lib/gtkada/gtk-selection.ali
-lib/gtkada/gtk-separator.ali
-lib/gtkada/gtk-separator_menu_item.ali
-lib/gtkada/gtk-separator_tool_item.ali
-lib/gtkada/gtk-settings.ali
-lib/gtkada/gtk-size_group.ali
-lib/gtkada/gtk-socket.ali
-lib/gtkada/gtk-spin_button.ali
-lib/gtkada/gtk-status_bar.ali
-lib/gtkada/gtk-stock.ali
-lib/gtkada/gtk-style.ali
-lib/gtkada/gtk-table.ali
-lib/gtkada/gtk-tearoff_menu_item.ali
-lib/gtkada/gtk-text.ali
-lib/gtkada/gtk-text_attributes.ali
-lib/gtkada/gtk-text_buffer.ali
-lib/gtkada/gtk-text_child.ali
-lib/gtkada/gtk-text_iter.ali
-lib/gtkada/gtk-text_mark.ali
-lib/gtkada/gtk-text_tag.ali
-lib/gtkada/gtk-text_tag_table.ali
-lib/gtkada/gtk-text_view.ali
-lib/gtkada/gtk-tips_query.ali
-lib/gtkada/gtk-toggle_button.ali
-lib/gtkada/gtk-toggle_tool_button.ali
-lib/gtkada/gtk-tool_button.ali
-lib/gtkada/gtk-tool_item.ali
-lib/gtkada/gtk-toolbar.ali
-lib/gtkada/gtk-tooltips.ali
-lib/gtkada/gtk-tree_model.ali
-lib/gtkada/gtk-tree_model_filter.ali
-lib/gtkada/gtk-tree_model_sort.ali
-lib/gtkada/gtk-tree_selection.ali
-lib/gtkada/gtk-tree_sortable.ali
-lib/gtkada/gtk-tree_store.ali
-lib/gtkada/gtk-tree_view.ali
-lib/gtkada/gtk-tree_view_column.ali
-lib/gtkada/gtk-type_conversion.ali
-lib/gtkada/gtk-vbutton_box.ali
-lib/gtkada/gtk-viewport.ali
-lib/gtkada/gtk-widget.ali
-lib/gtkada/gtk-window.ali
-lib/gtkada/gtk.ali
-lib/gtkada/gtkada-canvas.ali
-lib/gtkada/gtkada-dialogs.ali
-lib/gtkada/gtkada-file_selection.ali
-lib/gtkada/gtkada-handlers.ali
-lib/gtkada/gtkada-intl.ali
-lib/gtkada/gtkada-mdi.ali
-lib/gtkada/gtkada-multi_paned.ali
-lib/gtkada/gtkada-pixmaps.ali
-lib/gtkada/gtkada-types.ali
-lib/gtkada/gtkada.ali
-lib/gtkada/libgnomeada-2.8.so.1
-lib/gtkada/libgnomeada.a
-lib/gtkada/libgnomeada.so
-lib/gtkada/libgtkada-2.8.so.1
-lib/gtkada/libgtkada.a
-lib/gtkada/libgtkada.so
-lib/gtkada/libgtkada_gl-2.8.so.1
-lib/gtkada/libgtkada_gl.a
-lib/gtkada/libgtkada_gl.so
-lib/gtkada/libgtkada_glade-2.8.so.1
-lib/gtkada/libgtkada_glade.a
-lib/gtkada/libgtkada_glade.so
-lib/gtkada/pango-attributes.ali
-lib/gtkada/pango-context.ali
-lib/gtkada/pango-enums.ali
-lib/gtkada/pango-font.ali
-lib/gtkada/pango-layout.ali
-lib/gtkada/pango-tabs.ali
-lib/gtkada/pango.ali
-lib/libgnomeada-2.8.so.1
-lib/libgnomeada.so
-lib/libgtkada-2.8.so.1
-lib/libgtkada.so
-lib/libgtkada_gl-2.8.so.1
-lib/libgtkada_gl.so
-lib/libgtkada_glade-2.8.so.1
-lib/libgtkada_glade.so
-libdata/pkgconfig/gtkada.pc
-share/doc/gtkada/gtkada_rm/checkbutton.jpg
-share/doc/gtkada/gtkada_rm/font.jpg
-share/doc/gtkada/gtkada_rm/gtkada_rm.texi
-share/doc/gtkada/gtkada_rm/texinfo.tex
-share/doc/gtkada/gtkada_rm/togglebutton.jpg
-share/doc/gtkada/gtkada_ug/boxes.gif
-share/doc/gtkada/gtkada_ug/gtkada_ug.texi
-share/doc/gtkada/gtkada_ug/hierarchy.jpg
-share/doc/gtkada/gtkada_ug/hierarchy.txt
-share/doc/gtkada/gtkada_ug/texinfo.tex
-share/examples/gtkada/base_widget/Makefile
-share/examples/gtkada/base_widget/README
-share/examples/gtkada/base_widget/main.adb
-share/examples/gtkada/base_widget/my_widget.adb
-share/examples/gtkada/base_widget/my_widget.ads
-share/examples/gtkada/calendar_combo/Makefile
-share/examples/gtkada/calendar_combo/README
-share/examples/gtkada/calendar_combo/calendar_combo.adb
-share/examples/gtkada/calendar_combo/calendar_combo.ads
-share/examples/gtkada/calendar_combo/main.adb
-share/examples/gtkada/composite_widget/Makefile
-share/examples/gtkada/composite_widget/README
-share/examples/gtkada/composite_widget/main.adb
-share/examples/gtkada/composite_widget/my_dialog.adb
-share/examples/gtkada/composite_widget/my_dialog.ads
-share/examples/gtkada/documentation/Makefile
-share/examples/gtkada/documentation/README
-share/examples/gtkada/documentation/banner.adb
-share/examples/gtkada/documentation/clist.adb
-share/examples/gtkada/documentation/clist.ads
-share/examples/gtkada/documentation/contextual.adb
-share/examples/gtkada/documentation/draw.adb
-share/examples/gtkada/documentation/glist_traverse.adb
-share/examples/gtkada/documentation/toggle.adb
-share/examples/gtkada/documentation/tooltips.adb
-share/examples/gtkada/doublebuffer/Makefile
-share/examples/gtkada/doublebuffer/README
-share/examples/gtkada/doublebuffer/anim.adb
-share/examples/gtkada/doublebuffer/anim2.adb
-share/examples/gtkada/doublebuffer/anim_task.adb
-share/examples/gtkada/doublebuffer/anim_task.ads
-share/examples/gtkada/doublebuffer/anim_timeout.adb
-share/examples/gtkada/doublebuffer/anim_timeout.ads
-share/examples/gtkada/doublebuffer/double_buffer.adb
-share/examples/gtkada/doublebuffer/double_buffer.ads
-share/examples/gtkada/doublebuffer/full_test.adb
-share/examples/gtkada/doublebuffer/full_test.ads
-share/examples/gtkada/doublebuffer/parameters.adb
-share/examples/gtkada/dynamic_cast/Makefile
-share/examples/gtkada/dynamic_cast/README
-share/examples/gtkada/dynamic_cast/dynamic.adb
-share/examples/gtkada/editor/Makefile
-share/examples/gtkada/editor/README
-share/examples/gtkada/editor/about_dialog_pkg-callbacks.adb
-share/examples/gtkada/editor/about_dialog_pkg-callbacks.ads
-share/examples/gtkada/editor/about_dialog_pkg.adb
-share/examples/gtkada/editor/about_dialog_pkg.ads
-share/examples/gtkada/editor/callbacks_gladeedit.ads
-share/examples/gtkada/editor/file_utils.adb
-share/examples/gtkada/editor/file_utils.ads
-share/examples/gtkada/editor/gladeedit.adb
-share/examples/gtkada/editor/main_window_pkg-callbacks.adb
-share/examples/gtkada/editor/main_window_pkg-callbacks.ads
-share/examples/gtkada/editor/main_window_pkg.adb
-share/examples/gtkada/editor/main_window_pkg.ads
-share/examples/gtkada/editor/open_file_selection_pkg-callbacks.adb
-share/examples/gtkada/editor/open_file_selection_pkg-callbacks.ads
-share/examples/gtkada/editor/open_file_selection_pkg.adb
-share/examples/gtkada/editor/open_file_selection_pkg.ads
-share/examples/gtkada/editor/save_file_selection_pkg-callbacks.adb
-share/examples/gtkada/editor/save_file_selection_pkg-callbacks.ads
-share/examples/gtkada/editor/save_file_selection_pkg.adb
-share/examples/gtkada/editor/save_file_selection_pkg.ads
-share/examples/gtkada/gtk_examples/Makefile
-share/examples/gtkada/gtk_examples/README
-share/examples/gtkada/gtk_examples/scribble.adb
-share/examples/gtkada/handlers/Makefile
-share/examples/gtkada/handlers/README
-share/examples/gtkada/handlers/delete_event.adb
-share/examples/gtkada/handlers/general_tips.adb
-share/examples/gtkada/handlers/own_marshaller.adb
-share/examples/gtkada/handlers/own_marshaller.ads
-share/examples/gtkada/handlers/specific_tips.adb
-share/examples/gtkada/powergnu/Makefile
-share/examples/gtkada/powergnu/README
-share/examples/gtkada/powergnu/callbacks_power.ads
-share/examples/gtkada/powergnu/power.adb
-share/examples/gtkada/powergnu/power_gnu.adb
-share/examples/gtkada/powergnu/power_gnu.ads
-share/examples/gtkada/powergnu/powergnu_pkg-callbacks.adb
-share/examples/gtkada/powergnu/powergnu_pkg-callbacks.ads
-share/examples/gtkada/powergnu/powergnu_pkg.adb
-share/examples/gtkada/powergnu/powergnu_pkg.ads
-share/examples/gtkada/testgtk/3DRings.xpm
-share/examples/gtkada/testgtk/FilesQueue.xpm
-share/examples/gtkada/testgtk/Modeller.xpm
-share/examples/gtkada/testgtk/alps.png
-share/examples/gtkada/testgtk/apple-red.png
-share/examples/gtkada/testgtk/background.jpg
-share/examples/gtkada/testgtk/check-n.xpm
-share/examples/gtkada/testgtk/check-y.xpm
-share/examples/gtkada/testgtk/common.adb
-share/examples/gtkada/testgtk/common.ads
-share/examples/gtkada/testgtk/create_alignment.adb
-share/examples/gtkada/testgtk/create_alignment.ads
-share/examples/gtkada/testgtk/create_arrow.adb
-share/examples/gtkada/testgtk/create_arrow.ads
-share/examples/gtkada/testgtk/create_box.adb
-share/examples/gtkada/testgtk/create_box.ads
-share/examples/gtkada/testgtk/create_button_box.adb
-share/examples/gtkada/testgtk/create_button_box.ads
-share/examples/gtkada/testgtk/create_buttons.adb
-share/examples/gtkada/testgtk/create_buttons.ads
-share/examples/gtkada/testgtk/create_calendar.adb
-share/examples/gtkada/testgtk/create_calendar.ads
-share/examples/gtkada/testgtk/create_canvas.adb
-share/examples/gtkada/testgtk/create_canvas.ads
-share/examples/gtkada/testgtk/create_cell_view.adb
-share/examples/gtkada/testgtk/create_cell_view.ads
-share/examples/gtkada/testgtk/create_check_buttons.adb
-share/examples/gtkada/testgtk/create_check_buttons.ads
-share/examples/gtkada/testgtk/create_clipboard.adb
-share/examples/gtkada/testgtk/create_clipboard.ads
-share/examples/gtkada/testgtk/create_clist.adb
-share/examples/gtkada/testgtk/create_clist.ads
-share/examples/gtkada/testgtk/create_color_selection.adb
-share/examples/gtkada/testgtk/create_color_selection.ads
-share/examples/gtkada/testgtk/create_combo_box.adb
-share/examples/gtkada/testgtk/create_combo_box.ads
-share/examples/gtkada/testgtk/create_ctree.adb
-share/examples/gtkada/testgtk/create_ctree.ads
-share/examples/gtkada/testgtk/create_cursors.adb
-share/examples/gtkada/testgtk/create_cursors.ads
-share/examples/gtkada/testgtk/create_dialog.adb
-share/examples/gtkada/testgtk/create_dialog.ads
-share/examples/gtkada/testgtk/create_dnd.adb
-share/examples/gtkada/testgtk/create_dnd.ads
-share/examples/gtkada/testgtk/create_entry.adb
-share/examples/gtkada/testgtk/create_entry.ads
-share/examples/gtkada/testgtk/create_file_selection.adb
-share/examples/gtkada/testgtk/create_file_selection.ads
-share/examples/gtkada/testgtk/create_fixed.adb
-share/examples/gtkada/testgtk/create_fixed.ads
-share/examples/gtkada/testgtk/create_font_selection.adb
-share/examples/gtkada/testgtk/create_font_selection.ads
-share/examples/gtkada/testgtk/create_frame.adb
-share/examples/gtkada/testgtk/create_frame.ads
-share/examples/gtkada/testgtk/create_gamma_curve.adb
-share/examples/gtkada/testgtk/create_gamma_curve.ads
-share/examples/gtkada/testgtk/create_gc.adb
-share/examples/gtkada/testgtk/create_gc.ads
-share/examples/gtkada/testgtk/create_handle_box.adb
-share/examples/gtkada/testgtk/create_handle_box.ads
-share/examples/gtkada/testgtk/create_item_factory.adb
-share/examples/gtkada/testgtk/create_item_factory.ads
-share/examples/gtkada/testgtk/create_label.adb
-share/examples/gtkada/testgtk/create_label.ads
-share/examples/gtkada/testgtk/create_layout.adb
-share/examples/gtkada/testgtk/create_layout.ads
-share/examples/gtkada/testgtk/create_list.adb
-share/examples/gtkada/testgtk/create_list.ads
-share/examples/gtkada/testgtk/create_main_loop.adb
-share/examples/gtkada/testgtk/create_main_loop.ads
-share/examples/gtkada/testgtk/create_menu.adb
-share/examples/gtkada/testgtk/create_menu.ads
-share/examples/gtkada/testgtk/create_notebook.adb
-share/examples/gtkada/testgtk/create_notebook.ads
-share/examples/gtkada/testgtk/create_paned.adb
-share/examples/gtkada/testgtk/create_paned.ads
-share/examples/gtkada/testgtk/create_pixbuf.adb
-share/examples/gtkada/testgtk/create_pixbuf.ads
-share/examples/gtkada/testgtk/create_pixmap.adb
-share/examples/gtkada/testgtk/create_pixmap.ads
-share/examples/gtkada/testgtk/create_plot.adb
-share/examples/gtkada/testgtk/create_plot.ads
-share/examples/gtkada/testgtk/create_plot_3d.adb
-share/examples/gtkada/testgtk/create_plot_3d.ads
-share/examples/gtkada/testgtk/create_plot_realtime.adb
-share/examples/gtkada/testgtk/create_plot_realtime.ads
-share/examples/gtkada/testgtk/create_preview_color.adb
-share/examples/gtkada/testgtk/create_preview_color.ads
-share/examples/gtkada/testgtk/create_preview_gray.adb
-share/examples/gtkada/testgtk/create_preview_gray.ads
-share/examples/gtkada/testgtk/create_progress.adb
-share/examples/gtkada/testgtk/create_progress.ads
-share/examples/gtkada/testgtk/create_radio_button.adb
-share/examples/gtkada/testgtk/create_radio_button.ads
-share/examples/gtkada/testgtk/create_range.adb
-share/examples/gtkada/testgtk/create_range.ads
-share/examples/gtkada/testgtk/create_reparent.adb
-share/examples/gtkada/testgtk/create_reparent.ads
-share/examples/gtkada/testgtk/create_rulers.adb
-share/examples/gtkada/testgtk/create_rulers.ads
-share/examples/gtkada/testgtk/create_scroll_test.adb
-share/examples/gtkada/testgtk/create_scroll_test.ads
-share/examples/gtkada/testgtk/create_scrolled.adb
-share/examples/gtkada/testgtk/create_scrolled.ads
-share/examples/gtkada/testgtk/create_selection.adb
-share/examples/gtkada/testgtk/create_selection.ads
-share/examples/gtkada/testgtk/create_shapes.adb
-share/examples/gtkada/testgtk/create_shapes.ads
-share/examples/gtkada/testgtk/create_sheet.adb
-share/examples/gtkada/testgtk/create_sheet.ads
-share/examples/gtkada/testgtk/create_size_groups.adb
-share/examples/gtkada/testgtk/create_size_groups.ads
-share/examples/gtkada/testgtk/create_sources.adb
-share/examples/gtkada/testgtk/create_sources.ads
-share/examples/gtkada/testgtk/create_spin.adb
-share/examples/gtkada/testgtk/create_spin.ads
-share/examples/gtkada/testgtk/create_splittable.adb
-share/examples/gtkada/testgtk/create_splittable.ads
-share/examples/gtkada/testgtk/create_status.adb
-share/examples/gtkada/testgtk/create_status.ads
-share/examples/gtkada/testgtk/create_test_idle.adb
-share/examples/gtkada/testgtk/create_test_idle.ads
-share/examples/gtkada/testgtk/create_test_timeout.adb
-share/examples/gtkada/testgtk/create_test_timeout.ads
-share/examples/gtkada/testgtk/create_text_view.adb
-share/examples/gtkada/testgtk/create_text_view.ads
-share/examples/gtkada/testgtk/create_toggle_buttons.adb
-share/examples/gtkada/testgtk/create_toggle_buttons.ads
-share/examples/gtkada/testgtk/create_toolbar.adb
-share/examples/gtkada/testgtk/create_toolbar.ads
-share/examples/gtkada/testgtk/create_tooltips.adb
-share/examples/gtkada/testgtk/create_tooltips.ads
-share/examples/gtkada/testgtk/create_tree.adb
-share/examples/gtkada/testgtk/create_tree.ads
-share/examples/gtkada/testgtk/create_tree_filter.adb
-share/examples/gtkada/testgtk/create_tree_filter.ads
-share/examples/gtkada/testgtk/create_tree_view.adb
-share/examples/gtkada/testgtk/create_tree_view.ads
-share/examples/gtkada/testgtk/dancing-penguin.gif
-share/examples/gtkada/testgtk/gnome-applets.png
-share/examples/gtkada/testgtk/gnome-calendar.png
-share/examples/gtkada/testgtk/gnome-foot.png
-share/examples/gtkada/testgtk/gnome-gimp.png
-share/examples/gtkada/testgtk/gnome-gmush.png
-share/examples/gtkada/testgtk/gnome-gsame.png
-share/examples/gtkada/testgtk/gnu-keys.png
-share/examples/gtkada/testgtk/libart_demo.adb
-share/examples/gtkada/testgtk/libart_demo.ads
-share/examples/gtkada/testgtk/lightning.png
-share/examples/gtkada/testgtk/main_windows.adb
-share/examples/gtkada/testgtk/main_windows.ads
-share/examples/gtkada/testgtk/marble.xpm
-share/examples/gtkada/testgtk/opengl/lw.c
-share/examples/gtkada/testgtk/opengl/lw.h
-share/examples/gtkada/testgtk/opengl/lwobjects.adb
-share/examples/gtkada/testgtk/opengl/lwobjects.ads
-share/examples/gtkada/testgtk/opengl/trackball.adb
-share/examples/gtkada/testgtk/opengl/trackball.ads
-share/examples/gtkada/testgtk/opengl/view_gl.adb
-share/examples/gtkada/testgtk/opengl/view_gl.ads
-share/examples/gtkada/testgtk/penguin.lwo
-share/examples/gtkada/testgtk/test.xpm
-share/examples/gtkada/testgtk/testgtk
-share/examples/gtkada/testgtk/testgtk.adb
-share/examples/gtkada/testgtk/tree_minus.xpm
-share/examples/gtkada/testgtk/tree_plus.xpm
-share/examples/gtkada/tutorial/Makefile
-share/examples/gtkada/tutorial/README
-share/examples/gtkada/tutorial/gtkdial/Makefile
-share/examples/gtkada/tutorial/gtkdial/dial_handlers.adb
-share/examples/gtkada/tutorial/gtkdial/dial_handlers.ads
-share/examples/gtkada/tutorial/gtkdial/dial_test.adb
-share/examples/gtkada/tutorial/gtkdial/gtk_dial.adb
-share/examples/gtkada/tutorial/gtkdial/gtk_dial.ads
-share/examples/gtkada/tutorial/helloworld/Makefile
-share/examples/gtkada/tutorial/helloworld/hello.adb
-share/examples/gtkada/tutorial/helloworld/hello_package.adb
-share/examples/gtkada/tutorial/helloworld/hello_package.ads
-share/examples/gtkada/tutorial/helloworld2/Makefile
-share/examples/gtkada/tutorial/helloworld2/hello2.adb
-share/examples/gtkada/tutorial/helloworld2/hello2_package.adb
-share/examples/gtkada/tutorial/helloworld2/hello2_package.ads
-share/examples/gtkada/tutorial/packbox/Makefile
-share/examples/gtkada/tutorial/packbox/packbox.adb
-share/examples/gtkada/tutorial/packbox/packbox.ads
-share/examples/gtkada/tutorial/packbox/packbox_test.adb
-share/examples/gtkada/tutorial/simple/Makefile
-share/examples/gtkada/tutorial/simple/simple.adb
-share/examples/gtkada/tutorial/table/Makefile
-share/examples/gtkada/tutorial/table/table.adb
-share/examples/gtkada/tutorial/table/table.ads
-share/examples/gtkada/tutorial/table/table_test.adb
-share/examples/gtkada/tutorial/tictactoe/Makefile
-share/examples/gtkada/tutorial/tictactoe/tictactoe.adb
-share/examples/gtkada/tutorial/tictactoe/tictactoe.ads
-share/examples/gtkada/tutorial/tictactoe/ttt_test.adb
-share/examples/gtkada/user_data/Makefile
-share/examples/gtkada/user_data/README
-share/examples/gtkada/user_data/test_handlers.adb
-share/gps/plug-ins/gtkada.xml
-@dirrm share/gps/plug-ins
-@dirrm share/gps
-@dirrm share/examples/gtkada/user_data
-@dirrm share/examples/gtkada/tutorial/tictactoe
-@dirrm share/examples/gtkada/tutorial/table
-@dirrm share/examples/gtkada/tutorial/simple
-@dirrm share/examples/gtkada/tutorial/packbox
-@dirrm share/examples/gtkada/tutorial/helloworld2
-@dirrm share/examples/gtkada/tutorial/helloworld
-@dirrm share/examples/gtkada/tutorial/gtkdial
-@dirrm share/examples/gtkada/tutorial
-@dirrm share/examples/gtkada/testgtk/opengl
-@dirrm share/examples/gtkada/testgtk
-@dirrm share/examples/gtkada/powergnu
-@dirrm share/examples/gtkada/handlers
-@dirrm share/examples/gtkada/gtk_examples
-@dirrm share/examples/gtkada/editor
-@dirrm share/examples/gtkada/dynamic_cast
-@dirrm share/examples/gtkada/doublebuffer
-@dirrm share/examples/gtkada/documentation
-@dirrm share/examples/gtkada/composite_widget
-@dirrm share/examples/gtkada/calendar_combo
-@dirrm share/examples/gtkada/base_widget
-@dirrm share/examples/gtkada
-@dirrm share/doc/gtkada/gtkada_ug
-@dirrm share/doc/gtkada/gtkada_rm
-@dirrm share/doc/gtkada
-@dirrm lib/gtkada
-@dirrm lib/gnat/gtkada
-@dirrm lib/gnat
-@dirrm include/gtkada
diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile
deleted file mode 100644
index 7f0635f..0000000
--- a/x11-toolkits/gtkada/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:   gtkada
-# Date Created:			27 Nov 2000
-# Whom:				Samuel Tardieu <sam@inf.enst.fr>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gtkada
-PORTVERSION=	2.4.0
-PORTREVISION=	5
-CATEGORIES=	x11-toolkits
-MASTER_SITES=	https://libre2.adacore.com/GtkAda/ \
-		http://libre.act-europe.fr/GtkAda/ \
-		http://www.sourcefiles.org/Programming/Development/Interfaces/
-DISTNAME=	GtkAda-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Gtk2 binding for Ada
-
-BUILD_DEPENDS=	gnatgcc:${PORTSDIR}/lang/gnat
-
-CONFLICTS=	gtkada-devel-[0-9]* gtkada-gcc-[0-9]*
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_GL=		gl
-USE_GNOME=	gtk20 libglade2
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-GL=GL
-
-EXAMPLESDIR=	${DATADIR}/examples
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkada/distinfo b/x11-toolkits/gtkada/distinfo
deleted file mode 100644
index 13aaa18..0000000
--- a/x11-toolkits/gtkada/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (GtkAda-2.4.0.tgz) = 31232d695ca40c3fb346fb34bc93ed3d
-SHA256 (GtkAda-2.4.0.tgz) = 1c80eaa850eb87101188ea4d5145b7a8093b99ff99466c1f9f17a737828cd43e
-SIZE (GtkAda-2.4.0.tgz) = 3235169
diff --git a/x11-toolkits/gtkada/files/patch-Makefile.in b/x11-toolkits/gtkada/files/patch-Makefile.in
deleted file mode 100644
index 35da8b4..0000000
--- a/x11-toolkits/gtkada/files/patch-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	Fri Jul  7 16:07:08 2006
-+++ Makefile.in	Fri Jul  7 16:08:36 2006
-@@ -21,7 +21,9 @@
- 	$(MAKE) -C $(src_dir) install
- 	$(MAKE) -C $(projects_dir) install
- 	$(MAKE) -C $(testgtk_dir) install
-+ifndef NOPORTDOCS
- 	$(MAKE) -C $(doc_dir) install
-+endif
- 	$(MAKE) -C $(example_dir) install
-
- clean-generic:
diff --git a/x11-toolkits/gtkada/files/patch-docs::gtkada_rm::Makefile.in b/x11-toolkits/gtkada/files/patch-docs::gtkada_rm::Makefile.in
deleted file mode 100644
index 56ff345..0000000
--- a/x11-toolkits/gtkada/files/patch-docs::gtkada_rm::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- docs/gtkada_rm/Makefile.in	2001/08/15 09:23:56	1.1
-+++ docs/gtkada_rm/Makefile.in	2001/08/15 09:24:15
-@@ -1,5 +1,5 @@
- prefix = @prefix@
--docdir = $(prefix)/doc/GtkAda/gtkada_rm
-+docdir = $(prefix)/share/doc/gtkada/gtkada_rm
- 
- MKDIR = mkdir -p
- INSTALL = @INSTALL@
diff --git a/x11-toolkits/gtkada/files/patch-docs::gtkada_ug::Makefile.in b/x11-toolkits/gtkada/files/patch-docs::gtkada_ug::Makefile.in
deleted file mode 100644
index b1731d9..0000000
--- a/x11-toolkits/gtkada/files/patch-docs::gtkada_ug::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- docs/gtkada_ug/Makefile.in	2001/08/15 09:24:24	1.1
-+++ docs/gtkada_ug/Makefile.in	2001/08/15 09:24:35
-@@ -1,5 +1,5 @@
- prefix = @prefix@
--docdir = $(prefix)/doc/GtkAda/gtkada_ug
-+docdir = $(prefix)/share/doc/gtkada/gtkada_ug
- 
- MKDIR = mkdir -p
- INSTALL = @INSTALL@
diff --git a/x11-toolkits/gtkada/files/patch-projects_Makefile b/x11-toolkits/gtkada/files/patch-projects_Makefile
deleted file mode 100644
index 2b5c163..0000000
--- a/x11-toolkits/gtkada/files/patch-projects_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN projects/Makefile projects/Makefile
---- projects/Makefile	Fri Oct  8 12:59:36 2004
-+++ projects/Makefile	Thu Jun 15 18:32:43 2006
-@@ -3,6 +3,6 @@
- MKDIR = mkdir -p
-
- install:
--	${MKDIR} $(prefix)/projects/
--	cp *.gpr $(prefix)/projects/
-+	${MKDIR} $(prefix)/share/gtkada/projects/
-+	cp *.gpr $(prefix)/share/gtkada/projects/
-
diff --git a/x11-toolkits/gtkada/pkg-descr b/x11-toolkits/gtkada/pkg-descr
deleted file mode 100644
index 8f54d79..0000000
--- a/x11-toolkits/gtkada/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-GtkAda is an Ada95 graphical toolkit based on Gtk+, providing the complete set
-of Gtk+ widgets using the Object-Oriented features of this language. GtkAda
-supports the latest 2.2 and 2.4 stable releases.
-
-WWW: https://libre2.adacore.com/GtkAda/
diff --git a/x11-toolkits/gtkada/pkg-plist b/x11-toolkits/gtkada/pkg-plist
deleted file mode 100644
index 2f73da9..0000000
--- a/x11-toolkits/gtkada/pkg-plist
+++ /dev/null
@@ -1,1212 +0,0 @@
-bin/gate
-bin/gate-in.exe
-bin/gdialog
-bin/generate.pl
-bin/gtkada-config
-include/gtkada/bonobo-dock.adb
-include/gtkada/bonobo-dock.ads
-include/gtkada/bonobo-dock.ali
-include/gtkada/bonobo-dock_band.adb
-include/gtkada/bonobo-dock_band.ads
-include/gtkada/bonobo-dock_band.ali
-include/gtkada/bonobo-dock_item.adb
-include/gtkada/bonobo-dock_item.ads
-include/gtkada/bonobo-dock_item.ali
-include/gtkada/bonobo-dock_layout.adb
-include/gtkada/bonobo-dock_layout.ads
-include/gtkada/bonobo-dock_layout.ali
-include/gtkada/bonobo.ads
-include/gtkada/bonobo.ali
-include/gtkada/gdk-bitmap.adb
-include/gtkada/gdk-bitmap.ads
-include/gtkada/gdk-bitmap.ali
-include/gtkada/gdk-color.adb
-include/gtkada/gdk-color.ads
-include/gtkada/gdk-color.ali
-include/gtkada/gdk-cursor.adb
-include/gtkada/gdk-cursor.ads
-include/gtkada/gdk-cursor.ali
-include/gtkada/gdk-dnd.adb
-include/gtkada/gdk-dnd.ads
-include/gtkada/gdk-dnd.ali
-include/gtkada/gdk-drawable.adb
-include/gtkada/gdk-drawable.ads
-include/gtkada/gdk-drawable.ali
-include/gtkada/gdk-event.adb
-include/gtkada/gdk-event.ads
-include/gtkada/gdk-event.ali
-include/gtkada/gdk-font.adb
-include/gtkada/gdk-font.ads
-include/gtkada/gdk-font.ali
-include/gtkada/gdk-gc.adb
-include/gtkada/gdk-gc.ads
-include/gtkada/gdk-gc.ali
-include/gtkada/gdk-gl.adb
-include/gtkada/gdk-gl.ads
-include/gtkada/gdk-gl.ali
-include/gtkada/gdk-image.adb
-include/gtkada/gdk-image.ads
-include/gtkada/gdk-image.ali
-include/gtkada/gdk-input.ads
-include/gtkada/gdk-input.ali
-include/gtkada/gdk-keyval.adb
-include/gtkada/gdk-keyval.ads
-include/gtkada/gdk-keyval.ali
-include/gtkada/gdk-main.adb
-include/gtkada/gdk-main.ads
-include/gtkada/gdk-main.ali
-include/gtkada/gdk-pixbuf.adb
-include/gtkada/gdk-pixbuf.ads
-include/gtkada/gdk-pixbuf.ali
-include/gtkada/gdk-pixmap.adb
-include/gtkada/gdk-pixmap.ads
-include/gtkada/gdk-pixmap.ali
-include/gtkada/gdk-property.adb
-include/gtkada/gdk-property.ads
-include/gtkada/gdk-property.ali
-include/gtkada/gdk-rectangle.adb
-include/gtkada/gdk-rectangle.ads
-include/gtkada/gdk-rectangle.ali
-include/gtkada/gdk-region.adb
-include/gtkada/gdk-region.ads
-include/gtkada/gdk-region.ali
-include/gtkada/gdk-rgb.adb
-include/gtkada/gdk-rgb.ads
-include/gtkada/gdk-rgb.ali
-include/gtkada/gdk-threads.ads
-include/gtkada/gdk-threads.ali
-include/gtkada/gdk-types-keysyms.ads
-include/gtkada/gdk-types-keysyms.ali
-include/gtkada/gdk-types.ads
-include/gtkada/gdk-types.ali
-include/gtkada/gdk-visual.adb
-include/gtkada/gdk-visual.ads
-include/gtkada/gdk-visual.ali
-include/gtkada/gdk-window.adb
-include/gtkada/gdk-window.ads
-include/gtkada/gdk-window.ali
-include/gtkada/gdk-window_attr.adb
-include/gtkada/gdk-window_attr.ads
-include/gtkada/gdk-window_attr.ali
-include/gtkada/gdk.ads
-include/gtkada/gdk.ali
-include/gtkada/gl_h.ads
-include/gtkada/gl_h.ali
-include/gtkada/glade-xml.adb
-include/gtkada/glade-xml.ads
-include/gtkada/glade-xml.ali
-include/gtkada/glade.adb
-include/gtkada/glade.ads
-include/gtkada/glade.ali
-include/gtkada/glib-convert.adb
-include/gtkada/glib-convert.ads
-include/gtkada/glib-convert.ali
-include/gtkada/glib-enums.ads
-include/gtkada/glib-enums.ali
-include/gtkada/glib-error.adb
-include/gtkada/glib-error.ads
-include/gtkada/glib-error.ali
-include/gtkada/glib-generic_properties.adb
-include/gtkada/glib-generic_properties.ads
-include/gtkada/glib-generic_properties.ali
-include/gtkada/glib-glade.adb
-include/gtkada/glib-glade.ads
-include/gtkada/glib-glade.ali
-include/gtkada/glib-glist.adb
-include/gtkada/glib-glist.ads
-include/gtkada/glib-glist.ali
-include/gtkada/glib-gnodes.adb
-include/gtkada/glib-gnodes.ads
-include/gtkada/glib-gnodes.ali
-include/gtkada/glib-graphs.adb
-include/gtkada/glib-graphs.ads
-include/gtkada/glib-graphs.ali
-include/gtkada/glib-gslist.adb
-include/gtkada/glib-gslist.ads
-include/gtkada/glib-gslist.ali
-include/gtkada/glib-messages.adb
-include/gtkada/glib-messages.ads
-include/gtkada/glib-messages.ali
-include/gtkada/glib-module.adb
-include/gtkada/glib-module.ads
-include/gtkada/glib-module.ali
-include/gtkada/glib-object.adb
-include/gtkada/glib-object.ads
-include/gtkada/glib-object.ali
-include/gtkada/glib-properties-creation.adb
-include/gtkada/glib-properties-creation.ads
-include/gtkada/glib-properties-creation.ali
-include/gtkada/glib-properties.adb
-include/gtkada/glib-properties.ads
-include/gtkada/glib-properties.ali
-include/gtkada/glib-type_conversion_hooks.adb
-include/gtkada/glib-type_conversion_hooks.ads
-include/gtkada/glib-type_conversion_hooks.ali
-include/gtkada/glib-unicode.adb
-include/gtkada/glib-unicode.ads
-include/gtkada/glib-unicode.ali
-include/gtkada/glib-values.adb
-include/gtkada/glib-values.ads
-include/gtkada/glib-values.ali
-include/gtkada/glib-xml.adb
-include/gtkada/glib-xml.ads
-include/gtkada/glib-xml.ali
-include/gtkada/glib-xml_int.ads
-include/gtkada/glib-xml_int.ali
-include/gtkada/glib.adb
-include/gtkada/glib.ads
-include/gtkada/glib.ali
-include/gtkada/glu_h.ads
-include/gtkada/gnome-about.adb
-include/gtkada/gnome-about.ads
-include/gtkada/gnome-about.ali
-include/gtkada/gnome-app.adb
-include/gtkada/gnome-app.ads
-include/gtkada/gnome-app.ali
-include/gtkada/gnome-app_bar.adb
-include/gtkada/gnome-app_bar.ads
-include/gtkada/gnome-app_bar.ali
-include/gtkada/gnome-app_helper.adb
-include/gtkada/gnome-app_helper.ads
-include/gtkada/gnome-app_helper.ali
-include/gtkada/gnome-client.adb
-include/gtkada/gnome-client.ads
-include/gtkada/gnome-client.ali
-include/gtkada/gnome-color_picker.adb
-include/gtkada/gnome-color_picker.ads
-include/gtkada/gnome-color_picker.ali
-include/gtkada/gnome-date_edit.adb
-include/gtkada/gnome-date_edit.ads
-include/gtkada/gnome-date_edit.ali
-include/gtkada/gnome-dialog.adb
-include/gtkada/gnome-dialog.ads
-include/gtkada/gnome-dialog.ali
-include/gtkada/gnome-druid.adb
-include/gtkada/gnome-druid.ads
-include/gtkada/gnome-druid.ali
-include/gtkada/gnome-druid_page.adb
-include/gtkada/gnome-druid_page.ads
-include/gtkada/gnome-druid_page.ali
-include/gtkada/gnome-druid_page_edge.adb
-include/gtkada/gnome-druid_page_edge.ads
-include/gtkada/gnome-druid_page_edge.ali
-include/gtkada/gnome-druid_page_standard.adb
-include/gtkada/gnome-druid_page_standard.ads
-include/gtkada/gnome-druid_page_standard.ali
-include/gtkada/gnome-file_entry.adb
-include/gtkada/gnome-file_entry.ads
-include/gtkada/gnome-file_entry.ali
-include/gtkada/gnome-font_picker.adb
-include/gtkada/gnome-font_picker.ads
-include/gtkada/gnome-font_picker.ali
-include/gtkada/gnome-gentry.adb
-include/gtkada/gnome-gentry.ads
-include/gtkada/gnome-gentry.ali
-include/gtkada/gnome-href.adb
-include/gtkada/gnome-href.ads
-include/gtkada/gnome-href.ali
-include/gtkada/gnome-ice.ads
-include/gtkada/gnome-ice.ali
-include/gtkada/gnome-icon_entry.adb
-include/gtkada/gnome-icon_entry.ads
-include/gtkada/gnome-icon_entry.ali
-include/gtkada/gnome-icon_selection.adb
-include/gtkada/gnome-icon_selection.ads
-include/gtkada/gnome-icon_selection.ali
-include/gtkada/gnome-mdi.adb
-include/gtkada/gnome-mdi.ads
-include/gtkada/gnome-mdi.ali
-include/gtkada/gnome-mdi_child.adb
-include/gtkada/gnome-mdi_child.ads
-include/gtkada/gnome-mdi_child.ali
-include/gtkada/gnome-mdi_session.adb
-include/gtkada/gnome-mdi_session.ads
-include/gtkada/gnome-mdi_session.ali
-include/gtkada/gnome-message_box.adb
-include/gtkada/gnome-message_box.ads
-include/gtkada/gnome-message_box.ali
-include/gtkada/gnome-pixmap.adb
-include/gtkada/gnome-pixmap.ads
-include/gtkada/gnome-pixmap.ali
-include/gtkada/gnome-pixmap_entry.adb
-include/gtkada/gnome-pixmap_entry.ads
-include/gtkada/gnome-pixmap_entry.ali
-include/gtkada/gnome-property_box.adb
-include/gtkada/gnome-property_box.ads
-include/gtkada/gnome-property_box.ali
-include/gtkada/gnome-scores.adb
-include/gtkada/gnome-scores.ads
-include/gtkada/gnome-scores.ali
-include/gtkada/gnome-stock.ads
-include/gtkada/gnome-stock.ali
-include/gtkada/gnome-ui_defs.ads
-include/gtkada/gnome-ui_defs.ali
-include/gtkada/gnome-window.adb
-include/gtkada/gnome-window.ads
-include/gtkada/gnome-window.ali
-include/gtkada/gnome.adb
-include/gtkada/gnome.ads
-include/gtkada/gnome.ali
-include/gtkada/gnome_generates.adb
-include/gtkada/gnome_generates.ads
-include/gtkada/gtk-accel_group.adb
-include/gtkada/gtk-accel_group.ads
-include/gtkada/gtk-accel_group.ali
-include/gtkada/gtk-accel_label.adb
-include/gtkada/gtk-accel_label.ads
-include/gtkada/gtk-accel_label.ali
-include/gtkada/gtk-accel_map.adb
-include/gtkada/gtk-accel_map.ads
-include/gtkada/gtk-accel_map.ali
-include/gtkada/gtk-adjustment.adb
-include/gtkada/gtk-adjustment.ads
-include/gtkada/gtk-adjustment.ali
-include/gtkada/gtk-alignment.adb
-include/gtkada/gtk-alignment.ads
-include/gtkada/gtk-alignment.ali
-include/gtkada/gtk-arguments.adb
-include/gtkada/gtk-arguments.ads
-include/gtkada/gtk-arguments.ali
-include/gtkada/gtk-arrow.adb
-include/gtkada/gtk-arrow.ads
-include/gtkada/gtk-arrow.ali
-include/gtkada/gtk-aspect_frame.adb
-include/gtkada/gtk-aspect_frame.ads
-include/gtkada/gtk-aspect_frame.ali
-include/gtkada/gtk-bin.adb
-include/gtkada/gtk-bin.ads
-include/gtkada/gtk-bin.ali
-include/gtkada/gtk-box.adb
-include/gtkada/gtk-box.ads
-include/gtkada/gtk-box.ali
-include/gtkada/gtk-button.adb
-include/gtkada/gtk-button.ads
-include/gtkada/gtk-button.ali
-include/gtkada/gtk-button_box.adb
-include/gtkada/gtk-button_box.ads
-include/gtkada/gtk-button_box.ali
-include/gtkada/gtk-calendar.adb
-include/gtkada/gtk-calendar.ads
-include/gtkada/gtk-calendar.ali
-include/gtkada/gtk-cell_editable.adb
-include/gtkada/gtk-cell_editable.ads
-include/gtkada/gtk-cell_editable.ali
-include/gtkada/gtk-cell_renderer.adb
-include/gtkada/gtk-cell_renderer.ads
-include/gtkada/gtk-cell_renderer.ali
-include/gtkada/gtk-cell_renderer_pixbuf.adb
-include/gtkada/gtk-cell_renderer_pixbuf.ads
-include/gtkada/gtk-cell_renderer_pixbuf.ali
-include/gtkada/gtk-cell_renderer_text.adb
-include/gtkada/gtk-cell_renderer_text.ads
-include/gtkada/gtk-cell_renderer_text.ali
-include/gtkada/gtk-cell_renderer_toggle.adb
-include/gtkada/gtk-cell_renderer_toggle.ads
-include/gtkada/gtk-cell_renderer_toggle.ali
-include/gtkada/gtk-check_button.adb
-include/gtkada/gtk-check_button.ads
-include/gtkada/gtk-check_button.ali
-include/gtkada/gtk-check_menu_item.adb
-include/gtkada/gtk-check_menu_item.ads
-include/gtkada/gtk-check_menu_item.ali
-include/gtkada/gtk-clipboard.adb
-include/gtkada/gtk-clipboard.ads
-include/gtkada/gtk-clipboard.ali
-include/gtkada/gtk-clist.adb
-include/gtkada/gtk-clist.ads
-include/gtkada/gtk-clist.ali
-include/gtkada/gtk-color_selection.adb
-include/gtkada/gtk-color_selection.ads
-include/gtkada/gtk-color_selection.ali
-include/gtkada/gtk-color_selection_dialog.adb
-include/gtkada/gtk-color_selection_dialog.ads
-include/gtkada/gtk-color_selection_dialog.ali
-include/gtkada/gtk-combo.adb
-include/gtkada/gtk-combo.ads
-include/gtkada/gtk-combo.ali
-include/gtkada/gtk-container.adb
-include/gtkada/gtk-container.ads
-include/gtkada/gtk-container.ali
-include/gtkada/gtk-ctree.adb
-include/gtkada/gtk-ctree.ads
-include/gtkada/gtk-ctree.ali
-include/gtkada/gtk-curve.adb
-include/gtkada/gtk-curve.ads
-include/gtkada/gtk-curve.ali
-include/gtkada/gtk-dialog.adb
-include/gtkada/gtk-dialog.ads
-include/gtkada/gtk-dialog.ali
-include/gtkada/gtk-dnd.adb
-include/gtkada/gtk-dnd.ads
-include/gtkada/gtk-dnd.ali
-include/gtkada/gtk-drawing_area.adb
-include/gtkada/gtk-drawing_area.ads
-include/gtkada/gtk-drawing_area.ali
-include/gtkada/gtk-editable.adb
-include/gtkada/gtk-editable.ads
-include/gtkada/gtk-editable.ali
-include/gtkada/gtk-enums.adb
-include/gtkada/gtk-enums.ads
-include/gtkada/gtk-enums.ali
-include/gtkada/gtk-event_box.adb
-include/gtkada/gtk-event_box.ads
-include/gtkada/gtk-event_box.ali
-include/gtkada/gtk-extra-border_combo.adb
-include/gtkada/gtk-extra-border_combo.ads
-include/gtkada/gtk-extra-border_combo.ali
-include/gtkada/gtk-extra-color_combo.adb
-include/gtkada/gtk-extra-color_combo.ads
-include/gtkada/gtk-extra-color_combo.ali
-include/gtkada/gtk-extra-combo_box.adb
-include/gtkada/gtk-extra-combo_box.ads
-include/gtkada/gtk-extra-combo_box.ali
-include/gtkada/gtk-extra-font_combo.adb
-include/gtkada/gtk-extra-font_combo.ads
-include/gtkada/gtk-extra-font_combo.ali
-include/gtkada/gtk-extra-item_entry.adb
-include/gtkada/gtk-extra-item_entry.ads
-include/gtkada/gtk-extra-item_entry.ali
-include/gtkada/gtk-extra-plot.adb
-include/gtkada/gtk-extra-plot.ads
-include/gtkada/gtk-extra-plot.ali
-include/gtkada/gtk-extra-plot_3d.adb
-include/gtkada/gtk-extra-plot_3d.ads
-include/gtkada/gtk-extra-plot_3d.ali
-include/gtkada/gtk-extra-plot_bar.adb
-include/gtkada/gtk-extra-plot_bar.ads
-include/gtkada/gtk-extra-plot_bar.ali
-include/gtkada/gtk-extra-plot_box.adb
-include/gtkada/gtk-extra-plot_box.ads
-include/gtkada/gtk-extra-plot_box.ali
-include/gtkada/gtk-extra-plot_canvas.adb
-include/gtkada/gtk-extra-plot_canvas.ads
-include/gtkada/gtk-extra-plot_canvas.ali
-include/gtkada/gtk-extra-plot_data.adb
-include/gtkada/gtk-extra-plot_data.ads
-include/gtkada/gtk-extra-plot_data.ali
-include/gtkada/gtk-extra-plot_polar.adb
-include/gtkada/gtk-extra-plot_polar.ads
-include/gtkada/gtk-extra-plot_polar.ali
-include/gtkada/gtk-extra-plot_ps.adb
-include/gtkada/gtk-extra-plot_ps.ads
-include/gtkada/gtk-extra-plot_ps.ali
-include/gtkada/gtk-extra-plot_surface.adb
-include/gtkada/gtk-extra-plot_surface.ads
-include/gtkada/gtk-extra-plot_surface.ali
-include/gtkada/gtk-extra-sheet.adb
-include/gtkada/gtk-extra-sheet.ads
-include/gtkada/gtk-extra-sheet.ali
-include/gtkada/gtk-extra.ads
-include/gtkada/gtk-extra.ali
-include/gtkada/gtk-file_selection.adb
-include/gtkada/gtk-file_selection.ads
-include/gtkada/gtk-file_selection.ali
-include/gtkada/gtk-fixed.adb
-include/gtkada/gtk-fixed.ads
-include/gtkada/gtk-fixed.ali
-include/gtkada/gtk-font_selection.adb
-include/gtkada/gtk-font_selection.ads
-include/gtkada/gtk-font_selection.ali
-include/gtkada/gtk-font_selection_dialog.ads
-include/gtkada/gtk-font_selection_dialog.ali
-include/gtkada/gtk-frame.adb
-include/gtkada/gtk-frame.ads
-include/gtkada/gtk-frame.ali
-include/gtkada/gtk-gamma_curve.adb
-include/gtkada/gtk-gamma_curve.ads
-include/gtkada/gtk-gamma_curve.ali
-include/gtkada/gtk-gentry.adb
-include/gtkada/gtk-gentry.ads
-include/gtkada/gtk-gentry.ali
-include/gtkada/gtk-glade.adb
-include/gtkada/gtk-glade.ads
-include/gtkada/gtk-glarea.adb
-include/gtkada/gtk-glarea.ads
-include/gtkada/gtk-glarea.ali
-include/gtkada/gtk-grange.adb
-include/gtkada/gtk-grange.ads
-include/gtkada/gtk-grange.ali
-include/gtkada/gtk-handle_box.adb
-include/gtkada/gtk-handle_box.ads
-include/gtkada/gtk-handle_box.ali
-include/gtkada/gtk-handlers.adb
-include/gtkada/gtk-handlers.ads
-include/gtkada/gtk-handlers.ali
-include/gtkada/gtk-hbutton_box.adb
-include/gtkada/gtk-hbutton_box.ads
-include/gtkada/gtk-hbutton_box.ali
-include/gtkada/gtk-icon_factory.adb
-include/gtkada/gtk-icon_factory.ads
-include/gtkada/gtk-icon_factory.ali
-include/gtkada/gtk-image.adb
-include/gtkada/gtk-image.ads
-include/gtkada/gtk-image.ali
-include/gtkada/gtk-image_menu_item.adb
-include/gtkada/gtk-image_menu_item.ads
-include/gtkada/gtk-image_menu_item.ali
-include/gtkada/gtk-input_dialog.adb
-include/gtkada/gtk-input_dialog.ads
-include/gtkada/gtk-input_dialog.ali
-include/gtkada/gtk-invisible.adb
-include/gtkada/gtk-invisible.ads
-include/gtkada/gtk-invisible.ali
-include/gtkada/gtk-item.adb
-include/gtkada/gtk-item.ads
-include/gtkada/gtk-item.ali
-include/gtkada/gtk-item_factory.adb
-include/gtkada/gtk-item_factory.ads
-include/gtkada/gtk-item_factory.ali
-include/gtkada/gtk-label.adb
-include/gtkada/gtk-label.ads
-include/gtkada/gtk-label.ali
-include/gtkada/gtk-layout.adb
-include/gtkada/gtk-layout.ads
-include/gtkada/gtk-layout.ali
-include/gtkada/gtk-list.adb
-include/gtkada/gtk-list.ads
-include/gtkada/gtk-list.ali
-include/gtkada/gtk-list_item.adb
-include/gtkada/gtk-list_item.ads
-include/gtkada/gtk-list_item.ali
-include/gtkada/gtk-list_store.adb
-include/gtkada/gtk-list_store.ads
-include/gtkada/gtk-list_store.ali
-include/gtkada/gtk-main.adb
-include/gtkada/gtk-main.ads
-include/gtkada/gtk-main.ali
-include/gtkada/gtk-marshallers.adb
-include/gtkada/gtk-marshallers.ads
-include/gtkada/gtk-marshallers.ali
-include/gtkada/gtk-menu.adb
-include/gtkada/gtk-menu.ads
-include/gtkada/gtk-menu.ali
-include/gtkada/gtk-menu_bar.adb
-include/gtkada/gtk-menu_bar.ads
-include/gtkada/gtk-menu_bar.ali
-include/gtkada/gtk-menu_item.adb
-include/gtkada/gtk-menu_item.ads
-include/gtkada/gtk-menu_item.ali
-include/gtkada/gtk-menu_shell.adb
-include/gtkada/gtk-menu_shell.ads
-include/gtkada/gtk-menu_shell.ali
-include/gtkada/gtk-misc.adb
-include/gtkada/gtk-misc.ads
-include/gtkada/gtk-misc.ali
-include/gtkada/gtk-notebook.adb
-include/gtkada/gtk-notebook.ads
-include/gtkada/gtk-notebook.ali
-include/gtkada/gtk-object.adb
-include/gtkada/gtk-object.ads
-include/gtkada/gtk-object.ali
-include/gtkada/gtk-old_editable.adb
-include/gtkada/gtk-old_editable.ads
-include/gtkada/gtk-old_editable.ali
-include/gtkada/gtk-option_menu.adb
-include/gtkada/gtk-option_menu.ads
-include/gtkada/gtk-option_menu.ali
-include/gtkada/gtk-paned.adb
-include/gtkada/gtk-paned.ads
-include/gtkada/gtk-paned.ali
-include/gtkada/gtk-pixmap.adb
-include/gtkada/gtk-pixmap.ads
-include/gtkada/gtk-pixmap.ali
-include/gtkada/gtk-plug.adb
-include/gtkada/gtk-plug.ads
-include/gtkada/gtk-plug.ali
-include/gtkada/gtk-preview.adb
-include/gtkada/gtk-preview.ads
-include/gtkada/gtk-preview.ali
-include/gtkada/gtk-progress.adb
-include/gtkada/gtk-progress.ads
-include/gtkada/gtk-progress.ali
-include/gtkada/gtk-progress_bar.adb
-include/gtkada/gtk-progress_bar.ads
-include/gtkada/gtk-progress_bar.ali
-include/gtkada/gtk-radio_button.adb
-include/gtkada/gtk-radio_button.ads
-include/gtkada/gtk-radio_button.ali
-include/gtkada/gtk-radio_menu_item.adb
-include/gtkada/gtk-radio_menu_item.ads
-include/gtkada/gtk-radio_menu_item.ali
-include/gtkada/gtk-rc.adb
-include/gtkada/gtk-rc.ads
-include/gtkada/gtk-rc.ali
-include/gtkada/gtk-ruler.adb
-include/gtkada/gtk-ruler.ads
-include/gtkada/gtk-ruler.ali
-include/gtkada/gtk-scale.adb
-include/gtkada/gtk-scale.ads
-include/gtkada/gtk-scale.ali
-include/gtkada/gtk-scrollbar.adb
-include/gtkada/gtk-scrollbar.ads
-include/gtkada/gtk-scrollbar.ali
-include/gtkada/gtk-scrolled_window.adb
-include/gtkada/gtk-scrolled_window.ads
-include/gtkada/gtk-scrolled_window.ali
-include/gtkada/gtk-selection.adb
-include/gtkada/gtk-selection.ads
-include/gtkada/gtk-selection.ali
-include/gtkada/gtk-separator.adb
-include/gtkada/gtk-separator.ads
-include/gtkada/gtk-separator.ali
-include/gtkada/gtk-separator_menu_item.adb
-include/gtkada/gtk-separator_menu_item.ads
-include/gtkada/gtk-separator_menu_item.ali
-include/gtkada/gtk-size_group.adb
-include/gtkada/gtk-size_group.ads
-include/gtkada/gtk-size_group.ali
-include/gtkada/gtk-socket.adb
-include/gtkada/gtk-socket.ads
-include/gtkada/gtk-socket.ali
-include/gtkada/gtk-spin_button.adb
-include/gtkada/gtk-spin_button.ads
-include/gtkada/gtk-spin_button.ali
-include/gtkada/gtk-status_bar.adb
-include/gtkada/gtk-status_bar.ads
-include/gtkada/gtk-status_bar.ali
-include/gtkada/gtk-stock.adb
-include/gtkada/gtk-stock.ads
-include/gtkada/gtk-stock.ali
-include/gtkada/gtk-style.adb
-include/gtkada/gtk-style.ads
-include/gtkada/gtk-style.ali
-include/gtkada/gtk-table.adb
-include/gtkada/gtk-table.ads
-include/gtkada/gtk-table.ali
-include/gtkada/gtk-tearoff_menu_item.adb
-include/gtkada/gtk-tearoff_menu_item.ads
-include/gtkada/gtk-tearoff_menu_item.ali
-include/gtkada/gtk-text.adb
-include/gtkada/gtk-text.ads
-include/gtkada/gtk-text.ali
-include/gtkada/gtk-text_attributes.adb
-include/gtkada/gtk-text_attributes.ads
-include/gtkada/gtk-text_attributes.ali
-include/gtkada/gtk-text_buffer.adb
-include/gtkada/gtk-text_buffer.ads
-include/gtkada/gtk-text_buffer.ali
-include/gtkada/gtk-text_child.adb
-include/gtkada/gtk-text_child.ads
-include/gtkada/gtk-text_child.ali
-include/gtkada/gtk-text_iter.adb
-include/gtkada/gtk-text_iter.ads
-include/gtkada/gtk-text_iter.ali
-include/gtkada/gtk-text_mark.adb
-include/gtkada/gtk-text_mark.ads
-include/gtkada/gtk-text_mark.ali
-include/gtkada/gtk-text_tag.adb
-include/gtkada/gtk-text_tag.ads
-include/gtkada/gtk-text_tag.ali
-include/gtkada/gtk-text_tag_table.adb
-include/gtkada/gtk-text_tag_table.ads
-include/gtkada/gtk-text_tag_table.ali
-include/gtkada/gtk-text_view.adb
-include/gtkada/gtk-text_view.ads
-include/gtkada/gtk-text_view.ali
-include/gtkada/gtk-tips_query.adb
-include/gtkada/gtk-tips_query.ads
-include/gtkada/gtk-tips_query.ali
-include/gtkada/gtk-toggle_button.adb
-include/gtkada/gtk-toggle_button.ads
-include/gtkada/gtk-toggle_button.ali
-include/gtkada/gtk-toolbar.adb
-include/gtkada/gtk-toolbar.ads
-include/gtkada/gtk-toolbar.ali
-include/gtkada/gtk-tooltips.adb
-include/gtkada/gtk-tooltips.ads
-include/gtkada/gtk-tooltips.ali
-include/gtkada/gtk-tree_model.adb
-include/gtkada/gtk-tree_model.ads
-include/gtkada/gtk-tree_model.ali
-include/gtkada/gtk-tree_model_sort.adb
-include/gtkada/gtk-tree_model_sort.ads
-include/gtkada/gtk-tree_model_sort.ali
-include/gtkada/gtk-tree_selection.adb
-include/gtkada/gtk-tree_selection.ads
-include/gtkada/gtk-tree_selection.ali
-include/gtkada/gtk-tree_store.adb
-include/gtkada/gtk-tree_store.ads
-include/gtkada/gtk-tree_store.ali
-include/gtkada/gtk-tree_view.adb
-include/gtkada/gtk-tree_view.ads
-include/gtkada/gtk-tree_view.ali
-include/gtkada/gtk-tree_view_column.adb
-include/gtkada/gtk-tree_view_column.ads
-include/gtkada/gtk-tree_view_column.ali
-include/gtkada/gtk-type_conversion.adb
-include/gtkada/gtk-type_conversion.ads
-include/gtkada/gtk-type_conversion.ali
-include/gtkada/gtk-vbutton_box.adb
-include/gtkada/gtk-vbutton_box.ads
-include/gtkada/gtk-vbutton_box.ali
-include/gtkada/gtk-viewport.adb
-include/gtkada/gtk-viewport.ads
-include/gtkada/gtk-viewport.ali
-include/gtkada/gtk-widget.adb
-include/gtkada/gtk-widget.ads
-include/gtkada/gtk-widget.ali
-include/gtkada/gtk-window.adb
-include/gtkada/gtk-window.ads
-include/gtkada/gtk-window.ali
-include/gtkada/gtk.ads
-include/gtkada/gtk.ali
-include/gtkada/gtk_generates.adb
-include/gtkada/gtk_generates.ads
-include/gtkada/gtkada-canvas.adb
-include/gtkada/gtkada-canvas.ads
-include/gtkada/gtkada-canvas.ali
-include/gtkada/gtkada-dialogs.adb
-include/gtkada/gtkada-dialogs.ads
-include/gtkada/gtkada-dialogs.ali
-include/gtkada/gtkada-file_selection.adb
-include/gtkada/gtkada-file_selection.ads
-include/gtkada/gtkada-file_selection.ali
-include/gtkada/gtkada-handlers.ads
-include/gtkada/gtkada-handlers.ali
-include/gtkada/gtkada-intl.adb
-include/gtkada/gtkada-intl.ads
-include/gtkada/gtkada-intl.ali
-include/gtkada/gtkada-mdi.adb
-include/gtkada/gtkada-mdi.ads
-include/gtkada/gtkada-mdi.ali
-include/gtkada/gtkada-multi_paned.adb
-include/gtkada/gtkada-multi_paned.ads
-include/gtkada/gtkada-multi_paned.ali
-include/gtkada/gtkada-pixmaps.ads
-include/gtkada/gtkada-pixmaps.ali
-include/gtkada/gtkada-types.adb
-include/gtkada/gtkada-types.ads
-include/gtkada/gtkada-types.ali
-include/gtkada/gtkada.ads
-include/gtkada/gtkada.ali
-include/gtkada/gtkada.gpr
-include/gtkada/pango-attributes.adb
-include/gtkada/pango-attributes.ads
-include/gtkada/pango-attributes.ali
-include/gtkada/pango-context.adb
-include/gtkada/pango-context.ads
-include/gtkada/pango-context.ali
-include/gtkada/pango-enums.adb
-include/gtkada/pango-enums.ads
-include/gtkada/pango-enums.ali
-include/gtkada/pango-font.adb
-include/gtkada/pango-font.ads
-include/gtkada/pango-font.ali
-include/gtkada/pango-layout.adb
-include/gtkada/pango-layout.ads
-include/gtkada/pango-layout.ali
-include/gtkada/pango.ads
-include/gtkada/pango.ali
-lib/libgnomeada-2.4.so.0
-lib/libgnomeada.a
-lib/libgnomeada.so
-lib/libgtkada-2.4.so.0
-lib/libgtkada.a
-lib/libgtkada.so
-lib/libgtkada_gl-2.4.so.0
-lib/libgtkada_gl.a
-lib/libgtkada_gl.so
-lib/libgtkada_glade-2.4.so.0
-lib/libgtkada_glade.a
-lib/libgtkada_glade.so
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/checkbutton.jpg
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/font.jpg
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-1
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-10
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-11
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-12
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-13
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-14
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-15
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-16
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-17
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-18
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-19
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-2
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-20
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-21
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-22
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-23
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-24
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-25
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-3
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-4
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-5
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-6
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-7
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-8
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.info-9
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.ps
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.texi
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.txt
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_1.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_10.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_100.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_101.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_102.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_103.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_104.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_105.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_106.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_107.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_108.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_109.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_11.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_110.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_111.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_112.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_113.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_114.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_115.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_116.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_117.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_118.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_119.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_12.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_120.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_121.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_122.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_123.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_124.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_125.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_126.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_127.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_128.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_129.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_13.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_130.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_131.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_132.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_133.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_134.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_135.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_136.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_137.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_138.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_139.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_14.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_140.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_141.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_142.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_143.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_144.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_145.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_146.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_147.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_148.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_149.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_15.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_150.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_151.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_16.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_17.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_18.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_19.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_2.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_20.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_21.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_22.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_23.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_24.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_25.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_26.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_27.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_28.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_29.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_3.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_30.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_31.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_32.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_33.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_34.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_35.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_36.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_37.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_38.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_39.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_4.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_40.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_41.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_42.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_43.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_44.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_45.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_46.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_47.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_48.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_49.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_5.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_50.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_51.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_52.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_53.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_54.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_55.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_56.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_57.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_58.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_59.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_6.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_60.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_61.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_62.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_63.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_64.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_65.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_66.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_67.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_68.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_69.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_7.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_70.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_71.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_72.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_73.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_74.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_75.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_76.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_77.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_78.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_79.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_8.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_80.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_81.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_82.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_83.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_84.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_85.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_86.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_87.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_88.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_89.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_9.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_90.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_91.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_92.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_93.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_94.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_95.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_96.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_97.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_98.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_99.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_stoc.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm_toc.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/texinfo.tex
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/togglebutton.jpg
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/boxes.gif
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.html
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.info
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.info-1
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.info-2
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.ps
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.texi
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.txt
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/hierarchy.jpg
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/hierarchy.txt
-%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/texinfo.tex
-%%EXAMPLESDIR%%/base_widget/Makefile
-%%EXAMPLESDIR%%/base_widget/README
-%%EXAMPLESDIR%%/base_widget/main.adb
-%%EXAMPLESDIR%%/base_widget/my_widget.adb
-%%EXAMPLESDIR%%/base_widget/my_widget.ads
-%%EXAMPLESDIR%%/calendar_combo/Makefile
-%%EXAMPLESDIR%%/calendar_combo/README
-%%EXAMPLESDIR%%/calendar_combo/calendar_combo.adb
-%%EXAMPLESDIR%%/calendar_combo/calendar_combo.ads
-%%EXAMPLESDIR%%/calendar_combo/main.adb
-%%EXAMPLESDIR%%/composite_widget/Makefile
-%%EXAMPLESDIR%%/composite_widget/README
-%%EXAMPLESDIR%%/composite_widget/main.adb
-%%EXAMPLESDIR%%/composite_widget/my_dialog.adb
-%%EXAMPLESDIR%%/composite_widget/my_dialog.ads
-%%EXAMPLESDIR%%/documentation/Makefile
-%%EXAMPLESDIR%%/documentation/README
-%%EXAMPLESDIR%%/documentation/banner.adb
-%%EXAMPLESDIR%%/documentation/clist.adb
-%%EXAMPLESDIR%%/documentation/clist.ads
-%%EXAMPLESDIR%%/documentation/contextual.adb
-%%EXAMPLESDIR%%/documentation/draw.adb
-%%EXAMPLESDIR%%/documentation/glist_traverse.adb
-%%EXAMPLESDIR%%/documentation/toggle.adb
-%%EXAMPLESDIR%%/documentation/tooltips.adb
-%%EXAMPLESDIR%%/doublebuffer/Makefile
-%%EXAMPLESDIR%%/doublebuffer/README
-%%EXAMPLESDIR%%/doublebuffer/anim.adb
-%%EXAMPLESDIR%%/doublebuffer/anim2.adb
-%%EXAMPLESDIR%%/doublebuffer/anim_task.adb
-%%EXAMPLESDIR%%/doublebuffer/anim_task.ads
-%%EXAMPLESDIR%%/doublebuffer/anim_timeout.adb
-%%EXAMPLESDIR%%/doublebuffer/anim_timeout.ads
-%%EXAMPLESDIR%%/doublebuffer/double_buffer.adb
-%%EXAMPLESDIR%%/doublebuffer/double_buffer.ads
-%%EXAMPLESDIR%%/doublebuffer/full_test.adb
-%%EXAMPLESDIR%%/doublebuffer/full_test.ads
-%%EXAMPLESDIR%%/doublebuffer/parameters.adb
-%%EXAMPLESDIR%%/dynamic_cast/Makefile
-%%EXAMPLESDIR%%/dynamic_cast/README
-%%EXAMPLESDIR%%/dynamic_cast/dynamic.adb
-%%EXAMPLESDIR%%/editor/Makefile
-%%EXAMPLESDIR%%/editor/README
-%%EXAMPLESDIR%%/editor/about_dialog_pkg-callbacks.adb
-%%EXAMPLESDIR%%/editor/about_dialog_pkg-callbacks.ads
-%%EXAMPLESDIR%%/editor/about_dialog_pkg.adb
-%%EXAMPLESDIR%%/editor/about_dialog_pkg.ads
-%%EXAMPLESDIR%%/editor/callbacks_gladeedit.ads
-%%EXAMPLESDIR%%/editor/file_utils.adb
-%%EXAMPLESDIR%%/editor/file_utils.ads
-%%EXAMPLESDIR%%/editor/gladeedit.adb
-%%EXAMPLESDIR%%/editor/main_window_pkg-callbacks.adb
-%%EXAMPLESDIR%%/editor/main_window_pkg-callbacks.ads
-%%EXAMPLESDIR%%/editor/main_window_pkg.adb
-%%EXAMPLESDIR%%/editor/main_window_pkg.ads
-%%EXAMPLESDIR%%/editor/open_file_selection_pkg-callbacks.adb
-%%EXAMPLESDIR%%/editor/open_file_selection_pkg-callbacks.ads
-%%EXAMPLESDIR%%/editor/open_file_selection_pkg.adb
-%%EXAMPLESDIR%%/editor/open_file_selection_pkg.ads
-%%EXAMPLESDIR%%/editor/save_file_selection_pkg-callbacks.adb
-%%EXAMPLESDIR%%/editor/save_file_selection_pkg-callbacks.ads
-%%EXAMPLESDIR%%/editor/save_file_selection_pkg.adb
-%%EXAMPLESDIR%%/editor/save_file_selection_pkg.ads
-%%EXAMPLESDIR%%/gtk_examples/Makefile
-%%EXAMPLESDIR%%/gtk_examples/README
-%%EXAMPLESDIR%%/gtk_examples/scribble.adb
-%%EXAMPLESDIR%%/handlers/Makefile
-%%EXAMPLESDIR%%/handlers/README
-%%EXAMPLESDIR%%/handlers/delete_event.adb
-%%EXAMPLESDIR%%/handlers/general_tips.adb
-%%EXAMPLESDIR%%/handlers/own_marshaller.adb
-%%EXAMPLESDIR%%/handlers/own_marshaller.ads
-%%EXAMPLESDIR%%/handlers/specific_tips.adb
-%%EXAMPLESDIR%%/powergnu/Makefile
-%%EXAMPLESDIR%%/powergnu/README
-%%EXAMPLESDIR%%/powergnu/callbacks_power.ads
-%%EXAMPLESDIR%%/powergnu/power.adb
-%%EXAMPLESDIR%%/powergnu/power_gnu.adb
-%%EXAMPLESDIR%%/powergnu/power_gnu.ads
-%%EXAMPLESDIR%%/powergnu/powergnu_pkg-callbacks.adb
-%%EXAMPLESDIR%%/powergnu/powergnu_pkg-callbacks.ads
-%%EXAMPLESDIR%%/powergnu/powergnu_pkg.adb
-%%EXAMPLESDIR%%/powergnu/powergnu_pkg.ads
-%%EXAMPLESDIR%%/testgtk/3DRings.xpm
-%%EXAMPLESDIR%%/testgtk/FilesQueue.xpm
-%%EXAMPLESDIR%%/testgtk/Modeller.xpm
-%%EXAMPLESDIR%%/testgtk/alps.png
-%%EXAMPLESDIR%%/testgtk/apple-red.png
-%%EXAMPLESDIR%%/testgtk/background.jpg
-%%EXAMPLESDIR%%/testgtk/check-n.xpm
-%%EXAMPLESDIR%%/testgtk/check-y.xpm
-%%EXAMPLESDIR%%/testgtk/common.adb
-%%EXAMPLESDIR%%/testgtk/common.ads
-%%EXAMPLESDIR%%/testgtk/create_alignment.adb
-%%EXAMPLESDIR%%/testgtk/create_alignment.ads
-%%EXAMPLESDIR%%/testgtk/create_arrow.adb
-%%EXAMPLESDIR%%/testgtk/create_arrow.ads
-%%EXAMPLESDIR%%/testgtk/create_box.adb
-%%EXAMPLESDIR%%/testgtk/create_box.ads
-%%EXAMPLESDIR%%/testgtk/create_button_box.adb
-%%EXAMPLESDIR%%/testgtk/create_button_box.ads
-%%EXAMPLESDIR%%/testgtk/create_buttons.adb
-%%EXAMPLESDIR%%/testgtk/create_buttons.ads
-%%EXAMPLESDIR%%/testgtk/create_calendar.adb
-%%EXAMPLESDIR%%/testgtk/create_calendar.ads
-%%EXAMPLESDIR%%/testgtk/create_canvas.adb
-%%EXAMPLESDIR%%/testgtk/create_canvas.ads
-%%EXAMPLESDIR%%/testgtk/create_check_buttons.adb
-%%EXAMPLESDIR%%/testgtk/create_check_buttons.ads
-%%EXAMPLESDIR%%/testgtk/create_clist.adb
-%%EXAMPLESDIR%%/testgtk/create_clist.ads
-%%EXAMPLESDIR%%/testgtk/create_color_selection.adb
-%%EXAMPLESDIR%%/testgtk/create_color_selection.ads
-%%EXAMPLESDIR%%/testgtk/create_ctree.adb
-%%EXAMPLESDIR%%/testgtk/create_ctree.ads
-%%EXAMPLESDIR%%/testgtk/create_cursors.adb
-%%EXAMPLESDIR%%/testgtk/create_cursors.ads
-%%EXAMPLESDIR%%/testgtk/create_dialog.adb
-%%EXAMPLESDIR%%/testgtk/create_dialog.ads
-%%EXAMPLESDIR%%/testgtk/create_dnd.adb
-%%EXAMPLESDIR%%/testgtk/create_dnd.ads
-%%EXAMPLESDIR%%/testgtk/create_entry.adb
-%%EXAMPLESDIR%%/testgtk/create_entry.ads
-%%EXAMPLESDIR%%/testgtk/create_file_selection.adb
-%%EXAMPLESDIR%%/testgtk/create_file_selection.ads
-%%EXAMPLESDIR%%/testgtk/create_fixed.adb
-%%EXAMPLESDIR%%/testgtk/create_fixed.ads
-%%EXAMPLESDIR%%/testgtk/create_font_selection.adb
-%%EXAMPLESDIR%%/testgtk/create_font_selection.ads
-%%EXAMPLESDIR%%/testgtk/create_frame.adb
-%%EXAMPLESDIR%%/testgtk/create_frame.ads
-%%EXAMPLESDIR%%/testgtk/create_gamma_curve.adb
-%%EXAMPLESDIR%%/testgtk/create_gamma_curve.ads
-%%EXAMPLESDIR%%/testgtk/create_gc.adb
-%%EXAMPLESDIR%%/testgtk/create_gc.ads
-%%EXAMPLESDIR%%/testgtk/create_handle_box.adb
-%%EXAMPLESDIR%%/testgtk/create_handle_box.ads
-%%EXAMPLESDIR%%/testgtk/create_item_factory.adb
-%%EXAMPLESDIR%%/testgtk/create_item_factory.ads
-%%EXAMPLESDIR%%/testgtk/create_label.adb
-%%EXAMPLESDIR%%/testgtk/create_label.ads
-%%EXAMPLESDIR%%/testgtk/create_layout.adb
-%%EXAMPLESDIR%%/testgtk/create_layout.ads
-%%EXAMPLESDIR%%/testgtk/create_list.adb
-%%EXAMPLESDIR%%/testgtk/create_list.ads
-%%EXAMPLESDIR%%/testgtk/create_main_loop.adb
-%%EXAMPLESDIR%%/testgtk/create_main_loop.ads
-%%EXAMPLESDIR%%/testgtk/create_menu.adb
-%%EXAMPLESDIR%%/testgtk/create_menu.ads
-%%EXAMPLESDIR%%/testgtk/create_notebook.adb
-%%EXAMPLESDIR%%/testgtk/create_notebook.ads
-%%EXAMPLESDIR%%/testgtk/create_paned.adb
-%%EXAMPLESDIR%%/testgtk/create_paned.ads
-%%EXAMPLESDIR%%/testgtk/create_pixbuf.adb
-%%EXAMPLESDIR%%/testgtk/create_pixbuf.ads
-%%EXAMPLESDIR%%/testgtk/create_pixmap.adb
-%%EXAMPLESDIR%%/testgtk/create_pixmap.ads
-%%EXAMPLESDIR%%/testgtk/create_plot.adb
-%%EXAMPLESDIR%%/testgtk/create_plot.ads
-%%EXAMPLESDIR%%/testgtk/create_plot_3d.adb
-%%EXAMPLESDIR%%/testgtk/create_plot_3d.ads
-%%EXAMPLESDIR%%/testgtk/create_plot_realtime.adb
-%%EXAMPLESDIR%%/testgtk/create_plot_realtime.ads
-%%EXAMPLESDIR%%/testgtk/create_preview_color.adb
-%%EXAMPLESDIR%%/testgtk/create_preview_color.ads
-%%EXAMPLESDIR%%/testgtk/create_preview_gray.adb
-%%EXAMPLESDIR%%/testgtk/create_preview_gray.ads
-%%EXAMPLESDIR%%/testgtk/create_progress.adb
-%%EXAMPLESDIR%%/testgtk/create_progress.ads
-%%EXAMPLESDIR%%/testgtk/create_radio_button.adb
-%%EXAMPLESDIR%%/testgtk/create_radio_button.ads
-%%EXAMPLESDIR%%/testgtk/create_range.adb
-%%EXAMPLESDIR%%/testgtk/create_range.ads
-%%EXAMPLESDIR%%/testgtk/create_reparent.adb
-%%EXAMPLESDIR%%/testgtk/create_reparent.ads
-%%EXAMPLESDIR%%/testgtk/create_rulers.adb
-%%EXAMPLESDIR%%/testgtk/create_rulers.ads
-%%EXAMPLESDIR%%/testgtk/create_scroll_test.adb
-%%EXAMPLESDIR%%/testgtk/create_scroll_test.ads
-%%EXAMPLESDIR%%/testgtk/create_scrolled.adb
-%%EXAMPLESDIR%%/testgtk/create_scrolled.ads
-%%EXAMPLESDIR%%/testgtk/create_selection.adb
-%%EXAMPLESDIR%%/testgtk/create_selection.ads
-%%EXAMPLESDIR%%/testgtk/create_shapes.adb
-%%EXAMPLESDIR%%/testgtk/create_shapes.ads
-%%EXAMPLESDIR%%/testgtk/create_sheet.adb
-%%EXAMPLESDIR%%/testgtk/create_sheet.ads
-%%EXAMPLESDIR%%/testgtk/create_size_groups.adb
-%%EXAMPLESDIR%%/testgtk/create_size_groups.ads
-%%EXAMPLESDIR%%/testgtk/create_spin.adb
-%%EXAMPLESDIR%%/testgtk/create_spin.ads
-%%EXAMPLESDIR%%/testgtk/create_splittable.adb
-%%EXAMPLESDIR%%/testgtk/create_splittable.ads
-%%EXAMPLESDIR%%/testgtk/create_status.adb
-%%EXAMPLESDIR%%/testgtk/create_status.ads
-%%EXAMPLESDIR%%/testgtk/create_test_idle.adb
-%%EXAMPLESDIR%%/testgtk/create_test_idle.ads
-%%EXAMPLESDIR%%/testgtk/create_test_timeout.adb
-%%EXAMPLESDIR%%/testgtk/create_test_timeout.ads
-%%EXAMPLESDIR%%/testgtk/create_text_view.adb
-%%EXAMPLESDIR%%/testgtk/create_text_view.ads
-%%EXAMPLESDIR%%/testgtk/create_toggle_buttons.adb
-%%EXAMPLESDIR%%/testgtk/create_toggle_buttons.ads
-%%EXAMPLESDIR%%/testgtk/create_toolbar.adb
-%%EXAMPLESDIR%%/testgtk/create_toolbar.ads
-%%EXAMPLESDIR%%/testgtk/create_tooltips.adb
-%%EXAMPLESDIR%%/testgtk/create_tooltips.ads
-%%EXAMPLESDIR%%/testgtk/create_tree.adb
-%%EXAMPLESDIR%%/testgtk/create_tree.ads
-%%EXAMPLESDIR%%/testgtk/create_tree_view.adb
-%%EXAMPLESDIR%%/testgtk/create_tree_view.ads
-%%EXAMPLESDIR%%/testgtk/dancing-penguin.gif
-%%EXAMPLESDIR%%/testgtk/gnome-applets.png
-%%EXAMPLESDIR%%/testgtk/gnome-calendar.png
-%%EXAMPLESDIR%%/testgtk/gnome-foot.png
-%%EXAMPLESDIR%%/testgtk/gnome-gimp.png
-%%EXAMPLESDIR%%/testgtk/gnome-gmush.png
-%%EXAMPLESDIR%%/testgtk/gnome-gsame.png
-%%EXAMPLESDIR%%/testgtk/gnu-keys.png
-%%EXAMPLESDIR%%/testgtk/libart_demo.adb
-%%EXAMPLESDIR%%/testgtk/libart_demo.ads
-%%EXAMPLESDIR%%/testgtk/lightning.png
-%%EXAMPLESDIR%%/testgtk/main_windows.adb
-%%EXAMPLESDIR%%/testgtk/main_windows.ads
-%%EXAMPLESDIR%%/testgtk/marble.xpm
-%%EXAMPLESDIR%%/testgtk/opengl/lw.c
-%%EXAMPLESDIR%%/testgtk/opengl/lw.h
-%%EXAMPLESDIR%%/testgtk/opengl/lwobjects.adb
-%%EXAMPLESDIR%%/testgtk/opengl/lwobjects.ads
-%%EXAMPLESDIR%%/testgtk/opengl/trackball.adb
-%%EXAMPLESDIR%%/testgtk/opengl/trackball.ads
-%%EXAMPLESDIR%%/testgtk/opengl/view_gl.adb
-%%EXAMPLESDIR%%/testgtk/opengl/view_gl.ads
-%%EXAMPLESDIR%%/testgtk/penguin.lwo
-%%EXAMPLESDIR%%/testgtk/test.xpm
-%%EXAMPLESDIR%%/testgtk/testgtk
-%%EXAMPLESDIR%%/testgtk/testgtk.adb
-%%EXAMPLESDIR%%/testgtk/tree_minus.xpm
-%%EXAMPLESDIR%%/testgtk/tree_plus.xpm
-%%EXAMPLESDIR%%/tutorial/Makefile
-%%EXAMPLESDIR%%/tutorial/README
-%%EXAMPLESDIR%%/tutorial/gtkdial/Makefile
-%%EXAMPLESDIR%%/tutorial/gtkdial/dial_handlers.adb
-%%EXAMPLESDIR%%/tutorial/gtkdial/dial_handlers.ads
-%%EXAMPLESDIR%%/tutorial/gtkdial/dial_test.adb
-%%EXAMPLESDIR%%/tutorial/gtkdial/gtk_dial.adb
-%%EXAMPLESDIR%%/tutorial/gtkdial/gtk_dial.ads
-%%EXAMPLESDIR%%/tutorial/helloworld/Makefile
-%%EXAMPLESDIR%%/tutorial/helloworld/hello.adb
-%%EXAMPLESDIR%%/tutorial/helloworld/hello_package.adb
-%%EXAMPLESDIR%%/tutorial/helloworld/hello_package.ads
-%%EXAMPLESDIR%%/tutorial/helloworld2/Makefile
-%%EXAMPLESDIR%%/tutorial/helloworld2/hello2.adb
-%%EXAMPLESDIR%%/tutorial/helloworld2/hello2_package.adb
-%%EXAMPLESDIR%%/tutorial/helloworld2/hello2_package.ads
-%%EXAMPLESDIR%%/tutorial/packbox/Makefile
-%%EXAMPLESDIR%%/tutorial/packbox/packbox.adb
-%%EXAMPLESDIR%%/tutorial/packbox/packbox.ads
-%%EXAMPLESDIR%%/tutorial/packbox/packbox_test.adb
-%%EXAMPLESDIR%%/tutorial/simple/Makefile
-%%EXAMPLESDIR%%/tutorial/simple/simple.adb
-%%EXAMPLESDIR%%/tutorial/table/Makefile
-%%EXAMPLESDIR%%/tutorial/table/table.adb
-%%EXAMPLESDIR%%/tutorial/table/table.ads
-%%EXAMPLESDIR%%/tutorial/table/table_test.adb
-%%EXAMPLESDIR%%/tutorial/tictactoe/Makefile
-%%EXAMPLESDIR%%/tutorial/tictactoe/tictactoe.adb
-%%EXAMPLESDIR%%/tutorial/tictactoe/tictactoe.ads
-%%EXAMPLESDIR%%/tutorial/tictactoe/ttt_test.adb
-%%EXAMPLESDIR%%/user_data/Makefile
-%%EXAMPLESDIR%%/user_data/README
-%%EXAMPLESDIR%%/user_data/test_handlers.adb
-%%DATADIR%%/projects/gtkada.gpr
-%%DATADIR%%/projects/gtkada_gl.gpr
-%%DATADIR%%/projects/gtkada_glade.gpr
-%%DATADIR%%/projects/gtkada_lib.gpr
-@dirrm %%DATADIR%%/projects
-@dirrm %%EXAMPLESDIR%%/user_data
-@dirrm %%EXAMPLESDIR%%/tutorial/tictactoe
-@dirrm %%EXAMPLESDIR%%/tutorial/table
-@dirrm %%EXAMPLESDIR%%/tutorial/simple
-@dirrm %%EXAMPLESDIR%%/tutorial/packbox
-@dirrm %%EXAMPLESDIR%%/tutorial/helloworld2
-@dirrm %%EXAMPLESDIR%%/tutorial/helloworld
-@dirrm %%EXAMPLESDIR%%/tutorial/gtkdial
-@dirrm %%EXAMPLESDIR%%/tutorial
-@dirrm %%EXAMPLESDIR%%/testgtk/opengl
-@dirrm %%EXAMPLESDIR%%/testgtk
-@dirrm %%EXAMPLESDIR%%/powergnu
-@dirrm %%EXAMPLESDIR%%/handlers
-@dirrm %%EXAMPLESDIR%%/gtk_examples
-@dirrm %%EXAMPLESDIR%%/editor
-@dirrm %%EXAMPLESDIR%%/dynamic_cast
-@dirrm %%EXAMPLESDIR%%/doublebuffer
-@dirrm %%EXAMPLESDIR%%/documentation
-@dirrm %%EXAMPLESDIR%%/composite_widget
-@dirrm %%EXAMPLESDIR%%/calendar_combo
-@dirrm %%EXAMPLESDIR%%/base_widget
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gtkada_ug
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gtkada_rm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/gtkada
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 9fe97ea..4a47d03 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -67,7 +67,6 @@
     SUBDIR += i3
     SUBDIR += icewm
     SUBDIR += ion
-    SUBDIR += ion-2
     SUBDIR += jewel
     SUBDIR += jwm
     SUBDIR += kappdock
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
deleted file mode 100644
index 3ce57b3..0000000
--- a/x11-wm/ion-2/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for:   ion-2
-# Date created:        20 August 2003
-# Whom:                anthony.ginepro@laposte.net
-# Original ion port:   ricci@cs.utah.edu
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ion-2
-PORTVERSION=	20040729
-PORTREVISION=	5
-CATEGORIES=	x11-wm
-MASTER_SITES=	http://modeemi.fi/~tuomov/dl/archives/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A tiling tabbed window manager
-
-BROKEN=		Does not build with new libltdl 2.2
-DEPRECATED=	has been broken for 4 months
-EXPIRATION_DATE=2010-01-08
-
-CONFLICTS=	ion-2002* ion-devel-* pwm-*
-
-USE_XORG=	x11 xext xinerama
-USE_AUTOTOOLS=	libtool:22 libltdl:22
-USE_LUA=	5.0
-USE_GMAKE=	yes
-MAKE_ENV=	DEFINES="${IONDEFINES}"
-GNU_CONFIGURE=	yes
-
-.if !defined(WITH_MULTIBYTE)
-IONDEFINES+=	-DCF_NO_MB_SUPPORT
-.endif
-
-MAN1=		ion.1 pwm.1
-DOCSDIR=	share/doc/ion
-
-# NO, I don't want to use configure but ion's author system.mk
-do-configure:
-
-.include <bsd.port.mk>
diff --git a/x11-wm/ion-2/distinfo b/x11-wm/ion-2/distinfo
deleted file mode 100644
index 9b911ec..0000000
--- a/x11-wm/ion-2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ion-2-20040729.tar.gz) = d7d98baa41635c1989e423adf76eb2ac
-SHA256 (ion-2-20040729.tar.gz) = 8c8b7ef0cc6a98d409bde1b9b3f5159a2e632b4e78768e13cca0da174649a162
-SIZE (ion-2-20040729.tar.gz) = 399367
diff --git a/x11-wm/ion-2/files/patch-rules.mk b/x11-wm/ion-2/files/patch-rules.mk
deleted file mode 100644
index 5e7292e..0000000
--- a/x11-wm/ion-2/files/patch-rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./rules.mk.orig	Thu Jul 29 00:10:32 2004
-+++ ./rules.mk	Mon Jul 17 21:50:19 2006
-@@ -91,6 +91,7 @@
- module_install:
- 	$(INSTALLDIR) $(MODULEDIR)
- 	$(LIBTOOL) --mode=install $(INSTALL) -s -m $(BIN_MODE) $(MODULE).la $(MODULEDIR)
-+	$(INSTALL) -m $(BIN_MODE) $(MODULE).la $(MODULEDIR)
- 
- clean_objs:
- 	$(RM) -f $(OBJS)
diff --git a/x11-wm/ion-2/files/patch-system.mk b/x11-wm/ion-2/files/patch-system.mk
deleted file mode 100644
index a9391de..0000000
--- a/x11-wm/ion-2/files/patch-system.mk
+++ /dev/null
@@ -1,100 +0,0 @@
---- ./system.mk.orig	Thu Jul 29 00:10:32 2004
-+++ ./system.mk	Mon Jul 17 21:53:01 2006
-@@ -7,7 +7,7 @@
- ## Installation paths
- ##
- 
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- 
- # Unless you are creating a package conforming to some OS's standards, you
- # probably do not want to modify the following directories:
-@@ -19,7 +19,7 @@
- # Some .lua files and ion-* shell scripts
- SHAREDIR=$(PREFIX)/share/ion
- # Manual pages
--MANDIR=$(PREFIX)/share/man
-+MANDIR=$(PREFIX)/man
- # Some documents
- DOCDIR=$(PREFIX)/share/doc/ion
- # Nothing at the moment
-@@ -42,11 +42,11 @@
- # libtool because even more-recent-than-libtool-1.4.3 releases of those
- # OSes only have an _ancient_ 1.3.x libtool that _will_ _not_ _work even
- # though a lot of libltdl-using apps require 1.4.3.
--LIBTOOL=libtool
-+LIBTOOL=$(LOCALBASE)/bin/libtool --tag=CC
- 
- # Settings for compiling and linking to ltdl
--LTDL_INCLUDES=
--LTDL_LIBS=-lltdl
-+LTDL_INCLUDES=-I$(LOCALBASE)/include
-+LTDL_LIBS=-L$(LOCALBASE)/lib -lltdl
- 
- # The following should do it if you have manually installed libtool 1.5 in
- # $(LIBTOOLDIR).
-@@ -72,11 +72,11 @@
- 
- # If you have installed Lua 5.0 from the official tarball without changing
- # paths, this should do it.
--LUA_DIR=/usr/local
--LUA_LIBS = -L$(LUA_DIR)/lib -R$(LUA_DIR)/lib -llua -llualib
--LUA_INCLUDES = -I$(LUA_DIR)/include
--LUA=$(LUA_DIR)/bin/lua
--LUAC=$(LUA_DIR)/bin/luac
-+LUA_DIR=$(LOCALBASE)
-+LUA_LIBS = -L$(LUA_LIBDIR) -R$(LUA_LIBDIR) -llua -llualib
-+LUA_INCLUDES = -I$(LUA_INCDIR)
-+LUA=$(LUA_BINDIR)/lua
-+LUAC=$(LUA_BINDIR)/luac
- 
- # If you are using the Debian packages, the following settings should be
- # what you want.
-@@ -90,7 +90,7 @@
- ## X libraries, includes and options
- ##
- 
--X11_PREFIX=/usr/X11R6
-+X11_PREFIX=$(LOCALBASE)
- # SunOS/Solaris
- #X11_PREFIX=/usr/openwin
- 
-@@ -119,7 +119,7 @@
- # asprintf and vasprintf in the c library. (gnu libc has.)
- # If HAS_SYSTEM_ASPRINTF is not defined, an implementation
- # in sprintf_2.2/ is used.
--#HAS_SYSTEM_ASPRINTF=1
-+HAS_SYSTEM_ASPRINTF=1
- 
- 
- # If you're on an archaic system (such as relatively recent *BSD releases)
-@@ -132,16 +132,16 @@
- ## C compiler
- ##
- 
--CC=gcc
-+CC?=gcc
- 
- # Same as '-Wall -pedantic' without '-Wunused' as callbacks often
- # have unused variables.
- WARN=	-W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
- 	-Wtrigraphs -Wformat -Wchar-subscripts \
--	-Wparentheses -pedantic -Wuninitialized
-+	-Wparentheses -Wuninitialized
- 
--CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
--LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS)
-+CFLAGS+= $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
-+LDFLAGS= $(EXTRA_LIBS) $(LIBS)
- 
- # The following options are mainly for development use and can be used
- # to check that the code seems to conform to some standards. Depending
-@@ -154,7 +154,7 @@
- #POSIX_SOURCE=-D_POSIX_SOURCE
- 
- # Most systems
--#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
-+XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
- # SunOS, (Irix)
- #XOPEN_SOURCE=-D__EXTENSIONS__
- 
diff --git a/x11-wm/ion-2/pkg-descr b/x11-wm/ion-2/pkg-descr
deleted file mode 100644
index 20d61b9..0000000
--- a/x11-wm/ion-2/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Ion (based on PWM) is a new kind of window manager that brings a
-text-editorish, keyboard friendly user interface to window management.
- 
-Modern GUIs are unusable. Overlapping windows are hard to manage, especially
-from the keyboard, and the user often ends up in a jungle. Not to mention the
-application programs, which are even worse. Mouse-based search-and-click
-interfaces are slow - keyboard is fast having learnt the commands. Ion (the
-last three letters of vision =-) was written as an example and an experiment of
-something presumably better (just the window manager, though).
- 
-Ion simply divides the screen into frames that take the whole screen. Big
-displays have so much space that this is convenient and smaller displays
-couldn't show more than one window at a time anyway. The frames can be split
-and growing the size of one will shrink others. Alike in PWM, clients can be
-moved between frames and multiple clients can be attached to one frame.
- 
-With Ion you will hardly ever have to touch the mouse again for navigation
-between windows and the windows are always in order.
- 
-WWW: http://modeemi.cs.tut.fi/~tuomov/ion/
diff --git a/x11-wm/ion-2/pkg-plist b/x11-wm/ion-2/pkg-plist
deleted file mode 100644
index beaa7ec..0000000
--- a/x11-wm/ion-2/pkg-plist
+++ /dev/null
@@ -1,69 +0,0 @@
-bin/ion
-bin/pwm
-etc/ion/dock-draw.lua
-etc/ion/dock.lua
-etc/ion/draw.lua
-etc/ion/floatws.lua
-etc/ion/ion-bindings.lua
-etc/ion/ion-menus.lua
-etc/ion/ion.lua
-etc/ion/ionws.lua
-etc/ion/kludges.lua
-etc/ion/look-brownsteel.lua
-etc/ion/look-clean.lua
-etc/ion/look-cleanios.lua
-etc/ion/look-cleanviolet.lua
-etc/ion/look-dusky.lua
-etc/ion/look-greyviolet.lua
-etc/ion/look-ios.lua
-etc/ion/look-simpleblue.lua
-etc/ion/look-wheat2.lua
-etc/ion/menu.lua
-etc/ion/pwm-bindings.lua
-etc/ion/pwm-menus.lua
-etc/ion/pwm.lua
-etc/ion/query.lua
-lib/ion/de.a
-lib/ion/de.la
-lib/ion/de.so
-lib/ion/dock.a
-lib/ion/dock.la
-lib/ion/dock.so
-lib/ion/floatws.a
-lib/ion/floatws.la
-lib/ion/floatws.so
-lib/ion/ion-completefile
-lib/ion/ionws.a
-lib/ion/ionws.la
-lib/ion/ionws.so
-lib/ion/menu.a
-lib/ion/menu.la
-lib/ion/menu.so
-lib/ion/query.a
-lib/ion/query.la
-lib/ion/query.so
-lib/ion/lc/ioncore-efbb.lc
-lib/ion/lc/ioncorelib.lc
-lib/ion/lc/ioncorelib-mplexfns.lc
-lib/ion/lc/menulib.lc
-lib/ion/lc/querylib.lc
-share/ion/delib.lua
-share/ion/ion-edit
-share/ion/ion-man
-share/ion/ion-runinxterm
-share/ion/ion-ssh
-share/ion/ion-view
-share/ion/ioncore-efbb.lua
-share/ion/ioncorelib-mplexfns.lua
-share/ion/ioncorelib.lua
-share/ion/menulib.lua
-share/ion/querylib.lua
-share/ion/welcome_message.txt
-share/doc/ion/README
-share/doc/ion/LICENSE
-share/doc/ion/ChangeLog
-@dirrm lib/ion/lc
-@dirrm lib/ion
-@dirrm share/ion
-@dirrm share/doc/ion
-@dirrmtry etc/ion
author	pgollucci <pgollucci@FreeBSD.org>	2010-01-18 06:46:44 +0000
committer	pgollucci <pgollucci@FreeBSD.org>	2010-01-18 06:46:44 +0000
commit	21623aab02861d38823c01e555e67680543631b5 (patch)
tree	df1d5873daf262392584db897ee951887d6adbc2
parent	28b2532f6a610d812f7f05afc483e035f72cb640 (diff)
download	FreeBSD-ports-21623aab02861d38823c01e555e67680543631b5.zip FreeBSD-ports-21623aab02861d38823c01e555e67680543631b5.tar.gz