- Update to 1.1.14.1 [1]

- Remove some patches that are now applied on the source code [1]
- Use OPTIONS for some dependencies now
- Makefile and build script changes causing build to fail-fast
  rather than continue when errors occur; also explicitly build
  options rather than allowing build failures
- Misc other simple build fixes

Removed file(s) [1]:
- files/patch-clip::clip_makeslib.in
- files/patch-cliplibs::clip-gd::gd::gdft.c
- files/patch-cliplibs::clip-gtkextra::configure
- files/patch-gd::configure

PR:		ports/78536 [1]
Submitted by:	Renato Botelho <renato@galle.com.br>
Approved by:	clement (mentor)

17 files changed, 551 insertions, 332 deletions

diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 4543a09a2bbd..5ba91557dba0 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clip
-PORTVERSION=	1.1.11.1
-PORTREVISION=	2
+PORTVERSION=	1.1.14.1
 CATEGORIES=	databases lang
 MASTER_SITES=	ftp://ftp.itk.ru/pub/clip/	\
 		ftp://ftp.linux.ru.net/mirrors/clip/
@@ -20,55 +19,70 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	xBase and Clipper language compatible compiler
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-prg-${PORTVERSION:R}-${PORTVERSION:E}
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash			\
+		wget:${PORTSDIR}/ftp/wget			\
+		xmkmf:${X_IMAKE_PORT}
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
+		png.5:${PORTSDIR}/graphics/png			\
+		freetype.9:${PORTSDIR}/print/freetype2		\
+		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra	\
+		gd.4:${PORTSDIR}/graphics/gd			\
+		fcgi.0:${PORTSDIR}/www/fcgi
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash			\
+		wget:${PORTSDIR}/ftp/wget
 
 USE_GETTEXT=	yes
-
 WANT_GNOME=	yes
 
+OPTIONS=	IODBC		"iODBC support"				on \
+		UNIXODBC	"unixODBC support (not with iODBC)"	off \
+		MYSQL		"MySQL support"				off \
+		PGSQL		"PostgreSQL support"			off \
+		FIREBIRD	"Firebird (Interbase) support"		off
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
 BROKEN=		"Does not compile on !i386"
 .endif
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
-		wget:${PORTSDIR}/ftp/wget			\
-		xmkmf:${X_IMAKE_PORT}
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
-		png.5:${PORTSDIR}/graphics/png			\
-		freetype.9:${PORTSDIR}/print/freetype2		\
-		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra	\
-		gd.4:${PORTSDIR}/graphics/gd
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
-		wget:${PORTSDIR}/ftp/wget
+# OPT_CLIPLIBS contains the optional subdirectories built by
+# the patched ${WRKSRC}/cliplibs/Makefile
+# Not currently built: clip-oracle
 
-.if !defined(WITHOUT_IODBC) && !exists(${LOCALBASE}/bin/odbcinst)
+# Either IODBC or UNIXODBC
+.if defined(WITH_IODBC)
 LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
 PLIST_SUB=	ODBC=""
-.elif !defined(WITHOUT_UNIXODBC)
+OPT_CLIPLIBS+=clip-odbc
+.elif defined(WITH_UNIXODBC)
 LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
 PLIST_SUB=	ODBC=""
+OPT_CLIPLIBS+=clip-odbc
 .else
 PLIST_SUB=	ODBC="@comment "
 .endif
 
-.if !defined(WITHOUT_MYSQL) || exists(${LOCALBASE}/include/mysql/mysql.h)
+.if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 PLIST_SUB+=	MYSQL=""
+OPT_CLIPLIBS+=clip-mysql
 .else
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL) || exists(${LOCALBASE}/include/libpq-fe.h)
+.if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 PLIST_SUB+=	PGSQL=""
+OPT_CLIPLIBS+=clip-postgres
 .else
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if defined(WITH_FIREBIRD) || exists(${LOCALBASE}/firebird/include/ibase.h)
+.if defined(WITH_FIREBIRD)
 LIB_DEPENDS+=	gds.1:${PORTSDIR}/${FIREBIRD_PORT}
 PLIST_SUB+=	IBASE=""
+OPT_CLIPLIBS+=clip-interbase
 .else
 PLIST_SUB+=	IBASE="@comment "
 .endif
@@ -84,8 +98,17 @@ USE_GNOME=		gtk12 gtk20
 HAS_CONFIGURE=		yes
 CONFIGURE_WRKSRC=	${WRKSRC}/clip
 INSTALLS_SHLIB=		yes
+LDCONFIG_DIRS=		${LOCALBASE}/clip/lib
 ALL_TARGET=		local
-MAKE_ENV=		HOME=${WRKDIR} LANG=C
+MAKE_ENV=		HOME="${WRKDIR}" \
+			LANG="C" \
+			PGLIBDIR="${LOCALBASE}/lib" \
+			PGINCDIR="${LOCALBASE}/include" \
+			OPT_CLIPLIBS="${OPT_CLIPLIBS}" \
+			PTHREAD_LIBS="${PTHREAD_LIBS}" \
+			LOCALBASE="${LOCALBASE}" \
+			WITH_IODBC="${WITH_IODBC}" \
+			CLIP_CONFIGURE_FLAGS="-l"
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -121,12 +144,6 @@ pre-configure:
 	-e "s|#!/bin/sh|#!${LOCALBASE}/bin/bash|"				\
 	-e "s|/usr/local|${LOCALBASE}|g"					\
 	-e "s|/usr/X11R6|${X11BASE}|g"
