Unbreak (at least on i386) and upgrade to 1.1.9-1.

Approved by:	mat (mentor).

11 files changed, 261 insertions, 214 deletions

diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 11bb1586d9b6..af461b8d311a 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clip
-PORTVERSION=	1.1.5.1
-PORTREVISION=	1
+PORTVERSION=	1.1.9.1
 CATEGORIES=	databases lang
 MASTER_SITES=	ftp://ftp.linux.ru.net/mirrors/clip/	\
 		ftp://ftp.lastik.ru/clip/		\
@@ -26,8 +25,6 @@ WANT_GNOME=	yes
 
 .if ${ARCH} != "i386"
 BROKEN=		"Does not compile on !i386"
-.else
-BROKEN=		"Broken pkg-plist"
 .endif
 DEPRECATED=	${BROKEN}
 EXPIRATION_DATE=2004-06-18
@@ -80,7 +77,7 @@ USE_REINPLACE=		yes
 REINPLACE_ARGS=		-i ""
 USE_XLIB=		yes
 USE_XPM=		yes
-USE_GNOME=		gtk12
+USE_GNOME=		gtk12 gtk20
 HAS_CONFIGURE=		yes
 CONFIGURE_WRKSRC=	${WRKSRC}/clip
 ALL_TARGET=		local
diff --git a/databases/clip/distinfo b/databases/clip/distinfo
index 0d2f8dba30b0..c2ca4a16ad19 100644
--- a/databases/clip/distinfo
+++ b/databases/clip/distinfo
@@ -1,2 +1,2 @@
-MD5 (clip-prg-1.1.5-1.tgz) = f87bc17c7d7a110a490baeb8d2640d66
-SIZE (clip-prg-1.1.5-1.tgz) = 3935285
+MD5 (clip-prg-1.1.9-1.tgz) = 736eb763f2c1a786fb9c7613a92c2a05
+SIZE (clip-prg-1.1.9-1.tgz) = 4026221
diff --git a/databases/clip/files/patch-cliplibs::clip-gd::gd::gdcache.h b/databases/clip/files/patch-cliplibs::clip-gd::gd::gdcache.h
new file mode 100644
index 000000000000..bce72adfcea7
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs::clip-gd::gd::gdcache.h
@@ -0,0 +1,11 @@
+--- ./cliplibs/clip-gd/gd/gdcache.h.orig	Tue Apr 20 00:01:09 2004
++++ ./cliplibs/clip-gd/gd/gdcache.h	Tue Apr 20 00:13:40 2004
+@@ -40,7 +40,7 @@
+ /* header                                                */
+ /*********************************************************/
+ 
+-#include <sdtlib.h>
++#include <stdlib.h>
+ #ifndef NULL
+ #define NULL (void *)0
+ #endif
diff --git a/databases/clip/files/patch-cliplibs::clip-gd::gd::gdft.c b/databases/clip/files/patch-cliplibs::clip-gd::gd::gdft.c
new file mode 100644
index 000000000000..f5e720fd517a
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs::clip-gd::gd::gdft.c
@@ -0,0 +1,12 @@
+--- ./cliplibs/clip-gd/gd/gdft.c.orig	Mon Apr 19 22:33:22 2004
++++ ./cliplibs/clip-gd/gd/gdft.c	Mon Apr 19 23:04:04 2004
+@@ -33,7 +33,8 @@
+ #else
+ 
+ #include "gdcache.h"
+-#include "freetype/freetype.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include "freetype/ftglyph.h"
+ 
+ /* number of fonts cached before least recently used is replaced */
diff --git a/databases/clip/files/patch-cliplibs::clip-gtk::configure b/databases/clip/files/patch-cliplibs::clip-gtk::configure
index 59e575064446..9dfc65e5bcd1 100644
--- a/databases/clip/files/patch-cliplibs::clip-gtk::configure
+++ b/databases/clip/files/patch-cliplibs::clip-gtk::configure
@@ -1,5 +1,5 @@
---- cliplibs/clip-gtk/configure.orig	Tue Jan 14 08:09:54 2003
-+++ cliplibs/clip-gtk/configure	Mon Mar 24 19:44:16 2003
+--- cliplibs/clip-gtk/configure.orig	Fri Jan 16 14:42:19 2004
++++ cliplibs/clip-gtk/configure	Mon Apr 19 21:52:22 2004
 @@ -3,6 +3,8 @@
  uname=`uname -s`
  uver=`uname -r`
