20 files changed, 729 insertions, 388 deletions

diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 5dec8e57d0fb..27967b4e8aa4 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # New ports collection makefile for:	clip
 # Date created:			Dec 23, 2001
 # Whom:				ijliao
@@ -7,41 +6,102 @@
 #
 
 PORTNAME=	clip
-PORTVERSION=	0.99
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.lastik.ru/clip/ \
-		ftp://ftp.linux.ru.net/mirrors/clip/
-DISTNAME=	${PORTNAME}-prg-${PORTVERSION}-3
+PORTVERSION=	1.1.0
+CATEGORIES=	databases lang
+MASTER_SITES=	ftp://ftp.linux.ru.net/mirrors/clip/	\
+		ftp://ftp.lastik.ru/clip/		\
+		ftp://ftp.itk.ru/pub/clip/
+DISTNAME=	${PORTNAME}-prg-${PORTVERSION:S/.5/-5/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	xBase and Clipper language compatible compiler
 
-BROKEN=		Does not fetch
-
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra \
-		gd.2:${PORTSDIR}/graphics/gd \
-		intl.5:${PORTSDIR}/devel/gettext
-
-USE_BISON=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=  yes
-USE_XLIB=	yes
-USE_XPM=	yes
-ALL_TARGET=	local
-MAKE_ENV=	HOME=${WRKDIR}
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-		-e "s|%%X11BASE%%|${X11BASE}|g" \
-		${WRKSRC}/cliplibs/clip-gd/gd/configure
+.include <bsd.port.pre.mk>
+
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
+		wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
+		png.5:${PORTSDIR}/graphics/png			\
+		freetype.9:${PORTSDIR}/print/freetype2		\
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12		\
+		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra	\
+		gd.4:${PORTSDIR}/graphics/gd			\
+		intl.5:${PORTSDIR}/devel/gettext		\
+		iconv.3:${PORTSDIR}/converters/libiconv
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
+		wget:${PORTSDIR}/ftp/wget
+.if !defined(WITHOUT_IODBC)
+LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+PLIST_SUB=	ODBC=""
+.elseif !defined(WITHOUT_UNIXODBC)
+LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+PLIST_SUB=	ODBC=""
+.else
+PLIST_SUB=	ODBC="@comment "
+.endif
+.if !defined(WITHOUT_MYSQL) || exists(${LOCALBASE}/include/mysql/mysql.h)
+USE_MYSQL=	yes
+PLIST_SUB+=	MYSQL=""
+.else
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+.if defined(WITH_PGSQL) || exists(${LOCALBASE}/include/libpq-fe.h)
+LIB_DEPENDS+=	pq.3:${PORTSDIR}/${PGSQL_PORT}
+PLIST_SUB+=	PGSQL=""
+.else
+PLIST_SUB+=	PGSQL="@comment "
+.endif
+.if defined(WITH_FIREBIRD) || exists(${LOCALBASE}/firebird/include/ibase.h)
+LIB_DEPENDS+=	gds.1:${PORTSDIR}/${FIREBIRD_PORT}
+PLIST_SUB+=	IBASE=""
+.else
+PLIST_SUB+=	IBASE="@comment "
+.endif
+
+USE_BISON=		yes
+USE_GMAKE=		yes
+USE_REINPLACE=		yes
+REINPLACE_ARGS=		-i ""
+USE_XLIB=		yes
+USE_XPM=		yes
+HAS_CONFIGURE=		yes
+CONFIGURE_WRKSRC=	${WRKSRC}/clip
+ALL_TARGET=		local
+MAKE_ENV=		HOME=${WRKDIR} LANG=C
+
+PGSQL_PORT?=	databases/postgresql7
+FIREBIRD_PORT?=	databases/firebird
+
+BIN2STRIP=	bdbf clip clip_bl clip_blank clip_cld clip_conv clip_dbf2txt	\
+		clip_dbg clip_fl clip_hashextract clip_hindex clip_hseek	\
+		clip_hv clip_prg clip_run clip_trans clip_we clipar cliphash	\
+		codb_ab codb_abx codb_addobj codb_make codb_pack ctosgml dbc	\
+		ftosgml gen_tbl po_compat po_extr po_subst pp_ron sqlrun	\
+		wcl2prg www_clip xclip
+
+pre-configure:
+	@${FIND} ${WRKSRC} -name "Makefile*" -or -name Imakefile |		\
+	${XARGS} ${REINPLACE_CMD}						\
+	-e "s|-Wall -g|${CFLAGS}|;s|-g -Wall|${CFLAGS}|;s|-Wall|${CFLAGS}|"	\
+	-e "s|gcc|${CC}|;s|-O2||;s|-O ||;"
+	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD}		\
+	-e "s|-Wall -g|${CFLAGS}|;s|-g -Wall|${CFLAGS}|;s|-Wall|${CFLAGS}|"	\
+	-e "s|-O2||"
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD}			\
+	-e "s|#include.*<malloc.h>|#include <stdlib.h>|"			\
+	-e "s|#!/bin/sh|#!${LOCALBASE}/bin/bash|"				\
+	-e "s|/usr/local|${LOCALBASE}|g"					\
+	-e "s|/usr/X11R6|${X11BASE}|g"
 
 do-install:
-	${CP} -R ${WRKDIR}/cliproot ${LOCALBASE}/clip
+	${CP} -R ${WRKDIR}/cliproot ${PREFIX}/clip
+.for FILE in ${BIN2STRIP}
+	@${STRIP_CMD} ${PREFIX}/clip/bin/${FILE}
+.endfor
+	@for f in `ls ${PREFIX}/clip/lib/*.so` ;				\
+	do									\
+		${STRIP_CMD} $$f ;				\
+	done
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/clip/distinfo b/databases/clip/distinfo
index 09aeb13e84c4..4a7a5b195762 100644
--- a/databases/clip/distinfo
+++ b/databases/clip/distinfo
@@ -1 +1 @@
-MD5 (clip-prg-0.99-3.tgz) = a2b2b15e63cfc3f3cb7330cd3cf20f1c
+MD5 (clip-prg-1.1.0.tgz) = cfa6433ebf818a854d8de4c0f4e03f20
diff --git a/databases/clip/files/patch-clip::clip_makeslib.in b/databases/clip/files/patch-clip::clip_makeslib.in
new file mode 100644
index 000000000000..5fa601682f3e
--- /dev/null
+++ b/databases/clip/files/patch-clip::clip_makeslib.in
@@ -0,0 +1,11 @@
+--- ./clip/clip_makeslib.in.orig	Mon Nov 25 12:59:30 2002
++++ ./clip/clip_makeslib.in	Tue Mar 25 00:01:06 2003
+@@ -294,7 +294,7 @@
+ 	cp $target.dll $target.dll.a $pwd
+ 	;;
+ *)
+-	$CC $CFLAGS -O -I$pwd -I$CLIPROOT/include -shared -o $arch $target_ref `cat _olist` $addlib || cleanup 1
++	$CC $CFLAGS -O -I$pwd -I$CLIPROOT/include -shared -o $arch $target_ref `cat _olist` $addlib -L/usr/local/lib || cleanup 1
+ 	;;
+ esac
+ 
diff --git a/databases/clip/files/patch-clip::clip_msgmerge.in b/databases/clip/files/patch-clip::clip_msgmerge.in
new file mode 100644
index 000000000000..ac4e970617e1
--- /dev/null
+++ b/databases/clip/files/patch-clip::clip_msgmerge.in
@@ -0,0 +1,8 @@
+--- clip/clip_msgmerge.in.orig	Mon Nov  4 11:21:57 2002
++++ clip/clip_msgmerge.in	Sun Sep 21 00:42:16 2003
+@@ -1,4 +1,4 @@
+-PATH=/bin:/usr/bin
++PATH=/bin:/usr/bin:/usr/local/bin
+ export PATH
+ 
+ if [ "$NO_GETTEXT" = yes ]
diff --git a/databases/clip/files/patch-clip::configure b/databases/clip/files/patch-clip::configure
new file mode 100644
index 000000000000..6acd3634f79e
--- /dev/null
+++ b/databases/clip/files/patch-clip::configure
@@ -0,0 +1,29 @@
+--- clip/configure.orig	Fri Jun 27 09:02:39 2003
++++ clip/configure	Sun Sep 21 00:13:58 2003
+@@ -140,7 +140,7 @@
+ #	initial CFLAGS
+ #
+ #C_FLAGS="-Wall -I. $DEBUGFLAGS $OPTFLAGS $MDBG"
+-C_FLAGS="-Wall -I. -I./include $DEBUGFLAGS $OPTFLAGS"
++C_FLAGS="-Wall -I. -I./include -I/usr/local/include -L/usr/local/lib"
+ 
+ uname=`uname -s`
+ uver=`uname -r`
+@@ -459,7 +459,7 @@
+ #include <iconv.h>
+ int main(int argc, char **argv) { iconv_t it; it = iconv_open("utf-8", "utf-8"); return 0;}
+ ' > /tmp/$$.c
+-$CC -o /tmp/$$ /tmp/$$.c -liconv 2>/dev/null 1>&2
++$CC -o /tmp/$$ /tmp/$$.c -I/usr/local/include -L/usr/local/lib -liconv 2>/dev/null 1>&2
+ if [ $? = 0 ]
+ then
+ 	echo 'ICONV_LIB=-liconv' >&3
+@@ -600,7 +600,7 @@
+ else
+ 	if [ -f /usr/local/bin/wget ]
+ 	then
+-		echo '#define WGET_PRG "/usr/local/bin"' >&3
++		echo '#define WGET_PRG "/usr/local/bin/wget"' >&3
+ 	else
+ 		echo 'Warning: system does not have program WGET'
+ 	fi
diff --git a/databases/clip/files/patch-cliplibs::clip-com::Makefile b/databases/clip/files/patch-cliplibs::clip-com::Makefile
deleted file mode 100644
index 3ebb1c9a0a3e..000000000000
--- a/databases/clip/files/patch-cliplibs::clip-com::Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- cliplibs/clip-com/Makefile	Mon Jun 17 14:31:02 2002
-+++ cliplibs/clip-com/Makefile	Mon Jun 17 14:31:30 2002
-@@ -24,7 +24,7 @@
- 	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) $(LIBEZ)
- 
- $(LIBEZ):
--	cd libezV24 && make
-+	cd libezV24 && $(MAKE)
- 
- com.o: com.c hashcode.h
- 	$(CC) $(CFLAGS) $(CLIPINCLUDE) -c com.c
-@@ -42,5 +42,5 @@
- 
- clean distclean:
- 	rm -rf *.o *.bak *.a *.so hashcode.h *.dll *.exe bzpref.h
--	-cd libezV24; make clean; rm *.a *.so *.so.* *.exe
--	-cd example; make clean
-+	-cd libezV24; $(MAKE) clean; rm *.a *.so *.so.* *.exe
-+	-cd example; $(MAKE) clean
diff --git a/databases/clip/files/patch-cliplibs::clip-fcgi::Makefile b/databases/clip/files/patch-cliplibs::clip-fcgi::Makefile
deleted file mode 100644
index b78290848705..000000000000
--- a/databases/clip/files/patch-cliplibs::clip-fcgi::Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- cliplibs/clip-fcgi/Makefile	Mon Jun 17 14:31:04 2002
-+++ cliplibs/clip-fcgi/Makefile	Mon Jun 17 14:31:34 2002
-@@ -35,6 +35,6 @@
- 
- clean:
- 	rm -rf *.o *.bak *.a *.so hashcode.h *.dll *.exe names.h
--	cd example && make clean
-+	cd example && $(MAKE) clean
- 
- distclean: clean
diff --git a/databases/clip/files/patch-clip-gtk::configure b/databases/clip/files/patch-cliplibs::clip-gtk::configure
index 310344e0bd59..59e575064446 100644
--- a/databases/clip/files/patch-clip-gtk::configure
+++ b/databases/clip/files/patch-cliplibs::clip-gtk::configure
@@ -1,17 +1,15 @@
-$FreeBSD$
-
---- cliplibs/clip-gtk/configure.orig	Fri Sep 27 15:38:08 2002
-+++ cliplibs/clip-gtk/configure	Fri Sep 27 16:48:07 2002
+--- cliplibs/clip-gtk/configure.orig	Tue Jan 14 08:09:54 2003
++++ cliplibs/clip-gtk/configure	Mon Mar 24 19:44:16 2003
 @@ -3,6 +3,8 @@
  uname=`uname -s`
  uver=`uname -r`
  hname=`hostname -f 2>/dev/null`
 +gtkconfig=gtk-config
 +gtkpath=
