unbreak by upgrading to 1.1.5.1

5 files changed, 153 insertions, 46 deletions

diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 16bffeb7d4e5..599518122c86 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	clip
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.5.1
 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/}
+DISTNAME=	${PORTNAME}-prg-${PORTVERSION:R}-${PORTVERSION:E}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	xBase and Clipper language compatible compiler
 
-BROKEN=		"Does not install, will be removed after Feb 2"
-
 .include <bsd.port.pre.mk>
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
@@ -26,13 +24,13 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
 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=""
@@ -42,18 +40,21 @@ 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=""
@@ -67,6 +68,7 @@ USE_REINPLACE=		yes
 REINPLACE_ARGS=		-i ""
 USE_XLIB=		yes
 USE_XPM=		yes
+USE_GNOME=		gtk12
 HAS_CONFIGURE=		yes
 CONFIGURE_WRKSRC=	${WRKSRC}/clip
 ALL_TARGET=		local
diff --git a/databases/clip/distinfo b/databases/clip/distinfo
index 4a7a5b195762..a4ea9f62ffd6 100644
--- a/databases/clip/distinfo
+++ b/databases/clip/distinfo
@@ -1 +1 @@
-MD5 (clip-prg-1.1.0.tgz) = cfa6433ebf818a854d8de4c0f4e03f20
+MD5 (clip-prg-1.1.5-1.tgz) = f87bc17c7d7a110a490baeb8d2640d66
diff --git a/databases/clip/files/patch-clip::clip_msgmerge.in b/databases/clip/files/patch-clip::clip_msgmerge.in
deleted file mode 100644
index ac4e970617e1..000000000000
--- a/databases/clip/files/patch-clip::clip_msgmerge.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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/pkg-descr b/databases/clip/pkg-descr
index 2994e6b54f10..838dd8387bef 100644
--- a/databases/clip/pkg-descr
+++ b/databases/clip/pkg-descr
@@ -1,3 +1,3 @@
 Object orientired, CA-Clipper compatible compiler
 
-WWW: http://www.english.itk.ru/clipper/
+WWW: http://www.itk.ru/english/
diff --git a/databases/clip/pkg-plist b/databases/clip/pkg-plist
index 02ff697976e7..1ed46797511d 100644
--- a/databases/clip/pkg-plist
+++ b/databases/clip/pkg-plist
@@ -128,58 +128,118 @@ clip/charsets/utf_8.uni
 clip/cliprc/.notrm
 clip/cliprc/clip-gtk.cliprc
 clip/cliprc/clipflags
+clip/codb_ab/plugins/.clipcharset
+clip/codb_ab/plugins/.cliprc
+clip/codb_ab/plugins/acc_oper.ex
+clip/codb_ab/plugins/acc_oper.nm
 clip/codb_ab/plugins/acc_oper.po
 clip/codb_ab/plugins/acc_oper.prg
+clip/codb_ab/plugins/attr.ex
+clip/codb_ab/plugins/attr.nm
 clip/codb_ab/plugins/attr.po
 clip/codb_ab/plugins/attr.prg
+clip/codb_ab/plugins/class.ex
+clip/codb_ab/plugins/class.nm
 clip/codb_ab/plugins/class.po
 clip/codb_ab/plugins/class.prg
+clip/codb_ab/plugins/counter.ex
+clip/codb_ab/plugins/counter.nm
 clip/codb_ab/plugins/counter.po
 clip/codb_ab/plugins/counter.prg
+clip/codb_ab/plugins/default.ex
+clip/codb_ab/plugins/default.nm
 clip/codb_ab/plugins/default.po
 clip/codb_ab/plugins/default.prg
+clip/codb_ab/plugins/deposit.ex
+clip/codb_ab/plugins/deposit.nm
 clip/codb_ab/plugins/deposit.po
 clip/codb_ab/plugins/deposit.prg
+clip/codb_ab/plugins/extent.ex
+clip/codb_ab/plugins/extent.nm
 clip/codb_ab/plugins/extent.po
 clip/codb_ab/plugins/extent.prg
+clip/codb_ab/plugins/group.ex
+clip/codb_ab/plugins/group.nm
 clip/codb_ab/plugins/group.po
 clip/codb_ab/plugins/group.prg
+clip/codb_ab/plugins/index.ex
+clip/codb_ab/plugins/index.nm
 clip/codb_ab/plugins/index.po
 clip/codb_ab/plugins/index.prg
+clip/codb_ab/plugins/plugins.ex
+clip/codb_ab/plugins/plugins.nm
 clip/codb_ab/plugins/plugins.po
 clip/codb_ab/plugins/plugins.prg
+clip/codb_ab/plugins/report.ex
+clip/codb_ab/plugins/report.nm
 clip/codb_ab/plugins/report.po
 clip/codb_ab/plugins/report.prg
+clip/codb_ab/plugins/tcolumn.ex
+clip/codb_ab/plugins/tcolumn.nm
 clip/codb_ab/plugins/tcolumn.po
 clip/codb_ab/plugins/tcolumn.prg