@@ -8,8 +8,8 @@
 +gtkpath=
  oldpwd=`pwd`
  
- [ -z "$CLIPROOT" ] && CLIPROOT=/usr/local/clip
-@@ -34,6 +36,8 @@
+ [ -z "$CLIPROOT" ] && CLIPROOT=$(cd ../../../; pwd)/cliproot
+@@ -35,6 +37,8 @@
  		;;
  	FreeBSD*)
  		osname=FREEBSD
@@ -18,7 +18,7 @@
  		STATICLINK=-static
  		;;
  	NetBSD*)
-@@ -66,7 +70,7 @@
+@@ -67,7 +71,7 @@
  echo '#define SYSTEM "'$uname'"' >&3
  echo '' >&3
  
@@ -27,7 +27,7 @@
  
  if [ $? -ne 0 ]
  then
-@@ -81,7 +85,7 @@
+@@ -82,7 +86,7 @@
  #	cd $gtkincpath/..
  #	gtkincpath=`pwd`
  #	cd $oldpwd
@@ -36,7 +36,7 @@
  
  	if [ "$osname" = "CYGWIN" ]
  	then
-@@ -95,12 +99,14 @@
+@@ -96,12 +100,14 @@
  #		echo
  #		echo 'Warning: system do not have installed GTK+ development'
  #	fi
@@ -53,20 +53,12 @@
  	fi
  fi
  
-@@ -141,14 +147,14 @@
+@@ -143,7 +149,7 @@
+ echo "COMPILER='$CC'" >&3
  echo "DLLSUFF='$DLLSUFF'" >&3
  echo "DLLREALSUFF='$DLLREALSUFF'" >&3
- echo "CLIPROOT=$CLIPROOT" >&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
- 
- if [ "$USE_GTK" = yes ]
- then
--	XCFLAGS=`gtk-config --cflags`
-+	XCFLAGS=`${gtkconfig} --cflags`
- 	echo "XCFLAGS='$XCFLAGS'" >&3
- fi
- 
diff --git a/databases/clip/files/patch-cliplibs::clip-gtkextra::configure b/databases/clip/files/patch-cliplibs::clip-gtkextra::configure
index 633ad25e3048..f09066ace315 100644
--- a/databases/clip/files/patch-cliplibs::clip-gtkextra::configure
+++ b/databases/clip/files/patch-cliplibs::clip-gtkextra::configure
@@ -1,5 +1,5 @@
---- cliplibs/clip-gtkextra/configure.orig	Wed Oct  2 11:03:05 2002
-+++ cliplibs/clip-gtkextra/configure	Tue Mar 25 08:56:34 2003
+--- cliplibs/clip-gtkextra/configure.orig	Fri Dec 26 11:34:59 2003
++++ cliplibs/clip-gtkextra/configure	Mon Apr 19 22:02:13 2004
 @@ -3,6 +3,10 @@
  uname=`uname -s`
  uver=`uname -r`
@@ -10,8 +10,8 @@
 +glibpath=glibpath=
  oldpwd=`pwd`
  
- [ -z "$CLIPROOT" ] && CLIPROOT=/usr/local/clip
-@@ -34,6 +38,10 @@
+ [ -z "$CLIPROOT" ] && CLIPROOT=$(cd ../../../; pwd)/cliproot
+@@ -35,6 +39,10 @@
  		;;
  	FreeBSD*)
  		osname=FREEBSD
@@ -22,7 +22,7 @@
  		STATICLINK=-static
  		;;
  	NetBSD*)
-@@ -66,7 +74,8 @@
+@@ -67,7 +75,8 @@
  echo '#define SYSTEM "'$uname'"' >&3
  echo '' >&3
  
@@ -32,23 +32,23 @@
  
  if [ $? -ne 0 ]
  then
-@@ -76,11 +85,11 @@
+@@ -77,11 +86,11 @@
  	echo "*****************************************************************"
  	USE_GTK=no
  else
 -	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
+ 	cd $gtkincpath/..
+ 	gtkincpath=`pwd`
+ 	cd $oldpwd
 -	LIBS=`gtk-config --libs`
 +	LIBS=`${gtkconfig} --libs`
  
  	if [ "$osname" = "CYGWIN" ]
  	then