+ oldpwd=`pwd`
  
  [ -z "$CLIPROOT" ] && CLIPROOT=/usr/local/clip
- DLLSUFF='.so'
-@@ -33,6 +35,8 @@
+@@ -34,6 +36,8 @@
  		;;
  	FreeBSD*)
  		osname=FREEBSD
@@ -20,7 +18,7 @@ $FreeBSD$
  		STATICLINK=-static
  		;;
  	NetBSD*)
-@@ -65,7 +69,7 @@
+@@ -66,7 +70,7 @@
  echo '#define SYSTEM "'$uname'"' >&3
  echo '' >&3
  
@@ -29,28 +27,19 @@ $FreeBSD$
  
  if [ $? -ne 0 ]
  then
-@@ -76,7 +80,7 @@
- 	USE_GTK=no
- else
- #	LIBS='-lgtk -lgdk'
+@@ -81,7 +85,7 @@
+ #	cd $gtkincpath/..
+ #	gtkincpath=`pwd`
+ #	cd $oldpwd
 -	LIBS=`gtk-config --libs`
 +	LIBS=`${gtkconfig} --libs`
  
  	if [ "$osname" = "CYGWIN" ]
  	then
-@@ -85,7 +89,7 @@
- 		EXTRACFLAGS='-fnative-struct'
- #		LIBS='-lgtk-1.3 -lgdk-1.3 -lglib-1.3'
- 	fi
--	if [ -f $gtkprefix/include/gtk/gtk.h -o -f $gtkprefix/include/gtk+/gtk/gtk.h ]
-+	if [ -f $gtkprefix/include$gtkpath/gtk/gtk.h -o -f $gtkprefix/include/gtk+/gtk/gtk.h ]
- 	then
- 		USE_GTK=yes
- 		echo '#define HAVE_GTK' >&3
-@@ -93,8 +97,8 @@
- 		echo
- 		echo 'Warning: system do not have installed GTK+ development'
- 	fi
+@@ -95,12 +99,14 @@
+ #		echo
+ #		echo 'Warning: system do not have installed GTK+ development'
+ #	fi
 -	GTK_MAJOR=`gtk-config --version|cut -d. -f1`
 -	GTK_MINOR=`gtk-config --version|cut -d. -f2`
 +	GTK_MAJOR=`${gtkconfig} --version|cut -d. -f1`
@@ -58,19 +47,24 @@ $FreeBSD$
  	if [ ! \( "$GTK_MAJOR" -ge 1 -o "$GTK_MINOR" -ge 2 -o "$GTK_MAJOR" -gt 1 \) ]
  	then
  		echo
-@@ -147,7 +151,7 @@
+ 		echo 'Warning: system must have installed GTK+ version 1.2 or above'
++	else
++		USE_GTK=yes
+ 	fi
+ fi
+ 
+@@ -141,14 +147,14 @@
  echo "DLLSUFF='$DLLSUFF'" >&3
  echo "DLLREALSUFF='$DLLREALSUFF'" >&3
  echo "CLIPROOT=$CLIPROOT" >&3
--echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include' >&3
+-echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include '$(gtk-config --cflags) >&3
 +echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include'${gtkpath} >&3
  echo "XTARGETS='"'$(XLIB) $(XSLIB)'"'" >&3
  echo "C_FLAGS=-Wall '"'$(INCLUDEDIRS)'"' '$EXTRACFLAGS'" >&3
  echo "LIBS='$LIBS'" >&3
-@@ -160,7 +164,7 @@
- #	else
- #		XCFLAGS=`gtk-config --cflags`
- #	fi
+ 
+ if [ "$USE_GTK" = yes ]
+ then
 -	XCFLAGS=`gtk-config --cflags`
 +	XCFLAGS=`${gtkconfig} --cflags`
  	echo "XCFLAGS='$XCFLAGS'" >&3
diff --git a/databases/clip/files/patch-clip-gtkextra::configure b/databases/clip/files/patch-cliplibs::clip-gtkextra::configure
index 569acc8fca67..633ad25e3048 100644
--- a/databases/clip/files/patch-clip-gtkextra::configure
+++ b/databases/clip/files/patch-cliplibs::clip-gtkextra::configure
@@ -1,7 +1,5 @@
-$FreeBSD$
-
---- cliplibs/clip-gtkextra/configure.orig	Sat Sep 28 02:21:40 2002
-+++ cliplibs/clip-gtkextra/configure	Sat Sep 28 02:57:37 2002
+--- cliplibs/clip-gtkextra/configure.orig	Wed Oct  2 11:03:05 2002
++++ cliplibs/clip-gtkextra/configure	Tue Mar 25 08:56:34 2003
 @@ -3,6 +3,10 @@
  uname=`uname -s`
  uver=`uname -r`
@@ -9,11 +7,11 @@ $FreeBSD$
 +gtkconfig=gtk-config
 +gtkpath=
 +glibconfig=glib-config
-+glibpath=
++glibpath=glibpath=
+ oldpwd=`pwd`
  
  [ -z "$CLIPROOT" ] && CLIPROOT=/usr/local/clip
- DLLSUFF='.so'
-@@ -33,6 +37,10 @@
+@@ -34,6 +38,10 @@
  		;;
  	FreeBSD*)
  		osname=FREEBSD
@@ -24,37 +22,33 @@ $FreeBSD$
  		STATICLINK=-static
  		;;
  	NetBSD*)
-@@ -69,7 +77,8 @@
- #gtkextraincpath=/usr/local/include/gtkextra/
- LIBS='-lgtk -lgdk -lgtkextra'
+@@ -66,7 +74,8 @@
+ echo '#define SYSTEM "'$uname'"' >&3
+ echo '' >&3
  
 -gtkprefix=`gtk-config --prefix 2>/dev/null`
 +glibprefix=`${glibconfig} --prefix 2>/dev/null`
 +gtkprefix=`${gtkconfig} --prefix 2>/dev/null`
+ 
  if [ $? -ne 0 ]
  then
- 	echo
-@@ -79,7 +88,7 @@
+@@ -76,11 +85,11 @@
+ 	echo "*****************************************************************"
  	USE_GTK=no
  else
