Update to 1.2.1

8 files changed, 57 insertions, 29 deletions

diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 34fbc258e9fb..429abafd82fc 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	vdk
-PORTVERSION=	1.0.6
+PORTVERSION=	1.2.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://www.programmers.net/artic/Motta/vdk/
+MASTER_SITES=	http://download.sourceforge.net/vdkbuilder/
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/x11-toolkits/vdk/distinfo b/x11-toolkits/vdk/distinfo
index 191963756f6d..e4e8fe9ac06f 100644
--- a/x11-toolkits/vdk/distinfo
+++ b/x11-toolkits/vdk/distinfo
@@ -1 +1 @@
-MD5 (vdk-1.0.6.tar.gz) = 6ae68dbd467b94c494838009df4fe6b4
+MD5 (vdk-1.2.1.tar.gz) = 82e8e73983e7ea8200c933c31956692f
diff --git a/x11-toolkits/vdk/pkg-plist b/x11-toolkits/vdk/pkg-plist
index 4b3dd253a632..cf664d272566 100644
--- a/x11-toolkits/vdk/pkg-plist
+++ b/x11-toolkits/vdk/pkg-plist
@@ -58,6 +58,9 @@ include/vdk/scrolled.h
 include/vdk/scrolledForm.h
 include/vdk/separator.h
 include/vdk/sigc_addon.h
+include/vdk/sigc_events.h
+include/vdk/sigc_eventsignals.h
+include/vdk/sigc_eventtraits.h
 include/vdk/siglisthandle.h
 include/vdk/slider.h
 include/vdk/spins.h
@@ -103,14 +106,16 @@ include/vdk/widcontain.h
 lib/libvdk.a
 lib/libvdk.la
 lib/libvdk.so
-lib/libvdk.so.1
+lib/libvdk.so.3
 lib/libvdkcompo.a
 lib/libvdkcompo.la
 lib/libvdkcompo.so
-lib/libvdkcompo.so.1
+lib/libvdkcompo.so.3
 lib/libvdkgnome.a
 lib/libvdkgnome.la
 lib/libvdkgnome.so
-lib/libvdkgnome.so.1
+lib/libvdkgnome.so.3
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/vdk.m4
 @dirrm include/vdk
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 7a2ed688bc1d..07fb3ebac512 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -6,22 +6,23 @@
 #
 
 PORTNAME=	vdkbuilder
-PORTVERSION= 	1.0.6
+PORTVERSION= 	1.2.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://www.programmers.net/artic/Motta/vdk/
+MASTER_SITES=	http://download.sourceforge.net/vdkbuilder/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	vdk.1:${PORTSDIR}/x11-toolkits/vdk
+LIB_DEPENDS=	vdk.3:${PORTSDIR}/x11-toolkits/vdk
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_NEWGCC=	yes
+USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib -lgnuregex"
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/vdkbuilder/distinfo b/x11-toolkits/vdkbuilder/distinfo
index ced132a3b75f..5d4f248081b2 100644
--- a/x11-toolkits/vdkbuilder/distinfo
+++ b/x11-toolkits/vdkbuilder/distinfo
@@ -1 +1 @@
-MD5 (vdkbuilder-1.0.6.tar.gz) = 81abda998fe82e1efc43e635bd07821e
+MD5 (vdkbuilder-1.2.1.tar.gz) = 28607f3de0323b1d1180fe344babada6
diff --git a/x11-toolkits/vdkbuilder/files/patch-ac b/x11-toolkits/vdkbuilder/files/patch-ac
new file mode 100644
index 000000000000..6ef523ed3e7b
--- /dev/null
+++ b/x11-toolkits/vdkbuilder/files/patch-ac
@@ -0,0 +1,13 @@
+--- vdkbuilder/vdkb.cc.orig	Tue Jun 27 08:08:49 2000
++++ vdkbuilder/vdkb.cc	Tue Jun 27 08:09:27 2000
+@@ -55,6 +55,10 @@
+ #include <stdlib.h>
+ #include <sys/param.h>
+ 
++#if ENABLE_NLS
++#include <libintl.h>
++#endif
++
+ 
+ //////////////////////////////
+ #include "./pixmaps/cube.xpm"
diff --git a/x11-toolkits/vdkbuilder/files/patch-ad b/x11-toolkits/vdkbuilder/files/patch-ad
new file mode 100644
index 000000000000..e0558a48af37
--- /dev/null
+++ b/x11-toolkits/vdkbuilder/files/patch-ad
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Wed Jun 28 08:06:33 2000
++++ po/Makefile.in.in	Wed Jun 28 08:06:47 2000
+@@ -120,6 +120,7 @@
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+ 	    *.gmo) destdir=$(gnulocaledir);; \
++	    *.mo) destdir=$(gnulocaledir);; \
+ 	    *)     destdir=$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
diff --git a/x11-toolkits/vdkbuilder/pkg-plist b/x11-toolkits/vdkbuilder/pkg-plist
index 4818cfe2467a..3954a8e60fca 100644
--- a/x11-toolkits/vdkbuilder/pkg-plist
+++ b/x11-toolkits/vdkbuilder/pkg-plist
@@ -4,19 +4,11 @@ include/vdkb/customcombo.h
 include/vdkb/databox.h
 include/vdkb/gtkcolorcombo.h
 include/vdkb/gtkcombobox.h