-@@ -96,8 +105,8 @@
+@@ -97,8 +106,8 @@
  		echo 'Warning: system do not have installed GTK+ development'
-                 exit
+ 		exit
  	fi
 -	GTK_MAJOR=`gtk-config --version|cut -d. -f1`
 -	GTK_MINOR=`gtk-config --version|cut -d. -f2`
@@ -57,21 +57,21 @@
  	if [ ! \( "$GTK_MAJOR" -ge 1 -o "$GTK_MINOR" -ge 2 -o "$GTK_MAJOR" -gt 1 \) ]
  	then
  		echo
-@@ -114,7 +123,7 @@
+@@ -115,7 +124,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 @@
++	gtkextraincpath=gtkextraincpath=`find $gtkprefix/include -name 'gtk.h' -exec dirname {} \;`
+ 	cd $gtkextraincpath/..
+ 	gtkextraincpath=`pwd`
+ 	cd $oldpwd
+@@ -173,7 +182,7 @@
+ echo "COMPILER='$CC'" >&3
  echo "DLLSUFF='$DLLSUFF'" >&3
  echo "DLLREALSUFF='$DLLREALSUFF'" >&3
- echo "CLIPROOT=$CLIPROOT" >&3
 -echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include -I'$gtkextraprefix'/include' >&3
-+echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I'$gtkprefix'/include'${gtkpath}' -I'$glibprefix'/include'${glibpath}' -I'$gtkextraprefix'/include' >&3
++echo 'INCLUDEDIRS=-I. -I$(CLIPROOT)/include -I$(CLIPROOT)/clip-gtk -I'$gtkprefix'/include'${gtkpath}' -I'$glibprefix'/include'${glibpath}' -I'$gtkextraprefix'/include' >&3
  echo "XTARGETS='"'$(XLIB) $(XSLIB)'"'" >&3
  echo "C_FLAGS=-Wall '"'$(INCLUDEDIRS)'"' '$EXTRACFLAGS'" >&3
  echo "LIBS='$LIBS'" >&3
diff --git a/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in b/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in
index ef64e42fbc24..000a140e618e 100644
--- a/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in
+++ b/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in
@@ -1,5 +1,5 @@
---- 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
+--- cliplibs/clip-odbc/Makefile.in.orig	Thu Feb 19 14:16:38 2004
++++ cliplibs/clip-odbc/Makefile.in	Mon Apr 19 22:07:12 2004
 @@ -8,7 +8,7 @@
  
  LIBODBC=@LIBODBC@
@@ -9,11 +9,12 @@
  C_FLAGS=-Wall -g -I.
  #CC=gcc
  
-@@ -38,7 +38,6 @@
+@@ -38,7 +38,7 @@
  
- 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
+ install:
+ 	$(CLIPROOT)/bin/clip_cp $(TARGET) $(DESTDIR)$(CLIPROOT)/lib
+-	$(CLIPROOT)/bin/clip_cp $(TARGET1) $(DESTDIR)$(CLIPROOT)/lib
++	#$(CLIPROOT)/bin/clip_cp $(TARGET1) $(DESTDIR)$(CLIPROOT)/lib
+ 	#[ "$(TARGET)" = "$(RTARGET)" ] || cp $(RTARGET) $(DESTDIR)$(CLIPROOT)/lib
+ 	#[ "$(TARGET1)" = "$(RTARGET1)" ] || cp $(RTARGET1) $(DESTDIR)$(CLIPROOT)/lib
+ 	mkdir -p $(DESTDIR)$(CLIPROOT)/doc/clip-odbc
diff --git a/databases/clip/files/patch-cliplibs::clip-postgres::Makefile b/databases/clip/files/patch-cliplibs::clip-postgres::Makefile
deleted file mode 100644
index b0cb30889a92..000000000000
--- a/databases/clip/files/patch-cliplibs::clip-postgres::Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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-cliplibs::clip-postgres::configure b/databases/clip/files/patch-cliplibs::clip-postgres::configure
new file mode 100644
index 000000000000..496301cb80ec
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs::clip-postgres::configure
@@ -0,0 +1,15 @@
+--- cliplibs/clip-postgres/configure.orig	Wed Jan 21 14:35:13 2004
++++ cliplibs/clip-postgres/configure	Mon Apr 19 22:17:02 2004
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+ 
+ if [ -z "$PGINCDIR" ]; then
+-	for x in /usr/include/pgsql \
+-		/usr/include/pgsql/server \
+-		/usr/include/postgresql \
++	for x in /usr/local/include \
++		/usr/local/include/pgsql/server \
++		/usr/local/include/postgresql \
+ 		/opt/postgresql/include
+ 	do
+ 		if [ -f "$x/libpq-fe.h" ]; then
diff --git a/databases/clip/files/patch-gd::configure b/databases/clip/files/patch-gd::configure
index 1fa157673577..72c94f6c043f 100644
--- a/databases/clip/files/patch-gd::configure
+++ b/databases/clip/files/patch-gd::configure
@@ -1,7 +1,5 @@
-$FreeBSD$
-
---- cliplibs/clip-gd/gd/configure.orig	Fri Sep 27 15:29:21 2002
-+++ cliplibs/clip-gd/gd/configure	Sat Sep 28 03:03:27 2002
+--- cliplibs/clip-gd/gd/configure.orig	Wed Oct 29 15:23:06 2003
++++ cliplibs/clip-gd/gd/configure	Mon Apr 19 22:26:37 2004
 @@ -23,7 +23,9 @@
  osname=UNIX
  stdlibpath=/usr/local/lib