- #	LIBS='-lgtk -lgdk'
+-	gtkincpath=`find $gtkprefix/include -name 'gtk.h' -printf '%h'`
++	gtkincpath=`find $gtkprefix/include$gtkpath -name 'gtk.h' -exec dirname {} \;`
+         cd $gtkincpath/..
+         gtkincpath=`pwd`
+         cd $oldpwd
 -	LIBS=`gtk-config --libs`
 +	LIBS=`${gtkconfig} --libs`
  
  	if [ "$osname" = "CYGWIN" ]
  	then
-@@ -87,7 +96,7 @@
-                 LIBS=$LIBS" -L"$CLIPROOT"/lib -llibclip-gtk"
- #		LIBS='-lgtk-1.3 -lgdk-1.3 -lglib-1.3'
- 	fi
--	if [ -f $gtkprefix/include/gtk/gtk.h -o -f $gtkprefix/include/gtk+/gtk/gtk.h ]
-+	if [ -f $gtkprefix/include$gtkpath/gtk/gtk.h -o -f $gtkprefix/include/gtk+/gtk/gtk.h ]
- 	then
- 		USE_GTK=yes
- 		echo '#define HAVE_GTK' >&3
-@@ -95,8 +104,8 @@
- 		echo
+@@ -96,8 +105,8 @@
  		echo 'Warning: system do not have installed GTK+ development'
+                 exit
  	fi
 -	GTK_MAJOR=`gtk-config --version|cut -d. -f1`
 -	GTK_MINOR=`gtk-config --version|cut -d. -f2`
@@ -63,7 +57,16 @@ $FreeBSD$
  	if [ ! \( "$GTK_MAJOR" -ge 1 -o "$GTK_MINOR" -ge 2 -o "$GTK_MAJOR" -gt 1 \) ]
  	then
  		echo
-@@ -177,7 +186,7 @@
+@@ -114,7 +123,7 @@
+ 	echo "****************************************************************************"
+ 	USE_GTK_EXTRA=no
+ else
+-	gtkextraincpath=`find $gtkprefix/include -name 'gtk.h' -printf '%h'`
++	gtkextraincpath=`find $gtkprefix/include -name 'gtk.h' -exec dirname {} \;`
+         cd $gtkextraincpath/..
+         gtkextraincpath=`pwd`
+         cd $oldpwd
+@@ -171,7 +180,7 @@
  echo "DLLSUFF='$DLLSUFF'" >&3
  echo "DLLREALSUFF='$DLLREALSUFF'" >&3
  echo "CLIPROOT=$CLIPROOT" >&3
diff --git a/databases/clip/files/patch-cliplibs::clip-interbase::Makefile b/databases/clip/files/patch-cliplibs::clip-interbase::Makefile
new file mode 100644
index 000000000000..df2b325516c5
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs::clip-interbase::Makefile
@@ -0,0 +1,11 @@
+--- cliplibs/clip-interbase/Makefile.orig	Tue Apr 29 10:51:12 2003
++++ cliplibs/clip-interbase/Makefile	Sat Sep 20 23:36:21 2003
+@@ -1,7 +1,7 @@
+ #  GNU make makefile
+ #
+ 
+-IBROOT=/opt/interbase
++IBROOT=/usr/local/firebird
+ 
+ ifdef CLIPROOT
+ include $(CLIPROOT)/include/Makefile.inc
diff --git a/databases/clip/files/patch-cliplibs::clip-mysql::Makefile b/databases/clip/files/patch-cliplibs::clip-mysql::Makefile
new file mode 100644
index 000000000000..bc0d4c82d221
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs::clip-mysql::Makefile
@@ -0,0 +1,24 @@
+--- cliplibs/clip-mysql/Makefile.orig	Fri Dec 20 14:38:20 2002
++++ cliplibs/clip-mysql/Makefile	Sat Sep 20 23:40:00 2003
+@@ -13,7 +13,7 @@
+ TARGET=libclip-mysql$(DLLSUFF)
+ ATARGET=libclip-mysql.a
+ RTARGET=libclip-mysql$(DLLREALSUFF)
+-MSINC = -I/usr/include/mysql -I/usr/local/include/mysql
++MSINC = -I/usr/local/include/mysql
+ OBJS=ms_clip.o ms.o
+ 
+ all:  have_lib	$(TARGET) $(ATARGET)
+@@ -22,10 +22,10 @@
+ 	test -f /usr/include/mysql/mysql.h -o -f /usr/local/include/mysql/mysql.h
+ 
+ $(TARGET): $(OBJS)
+-	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) -lmysqlclient -L/usr/lib/mysql
++	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) -lmysqlclient -L/usr/local/lib/mysql
+ 
+ $(ATARGET): $(OBJS)
+-	$(CLIPROOT)/bin/clip_makelib $(ATARGET) $(OBJS) -lmysqlclient -L/usr/lib/mysql
++	$(CLIPROOT)/bin/clip_makelib $(ATARGET) $(OBJS) -lmysqlclient -L/usr/local/lib/mysql
+ 
+ ms_clip.o: ms_clip.c
+ 	$(CC) $(C_FLAGS) $(CLIPINCLUDE) $(MSINC) -c ms_clip.c
diff --git a/databases/clip/files/patch-cliplibs::clip-oasis::Makefile b/databases/clip/files/patch-cliplibs::clip-oasis::Makefile
deleted file mode 100644
index 7152fcfd86bc..000000000000
--- a/databases/clip/files/patch-cliplibs::clip-oasis::Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- cliplibs/clip-oasis/Makefile	Mon Jun 17 14:31:04 2002
-+++ cliplibs/clip-oasis/Makefile	Mon Jun 17 14:31:45 2002
-@@ -1,11 +1,11 @@
- 
- all:
--	cd netto; make
--	cd nanfor; make
-+	cd netto; $(MAKE)
-+	cd nanfor; $(MAKE)
- install:
--	cd netto; make install
--	cd nanfor; make install
-+	cd netto; $(MAKE) install
-+	cd nanfor; $(MAKE) install
- clean:
--	cd netto; make clean
--	cd nanfor; make clean
-+	cd netto; $(MAKE) clean
-+	cd nanfor; $(MAKE) clean
- 
diff --git a/databases/clip/files/patch-cliplibs::clip-oasis::nanfor::Makefile b/databases/clip/files/patch-cliplibs::clip-oasis::nanfor::Makefile
deleted file mode 100644
index ca36869dd182..000000000000
--- a/databases/clip/files/patch-cliplibs::clip-oasis::nanfor::Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- cliplibs/clip-oasis/nanfor/Makefile	Mon Jun 17 14:31:02 2002
-+++ cliplibs/clip-oasis/nanfor/Makefile	Mon Jun 17 14:31:49 2002
-@@ -10,11 +10,11 @@
- all: $(TARGET)
- 
- $(TARGET):
--	cd prg; make
-+	cd prg; $(MAKE)
- 	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(LIBS)
- 
- clean distclean:
--	cd prg; make clean
-+	cd prg; $(MAKE) clean
- 	rm -f $(LIBS) $(TARGET) $(RTARGET)
- 
- install:  $(TARGET)
diff --git a/databases/clip/files/patch-cliplibs::clip-oasis::netto::Makefile b/databases/clip/files/patch-cliplibs::clip-oasis::netto::Makefile
deleted file mode 100644
index da209f1fea7e..000000000000
--- a/databases/clip/files/patch-cliplibs::clip-oasis::netto::Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- cliplibs/clip-oasis/netto/Makefile	Mon Jun 17 14:31:04 2002
-+++ cliplibs/clip-oasis/netto/Makefile	Mon Jun 17 14:32:10 2002
-@@ -10,11 +10,11 @@
- all: $(TARGET)
- 
- $(TARGET):
--	cd misc; make
-+	cd misc; $(MAKE)
- 	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(LIBS)
- 
- clean distclean*:
--	cd misc; make clean
-+	cd misc; $(MAKE) clean
- 	rm -f $(LIBS) $(TARGET) $(RTARGET)
- 
- install: $(TARGET)
diff --git a/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in b/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in
new file mode 100644
index 000000000000..ef64e42fbc24
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in
@@ -0,0 +1,19 @@
+--- cliplibs/clip-odbc/Makefile.in.orig	Fri Dec 20 14:39:13 2002
++++ cliplibs/clip-odbc/Makefile.in	Sat Sep 20 23:42:32 2003
+@@ -8,7 +8,7 @@
+ 
+ LIBODBC=@LIBODBC@
+ LIBOOB=@LIBOOB@
+-CLIPINCLUDE=-I$(CLIPROOT)/include
++CLIPINCLUDE=-I$(CLIPROOT)/include -I/usr/local/include -L/usr/local/lib
+ C_FLAGS=-Wall -g -I.
+ #CC=gcc
+ 
+@@ -38,7 +38,6 @@
+ 
+ install: all
+ 	$(CLIPROOT)/bin/clip_cp $(TARGET) $(CLIPROOT)/lib
+-	$(CLIPROOT)/bin/clip_cp $(TARGET1) $(CLIPROOT)/lib
+ 	#[ "$(TARGET)" = "$(RTARGET)" ] || cp $(RTARGET) $(CLIPROOT)/lib
+ 	#[ "$(TARGET1)" = "$(RTARGET1)" ] || cp $(RTARGET1) $(CLIPROOT)/lib
+ 	mkdir -p $(CLIPROOT)/doc/clip-odbc
diff --git a/databases/clip/files/patch-cliplibs::clip-odbc::configure b/databases/clip/files/patch-cliplibs::clip-odbc::configure
new file mode 100644
index 000000000000..f43975530101
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs::clip-odbc::configure
@@ -0,0 +1,24 @@
+--- cliplibs/clip-odbc/configure.orig	Mon May 27 12:25:29 2002
++++ cliplibs/clip-odbc/configure	Sat Sep 20 23:46:44 2003
+@@ -21,11 +21,11 @@
+ LIBODBC=''
+ LIBOOB=''
+ 
+-gcc -o test_odbc test_odbc.c -liodbc >/dev/null 2>&1 && LIBODBC='-liodbc' && echo 'iODBC driver manager were found'
++gcc -o test_odbc test_odbc.c  -I/usr/local/include -L/usr/local/lib -liodbc >/dev/null 2>&1 && LIBODBC='-liodbc' && echo 'iODBC driver manager were found'
+ 
+ if [ -z "$LIBODBC" ]
+ then
+-	gcc -o test_odbc test_odbc.c -lodbc >/dev/null 2>&1 && LIBODBC='-lodbc' && echo 'unixODBC driver manager were found'
++	gcc -o test_odbc test_odbc.c  -I/usr/local/include -L/usr/local/lib -lodbc >/dev/null 2>&1 && LIBODBC='-lodbc' && echo 'unixODBC driver manager were found'
+ fi
+ 
+ if [ -z "$LIBODBC" ]
+@@ -36,6 +36,6 @@
+ 
+ gcc -o test_odbc test_odbc.c -L/usr/local/easysoft/oob/client -lesoobclient >/dev/null 2>&1 && LIBOOB='-L\/usr\/local\/easysoft\/oob\/client -lesoobclient' && echo 'ODBC-ODBC bridge client were found'
+ 
+-sed -e "s/@LIBODBC@/$LIBODBC/g" < Makefile.in | sed -e "s/@LIBOOB@/$LIBOOB/g" - >Makefile
++sed -e "s/@LIBODBC@/$LIBODBC/g" < Makefile.in | sed -e "s/@LIBOOB@/$LIBOOB/g" >Makefile
+ 
+ exitf 0
diff --git a/databases/clip/files/patch-cliplibs::clip-postgres::Makefile b/databases/clip/files/patch-cliplibs::clip-postgres::Makefile
new file mode 100644
index 000000000000..b0cb30889a92
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs::clip-postgres::Makefile
@@ -0,0 +1,18 @@
+--- cliplibs/clip-postgres/Makefile.orig	Mon Jan 13 12:14:20 2003
++++ cliplibs/clip-postgres/Makefile	Sat Sep 20 23:52:16 2003
+@@ -13,13 +13,13 @@
+ 
+ TARGET=libclip-postgres$(DLLSUFF)
+ RTARGET=libclip-postgres$(DLLREALSUFF)
+-PGINC = -I/usr/include/pgsql -I/usr/include/postgresql -I/usr/include/pgsql/server
++PGINC = -I/usr/include/postgresql -I/usr/include/postgresql/server
+ OBJS=pg_clip.o pg.o
+ 
+ all:  have_lib	$(TARGET)
+ 
+ have_lib:
+-	test -f /usr/include/pgsql/libpq-fe.h -o -f /usr/include/postgresql/libpq-fe.h -o -f /usr/include/libpq-fe.h -o -f /usr/local/include/libpq-fe.h
++	test -f /usr/local/include/pgsql/libpq-fe.h -o -f /usr/local/include/postgresql/libpq-fe.h -o -f /usr/local/include/libpq-fe.h
+ 
+ $(TARGET): $(OBJS)
+ 	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) -lpq -L/usr/local/lib -L/usr/local/pgsql/lib
diff --git a/databases/clip/files/patch-prg::udb::Makefile b/databases/clip/files/patch-prg::udb::Makefile
deleted file mode 100644
index 5e8e6890590b..000000000000
--- a/databases/clip/files/patch-prg::udb::Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- prg/udb/Makefile	Mon Jun 17 14:31:09 2002
-+++ prg/udb/Makefile	Mon Jun 17 14:32:30 2002
-@@ -13,7 +13,7 @@
- commit:
- 	../_cvs commit
- clean:
--	cd dict; make clean
-+	cd dict; $(MAKE) clean
- 	cd include; rm -rf *.bak *.log
- 	cd gbl01; rm -rf *.po *.bak *.log *.po *core core*
- 	cd plugins; rm -rf *.po *.bak *.log *.po *core core*
-@@ -23,7 +23,7 @@
- 	$(CLIP) $(CLIPFLAGS) -s -e -M test.prg $(CLIPLIBS) $(LIBS)
- 
- lib:
--	cd dict; make lib
-+	cd dict; $(MAKE) lib
- 
- codb_mk: $(LIBS) codb_mk.prg
- 	$(CLIP) $(CLIPFLAGS) -s -e -M codb_mk.prg $(CLIPLIBS) $(LIBS)
-@@ -35,7 +35,7 @@
- #	$(CLIP) $(CLIPFLAGS) codb_mk.prg
- 
- libclip-codb.a:
--	cd dict; make
-+	cd dict; $(MAKE)
- 
- libclip-codb.so: $(ALIBS)
- 	clip_makeslib libclip-codb.so $(ALIBS)
diff --git a/databases/clip/pkg-message b/databases/clip/pkg-message
new file mode 100644
index 000000000000..f9519d7a33d3
--- /dev/null
+++ b/databases/clip/pkg-message
@@ -0,0 +1,3 @@
+You should add /usr/local/clip/bin to your $PATH.
+
+Remark: unset LANG / LC_ALL for better results.
diff --git a/databases/clip/pkg-plist b/databases/clip/pkg-plist
index 52f840818517..02ff697976e7 100644
--- a/databases/clip/pkg-plist
+++ b/databases/clip/pkg-plist
@@ -1,10 +1,15 @@
+clip/bin/add_meta_tag
 clip/bin/bdbf