-include/vdkb/gtkeditor-regex.h
-include/vdkb/gtkeditor.h
-include/vdkb/gtkhint.h
-include/vdkb/gtksctext.h
+include/vdkb/gtkextext.h
+include/vdkb/highlight.h
 include/vdkb/input.h
-include/vdkb/internal.h
-include/vdkb/parent.h
-include/vdkb/regex.h
-include/vdkb/sctext.h
-include/vdkb/syntaxtable.h
 include/vdkb/vdkb.h
 include/vdkb/vdkb_about.h
-include/vdkb/vdkb_actstack.h
 include/vdkb/vdkb_calendar.h
 include/vdkb/vdkb_cbuttdlg.h
 include/vdkb/vdkb_checkbutton.h
@@ -53,7 +45,6 @@ include/vdkb/vdkb_grep.h
 include/vdkb/vdkb_grid.h
 include/vdkb/vdkb_guicanvas.h
 include/vdkb/vdkb_handlebox.h
-include/vdkb/vdkb_hilite.h
 include/vdkb/vdkb_ide_def.h
 include/vdkb/vdkb_interface.h
 include/vdkb/vdkb_labelbutton.h
@@ -107,9 +98,16 @@ include/vdkb/vdkb_unit.h
 include/vdkb/vdkb_utils.h
 include/vdkb/vdkb_widclip.h
 include/vdkb/vdkb_widpopmenu.h
+include/vdkb/vdkb_xcheckbutton.h
+include/vdkb/vdkb_xcustomlist.h
+include/vdkb/vdkb_xentry.h
+include/vdkb/vdkb_xmemo.h
+include/vdkb/vdkb_xtDlg.h
 include/vdkb/vdkcalendar.h
 include/vdkb/vdkdclock.h
 include/vdkb/vdkeditor.h
+include/vdkb/vdkextext.h
+include/vdkb/vdksynted.h
 include/vdkb/vdkxpmbrowser.h
 include/vdkb/waitcursor.h
 lib/libvdkbcalendar.a
@@ -132,11 +130,11 @@ lib/libvdkdclock.a
 lib/libvdkdclock.la
 lib/libvdkdclock.so
 lib/libvdkdclock.so.1
-share/vdkb/lang/de.lan
-share/vdkb/lang/en.lan
-share/vdkb/lang/it.lan
-share/vdkb/lang/vdkhints.en
-share/vdkb/lang/~.vdk
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/locale/da/LC_MESSAGES/vdkbuilder.mo
+share/locale/de/LC_MESSAGES/vdkbuilder.mo
+share/locale/it/LC_MESSAGES/vdkbuilder.mo
 share/vdkb/res/AUTHORS
 share/vdkb/res/COPYING
 share/vdkb/res/ChangeLog
@@ -169,13 +167,14 @@ share/vdkb/res/vdkapp.htm
 share/vdkb/res/vdkbide.defaults
 share/vdkb/res/vdkbmaker.gif
 share/vdkb/res/vdkbrc
+share/vdkb/res/vdkcanvas.htm
+share/vdkb/res/vdkchkbut.htm
 share/vdkb/res/vdkform.htm
 share/vdkb/res/vdklogo.gif
+share/vdkb/res/vdkobjcont.htm
 share/vdkb/res/vdkobject.htm
 share/vdkb/res/vdkpaned.htm
 share/vdkb/res/vdkscrolled.htm
 share/vdkb/res/wi1.gif
 @dirrm include/vdkb
-@dirrm share/vdkb/lang
 @dirrm share/vdkb/res
-@dirrm share/vdkb