@@ -29,33 +27,7 @@ $FreeBSD$
  
  if [ -f $stdlibpath/libpng${DLLSUFF} ]
  then
-@@ -108,18 +111,17 @@
- fi
- 
- #??????????
--if [ -f $stdlibpath/freetype${DLLSUFF} ]
-+if [ -f $stdlibpath/libfreetype${DLLSUFF} ]
- then
- 	echo "LIBFREETYPE='-lfreetype'" >&3
- else
- 	echo 'Warning: libfreetype not installed'
--fi
--
--if [ -f $stdlibpath/libttf${DLLSUFF} ]
--then
--	echo "LIBTTF='-lttf'" >&3
--else
--	echo 'Warning: libttf not installed'
-+	if [ -f $stdlibpath/libttf${DLLSUFF} ]
-+	then
-+		echo "LIBTTF='-lttf'" >&3
-+	else
-+		echo 'Warning: libttf not installed'
-+	fi
- fi
- 
- if [ -f /usr/X11R6/include/X11/xpm.h -o -f /usr/include/X11/xpm.h ]
-@@ -178,18 +180,17 @@
+@@ -178,18 +181,17 @@
  	echo '#define HAVE_LIBXPM'  >&3
  fi
  
diff --git a/databases/clip/pkg-plist b/databases/clip/pkg-plist
index 1ed46797511d..87725d632ba0 100644
--- a/databases/clip/pkg-plist
+++ b/databases/clip/pkg-plist
@@ -27,9 +27,12 @@ clip/bin/clip_trans
 clip/bin/clip_we
 clip/bin/clipar
 clip/bin/cliphash
+clip/bin/cobra_clnt1
+clip/bin/cobra_serv
 clip/bin/codb_ab
 clip/bin/codb_abx
 clip/bin/codb_addobj
+clip/bin/codb_export
 clip/bin/codb_make
 clip/bin/codb_pack
 clip/bin/ctosgml
@@ -127,7 +130,21 @@ clip/charsets/ruscii.uni
 clip/charsets/utf_8.uni
 clip/cliprc/.notrm
 clip/cliprc/clip-gtk.cliprc
+clip/cliprc/clip-gtk2.cliprc
 clip/cliprc/clipflags
+clip/cobra/auth/Makefile
+clip/cobra/auth/other
+clip/cobra/auth/pam-auth.c
+clip/cobra/auth/pam-err-msg
+clip/cobra/cobra_clnt.ini
+clip/cobra/cobra_clnt1
+clip/cobra/cobra_serv
+clip/cobra/cobra_serv.ini
+clip/cobra/codbtview.po
+clip/cobra/files/pam-err-msg
+clip/cobra/module1.po
+clip/cobra/tcp-wrap/Makefile
+clip/cobra/tcp-wrap/tcp-wrap.c
 clip/codb_ab/plugins/.clipcharset
 clip/codb_ab/plugins/.cliprc
 clip/codb_ab/plugins/acc_oper.ex