+clip/bin/bdbf.hlp
+clip/bin/bdbfr.hlp
+clip/bin/bdbfs.hlp
 clip/bin/clip
 clip/bin/clip_bl
 clip/bin/clip_blank
 clip/bin/clip_bug
 clip/bin/clip_cld
 clip/bin/clip_conv
+clip/bin/clip_cp
 clip/bin/clip_dbf2txt
 clip/bin/clip_dbg
 clip/bin/clip_fl
@@ -12,6 +17,7 @@ clip/bin/clip_hashextract
 clip/bin/clip_hindex
 clip/bin/clip_hseek
 clip/bin/clip_hv
+clip/bin/clip_makelib
 clip/bin/clip_makeslib
 clip/bin/clip_msgfmt
 clip/bin/clip_msgmerge
@@ -21,15 +27,29 @@ clip/bin/clip_trans
 clip/bin/clip_we
 clip/bin/clipar
 clip/bin/cliphash
+clip/bin/codb_ab
+clip/bin/codb_abx
+clip/bin/codb_addobj
+clip/bin/codb_make
+clip/bin/codb_pack
+clip/bin/ctosgml
+clip/bin/dbc
+clip/bin/ftosgml
 clip/bin/gen_tbl
 clip/bin/joinlib.sh
 clip/bin/lowname
+clip/bin/po_compat
+clip/bin/po_extr
+clip/bin/po_subst
 clip/bin/pp_ron
 clip/bin/sqlrun
+clip/bin/tconv
 clip/bin/wcl2prg
 clip/bin/www_clip
+clip/bin/xclip
 clip/charsets/7bit.uni
 clip/charsets/8859-1.uni
+clip/charsets/8859-2.tbl
 clip/charsets/8859-2.uni
 clip/charsets/8859-5.uni
 clip/charsets/BIG5.TXT.gz
@@ -51,6 +71,8 @@ clip/charsets/cp850.tbl
 clip/charsets/cp850.uni
 clip/charsets/cp852.tbl
 clip/charsets/cp852.uni
+clip/charsets/cp866-raw.tbl
+clip/charsets/cp866-raw.uni
 clip/charsets/cp866.tbl
 clip/charsets/cp866.uni
 clip/charsets/cp866u.tbl
@@ -61,6 +83,7 @@ clip/charsets/gbk.tbl
 clip/charsets/gbk.uni
 clip/charsets/gen-uni.sh
 clip/charsets/gen_tbl.c
+clip/charsets/gentbl_strcoll.c
 clip/charsets/iso01.tbl
 clip/charsets/iso01.uni
 clip/charsets/iso02.tbl
@@ -87,6 +110,8 @@ clip/charsets/koi8-r.uni
 clip/charsets/koi8-u.tbl
 clip/charsets/koi8-u.uni
 clip/charsets/koi8.uni
+clip/charsets/koi8r.tbl
+clip/charsets/koi8r.uni
 clip/charsets/lat1.tbl
 clip/charsets/lat1.uni
 clip/charsets/lat1u.uni
@@ -103,19 +128,60 @@ clip/charsets/utf_8.uni
 clip/cliprc/.notrm
 clip/cliprc/clip-gtk.cliprc
 clip/cliprc/clipflags