-	@${REINPLACE_CMD} -e "s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|"		\
-	-e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" ${WRKSRC}/cliplibs/clip-odbc/configure
-	@${REINPLACE_CMD} -e 's|;;|;|g' \
-		${WRKSRC}/cliplibs/clip-gtk2/toolbutton.c \
-		${WRKSRC}/cliplibs/clip-gtk2/cellrenderer.c \
-		${WRKSRC}/cliplibs/clip-gtk2/action.c
 
 post-build: # don't include emppty directories
 	@cd ${WRKDIR}/cliproot && ${RMDIR} include/memdebug doc/clip-oasis/nanfor doc/clip-oasis
diff --git a/databases/clip/distinfo b/databases/clip/distinfo
index 41c0f56d38cf..404d899f505e 100644
--- a/databases/clip/distinfo
+++ b/databases/clip/distinfo
@@ -1,4 +1,4 @@
-MD5 (clip/clip-prg-1.1.11-1.tgz) = f0ba4496128b63cce6db73480aeccac2
-SIZE(clip/clip-prg-1.1.11-1.tgz) = 4355143
-MD5 (clip/patch.tgz) = 76fc43295f29577bcdf4c69a78e8d0ef
-SIZE(clip/patch.tgz) = 242174
+MD5 (clip/clip-prg-1.1.14-1.tgz) = d9248340ec5925ee0c28ee125beae162
+SIZE (clip/clip-prg-1.1.14-1.tgz) = 4445544
+MD5 (clip/patch.tgz) = 0f72b94ce943bf8ba0bbf49ac372c187
+SIZE (clip/patch.tgz) = 483165
diff --git a/databases/clip/files/patch-clip::clip_makeslib.in b/databases/clip/files/patch-clip::clip_makeslib.in
deleted file mode 100644
index 5fa601682f3e..000000000000
--- a/databases/clip/files/patch-clip::clip_makeslib.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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-cliplibs::clip-gd::gd::gdft.c b/databases/clip/files/patch-cliplibs::clip-gd::gd::gdft.c
deleted file mode 100644
index f5e720fd517a..000000000000
--- a/databases/clip/files/patch-cliplibs::clip-gd::gd::gdft.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./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-gtkextra::configure b/databases/clip/files/patch-cliplibs::clip-gtkextra::configure
index f09066ace315..02a562795007 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	Fri Dec 26 11:34:59 2003
-+++ cliplibs/clip-gtkextra/configure	Mon Apr 19 22:02:13 2004
+--- cliplibs/clip-gtkextra/configure.orig	Mon Oct 25 19:56:51 2004
++++ cliplibs/clip-gtkextra/configure	Fri Apr 15 21:24:57 2005
 @@ -3,6 +3,10 @@
  uname=`uname -s`
  uver=`uname -r`
@@ -36,13 +36,13 @@
  	echo "*****************************************************************"
  	USE_GTK=no
  else
--	gtkincpath=`find $gtkprefix/include -name 'gtk.h' -printf '%h'`
-+	gtkincpath=`find $gtkprefix/include$gtkpath -name 'gtk.h' -exec dirname {} \;`
+-	gtkincpath=`find $gtkprefix/include/gtk-1.2 -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`
++ 	LIBS=`${gtkconfig} --libs`
  
  	if [ "$osname" = "CYGWIN" ]
  	then
@@ -61,8 +61,8 @@
  	echo "****************************************************************************"
  	USE_GTK_EXTRA=no
  else
--	gtkextraincpath=`find $gtkprefix/include -name 'gtk.h' -printf '%h'`
-+	gtkextraincpath=gtkextraincpath=`find $gtkprefix/include -name 'gtk.h' -exec dirname {} \;`
+-	gtkextraincpath=`find $gtkextraprefix/include -name 'gtkextra.h' -printf '%h'`
++ 	gtkextraincpath=`find $gtkprefix/include -name 'gtk.h' -exec dirname {} \;`
  	cd $gtkextraincpath/..
  	gtkextraincpath=`pwd`
  	cd $oldpwd
diff --git a/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in b/databases/clip/files/patch-cliplibs::clip-odbc::Makefile.in
index 000a140e618e..dbb0f7f87777 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	Thu Feb 19 14:16:38 2004
-+++ cliplibs/clip-odbc/Makefile.in	Mon Apr 19 22:07:12 2004
+--- cliplibs/clip-odbc/Makefile.in.orig	Mon Mar 29 22:59:56 2004
++++ cliplibs/clip-odbc/Makefile.in	Sat Apr 16 00:54:33 2005
 @@ -8,7 +8,7 @@
  
  LIBODBC=@LIBODBC@
@@ -9,6 +9,15 @@
  C_FLAGS=-Wall -g -I.
  #CC=gcc
  
+@@ -22,7 +22,7 @@
+ all:  $(TARGET) $(TARGET1) $(ATARGET)
+ 
+ $(TARGET): $(OBJS)
+-	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) $(LIBODBC)
++	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) $(LIBODBC) -L/usr/local/lib 
+ 
+ $(ATARGET): $(OBJS)
+ 	$(CLIPROOT)/bin/clip_makelib $(ATARGET) $(OBJS) $(LIBODBC)
 @@ -38,7 +38,7 @@
  
  install:
diff --git a/databases/clip/files/patch-cliplibs::clip-odbc::configure b/databases/clip/files/patch-cliplibs::clip-odbc::configure
index bf61aaca3838..d0e7874d4de6 100644
--- a/databases/clip/files/patch-cliplibs::clip-odbc::configure
+++ b/databases/clip/files/patch-cliplibs::clip-odbc::configure
@@ -1,24 +1,33 @@
---- cliplibs/clip-odbc/configure.orig	Fri Dec 26 11:34:59 2003
-+++ cliplibs/clip-odbc/configure	Sat Apr 24 15:52:06 2004
-@@ -22,11 +22,11 @@
- LIBODBC=''
- LIBOOB=''
+--- cliplibs/clip-odbc/configure.orig	Fri Dec 26 21:34:59 2003
++++ cliplibs/clip-odbc/configure	Sat Apr 16 16:43:29 2005
+@@ -19,24 +19,12 @@
+ }
+ EOF
  
+-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 %%PTHREAD_CFLAGS%% -I/usr/local/include -L/usr/local/lib %%PTHREAD_LIBS%% -liodbc >/dev/null 2>&1 && LIBODBC='-liodbc' && echo 'iODBC driver manager were found'
- 
- if [ -z "$LIBODBC" ]
- then
+-
+-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" ]
+-then
+-	echo 'No ODBC driver`s manager were found'
+-	exitf 1
++if [ -n "$WITH_IODBC" ]; then
++	LIBODBC=-liodbc
++else
++	LIBODBC=-lodbc
  fi