@@ -301,6 +318,10 @@ 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
@@ -360,11 +381,28 @@ 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-gtk2/Makefile
+clip/doc/example/clip-gtk2/accel.prg
+clip/doc/example/clip-gtk2/banner.gif
+clip/doc/example/clip-gtk2/basket.bmp
+clip/doc/example/clip-gtk2/clip.xpm
+clip/doc/example/clip-gtk2/clipgtktest.prg
+clip/doc/example/clip-gtk2/simple.prg
+clip/doc/example/clip-gtk2/tbrow.prg
+clip/doc/example/clip-gtk2/tbrow.xpm
+clip/doc/example/clip-gtk2/test_image.prg
+clip/doc/example/clip-gtk2/test_stock.prg
+clip/doc/example/clip-gtk2/test_tree.prg
 clip/doc/example/clip-gzip/Makefile
 clip/doc/example/clip-gzip/gz.prg
+%%IBASE%%clip/doc/example/clip-interbase/Makefile
+%%IBASE%%clip/doc/example/clip-interbase/my_isql.prg
+%%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
@@ -447,7 +485,8 @@ clip/include/btree.h
 clip/include/button.ch
 clip/include/clip-gtk.ch
 clip/include/clip-gtk.h
-clip/include/clip-gtkextra.ch
+clip/include/clip-gtk2.ch
+clip/include/clip-gtk2.h
 clip/include/clip.ch
 clip/include/clip.h
 clip/include/clipbase.h
@@ -455,7 +494,9 @@ clip/include/clipbrd.ch
 clip/include/clipcfg.h
 clip/include/clipcfg.sh
 clip/include/clr_html.ch
+clip/include/cobra.ch
 clip/include/codb.ch
+clip/include/codbcfg.ch
 clip/include/color.ch
 clip/include/common.ch
 clip/include/config.ch
@@ -507,7 +548,6 @@ clip/include/ctvideo.ch
 clip/include/ctwin.ch
 clip/include/date.ch
 clip/include/dbedit.ch
-clip/include/dbfcdxax.ch
 clip/include/dbfsql.h
 clip/include/dbinames.ch
 clip/include/dbinfo.ch
@@ -568,16 +608,19 @@ clip/include/fwin/winten.h
 clip/include/fwin/yacc.ch
 clip/include/gdinfo.ch
 clip/include/getexit.ch
+clip/include/gtk2-stock.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/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
@@ -587,9 +630,11 @@ 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
@@ -665,18 +710,26 @@ clip/lib/libclip-gd.a
 clip/lib/libclip-gd.ex
 clip/lib/libclip-gd.nm
 clip/lib/libclip-gd.so
+clip/lib/libgd.a
 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-gtk2.a
+clip/lib/libclip-gtk2.ex
+clip/lib/libclip-gtk2.nm
+clip/lib/libclip-gtk2.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.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
@@ -685,6 +738,14 @@ 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.a
+%%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
@@ -693,13 +754,15 @@ clip/lib/libclip.a
 clip/lib/libclip.ex
 clip/lib/libclip.nm
 clip/lib/libclip.so
-clip/lib/libgd.a
 clip/locale.mo/es_ES.8859-1/bdbfs.mo
 clip/locale.mo/es_ES.8859-1/clip-cti.mo
 clip/locale.mo/es_ES.8859-1/clip-fw.mo
 clip/locale.mo/es_ES.8859-1/clip-gtk.mo
+clip/locale.mo/es_ES.8859-1/clip-gtk2.mo
 clip/locale.mo/es_ES.8859-1/clip.mo
 clip/locale.mo/es_ES.8859-1/cliprt.mo
+clip/locale.mo/es_ES.8859-1/cobra_clnt.mo
+clip/locale.mo/es_ES.8859-1/cobra_serv.mo
 clip/locale.mo/es_ES.8859-1/codb.mo
 clip/locale.mo/es_ES.8859-1/debug.mo
 clip/locale.mo/es_ES.8859-1/pp.mo
@@ -710,8 +773,11 @@ clip/locale.mo/es_ES.ISO01/bdbfs.mo
 clip/locale.mo/es_ES.ISO01/clip-cti.mo
 clip/locale.mo/es_ES.ISO01/clip-fw.mo
 clip/locale.mo/es_ES.ISO01/clip-gtk.mo
+clip/locale.mo/es_ES.ISO01/clip-gtk2.mo
 clip/locale.mo/es_ES.ISO01/clip.mo
 clip/locale.mo/es_ES.ISO01/cliprt.mo