-clip/doc/Readme.cygwin
-clip/doc/Readme.en
-clip/doc/Readme.rus
-clip/doc/TODO
-clip/doc/bdbfs/bdbfs.hlp
-clip/doc/bdbfs/bdbfs_en.htm
-clip/doc/bdbfs/bdbfs_ru.htm
-clip/doc/charset/cp866.html
-clip/doc/charset/cp866u.html
-clip/doc/charset/koi8r.html
-clip/doc/charset/koi8u.html
-clip/doc/charset/ruscii.html
-clip/doc/clip-bzip2/bzip2.html
+clip/codb_ab/plugins/acc_oper.po
+clip/codb_ab/plugins/acc_oper.prg
+clip/codb_ab/plugins/attr.po
+clip/codb_ab/plugins/attr.prg
+clip/codb_ab/plugins/class.po
+clip/codb_ab/plugins/class.prg
+clip/codb_ab/plugins/counter.po
+clip/codb_ab/plugins/counter.prg
+clip/codb_ab/plugins/default.po
+clip/codb_ab/plugins/default.prg
+clip/codb_ab/plugins/deposit.po
+clip/codb_ab/plugins/deposit.prg
+clip/codb_ab/plugins/extent.po
+clip/codb_ab/plugins/extent.prg
+clip/codb_ab/plugins/group.po
+clip/codb_ab/plugins/group.prg
+clip/codb_ab/plugins/index.po
+clip/codb_ab/plugins/index.prg
+clip/codb_ab/plugins/plugins.po
+clip/codb_ab/plugins/plugins.prg
+clip/codb_ab/plugins/report.po
+clip/codb_ab/plugins/report.prg
+clip/codb_ab/plugins/tcolumn.po
+clip/codb_ab/plugins/tcolumn.prg
+clip/codb_ab/plugins/tview.po
+clip/codb_ab/plugins/tview.prg
+clip/codb_ab/plugins/user.po
+clip/codb_ab/plugins/user.prg
+clip/codb_ab/reports/default.po
+clip/codb_ab/reports/default.prg
+clip/codb_abx/plugins/attr.po
+clip/codb_abx/plugins/attr.prg
+clip/codb_abx/plugins/class.po
+clip/codb_abx/plugins/class.prg
+clip/codb_abx/plugins/counter.po
+clip/codb_abx/plugins/counter.prg
+clip/codb_abx/plugins/default.po
+clip/codb_abx/plugins/default.prg
+clip/codb_abx/plugins/deposit.po
+clip/codb_abx/plugins/deposit.prg
+clip/codb_abx/plugins/group.po
+clip/codb_abx/plugins/group.prg
+clip/codb_abx/plugins/index.po
+clip/codb_abx/plugins/index.prg
+clip/codb_abx/plugins/plugins.po
+clip/codb_abx/plugins/plugins.prg
+clip/codb_abx/plugins/report.po
+clip/codb_abx/plugins/report.prg
+clip/codb_abx/plugins/tcolumn.po
+clip/codb_abx/plugins/tcolumn.prg
+clip/codb_abx/plugins/tview.po
+clip/codb_abx/plugins/tview.prg
+clip/codb_abx/plugins/user.po
+clip/codb_abx/plugins/user.prg
 clip/doc/clip-com/com_close.html
 clip/doc/clip-com/com_count.html
 clip/doc/clip-com/com_dtr.html
@@ -130,48 +196,55 @@ clip/doc/clip-com/com_sflush.html
 clip/doc/clip-com/com_soft.html
 clip/doc/clip-com/com_timeout.html
 clip/doc/clip-com/index.html
-clip/doc/clip-crypto/crypto.html
-clip/doc/clip-gd/gd_lib.html
-clip/doc/clip-gd/gd_prg.html
-clip/doc/clip-gd/o_gdimage.html
-clip/doc/clip-gzip/gzip.html
-clip/doc/clip-oasis/netto/netto.ng
-clip/doc/clip-oasis/netto/readme.1st
-clip/doc/clip.html
-clip/doc/cygwin.reg
-clip/doc/eng/about.html
-clip/doc/eng/circle1.png
-clip/doc/eng/circle2.png
-clip/doc/eng/clip_news.html
-clip/doc/eng/clipper1.html
-clip/doc/eng/clipper19.html
-clip/doc/eng/clipper2.html
-clip/doc/eng/clipper3.html
-clip/doc/eng/clipper4.html
-clip/doc/eng/clipper6.html
-clip/doc/eng/clipper_ml.html
-clip/doc/eng/fon.gif
-clip/doc/eng/hist1.png
-clip/doc/eng/hist2.png
-clip/doc/eng/histcumul1.png
-clip/doc/eng/histcumul2.png
-clip/doc/eng/histnorm1.png
-clip/doc/eng/histnorm2.png
-clip/doc/eng/histvolume.png
-clip/doc/eng/index.html
-clip/doc/eng/license.html
-clip/doc/eng/line1.png
-clip/doc/eng/line2.png
-clip/doc/eng/linecumul1.png
-clip/doc/eng/linecumul2.png
-clip/doc/eng/linenorm1.png
-clip/doc/eng/linenorm2.png
-clip/doc/eng/o_dt.html
-clip/doc/eng/o_graphics.html
-clip/doc/eng/ring1.png
-clip/doc/eng/ring2.png
-clip/doc/eng/styl.css
-clip/doc/eng/style.css
+clip/doc/clip-gd/eng/asdf.png
+clip/doc/clip-gd/eng/circle1.png
+clip/doc/clip-gd/eng/circle2.png
+clip/doc/clip-gd/eng/gd_lib.html
+clip/doc/clip-gd/eng/gd_prg.html
+clip/doc/clip-gd/eng/hist1.png
+clip/doc/clip-gd/eng/hist2.png
+clip/doc/clip-gd/eng/histcumul1.png
+clip/doc/clip-gd/eng/histcumul2.png
+clip/doc/clip-gd/eng/histnorm1.png
+clip/doc/clip-gd/eng/histnorm2.png
+clip/doc/clip-gd/eng/histvolume.png
+clip/doc/clip-gd/eng/line1.png
+clip/doc/clip-gd/eng/line2.png
+clip/doc/clip-gd/eng/linecumul1.png
+clip/doc/clip-gd/eng/linecumul2.png
+clip/doc/clip-gd/eng/linenorm1.png
+clip/doc/clip-gd/eng/linenorm2.png
+clip/doc/clip-gd/eng/o_gdimage.html
+clip/doc/clip-gd/eng/o_graphics.html
+clip/doc/clip-gd/eng/ring1.png
+clip/doc/clip-gd/eng/ring2.png
+clip/doc/clip-gd/rus/asdf.png
+clip/doc/clip-gd/rus/circle1.png
+clip/doc/clip-gd/rus/circle2.png
+clip/doc/clip-gd/rus/gd_lib.html
+clip/doc/clip-gd/rus/gd_prg.html
+clip/doc/clip-gd/rus/gistvolume.png
+clip/doc/clip-gd/rus/hist1.png
+clip/doc/clip-gd/rus/hist2.png
+clip/doc/clip-gd/rus/histcumul1.png
+clip/doc/clip-gd/rus/histcumul2.png
+clip/doc/clip-gd/rus/histnorm1.png
+clip/doc/clip-gd/rus/histnorm2.png
+clip/doc/clip-gd/rus/histvolume.png
+clip/doc/clip-gd/rus/line1.png
+clip/doc/clip-gd/rus/line2.png
+clip/doc/clip-gd/rus/linecumul1.png
+clip/doc/clip-gd/rus/linecumul2.png
+clip/doc/clip-gd/rus/linenorm1.png
+clip/doc/clip-gd/rus/linenorm2.png
+clip/doc/clip-gd/rus/o_gdimage.html
+clip/doc/clip-gd/rus/o_graphics.html
+clip/doc/clip-gd/rus/ring1.png
+clip/doc/clip-gd/rus/ring2.png
+%%IBASE%%clip/doc/clip-interbase/interbase.html
+%%MYSQL%%clip/doc/clip-mysql/mysql.html
+%%ODBC%%clip/doc/clip-odbc/odbc.html
+%%PGSQL%%clip/doc/clip-postgres/postgres.html
 clip/doc/example/Makefile
 clip/doc/example/abox.ch
 clip/doc/example/box.ch
@@ -181,6 +254,12 @@ clip/doc/example/clip-com/Makefile
 clip/doc/example/clip-com/com.prg
 clip/doc/example/clip-crypto/Makefile
 clip/doc/example/clip-crypto/crypto.prg
+clip/doc/example/clip-cti/Makefile
+clip/doc/example/clip-cti/browsecombo.prg
+clip/doc/example/clip-cti/ctifd.prg
+clip/doc/example/clip-cti/ctitest.prg
+clip/doc/example/clip-cti/test.dbf
+clip/doc/example/clip-fw/.clipcharset
 clip/doc/example/clip-fw/Makefile
 clip/doc/example/clip-fw/atest.prg
 clip/doc/example/clip-fw/bitmaps/calc.bmp
@@ -207,11 +286,15 @@ clip/doc/example/clip-fw/data/custname.ntx
 clip/doc/example/clip-fw/data/customer.dbf
 clip/doc/example/clip-fw/data/sales.dbf
 clip/doc/example/clip-fw/dlgtest.prg
+clip/doc/example/clip-fw/gettest.prg
 clip/doc/example/clip-fw/lines.prg
 clip/doc/example/clip-fw/t.prg
 clip/doc/example/clip-fw/test.prg
 clip/doc/example/clip-fw/testbar.prg
+clip/doc/example/clip-fw/testbrw.prg
 clip/doc/example/clip-fw/testlbx.prg
+clip/doc/example/clip-fw/testscrl.prg
+clip/doc/example/clip-fw/testwsty.prg
 clip/doc/example/clip-fw/tooltip.prg
 clip/doc/example/clip-gd/Makefile
 clip/doc/example/clip-gd/gr.prg