- 
- if [ -z "$LIBODBC" ]
-@@ -37,6 +37,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'
- 
+-
+-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::configure b/databases/clip/files/patch-cliplibs::clip-postgres::configure
deleted file mode 100644
index 496301cb80ec..000000000000
--- a/databases/clip/files/patch-cliplibs::clip-postgres::configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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-cliplibs_Makefile b/databases/clip/files/patch-cliplibs_Makefile
new file mode 100644
index 000000000000..2d26567de1af
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs_Makefile
@@ -0,0 +1,38 @@
+--- cliplibs/Makefile.orig	Sat Jan 22 01:58:51 2005
++++ cliplibs/Makefile	Sun Apr 17 11:26:06 2005
+@@ -1,17 +1,27 @@
+ #
++# FreeBSD changes:
++# - remove some directories from being built automatically
++# - switch from shell for (which never fails) to phony targets (fail fast)
++# - build in any directories specified in OPT_CLIPLIBS
++# - execute install target to install libs into the temporary CLIPROOT
++#   under WRKSRC, so the rest of clip can find them.
+ 
+ dirs = clip-gzip clip-bzip2 clip-crypto clip-gd clip-fcgi \
+        clip-cti clip-gtk clip-gtkextra clip-gtk2 clip-fw \
+-       clip-mysql clip-postgres clip-oracle clip-interbase clip-odbc \
+        clip-com clip-oasis clip-rtf clip-r2d2 clip-ui \
+ 
+-all local user system install lib:
+-	for dir in $(dirs); \
+-	do \
+-		(cd $$dir ;\
+-		[ -x ./configure ] && ./configure ;\
+-		$(MAKE) $@ );\
+-	done
++dirs += $(OPT_CLIPLIBS)
++
++.PHONY: subdirs $(dirs)
++
++subdirs: $(dirs)
++
++$(dirs):
++	cd $@; ( [ -x ./configure ] && ./configure ) || true
++	$(MAKE) -C $@
++	$(MAKE) -C $@ install
++
++all local user system install lib: subdirs
+ 
+ clean:
+ 	for dir in $(dirs); \
diff --git a/databases/clip/files/patch-cliplibs_clip-fcgi_Makefile b/databases/clip/files/patch-cliplibs_clip-fcgi_Makefile
new file mode 100644
index 000000000000..2c2c2d83d8ca
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs_clip-fcgi_Makefile
@@ -0,0 +1,19 @@
+--- cliplibs/clip-fcgi/Makefile.orig	Fri Apr 15 20:59:45 2005
++++ cliplibs/clip-fcgi/Makefile	Fri Apr 15 21:08:03 2005
+@@ -15,13 +15,13 @@
+ 
+ 
+ have_lib:
+-	test -f /usr/include/fcgi_config.h
++	test -f /usr/local/include/fcgi_config.h
+ 
+ $(TARGET): $(OBJS)
+-	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) -lfcgi
++	$(CLIPROOT)/bin/clip_makeslib $(TARGET) $(OBJS) -lfcgi -L/usr/local/lib
+ 
+ $(ATARGET): $(OBJS)
+-	$(CLIPROOT)/bin/clip_makelib $(ATARGET) $(OBJS) -lfcgi
++	$(CLIPROOT)/bin/clip_makelib $(ATARGET) $(OBJS) -lfcgi -L/usr/local/lib
+ 
+ fcgi.o: fcgi.c hashcode.h
+ 	$(CC) $(C_FLAGS) $(CLIPINCLUDE) -c fcgi.c
diff --git a/databases/clip/files/patch-cliplibs_clip-gd_gd_configure b/databases/clip/files/patch-cliplibs_clip-gd_gd_configure
new file mode 100644
index 000000000000..df08b40a65cd
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs_clip-gd_gd_configure
@@ -0,0 +1,24 @@
+--- cliplibs/clip-gd/gd/configure.orig	Tue Jan 18 23:02:01 2005
++++ cliplibs/clip-gd/gd/configure	Sun Apr 17 11:31:23 2005
+@@ -4,6 +4,9 @@
+ #	<uri@itk.ru>
+ #
+ 
++# FreeBSD changes:
++# - use freetype-config 
++
+ uname=`uname -s`
+ uver=`uname -r`
+ hname=`hostname -f 2>/dev/null`
+@@ -91,9 +94,9 @@
+ echo "COMPILER='$CC'" >&3
+ echo "INSTALL_LIB='$stdlibpath'" >&3
+ echo "INSTALL_INCLUDE='$stdincpath'" >&3
+-echo "LIBDIRS='-L. -L$stdlibpath -L/usr/lib/X11 -L/usr/X11R6/lib'" >&3
++echo "LIBDIRS='-L. -L$stdlibpath -L/usr/lib/X11 -L/usr/X11R6/lib `freetype-config --libs` '">&3
+ #echo "INCLUDEDIRS='-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I$stdincpath'" >&3
+-echo "INCLUDEDIRS='-I. -I/usr/include/freetype2 -I/usr/include/freetype2/freetype -I/usr/include/X11 -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I$stdincpath'" >&3
++echo "INCLUDEDIRS='-I. -I/usr/include/freetype2 -I/usr/include/freetype2/freetype -I/usr/include/X11 -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I$stdincpath `freetype-config --cflags` '" >&3
+ 
+ if [ -f $stdlibpath/libpng${DLLSUFF} ]
+ then
diff --git a/databases/clip/files/patch-cliplibs_clip-gtk2_common.c b/databases/clip/files/patch-cliplibs_clip-gtk2_common.c
new file mode 100644
index 000000000000..1679929db627
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs_clip-gtk2_common.c
@@ -0,0 +1,22 @@
+--- cliplibs/clip-gtk2/common.c.orig	Wed Mar  2 19:50:57 2005
++++ cliplibs/clip-gtk2/common.c	Fri Apr 15 13:17:57 2005
+@@ -142,6 +142,8 @@
+ _list_remove_cobject(ClipMachine * cm)
+ {
+         ClipVar *cv;
++        C_object *cobj;
++        C_widget *cwid;
+         if (widget_list->t.type != MAP_t)
+         	return;
+         cv = (ClipVar *)&(widget_list->m.items[0]);
+@@ -152,8 +154,8 @@
+         		cv = (ClipVar *)&(widget_list->m.items[0]);
+ 		else
+                 	break;
+-        	C_object *cobj = (C_object *)((long)(((ClipVar*)&(cv->m.items[0]))->n.d));
+-                C_widget *cwid = (C_widget *)((long)(((ClipVar*)&(cv->m.items[0]))->n.d));
++        	cobj = (C_object *)((long)(((ClipVar*)&(cv->m.items[0]))->n.d));
++                cwid = (C_widget *)((long)(((ClipVar*)&(cv->m.items[0]))->n.d));
+ 
+                 if (cobj->objtype)
+                 	destroy_c_object(cobj);
diff --git a/databases/clip/files/patch-cliplibs_clip-gtk2_liststore.c b/databases/clip/files/patch-cliplibs_clip-gtk2_liststore.c
new file mode 100644
index 000000000000..13b9970e268d
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs_clip-gtk2_liststore.c
@@ -0,0 +1,44 @@
+--- cliplibs/clip-gtk2/liststore.c.orig	Wed Mar  2 22:27:03 2005
++++ cliplibs/clip-gtk2/liststore.c	Fri Apr 15 13:48:23 2005
+@@ -275,9 +275,12 @@
+ int
+ clip_GTK_LISTSTORESET(ClipMachine * cm)
+ {
+-	C_object *cslist = _fetch_co_arg(cm);
+-        gchar      *path = _clip_parc(cm, 2);
+         GtkTreeIter iter;
++	C_object *cslist;
++	gchar      *path;
++
++	path = _clip_parc(cm, 2);
++	cslist = _fetch_co_arg(cm);
+ 
+         CHECKARG2(1, MAP_t, NUMERIC_t);CHECKCOBJ(cslist, GTK_IS_LIST_STORE(cslist->object));
+         CHECKARG(2, CHARACTER_t);
+@@ -300,10 +303,10 @@
+ int
+ clip_GTK_LISTSTORESETVALUE(ClipMachine * cm)
+ {
+-	C_object *cslist = _fetch_co_arg(cm);
+-        gchar      *path = _clip_parc(cm, 2);
+-        gint	  column = _clip_parni(cm, 3);
+-	ClipVar     *val = _clip_par(cm, 4);;
++	C_object *cslist;
++	gchar      *path;
++	gint	  column;
++	ClipVar     *val;
+ 	GtkTreeIter iter;
+         ClipArrVar *utypes;
+ 	GValue value;
+@@ -311,6 +314,11 @@
+ 	int j;
+ 	double d;
+ 
++	cslist = _fetch_co_arg(cm);
++	path =_clip_parc(cm, 2);
++	column = _clip_parni(cm, 3);
++	val = _clip_par(cm, 4);
++
+         CHECKARG2(1, MAP_t, NUMERIC_t);CHECKCOBJ(cslist, GTK_IS_LIST_STORE(cslist->object));
+         CHECKARG(2, CHARACTER_t);
+         CHECKARG(3, NUMERIC_t);
diff --git a/databases/clip/files/patch-cliplibs_clip-gtk2_treestore.c b/databases/clip/files/patch-cliplibs_clip-gtk2_treestore.c
new file mode 100644
index 000000000000..8032a61a5f12
--- /dev/null
+++ b/databases/clip/files/patch-cliplibs_clip-gtk2_treestore.c
@@ -0,0 +1,28 @@
+--- cliplibs/clip-gtk2/treestore.c.orig	Fri Apr 15 21:47:28 2005
++++ cliplibs/clip-gtk2/treestore.c	Fri Apr 15 21:48:06 2005
+@@ -298,16 +298,21 @@
+ int
+ clip_GTK_TREESTORESETVALUE(ClipMachine * cm)
+ {
+-	C_object *cstree = _fetch_co_arg(cm);
+-        gchar      *path = _clip_parc(cm, 2);
+-        gint	  column = _clip_parni(cm, 3);
+-	ClipVar     *val = _clip_par(cm, 4);;
++	C_object *cstree;
++        gchar      *path;
++        gint	  column;
++	ClipVar     *val;
+ 	GtkTreeIter iter;
+         ClipArrVar *utypes;
+ 	GValue value;
+ 	gchar *str;
+ 	int j;
+ 	double d;
++
++	cstree = _fetch_co_arg(cm);
++        path = _clip_parc(cm, 2);
++        column = _clip_parni(cm, 3);
++	val = _clip_par(cm, 4);;
+ 
+         CHECKARG2(1, MAP_t, NUMERIC_t);CHECKCOBJ(cstree, GTK_IS_TREE_STORE(cstree->object));
+         CHECKARG(2, CHARACTER_t);
diff --git a/databases/clip/files/patch-gd::configure b/databases/clip/files/patch-gd::configure
deleted file mode 100644
index 72c94f6c043f..000000000000
--- a/databases/clip/files/patch-gd::configure
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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
- stdincpath=/usr/local/include
-+freetypepath=
- LIBXPM='-lXpm -lX11'
-+DLLSUFF='.so'
- 
- case "$uname" in
- 	BSD/OS*|bsdi*)
-@@ -36,6 +38,7 @@
- 		;;
- 	FreeBSD*)
- 		osname=FREEBSD
-+		freetypepath=/freetype
- 		STATICLINK=-static
- 		;;
- 	NetBSD*)
-@@ -91,7 +94,7 @@
- echo "INSTALL_LIB='$stdlibpath'" >&3
- echo "INSTALL_INCLUDE='$stdincpath'" >&3
- echo "LIBDIRS='-L. -L$stdlibpath -L/usr/lib/X11 -L/usr/X11R6/lib'" >&3
--echo "INCLUDEDIRS='-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I$stdincpath'" >&3
-+echo "INCLUDEDIRS='-I. -I${stdincpath}/freetype2 -I${stdincpath}/freetype2/freetype -I${stdincpath}/freetype1 -I${stdincpath}/freetype1/freetype -I/usr/include/X11 -I/usr/X11R6/include -I/usr/X11R6/include/X11 -I$stdincpath'" >&3
- 
- if [ -f $stdlibpath/libpng${DLLSUFF} ]
- then
-@@ -178,18 +181,17 @@
- 	echo '#define HAVE_LIBXPM'  >&3
- fi
- 
--if [ -f $stdincpath/freetype2/freetype.h ]
-+if [ -f $stdincpath/freetype2${freetypepath}/freetype.h ]
- then
- 	echo '#define HAVE_LIBFREETYPE' >&3
- else
- 	echo 'Warning: system do not have installed FREETYPE development'
--fi
--
--if [ -f $stdincpath/freetype2/freetype.h ]
--then
--	echo '#define HAVE_LIBTTF' >&3
--else
--	echo 'Warning: system do not have installed TTF development'
-+	if [ -f $stdincpath/freetype1${freetypepath}/freetype.h ]
-+	then
-+		echo '#define HAVE_LIBTTF' >&3
-+	else
-+		echo 'Warning: system do not have installed TTF development'
-+	fi
- fi
- 
- echo "#endif" >&3
diff --git a/databases/clip/files/patch-mklocal b/databases/clip/files/patch-mklocal
new file mode 100644
index 000000000000..b1acd05ac7ac
--- /dev/null
+++ b/databases/clip/files/patch-mklocal
@@ -0,0 +1,47 @@
+--- mklocal.orig	Tue Jul 20 18:59:08 2004
++++ mklocal	Sun Apr 17 11:28:48 2005
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+ 
++# FreeBSD changes:
++# - add a number of '|| exit' so the build will stop immediately at any
++#   failure (rather than being detected later when packaging)
+ 
+ for opt in $*
+ do
+@@ -89,7 +92,7 @@
+ #	./configure ${RFLAG} ${CLIP_CONFIGURE_FLAGS}
+ #	$MAKE install || exit 2
+ 	./configure ${RFLAG} ${CLIP_CONFIGURE_FLAGS} || exit 2
+-	$MAKE install DESTDIR=${DESTDIR}
++	$MAKE install DESTDIR=${DESTDIR} || exit 2
+ cd $pwd
+ 
+ fi
+@@ -106,12 +109,12 @@
+ #$MAKE install
+ 
+ #(
+-	cd cliplibs
++	cd cliplibs || exit 2
+ 	CLIPROOT=${DESTDIR}${CLIPROOT}
+ 	LD_LIBRARY_PATH=${DESTDIR}/usr/lib:$LD_LIBRARY_PATH
+ 	export CLIPROOT  LD_LIBRARY_PATH
+-	$MAKE
+-	$MAKE install DESTDIR=''
++	$MAKE || exit 2
++	$MAKE install DESTDIR='' || exit 2
+ #)
+ 
+ cd $pwd
+@@ -133,8 +136,8 @@
+ #		CLIPROOT=${DESTDIR}${CLIPROOT}
+ #		LD_LIBRARY_PATH=${DESTDIR}/usr/lib:$LD_LIBRARY_PATH
+ #		export CLIPROOT  LD_LIBRARY_PATH
+-		$MAKE
+-		$MAKE install
++		$MAKE || exit 3
++		$MAKE install || exit 3
+ #		${DESTDIR}${CLIPROOT}/bin/clip_msgmerge
+ #		${DESTDIR}${CLIPROOT}/bin/clip_msgfmt
+ #	)
diff --git a/databases/clip/pkg-plist b/databases/clip/pkg-plist
index 29bce5d0c2b3..c651b420ab4f 100644
--- a/databases/clip/pkg-plist
+++ b/databases/clip/pkg-plist
@@ -1,3 +1,34 @@
+%%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.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.a
+%%PGSQL%%clip/lib/libclip-postgres.ex
+%%PGSQL%%clip/lib/libclip-postgres.nm
+%%PGSQL%%clip/lib/libclip-postgres.so
 clip/bin/add_meta_tag
 clip/bin/bdbf
 clip/bin/bdbf.hlp
@@ -33,8 +64,10 @@ clip/bin/codb_ab
 clip/bin/codb_abx
 clip/bin/codb_addobj
 clip/bin/codb_export
+clip/bin/codb_load
 clip/bin/codb_make
 clip/bin/codb_pack
+clip/bin/codb_rcheck
 clip/bin/codb_reindex
 clip/bin/ctosgml
 clip/bin/dbc
@@ -88,6 +121,8 @@ clip/charsets/gbk.uni
 clip/charsets/gen-uni.sh
 clip/charsets/gen_tbl.c
 clip/charsets/gentbl_strcoll.c
+clip/charsets/iso-8859-2.tbl
+clip/charsets/iso-8859-2.uni
 clip/charsets/iso01.tbl
 clip/charsets/iso01.uni
 clip/charsets/iso02.tbl
@@ -111,6 +146,8 @@ clip/charsets/iso10.uni
 clip/charsets/kamen.uni
 clip/charsets/koi8-r.tbl
 clip/charsets/koi8-r.uni
+clip/charsets/koi8-ru.tbl
+clip/charsets/koi8-ru.uni
 clip/charsets/koi8-u.tbl
 clip/charsets/koi8-u.uni
 clip/charsets/koi8.uni
@@ -134,10 +171,13 @@ clip/cliprc/clip-gtk.cliprc
 clip/cliprc/clip-gtk2.cliprc
 clip/cliprc/clipflags
 clip/cobra/auth/Makefile
+clip/cobra/auth/make_mod.sh
 clip/cobra/auth/other
+clip/cobra/auth/pam-auth
 clip/cobra/auth/pam-auth.c
 clip/cobra/auth/pam-err-msg
 clip/cobra/cobra_clnt.ini
+clip/cobra/cobra_serv
 clip/cobra/cobra_serv.ini
 clip/cobra/codbdlist.po
 clip/cobra/codbtview.po
@@ -156,6 +196,10 @@ 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_chart.ex
+clip/codb_ab/plugins/acc_chart.nm
+clip/codb_ab/plugins/acc_chart.po
+clip/codb_ab/plugins/acc_chart.prg
 clip/codb_ab/plugins/acc_oper.ex
 clip/codb_ab/plugins/acc_oper.nm
 clip/codb_ab/plugins/acc_oper.po
@@ -268,69 +312,6 @@ clip/codb_abx/plugins/user.ex
 clip/codb_abx/plugins/user.nm
 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
-clip/doc/clip-com/com_flush.html
-clip/doc/clip-com/com_hard.html
-clip/doc/clip-com/com_init.html
-clip/doc/clip-com/com_num.html
-clip/doc/clip-com/com_open.html
-clip/doc/clip-com/com_read.html
-clip/doc/clip-com/com_send.html
-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-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
@@ -382,8 +363,6 @@ 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
 clip/doc/example/clip-gtk/Makefile
 clip/doc/example/clip-gtk/accel.prg
 clip/doc/example/clip-gtk/basket.bmp
@@ -406,10 +385,19 @@ 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/colorbtn.prg
+clip/doc/example/clip-gtk2/combobox.prg
 clip/doc/example/clip-gtk2/container.prg
 clip/doc/example/clip-gtk2/drag_and_drop.prg
+clip/doc/example/clip-gtk2/draw.prg
+clip/doc/example/clip-gtk2/entrytempl.prg
 clip/doc/example/clip-gtk2/fonttest.prg
+clip/doc/example/clip-gtk2/ifactory.prg
+clip/doc/example/clip-gtk2/imgmenu.prg
+clip/doc/example/clip-gtk2/lines.prg
+clip/doc/example/clip-gtk2/lists.prg
 clip/doc/example/clip-gtk2/note.prg
+clip/doc/example/clip-gtk2/pango.prg
 clip/doc/example/clip-gtk2/simple.prg
 clip/doc/example/clip-gtk2/tbrow.prg
 clip/doc/example/clip-gtk2/tbrow.xpm
@@ -424,19 +412,18 @@ clip/doc/example/clip-gtk2/text.prg
 clip/doc/example/clip-gtk2/winpic.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
 clip/doc/example/clip-rtf/rtfdemo.prg
 clip/doc/example/clip-rtf/veggies.dbf
+clip/doc/example/clip-ui/Makefile
+clip/doc/example/clip-ui/form_ui.prg
+clip/doc/example/clip-ui/icons/doc_bank_pp.xpm
+clip/doc/example/clip-ui/icons/journal_bank_pp.xpm
+clip/doc/example/clip-ui/icons/reference_partner.xpm
+clip/doc/example/clip-ui/testWindow.xfl
+clip/doc/example/clip-ui/test_ui.prg
 clip/doc/example/hello.prg
 clip/doc/example/inkey.prg
 clip/doc/example/mouse.prg
@@ -449,6 +436,62 @@ clip/doc/example/tcpserv.prg
 clip/doc/example/test.dbf.orig
 clip/doc/example/test_dbf.prg
 clip/doc/example/testlock.prg
+clip/doc/example/clip-gd/gr.prg
+clip/doc/example/clip-gd/Makefile
+clip/doc/example/clip-fcgi/clip_echo.fcgi.prg
+clip/doc/example/clip-fcgi/Makefile
+clip/doc/example/clip-gtkextra/pixmaps.ch
+clip/doc/example/clip-gtkextra/Makefile
+clip/doc/example/clip-gtkextra/sheet.prg
+clip/doc/example/clip-gtk2/winback.prg
+clip/doc/example/clip-gtk2/test_rc.prg
+clip/doc/example/clip-ui/icons/eas-logo.xpm
+clip/doc/example/clip-ui/icons/tick.xpm
+clip/doc/clip-gd/rus/ring2.png
+clip/doc/clip-gd/rus/o_gdimage.html
+clip/doc/clip-gd/rus/gd_prg.html
+clip/doc/clip-gd/rus/gd_lib.html
+clip/doc/clip-gd/rus/asdf.png
+clip/doc/clip-gd/rus/ring1.png
+clip/doc/clip-gd/rus/linenorm2.png
+clip/doc/clip-gd/rus/linenorm1.png
+clip/doc/clip-gd/rus/linecumul2.png
+clip/doc/clip-gd/rus/linecumul1.png
+clip/doc/clip-gd/rus/line2.png
+clip/doc/clip-gd/rus/line1.png
+clip/doc/clip-gd/rus/histvolume.png
+clip/doc/clip-gd/rus/histnorm2.png
+clip/doc/clip-gd/rus/histnorm1.png
+clip/doc/clip-gd/rus/histcumul2.png
+clip/doc/clip-gd/rus/histcumul1.png
+clip/doc/clip-gd/rus/hist2.png
+clip/doc/clip-gd/rus/hist1.png
+clip/doc/clip-gd/rus/gistvolume.png
+clip/doc/clip-gd/rus/circle2.png
+clip/doc/clip-gd/rus/circle1.png
+clip/doc/clip-gd/rus/o_graphics.html
+clip/doc/clip-gd/eng/ring2.png
+clip/doc/clip-gd/eng/o_gdimage.html
+clip/doc/clip-gd/eng/gd_prg.html
+clip/doc/clip-gd/eng/gd_lib.html
+clip/doc/clip-gd/eng/asdf.png
+clip/doc/clip-gd/eng/ring1.png
+clip/doc/clip-gd/eng/linenorm2.png
+clip/doc/clip-gd/eng/linenorm1.png
+clip/doc/clip-gd/eng/linecumul2.png
+clip/doc/clip-gd/eng/linecumul1.png
+clip/doc/clip-gd/eng/line2.png
+clip/doc/clip-gd/eng/line1.png
+clip/doc/clip-gd/eng/histvolume.png
+clip/doc/clip-gd/eng/histnorm2.png
+clip/doc/clip-gd/eng/histnorm1.png
+clip/doc/clip-gd/eng/histcumul2.png
+clip/doc/clip-gd/eng/histcumul1.png
+clip/doc/clip-gd/eng/hist2.png
+clip/doc/clip-gd/eng/hist1.png
+clip/doc/clip-gd/eng/circle2.png
+clip/doc/clip-gd/eng/circle1.png
+clip/doc/clip-gd/eng/o_graphics.html
 clip/etc/.calendar
 clip/etc/.macro
 clip/etc/.templ
@@ -506,7 +549,6 @@ clip/include/_win32.h
 clip/include/achoice.ch
 clip/include/aof.ch
 clip/include/assert.ch
-clip/include/bggraph.ch
 clip/include/blob.ch
 clip/include/box.ch
 clip/include/browsys.ch
@@ -516,6 +558,7 @@ clip/include/clip-gtk.ch
 clip/include/clip-gtk.h
 clip/include/clip-gtk2.ch
 clip/include/clip-gtk2.h
+clip/include/clip-ui.ch
 clip/include/clip.ch
 clip/include/clip.h
 clip/include/clipbrd.ch
@@ -635,7 +678,6 @@ clip/include/fwin/vkey.ch
 clip/include/fwin/winapi.ch
 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
@@ -643,14 +685,12 @@ clip/include/html.ch
 clip/include/http.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
@@ -660,11 +700,9 @@ 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/r2d2lib.ch
@@ -688,6 +726,10 @@ clip/include/taskcfg.h
 clip/include/tbrowse.ch
 clip/include/tcp.ch
 clip/include/ulimit.ch
+clip/include/gdinfo.ch
+clip/include/bggraph.ch
+clip/include/fcgi.ch
+clip/include/clip-gtkextra.ch
 clip/kamache/kamache
 clip/kamache/kamache.ini
 clip/kamache/mod-clip/Makefile
@@ -724,6 +766,12 @@ clip/lang/ru_RU.CP1251
 clip/lang/ru_RU.CP866
 clip/lang/ru_RU.KOI8-R
 clip/lang/ru_RU.KOI8-U
+clip/lib/drivers/driver-gtk.ex
+clip/lib/drivers/driver-gtk.nm
+clip/lib/drivers/driver-gtk.po
+clip/lib/drivers/driver-gtk2.ex
+clip/lib/drivers/driver-gtk2.nm
+clip/lib/drivers/driver-gtk2.po
 clip/lib/libclip-bzip2.a
 clip/lib/libclip-bzip2.ex
 clip/lib/libclip-bzip2.nm
@@ -748,11 +796,6 @@ 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/libgd.a
 clip/lib/libclip-gtk.a
 clip/lib/libclip-gtk.ex
 clip/lib/libclip-gtk.nm
@@ -765,13 +808,6 @@ 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
@@ -780,26 +816,34 @@ 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-r2d2.a
+clip/lib/libclip-r2d2.ex
+clip/lib/libclip-r2d2.nm
+clip/lib/libclip-r2d2.so
 clip/lib/libclip-rtf.a
 clip/lib/libclip-rtf.ex
 clip/lib/libclip-rtf.nm
 clip/lib/libclip-rtf.so
+clip/lib/libclip-ui.ex
+clip/lib/libclip-ui.nm
+clip/lib/libclip-ui.so
 clip/lib/libclip.a
 clip/lib/libclip.ex
 clip/lib/libclip.nm
 clip/lib/libclip.so
-clip/lib/libclip-r2d2.a
-clip/lib/libclip-r2d2.ex
-clip/lib/libclip-r2d2.nm
-clip/lib/libclip-r2d2.so
+clip/lib/libclip-gd.so
+clip/lib/libclip-gd.nm
+clip/lib/libclip-gd.ex
+clip/lib/libclip-gd.a
+clip/lib/libgd.a
+clip/lib/libclip-fcgi.so
+clip/lib/libclip-fcgi.nm
+clip/lib/libclip-fcgi.ex
+clip/lib/libclip-fcgi.a
+clip/lib/libclip-gtkextra.so
+clip/lib/libclip-gtkextra.nm
+clip/lib/libclip-gtkextra.ex
+clip/lib/libclip-gtkextra.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
@@ -945,11 +989,13 @@ clip/locale.pot/codb/_.pot
 clip/locale.pot/codb/codb_cobra.pot
 clip/locale.pot/codb/codb_err.pot
 clip/locale.pot/codb/codb_funcs.pot
+clip/locale.pot/codb/count_dbf.pot
 clip/locale.pot/codb/dep_all.pot
 clip/locale.pot/codb/dep_dbf.pot
-clip/locale.pot/codb/dict_cobra.pot
 clip/locale.pot/codb/dict_dbf.pot
 clip/locale.pot/codb/list_id.pot
+clip/locale.pot/codb/dict_all.pot
+clip/locale.pot/codb/dict_sql.pot
 clip/locale.pot/debug/_.pot
 clip/locale.pot/debug/cld_obj.pot
 clip/locale.pot/debug/clip_cld.pot
@@ -1003,14 +1049,17 @@ 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_chart.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_ab.pot
 clip/locale.pot/udb/codb_addobj.pot
 clip/locale.pot/udb/codb_export.pot
+clip/locale.pot/udb/codb_load.pot
 clip/locale.pot/udb/codb_make.pot
 clip/locale.pot/udb/codb_pack.pot
+clip/locale.pot/udb/codb_rcheck.pot
 clip/locale.pot/udb/codb_reindex.pot
 clip/locale.pot/udb/counter.pot
 clip/locale.pot/udb/default.pot
@@ -1024,11 +1073,12 @@ 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_menu.pot
+clip/locale.pot/udbx/abx_data_browse.pot
 clip/locale.pot/udbx/abx_funcs.pot
-clip/locale.pot/udbx/abx_meta_browse.pot
 clip/locale.pot/udbx/abx_getobj.pot
-clip/locale.pot/udbx/abx_data_browse.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
@@ -1041,7 +1091,6 @@ 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/locale.pot/udbx/abx_obj.pot
 clip/term/cons25r
 clip/term/cygwin
 clip/term/linux-console
@@ -1051,92 +1100,98 @@ clip/term/linux-koi8-xterm
 clip/term/linux-stelnet
 clip/term/linux-stelnet1
 clip/term/linux-trans
+clip/term/pc3c
 clip/term/pcansi
-@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/mod-ini
-@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-r2d2
-@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/kamache/mod-clip
-@dirrm clip/kamache/mod-ini
-@dirrm clip/kamache
-@dirrm clip/keymaps
-@dirrm clip/include/netto
-@dirrm clip/include/nanfor
-@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/bin
+@dirrm clip/charsets
+@dirrm clip/cliprc
+@dirrm clip/cobra/auth
+@dirrm clip/cobra/files
+@dirrm clip/cobra/mod-ini
+@dirrm clip/cobra/tcp-wrap
+@dirrm clip/cobra
+@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
+@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-fcgi
+@dirrm clip/doc/example/clip-fw/bitmaps
+@dirrm clip/doc/example/clip-fw/data
+@dirrm clip/doc/example/clip-fw
+@dirrm clip/doc/example/clip-gd
+@dirrm clip/doc/example/clip-gtk
+@dirrm clip/doc/example/clip-gtk2
+@dirrm clip/doc/example/clip-gtkextra
+@dirrm clip/doc/example/clip-gzip
 @dirrm clip/doc/example/clip-rtf
+@dirrm clip/doc/example/clip-ui/icons
+@dirrm clip/doc/example/clip-ui
 %%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-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
 %%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/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/mod-ini
-@dirrm clip/cobra/files
-@dirrm clip/cobra/auth
-@dirrm clip/cobra
-@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/nanfor
+@dirrm clip/include/netto
+@dirrm clip/include
+@dirrm clip/kamache/mod-clip
+@dirrm clip/kamache/mod-ini
+@dirrm clip/kamache
+@dirrm clip/keymaps
+@dirrm clip/lang
+@dirrm clip/lib/drivers
+@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/clip-gtk2
+@dirrm clip/locale.pot/clip-r2d2
+@dirrm clip/locale.pot/cobra_clnt
+@dirrm clip/locale.pot/cobra_serv
+@dirrm clip/locale.pot/codb
+@dirrm clip/locale.pot/debug
+@dirrm clip/locale.pot/mod-ini
+@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