+clip/locale.mo/es_ES.ISO01/cobra_clnt.mo
+clip/locale.mo/es_ES.ISO01/cobra_serv.mo
 clip/locale.mo/es_ES.ISO01/codb.mo
 clip/locale.mo/es_ES.ISO01/debug.mo
 clip/locale.mo/es_ES.ISO01/pp.mo
@@ -724,8 +790,11 @@ 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-gtk2.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/cobra_clnt.mo
+clip/locale.mo/ru_RU.KOI8-R/cobra_serv.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
@@ -736,8 +805,11 @@ clip/locale.po/es_ES.8859-1/bdbfs.po
 clip/locale.po/es_ES.8859-1/clip-cti.po
 clip/locale.po/es_ES.8859-1/clip-fw.po
 clip/locale.po/es_ES.8859-1/clip-gtk.po
+clip/locale.po/es_ES.8859-1/clip-gtk2.po
 clip/locale.po/es_ES.8859-1/clip.po
 clip/locale.po/es_ES.8859-1/cliprt.po
+clip/locale.po/es_ES.8859-1/cobra_clnt.po
+clip/locale.po/es_ES.8859-1/cobra_serv.po
 clip/locale.po/es_ES.8859-1/codb.po
 clip/locale.po/es_ES.8859-1/debug.po
 clip/locale.po/es_ES.8859-1/pp.po
@@ -748,8 +820,11 @@ clip/locale.po/es_ES.ISO01/bdbfs.po
 clip/locale.po/es_ES.ISO01/clip-cti.po
 clip/locale.po/es_ES.ISO01/clip-fw.po
 clip/locale.po/es_ES.ISO01/clip-gtk.po
+clip/locale.po/es_ES.ISO01/clip-gtk2.po
 clip/locale.po/es_ES.ISO01/clip.po
 clip/locale.po/es_ES.ISO01/cliprt.po
+clip/locale.po/es_ES.ISO01/cobra_clnt.po
+clip/locale.po/es_ES.ISO01/cobra_serv.po
 clip/locale.po/es_ES.ISO01/codb.po
 clip/locale.po/es_ES.ISO01/debug.po
 clip/locale.po/es_ES.ISO01/pp.po
@@ -762,8 +837,11 @@ 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-gtk2.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/cobra_clnt.po
+clip/locale.po/ru_RU.KOI8-R/cobra_serv.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
@@ -796,6 +874,13 @@ 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/clip-gtk2/_.pot
+clip/locale.pot/clip-gtk2/gtkermsg.pot
+clip/locale.pot/cobra_clnt/_.pot
+clip/locale.pot/cobra_clnt/objbrowse.pot
+clip/locale.pot/cobra_serv/_.pot
+clip/locale.pot/cobra_serv/cobra_serv.pot
+clip/locale.pot/cobra_serv/codbtview.pot
 clip/locale.pot/codb/_.pot
 clip/locale.pot/codb/codb_err.pot
 clip/locale.pot/codb/codb_funcs.pot
@@ -816,8 +901,10 @@ 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/blank.pot
 clip/locale.pot/sys/block.pot
 clip/locale.pot/sys/browse.pot
+clip/locale.pot/sys/cobra_service.pot
 clip/locale.pot/sys/database.pot
 clip/locale.pot/sys/dbm.pot
 clip/locale.pot/sys/dialbox.pot
@@ -837,6 +924,7 @@ 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_init.pot
 clip/locale.pot/sys/sys_prn.pot
 clip/locale.pot/sys/te_find.pot
 clip/locale.pot/sys/tedit_obj.pot
@@ -851,6 +939,7 @@ 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_export.pot
 clip/locale.pot/udb/codb_make.pot
 clip/locale.pot/udb/codb_pack.pot
 clip/locale.pot/udb/counter.pot
@@ -893,112 +982,88 @@ clip/term/linux-stelnet
 clip/term/linux-stelnet1
 clip/term/linux-trans
 clip/term/pcansi