@@ -219,97 +302,41 @@ clip/doc/example/clip-gtk/Makefile
 clip/doc/example/clip-gtk/basket.bmp
 clip/doc/example/clip-gtk/clip.xpm
 clip/doc/example/clip-gtk/clipgtktest.prg
+clip/doc/example/clip-gtk/tbrow.prg
+clip/doc/example/clip-gtk/tbrow.xpm
 clip/doc/example/clip-gtkextra/Makefile
 clip/doc/example/clip-gtkextra/pixmaps.ch
 clip/doc/example/clip-gtkextra/sheet.prg
 clip/doc/example/clip-gzip/Makefile
 clip/doc/example/clip-gzip/gz.prg
+%%IBASE%%clip/doc/example/clip-interbase/my_isql.prg
+%%IBASE%%clip/doc/example/clip-interbase/Makefile
+%%MYSQL%%clip/doc/example/clip-mysql/Makefile
+%%MYSQL%%clip/doc/example/clip-mysql/my_mysql.prg
+%%ODBC%%clip/doc/example/clip-odbc/Makefile
+%%ODBC%%clip/doc/example/clip-odbc/my_isql.prg
+%%PGSQL%%clip/doc/example/clip-postgres/Makefile
+%%PGSQL%%clip/doc/example/clip-postgres/my_psql.prg
+clip/doc/example/clip-rtf/Makefile
+clip/doc/example/clip-rtf/flowers.dbf
+clip/doc/example/clip-rtf/flowers.dbt
+clip/doc/example/clip-rtf/rtfdemo.prg
+clip/doc/example/clip-rtf/veggies.dbf
 clip/doc/example/hello.prg
+clip/doc/example/inkey.prg
 clip/doc/example/mouse.prg
 clip/doc/example/pg.prg
 clip/doc/example/reclock.prg
 clip/doc/example/task.prg
 clip/doc/example/task_msg.prg
+clip/doc/example/tcpclient.prg
+clip/doc/example/tcpserv.prg
 clip/doc/example/test.dbf.orig
 clip/doc/example/test_dbf.prg
 clip/doc/example/testlock.prg
-clip/doc/ncpfs/Readme
-clip/doc/ncpfs/patch-2.2.18
-clip/doc/ncpfs/patch-2.4.18
-clip/doc/pcode.txt
-clip/doc/rus/about.html
-clip/doc/rus/about_lang.html
-clip/doc/rus/asdf.png
-clip/doc/rus/asg.html
-clip/doc/rus/c_html.html
-clip/doc/rus/circle1.png
-clip/doc/rus/circle2.png
-clip/doc/rus/clip.html
-clip/doc/rus/clip_dev.html
-clip/doc/rus/clip_news.html
-clip/doc/rus/clip_util.html
-clip/doc/rus/clipper1.html
-clip/doc/rus/clipper10.html
-clip/doc/rus/clipper12.html
-clip/doc/rus/clipper18.html
-clip/doc/rus/clipper19.html
-clip/doc/rus/clipper1_1.html
-clip/doc/rus/clipper1_2.html
-clip/doc/rus/clipper2.html
-clip/doc/rus/clipper3.html
-clip/doc/rus/clipper4.html
-clip/doc/rus/clipper5.html
-clip/doc/rus/clipper6.html
-clip/doc/rus/clipper7.html
-clip/doc/rus/clipper8.html
-clip/doc/rus/clipper9.html
-clip/doc/rus/clipper_ml.html
-clip/doc/rus/dbfsql.html
-clip/doc/rus/debug.html
-clip/doc/rus/edit.html
-clip/doc/rus/extend.html
-clip/doc/rus/fon.gif
-clip/doc/rus/func_list.html
-clip/doc/rus/gistvolume.png
-clip/doc/rus/hist1.png
-clip/doc/rus/hist2.png
-clip/doc/rus/histcumul1.png
-clip/doc/rus/histcumul2.png
-clip/doc/rus/histnorm1.png
-clip/doc/rus/histnorm2.png
-clip/doc/rus/histvolume.png
-clip/doc/rus/index.html
-clip/doc/rus/lic_art.txt
-clip/doc/rus/lic_bsd.txt
-clip/doc/rus/lic_gpl.txt
-clip/doc/rus/lic_lgpl.txt
-clip/doc/rus/license.html
-clip/doc/rus/line1.png
-clip/doc/rus/line2.png
-clip/doc/rus/linecumul1.png
-clip/doc/rus/linecumul2.png
-clip/doc/rus/linenorm1.png
-clip/doc/rus/linenorm2.png
-clip/doc/rus/o_dt.html
-clip/doc/rus/o_graphics.html
-clip/doc/rus/o_hparser.html
-clip/doc/rus/o_html.html
-clip/doc/rus/o_inifile.html
-clip/doc/rus/o_listitem.html
-clip/doc/rus/o_medit.html
-clip/doc/rus/o_rdd.html
-clip/doc/rus/o_sarray.html
-clip/doc/rus/o_smtp.html
-clip/doc/rus/o_textedit.html
-clip/doc/rus/o_url.html
-clip/doc/rus/oo_paul.html
-clip/doc/rus/ring1.png
-clip/doc/rus/ring2.png
-clip/doc/rus/speedinfo.html
-clip/doc/rus/sqlfox.html
-clip/doc/rus/styl.css
-clip/doc/rus/why.html
-clip/doc/rus/www_sql.html
+clip/etc/.calendar
+clip/etc/.macro
+clip/etc/.templ
 clip/etc/environment
 clip/etc/printers.ini
 clip/etc/termcap
@@ -359,6 +386,7 @@ clip/etc/terminfo/x/xterm-fssh
 clip/etc/terminfo/x/xterm-mono
 clip/etc/terminfo/x/xterm-xfree86
 clip/include/Makefile.inc
+clip/include/Makefile.tdoc
 clip/include/achoice.ch
 clip/include/aof.ch
 clip/include/assert.ch
@@ -366,6 +394,7 @@ clip/include/bggraph.ch
 clip/include/blob.ch
 clip/include/box.ch
 clip/include/browsys.ch
+clip/include/btree.h
 clip/include/button.ch
 clip/include/clip-gtk.ch
 clip/include/clip-gtk.h
@@ -373,15 +402,50 @@ clip/include/clip-gtkextra.ch
 clip/include/clip.ch
 clip/include/clip.h
 clip/include/clipbase.h
+clip/include/clipbrd.ch
 clip/include/clipcfg.h
 clip/include/clipcfg.sh
 clip/include/clr_html.ch
+clip/include/codb.ch
 clip/include/color.ch
 clip/include/common.ch
 clip/include/config.ch
 clip/include/ct.ch
 clip/include/ctdisk.ch
 clip/include/ctdrv.ch
+clip/include/cti.ch
+clip/include/cti/clipcti.ch
+clip/include/cti/cti.ch
+clip/include/cti/ctiapp.ch
+clip/include/cti/ctibin.ch
+clip/include/cti/ctibox.ch
+clip/include/cti/ctibrowsecombo.ch
+clip/include/cti/cticheckbox.ch
+clip/include/cti/cticontainer.ch
+clip/include/cti/cticontrol.ch
+clip/include/cti/ctientry.ch
+clip/include/cti/ctievents.ch
+clip/include/cti/ctihbox.ch
+clip/include/cti/ctilabel.ch
+clip/include/cti/ctilayout.ch
+clip/include/cti/ctilist.ch
+clip/include/cti/ctimenu.ch
+clip/include/cti/ctimenubar.ch
+clip/include/cti/ctimenuitem.ch
+clip/include/cti/ctimenushell.ch
+clip/include/cti/ctiobject.ch
+clip/include/cti/ctioptionmenu.ch
+clip/include/cti/ctipopupmenu.ch
+clip/include/cti/ctipushbutton.ch
+clip/include/cti/ctiradiobutton.ch
+clip/include/cti/ctiradiogroup.ch
+clip/include/cti/ctisignal.ch
+clip/include/cti/ctistatusbar.ch
+clip/include/cti/ctitbrowse.ch
+clip/include/cti/ctivbox.ch
+clip/include/cti/ctiwidget.ch
+clip/include/cti/ctiwindow.ch
+clip/include/cti/ctizorder.ch
 clip/include/ctkbd.ch
 clip/include/ctmisc.ch
 clip/include/ctnnet.ch
@@ -455,32 +519,38 @@ clip/include/fwin/winten.h
 clip/include/fwin/yacc.ch
 clip/include/gdinfo.ch
 clip/include/getexit.ch
+clip/include/hash.h
 clip/include/html.ch
 clip/include/imenu.ch
 clip/include/inkey.ch
+%%IBASE%%clip/include/interbase.ch
 clip/include/key_name.ch
 clip/include/lang.ch
 clip/include/lbldef.ch
 clip/include/llibg.ch
-clip/include/memdebug/malloc.h
-clip/include/memdebug/malloc_str.h
 clip/include/memoedit.ch
 clip/include/mset.ch
+%%MYSQL%%clip/include/mysql.ch
 clip/include/nanfor/dfkey.h
+clip/include/nanfor/ft_ach2t.ch
 clip/include/nanfor/ftint86.ch
 clip/include/nanfor/ftmenuto.ch
 clip/include/netto/dfkey.h
 clip/include/netto/ftint86.ch
 clip/include/netto/ftmenuto.ch
 clip/include/netto/netto.ch