+clip/codb_ab/plugins/tview.ex
+clip/codb_ab/plugins/tview.nm
 clip/codb_ab/plugins/tview.po
 clip/codb_ab/plugins/tview.prg
+clip/codb_ab/plugins/user.ex
+clip/codb_ab/plugins/user.nm
 clip/codb_ab/plugins/user.po
 clip/codb_ab/plugins/user.prg
+clip/codb_ab/reports/.clipcharset
+clip/codb_ab/reports/.cliprc
+clip/codb_ab/reports/default.ex
+clip/codb_ab/reports/default.nm
 clip/codb_ab/reports/default.po
 clip/codb_ab/reports/default.prg
+clip/codb_abx/plugins/.clipcharset
+clip/codb_abx/plugins/.cliprc
+clip/codb_abx/plugins/attr.ex
+clip/codb_abx/plugins/attr.nm
 clip/codb_abx/plugins/attr.po
 clip/codb_abx/plugins/attr.prg
+clip/codb_abx/plugins/class.ex
+clip/codb_abx/plugins/class.nm
 clip/codb_abx/plugins/class.po
 clip/codb_abx/plugins/class.prg
+clip/codb_abx/plugins/counter.ex
+clip/codb_abx/plugins/counter.nm
 clip/codb_abx/plugins/counter.po
 clip/codb_abx/plugins/counter.prg
+clip/codb_abx/plugins/default.ex
+clip/codb_abx/plugins/default.nm
 clip/codb_abx/plugins/default.po
 clip/codb_abx/plugins/default.prg
+clip/codb_abx/plugins/deposit.ex
+clip/codb_abx/plugins/deposit.nm
 clip/codb_abx/plugins/deposit.po
 clip/codb_abx/plugins/deposit.prg
+clip/codb_abx/plugins/group.ex
+clip/codb_abx/plugins/group.nm
 clip/codb_abx/plugins/group.po
 clip/codb_abx/plugins/group.prg
+clip/codb_abx/plugins/index.ex
+clip/codb_abx/plugins/index.nm
 clip/codb_abx/plugins/index.po
 clip/codb_abx/plugins/index.prg
+clip/codb_abx/plugins/plugins.ex
+clip/codb_abx/plugins/plugins.nm
 clip/codb_abx/plugins/plugins.po
 clip/codb_abx/plugins/plugins.prg
+clip/codb_abx/plugins/report.ex
+clip/codb_abx/plugins/report.nm
 clip/codb_abx/plugins/report.po
 clip/codb_abx/plugins/report.prg
+clip/codb_abx/plugins/tcolumn.ex
+clip/codb_abx/plugins/tcolumn.nm
 clip/codb_abx/plugins/tcolumn.po
 clip/codb_abx/plugins/tcolumn.prg
+clip/codb_abx/plugins/tview.ex
+clip/codb_abx/plugins/tview.nm
 clip/codb_abx/plugins/tview.po
 clip/codb_abx/plugins/tview.prg
+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
@@ -241,10 +301,6 @@ 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
@@ -309,14 +365,6 @@ 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
@@ -387,6 +435,7 @@ clip/etc/terminfo/x/xterm-mono
 clip/etc/terminfo/x/xterm-xfree86
 clip/include/Makefile.inc
 clip/include/Makefile.tdoc
+clip/include/_win32.h
 clip/include/achoice.ch
 clip/include/aof.ch
 clip/include/assert.ch
@@ -523,14 +572,12 @@ 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
@@ -540,11 +587,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/rdd.ch
@@ -632,14 +677,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.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
@@ -648,13 +685,6 @@ 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
@@ -664,6 +694,30 @@ 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.mo
+clip/locale.mo/es_ES.8859-1/cliprt.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
+clip/locale.mo/es_ES.8859-1/sys.mo
+clip/locale.mo/es_ES.8859-1/udb.mo
+clip/locale.mo/es_ES.8859-1/udbx.mo
+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.mo
+clip/locale.mo/es_ES.ISO01/cliprt.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
+clip/locale.mo/es_ES.ISO01/sys.mo
+clip/locale.mo/es_ES.ISO01/udb.mo
+clip/locale.mo/es_ES.ISO01/udbx.mo
 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
@@ -678,6 +732,30 @@ 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/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.po
+clip/locale.po/es_ES.8859-1/cliprt.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
+clip/locale.po/es_ES.8859-1/sys.po
+clip/locale.po/es_ES.8859-1/udb.po
+clip/locale.po/es_ES.8859-1/udbx.po
+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.po
+clip/locale.po/es_ES.ISO01/cliprt.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
+clip/locale.po/es_ES.ISO01/sys.po
+clip/locale.po/es_ES.ISO01/udb.po
+clip/locale.po/es_ES.ISO01/udbx.po
 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
@@ -815,6 +893,37 @@ 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
@@ -872,8 +981,12 @@ clip/term/pcansi
 @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