-%%IBASE%%clip/doc/clip-interbase/interbase.html
-%%IBASE%%clip/doc/example/clip-interbase/Makefile
-%%IBASE%%clip/doc/example/clip-interbase/my_isql.prg
-%%IBASE%%clip/include/interbase.ch
-%%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/doc/clip-mysql/mysql.html
-%%MYSQL%%clip/doc/example/clip-mysql/Makefile
-%%MYSQL%%clip/doc/example/clip-mysql/my_mysql.prg
-%%MYSQL%%clip/include/mysql.ch
-%%MYSQL%%clip/lib/libclip-mysql.a
-%%MYSQL%%clip/lib/libclip-mysql.ex
-%%MYSQL%%clip/lib/libclip-mysql.nm
-%%MYSQL%%clip/lib/libclip-mysql.so
-%%ODBC%%clip/doc/clip-odbc/odbc.html
-%%ODBC%%clip/doc/example/clip-odbc/Makefile
-%%ODBC%%clip/doc/example/clip-odbc/my_isql.prg
-%%ODBC%%clip/include/odbc.ch
-%%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/doc/clip-postgres/postgres.html
-%%PGSQL%%clip/doc/example/clip-postgres/Makefile
-%%PGSQL%%clip/doc/example/clip-postgres/my_psql.prg
-%%PGSQL%%clip/include/postgres.ch
-%%PGSQL%%clip/lib/libclip-postgres.ex
-%%PGSQL%%clip/lib/libclip-postgres.nm
-%%PGSQL%%clip/lib/libclip-postgres.so
-@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/term
+@dirrm clip/locale.pot/udbx
+@dirrm clip/locale.pot/udb
+@dirrm clip/locale.pot/sys
+@dirrm clip/locale.pot/pp
+@dirrm clip/locale.pot/debug
+@dirrm clip/locale.pot/codb
+@dirrm clip/locale.pot/cobra_serv
+@dirrm clip/locale.pot/cobra_clnt
+@dirrm clip/locale.pot/clip-gtk2
+@dirrm clip/locale.pot/clip-gtk
+@dirrm clip/locale.pot/clip-fw
+@dirrm clip/locale.pot/clip-cti
+@dirrm clip/locale.pot/bdbfs
+@dirrm clip/locale.pot
+@dirrm clip/locale.po/ru_RU.KOI8-R
+@dirrm clip/locale.po/es_ES.ISO01
+@dirrm clip/locale.po/es_ES.8859-1
+@dirrm clip/locale.po
+@dirrm clip/locale.mo/ru_RU.KOI8-R
+@dirrm clip/locale.mo/es_ES.ISO01
+@dirrm clip/locale.mo/es_ES.8859-1
+@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/cti
+@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/example/clip-rtf
+%%PGSQL%%@dirrm clip/doc/example/clip-postgres
+%%ODBC%%@dirrm clip/doc/example/clip-odbc
+%%MYSQL%%@dirrm clip/doc/example/clip-mysql
+%%IBASE%%@dirrm clip/doc/example/clip-interbase
+@dirrm clip/doc/example/clip-gzip
+@dirrm clip/doc/example/clip-gtk2
+@dirrm clip/doc/example/clip-gtk
+@dirrm clip/doc/example/clip-gd
 @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-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/clip-cti
+@dirrm clip/doc/example/clip-crypto
+@dirrm clip/doc/example/clip-com
+@dirrm clip/doc/example/clip-bzip2
 @dirrm clip/doc/example
+%%PGSQL%%@dirrm clip/doc/clip-postgres
+%%ODBC%%@dirrm clip/doc/clip-odbc
+@dirrm clip/doc/clip-oasis/nanfor
+@dirrm clip/doc/clip-oasis
+%%MYSQL%%@dirrm clip/doc/clip-mysql
+@dirrm clip/doc/clip-gd/eng
+@dirrm clip/doc/clip-gd/rus
+@dirrm clip/doc/clip-gd
+%%IBASE%%@dirrm clip/doc/clip-interbase
+@dirrm clip/doc/clip-com
 @dirrm clip/doc
-@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/es_ES.8859-1
-@dirrm clip/locale.mo/es_ES.ISO01
-@dirrm clip/locale.mo/ru_RU.KOI8-R
-@dirrm clip/locale.mo
-@dirrm clip/locale.po/es_ES.8859-1
-@dirrm clip/locale.po/es_ES.ISO01
-@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/codb_abx/plugins
+@dirrm clip/codb_abx
+@dirrm clip/codb_ab/reports
+@dirrm clip/codb_ab/plugins
+@dirrm clip/codb_ab
+@dirrm clip/cobra/tcp-wrap
+@dirrm clip/cobra/files
+@dirrm clip/cobra/auth
+@dirrm clip/cobra
+@dirrm clip/cliprc
+@dirrm clip/charsets
+@dirrm clip/bin
 @dirrm clip