+clip/include/objects.ch
+%%ODBC%%clip/include/odbc.ch
 clip/include/ord.ch
 clip/include/ordinfo.ch
 clip/include/pgch.ch
+%%PGSQL%%clip/include/postgres.ch
 clip/include/pp_harb.ch
 clip/include/ppclass.ch
 clip/include/rdd.ch
 clip/include/rddsys.ch
 clip/include/reserved.ch
+clip/include/richtext.ch
 clip/include/rp_dot.ch
 clip/include/rp_run.ch
 clip/include/set.ch
@@ -501,8 +571,12 @@ clip/keymaps/pl-maz
 clip/keymaps/pl-maz.kmap
 clip/keymaps/ru-cp1251
 clip/keymaps/ru-cp1251.kmap
+clip/keymaps/ru-cp1251_1
+clip/keymaps/ru-cp1251_1.kmap
 clip/keymaps/ru-cp866
 clip/keymaps/ru-cp866.kmap
+clip/keymaps/ru-cp866_1
+clip/keymaps/ru-cp866_1.kmap
 clip/keymaps/ru-koi8-r
 clip/keymaps/ru-koi8-r.kmap
 clip/keymaps/ru-stelnet.kmap
@@ -518,38 +592,114 @@ clip/lang/ru_RU.CP1251
 clip/lang/ru_RU.CP866
 clip/lang/ru_RU.KOI8-R
 clip/lang/ru_RU.KOI8-U
+clip/lib/libclip-bzip2.a
+clip/lib/libclip-bzip2.ex
+clip/lib/libclip-bzip2.nm
 clip/lib/libclip-bzip2.so
+clip/lib/libclip-codb.a
+clip/lib/libclip-codb.ex
+clip/lib/libclip-codb.nm
+clip/lib/libclip-codb.so
+clip/lib/libclip-com.a
+clip/lib/libclip-com.ex
+clip/lib/libclip-com.nm
 clip/lib/libclip-com.so
+clip/lib/libclip-crypto.a
+clip/lib/libclip-crypto.ex
+clip/lib/libclip-crypto.nm
 clip/lib/libclip-crypto.so
+clip/lib/libclip-cti.a
+clip/lib/libclip-cti.ex
+clip/lib/libclip-cti.nm
+clip/lib/libclip-cti.so
+clip/lib/libclip-fw.a
+clip/lib/libclip-fw.ex
+clip/lib/libclip-fw.nm
 clip/lib/libclip-fw.so
 clip/lib/libclip-gd.a
+clip/lib/libclip-gd.ex
+clip/lib/libclip-gd.nm
 clip/lib/libclip-gd.so
 clip/lib/libclip-gtk.a
+clip/lib/libclip-gtk.ex
+clip/lib/libclip-gtk.nm
 clip/lib/libclip-gtk.so
 clip/lib/libclip-gtkextra.a
+clip/lib/libclip-gtkextra.ex
+clip/lib/libclip-gtkextra.nm
 clip/lib/libclip-gtkextra.so
+clip/lib/libclip-gzip.a
+clip/lib/libclip-gzip.ex
+clip/lib/libclip-gzip.nm
 clip/lib/libclip-gzip.so
+%%IBASE%%clip/lib/libclip-interbase.a
+%%IBASE%%clip/lib/libclip-interbase.ex
+%%IBASE%%clip/lib/libclip-interbase.nm
+%%IBASE%%clip/lib/libclip-interbase.so
+%%MYSQL%%clip/lib/libclip-mysql.a
+%%MYSQL%%clip/lib/libclip-mysql.ex
+%%MYSQL%%clip/lib/libclip-mysql.nm
+%%MYSQL%%clip/lib/libclip-mysql.so
+clip/lib/libclip-nanfor.a
+clip/lib/libclip-nanfor.ex
+clip/lib/libclip-nanfor.nm
 clip/lib/libclip-nanfor.so
+clip/lib/libclip-netto.a
+clip/lib/libclip-netto.ex
+clip/lib/libclip-netto.nm
 clip/lib/libclip-netto.so
+%%ODBC%%clip/lib/libclip-odbc.a
+%%ODBC%%clip/lib/libclip-odbc.ex
+%%ODBC%%clip/lib/libclip-odbc.nm
+%%ODBC%%clip/lib/libclip-odbc.so
+%%PGSQL%%clip/lib/libclip-postgres.ex
+%%PGSQL%%clip/lib/libclip-postgres.nm
+%%PGSQL%%clip/lib/libclip-postgres.so
+clip/lib/libclip-rtf.a
+clip/lib/libclip-rtf.ex
+clip/lib/libclip-rtf.nm
+clip/lib/libclip-rtf.so
 clip/lib/libclip.a
+clip/lib/libclip.ex
+clip/lib/libclip.nm
 clip/lib/libclip.so
 clip/lib/libgd.a
+clip/locale.mo/ru_RU.KOI8-R/bdbfs.mo
 clip/locale.mo/ru_RU.KOI8-R/brow.mo
 clip/locale.mo/ru_RU.KOI8-R/ca_dbu.mo
+clip/locale.mo/ru_RU.KOI8-R/clip-cti.mo
+clip/locale.mo/ru_RU.KOI8-R/clip-fw.mo
+clip/locale.mo/ru_RU.KOI8-R/clip-gtk.mo
+clip/locale.mo/ru_RU.KOI8-R/clip.mo
+clip/locale.mo/ru_RU.KOI8-R/cliprt.mo
 clip/locale.mo/ru_RU.KOI8-R/codb.mo
 clip/locale.mo/ru_RU.KOI8-R/debug.mo
+clip/locale.mo/ru_RU.KOI8-R/pp.mo
 clip/locale.mo/ru_RU.KOI8-R/sys.mo
+clip/locale.mo/ru_RU.KOI8-R/udb.mo
+clip/locale.mo/ru_RU.KOI8-R/udbx.mo
+clip/locale.po/ru_RU.KOI8-R/bdbfs.po
 clip/locale.po/ru_RU.KOI8-R/brow.po
 clip/locale.po/ru_RU.KOI8-R/ca_dbu.po
+clip/locale.po/ru_RU.KOI8-R/clip-cti.po
+clip/locale.po/ru_RU.KOI8-R/clip-fw.po
+clip/locale.po/ru_RU.KOI8-R/clip-gtk.po
+clip/locale.po/ru_RU.KOI8-R/clip.po
+clip/locale.po/ru_RU.KOI8-R/cliprt.po
 clip/locale.po/ru_RU.KOI8-R/codb.po
 clip/locale.po/ru_RU.KOI8-R/debug.po
+clip/locale.po/ru_RU.KOI8-R/pp.po
 clip/locale.po/ru_RU.KOI8-R/sys.po
+clip/locale.po/ru_RU.KOI8-R/udb.po
+clip/locale.po/ru_RU.KOI8-R/udbx.po
+clip/locale.pot/bdbfs/_.pot
 clip/locale.pot/bdbfs/aktions.pot
 clip/locale.pot/bdbfs/bdbf.pot
-clip/locale.pot/bdbfs/blinker.pot
 clip/locale.pot/bdbfs/cliplib.pot
 clip/locale.pot/bdbfs/common.pot
+clip/locale.pot/bdbfs/config.pot
 clip/locale.pot/bdbfs/editor.pot
+clip/locale.pot/bdbfs/errorsys.pot
 clip/locale.pot/bdbfs/filer.pot
 clip/locale.pot/bdbfs/getsys.pot
 clip/locale.pot/bdbfs/help.pot
@@ -559,10 +709,22 @@ clip/locale.pot/bdbfs/modistru.pot
 clip/locale.pot/bdbfs/print.pot
 clip/locale.pot/bdbfs/tb2html.pot
 clip/locale.pot/bdbfs/viewer.pot
+clip/locale.pot/clip-cti/_.pot
+clip/locale.pot/clip-cti/cticalendar.pot
+clip/locale.pot/clip-cti/ctifiled.pot
+clip/locale.pot/clip-fw/_.pot
 clip/locale.pot/clip-fw/fw_msg.pot
-clip/locale.pot/clip-fw/fw_sys.pot
-clip/locale.pot/clip-fw/fw_utils.pot
-clip/locale.pot/clip-fw/x_sys.pot
+clip/locale.pot/clip-fw/fw_syscti.pot
+clip/locale.pot/clip-fw/fw_sysgtk.pot
+clip/locale.pot/clip-gtk/_.pot
+clip/locale.pot/clip-gtk/gtkermsg.pot
+clip/locale.pot/codb/_.pot
+clip/locale.pot/codb/codb_err.pot
+clip/locale.pot/codb/codb_funcs.pot
+clip/locale.pot/codb/dep_dbf.pot
+clip/locale.pot/codb/dict_dbf.pot
+clip/locale.pot/codb/list_id.pot
+clip/locale.pot/debug/_.pot
 clip/locale.pot/debug/cld_obj.pot
 clip/locale.pot/debug/clip_cld.pot
 clip/locale.pot/debug/command.pot
@@ -572,7 +734,77 @@ clip/locale.pot/debug/source.pot
 clip/locale.pot/debug/values.pot
 clip/locale.pot/debug/viewali.pot
 clip/locale.pot/debug/viewset.pot
+clip/locale.pot/pp/_.pot
 clip/locale.pot/pp/pp.pot
+clip/locale.pot/sys/_.pot
+clip/locale.pot/sys/a2edit.pot
+clip/locale.pot/sys/block.pot
+clip/locale.pot/sys/browse.pot
+clip/locale.pot/sys/database.pot
+clip/locale.pot/sys/dbm.pot
+clip/locale.pot/sys/dialbox.pot
+clip/locale.pot/sys/dtools.pot
+clip/locale.pot/sys/edit.pot
+clip/locale.pot/sys/errorsys.pot
+clip/locale.pot/sys/filedd.pot
+clip/locale.pot/sys/foxsel.pot
+clip/locale.pot/sys/ftools.pot
+clip/locale.pot/sys/get_obj.pot
+clip/locale.pot/sys/hbrowse.pot
+clip/locale.pot/sys/inifile.pot
+clip/locale.pot/sys/memoedit.pot
+clip/locale.pot/sys/nation.pot
+clip/locale.pot/sys/rtcompil.pot
+clip/locale.pot/sys/sarray.pot
+clip/locale.pot/sys/scr_func.pot
+clip/locale.pot/sys/smtp_obj.pot
+clip/locale.pot/sys/sqlbrows.pot
+clip/locale.pot/sys/sys_prn.pot
+clip/locale.pot/sys/te_find.pot
+clip/locale.pot/sys/tedit_obj.pot
+clip/locale.pot/sys/var_func.pot
+clip/locale.pot/udb/_.pot
+clip/locale.pot/udb/ab_brow.pot
+clip/locale.pot/udb/ab_funcs.pot
+clip/locale.pot/udb/ab_menu.pot
+clip/locale.pot/udb/ab_obj.pot
+clip/locale.pot/udb/ab_report.pot
+clip/locale.pot/udb/acc_oper.pot
+clip/locale.pot/udb/attr.pot
+clip/locale.pot/udb/class.pot
+clip/locale.pot/udb/codb_addobj.pot
+clip/locale.pot/udb/codb_make.pot
+clip/locale.pot/udb/codb_pack.pot
+clip/locale.pot/udb/counter.pot
+clip/locale.pot/udb/default.pot
+clip/locale.pot/udb/deposit.pot
+clip/locale.pot/udb/extent.pot
+clip/locale.pot/udb/group.pot
+clip/locale.pot/udb/index.pot
+clip/locale.pot/udb/plugins.pot
+clip/locale.pot/udb/report.pot
+clip/locale.pot/udb/tcolumn.pot
+clip/locale.pot/udb/tview.pot
+clip/locale.pot/udb/user.pot
+clip/locale.pot/udbx/_.pot
+clip/locale.pot/udbx/abx_data_browse.pot
+clip/locale.pot/udbx/abx_funcs.pot
+clip/locale.pot/udbx/abx_getobj.pot
+clip/locale.pot/udbx/abx_menu.pot
+clip/locale.pot/udbx/abx_meta_browse.pot
+clip/locale.pot/udbx/abx_obj.pot
+clip/locale.pot/udbx/attr.pot
+clip/locale.pot/udbx/class.pot
+clip/locale.pot/udbx/counter.pot
+clip/locale.pot/udbx/default.pot
+clip/locale.pot/udbx/deposit.pot
+clip/locale.pot/udbx/group.pot
+clip/locale.pot/udbx/index.pot
+clip/locale.pot/udbx/plugins.pot
+clip/locale.pot/udbx/report.pot
+clip/locale.pot/udbx/tcolumn.pot
+clip/locale.pot/udbx/tview.pot
+clip/locale.pot/udbx/user.pot
 clip/term/cons25r
 clip/term/cygwin
 clip/term/linux-console
@@ -583,62 +815,77 @@ clip/term/linux-stelnet
 clip/term/linux-stelnet1
 clip/term/linux-trans
 clip/term/pcansi
-@dirrm clip/term
-@dirrm clip/locale.pot/pp
-@dirrm clip/locale.pot/debug
-@dirrm clip/locale.pot/clip-fw
-@dirrm clip/locale.pot/bdbfs
-@dirrm clip/locale.pot
-@dirrm clip/locale.po/ru_RU.KOI8-R
-@dirrm clip/locale.po
-@dirrm clip/locale.mo/ru_RU.KOI8-R
-@dirrm clip/locale.mo
-@dirrm clip/lib
-@dirrm clip/lang
-@dirrm clip/keymaps
-@dirrm clip/include/netto
-@dirrm clip/include/nanfor
-@dirrm clip/include/memdebug
-@dirrm clip/include/fwin
-@dirrm clip/include
-@dirrm clip/etc/terminfo/x
-@dirrm clip/etc/terminfo/v
-@dirrm clip/etc/terminfo/s
-@dirrm clip/etc/terminfo/r
-@dirrm clip/etc/terminfo/p
-@dirrm clip/etc/terminfo/m
-@dirrm clip/etc/terminfo/l
-@dirrm clip/etc/terminfo/d
-@dirrm clip/etc/terminfo/c
-@dirrm clip/etc/terminfo/a
-@dirrm clip/etc/terminfo
-@dirrm clip/etc
-@dirrm clip/doc/rus
-@dirrm clip/doc/ncpfs
-@dirrm clip/doc/example/clip-gzip
-@dirrm clip/doc/example/clip-gtkextra
-@dirrm clip/doc/example/clip-gtk
-@dirrm clip/doc/example/clip-gd
+@dirrm clip/bin
+@dirrm clip/charsets
+@dirrm clip/cliprc
+@dirrm clip/codb_ab/plugins
+@dirrm clip/codb_ab/reports
+@dirrm clip/codb_ab
+@dirrm clip/codb_abx/plugins
+@dirrm clip/codb_abx
+@dirrm clip/doc/clip-com
+@dirrm clip/doc/clip-gd/eng
+@dirrm clip/doc/clip-gd/rus
+@dirrm clip/doc/clip-gd
+%%IBASE%%@dirrm clip/doc/clip-interbase
+%%MYSQL%%@dirrm clip/doc/clip-mysql
+@dirrm clip/doc/clip-oasis/nanfor
+@dirrm clip/doc/clip-oasis
+%%ODBC%%@dirrm clip/doc/clip-odbc
+%%PGSQL%%@dirrm clip/doc/clip-postgres
+@dirrm clip/doc/example/clip-bzip2
+@dirrm clip/doc/example/clip-com
+@dirrm clip/doc/example/clip-crypto
+@dirrm clip/doc/example/clip-cti
 @dirrm clip/doc/example/clip-fw/data
 @dirrm clip/doc/example/clip-fw/bitmaps
 @dirrm clip/doc/example/clip-fw
-@dirrm clip/doc/example/clip-crypto
-@dirrm clip/doc/example/clip-com
-@dirrm clip/doc/example/clip-bzip2
+@dirrm clip/doc/example/clip-gd
+@dirrm clip/doc/example/clip-gtk
+@dirrm clip/doc/example/clip-gtkextra
+@dirrm clip/doc/example/clip-gzip
+%%IBASE%%@dirrm clip/doc/example/clip-interbase
+%%MYSQL%%@dirrm clip/doc/example/clip-mysql
+%%ODBC%%@dirrm clip/doc/example/clip-odbc
+%%PGSQL%%@dirrm clip/doc/example/clip-postgres
+@dirrm clip/doc/example/clip-rtf
 @dirrm clip/doc/example
-@dirrm clip/doc/eng
-@dirrm clip/doc/clip-oasis/netto
-@dirrm clip/doc/clip-oasis/nanfor
-@dirrm clip/doc/clip-oasis
-@dirrm clip/doc/clip-gzip
-@dirrm clip/doc/clip-gd
-@dirrm clip/doc/clip-crypto
-@dirrm clip/doc/clip-com
-@dirrm clip/doc/clip-bzip2
-@dirrm clip/doc/charset
-@dirrm clip/doc/bdbfs
 @dirrm clip/doc
-@dirrm clip/cliprc
-@dirrm clip/charsets
-@dirrm clip/bin
+@dirrm clip/etc/terminfo/a
+@dirrm clip/etc/terminfo/c
+@dirrm clip/etc/terminfo/d
+@dirrm clip/etc/terminfo/l
+@dirrm clip/etc/terminfo/m
+@dirrm clip/etc/terminfo/p
+@dirrm clip/etc/terminfo/r
+@dirrm clip/etc/terminfo/s
+@dirrm clip/etc/terminfo/v
+@dirrm clip/etc/terminfo/x
+@dirrm clip/etc/terminfo
+@dirrm clip/etc
+@dirrm clip/include/cti
+@dirrm clip/include/fwin
+@dirrm clip/include/memdebug
+@dirrm clip/include/nanfor
+@dirrm clip/include/netto
+@dirrm clip/include
+@dirrm clip/keymaps
+@dirrm clip/lang
+@dirrm clip/lib
+@dirrm clip/locale.mo/ru_RU.KOI8-R
+@dirrm clip/locale.mo
+@dirrm clip/locale.po/ru_RU.KOI8-R
+@dirrm clip/locale.po
+@dirrm clip/locale.pot/bdbfs
+@dirrm clip/locale.pot/clip-cti
+@dirrm clip/locale.pot/clip-fw
+@dirrm clip/locale.pot/clip-gtk
+@dirrm clip/locale.pot/codb
+@dirrm clip/locale.pot/debug
+@dirrm clip/locale.pot/pp
+@dirrm clip/locale.pot/sys
+@dirrm clip/locale.pot/udb
+@dirrm clip/locale.pot/udbx
+@dirrm clip/locale.pot
+@dirrm clip/term
 @dirrm clip