5 files changed, 33 insertions, 142 deletions

diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 785ed4c31153..176e4bfefddd 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vdk
-PORTVERSION=	2.0.3
-PORTREVISION=	2
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	vdkbuilder
@@ -16,10 +15,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GTK+ toolkit
 
 USE_X_PREFIX=	yes
-WANT_GNOME=	yes
-USE_GNOME=	gnometarget gtk20
+USE_GNOME=	gnometarget gtk20 lthack
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no
@@ -28,8 +26,8 @@ INSTALLS_SHLIB=	yes
 MAN1=		vdk-config-2.1
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|CXXFLAGS="-s"|CXXFLAGS="$$CXXFLAGS"|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 .for file in vdk/FileDialog.h vdk/gtksourcebuffer.h vdk/gtksourcetag.h
 	@${REINPLACE_CMD} -e 's|<regex\.h>|<gnuregex.h>|g' ${WRKSRC}/${file}
 .endfor
diff --git a/x11-toolkits/vdk/distinfo b/x11-toolkits/vdk/distinfo
index 9d3413003f9f..961f1f199573 100644
--- a/x11-toolkits/vdk/distinfo
+++ b/x11-toolkits/vdk/distinfo
@@ -1,2 +1,2 @@
-MD5 (vdk-2.0.3.tar.gz) = b76be21a0014d089c176442ba68bd3c7
-SIZE (vdk-2.0.3.tar.gz) = 954062
+MD5 (vdk-2.4.0.tar.gz) = b23dcfa237dbf4b9424bcaa37683a7ba
+SIZE (vdk-2.4.0.tar.gz) = 1071732
diff --git a/x11-toolkits/vdk/files/patch-configure b/x11-toolkits/vdk/files/patch-configure
deleted file mode 100644
index f156a2d589f5..000000000000
--- a/x11-toolkits/vdk/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Sat May 17 13:55:10 2003
-+++ configure	Mon Nov 17 13:11:06 2003
-@@ -7562,6 +7562,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8628,7 +8629,7 @@
- 
-     CXXFLAGS="-g"
-   else
--    CXXFLAGS="-s"
-+    CXXFLAGS="$CXXFLAGS"
-   fi
- fi
- 
diff --git a/x11-toolkits/vdk/files/patch-vdk::Makefile.in b/x11-toolkits/vdk/files/patch-vdk::Makefile.in
index 313f7ad93391..94fec8a710ee 100644
--- a/x11-toolkits/vdk/files/patch-vdk::Makefile.in
+++ b/x11-toolkits/vdk/files/patch-vdk::Makefile.in
@@ -1,117 +1,27 @@
---- vdk/Makefile.in.orig	Mon May 19 17:19:53 2003
-+++ vdk/Makefile.in	Mon Nov 17 14:29:13 2003
-@@ -139,7 +139,7 @@
+--- vdk/Makefile.in.orig	Tue May 18 15:55:11 2004
++++ vdk/Makefile.in	Fri Jul  9 02:31:31 2004
+@@ -197,7 +197,6 @@
  #	vdktextview.h
  #	vdkpacker.h
- 
--vdkinclude_HEADERS =  	regex.h 	gtksourcebuffer.h 	gtktextsearch.h 	gtksourcetag.h 	gtksourceview.h 	gtkundomanager.h 	gtksourceview-marshal.h 	gtktextregion.h 	vdkeditor.h 	gtkdatabox.h 	gtkdataboxmarshal.h 	FileDialog.h 	FileSaveAsDialog.h 	abstract_button.h 	application.h 	boxes.h 	button.h 	canvas.h 	chart.h 	checkbutton.h 	colors.h 	combo.h 	container.h 	dlist.h 	entry.h 	evbrowser.h 	evhandle.h 	evlisthandle.h 	evobjhandle.h 	filedlg.h 	fixed.h 	forms.h 	frame.h 	handlebox.h 	image.h 	label.h 	menu.h 	messagebox.h 	notebook.h 	numentry.h 	paned.h 	panelbar.h 	pixmaps.h 	progressbar.h 	radiobtngroup.h 	rawpixbuf.h 	rawobj.h 	rawpixmap.h 	scrolled.h 	separator.h 	siglisthandle.h 	slider.h 	spins.h 	statusbar.h 	tables.h 	timer.h 	toolbar.h 	tooltips.h 	value_sem_list.h 	vdk.h 	vdkarray.h 	vdkbtrees.h 	vdkcalendar.h 	vdkclist.h 	vdkcsortlist.h 	vdkctree.h 	vdkcursor.h 	vdkcustom.h 	vdkcustombutton.h 	vdkdatabox.h 	vdkdate.h 	vdkdrawarea.h 	vdkdnd.h 	vdkfont.h 	vdkfeatures.h 	vdkheap.h 	vdkhlbutton.h 	vdkhlbuttonbar.h 	vdkinchannel.h 	vdkobj.h 	vdkprops.h 	vdkstring.h 	vdktextview.h 	vdktreeview.h 	vdkthread.h 	vdktypes.h 	vdkutils.h 	widcontain.h 	eventbox.h 	sigc_addon.h 	sigc_events.h 	sigc_eventsignals.h 	sigc_eventtraits.h 	vdkgnomeapp.h 	vdkgnomeform.h 	vdkgnomeappbar.h 	vdkgnomededit.h 	vdkgnomeentry.h 	vdkfileicondlg.h 	vdkdockable.h
-+vdkinclude_HEADERS =  	gtksourcebuffer.h 	gtktextsearch.h 	gtksourcetag.h 	gtksourceview.h 	gtkundomanager.h 	gtksourceview-marshal.h 	gtktextregion.h 	vdkeditor.h 	gtkdatabox.h 	gtkdataboxmarshal.h 	FileDialog.h 	FileSaveAsDialog.h 	abstract_button.h 	application.h 	boxes.h 	button.h 	canvas.h 	chart.h 	checkbutton.h 	colors.h 	combo.h 	container.h 	dlist.h 	entry.h 	evbrowser.h 	evhandle.h 	evlisthandle.h 	evobjhandle.h 	filedlg.h 	fixed.h 	forms.h 	frame.h 	handlebox.h 	image.h 	label.h 	menu.h 	messagebox.h 	notebook.h 	numentry.h 	paned.h 	panelbar.h 	pixmaps.h 	progressbar.h 	radiobtngroup.h 	rawpixbuf.h 	rawobj.h 	rawpixmap.h 	scrolled.h 	separator.h 	siglisthandle.h 	slider.h 	spins.h 	statusbar.h 	tables.h 	timer.h 	toolbar.h 	tooltips.h 	value_sem_list.h 	vdk.h 	vdkarray.h 	vdkbtrees.h 	vdkcalendar.h 	vdkclist.h 	vdkcsortlist.h 	vdkctree.h 	vdkcursor.h 	vdkcustom.h 	vdkcustombutton.h 	vdkdatabox.h 	vdkdate.h 	vdkdrawarea.h 	vdkdnd.h 	vdkfont.h 	vdkfeatures.h 	vdkheap.h 	vdkhlbutton.h 	vdkhlbuttonbar.h 	vdkinchannel.h 	vdkobj.h 	vdkprops.h 	vdkstring.h 	vdktextview.h 	vdktreeview.h 	vdkthread.h 	vdktypes.h 	vdkutils.h 	widcontain.h 	eventbox.h 	sigc_addon.h 	sigc_events.h 	sigc_eventsignals.h 	sigc_eventtraits.h 	vdkgnomeapp.h 	vdkgnomeform.h 	vdkgnomeappbar.h 	vdkgnomededit.h 	vdkgnomeentry.h 	vdkfileicondlg.h 	vdkdockable.h
- 
- 
- #	coolbar.cc
-@@ -171,10 +171,10 @@
+ vdkinclude_HEADERS = \
+-	regex.h\
+ 	gtksourcebuffer.h\
+ 	gtktextsearch.h \
+ 	gtksourcetag.h\
+@@ -333,7 +332,6 @@
  #	vdkregex.cc
  #	vdkpacker.cc
- 
--libvdk_la_SOURCES =  	regex.c 	gtksourcebuffer.c 	gtktextsearch.c 	gtksourcetag.c 	gtksourceview.c 	gtkundomanager.c 	gtksourceview-marshal.c 	gtktextregion.c 	vdkeditor.cc 	gtkdatabox.c 	gtkdataboxmarshal.c 	abstract_button.cc 	application.cc 	boxes.cc 	button.cc 	canvas.cc 	checkbutton.cc 	colors.cc 	entry.cc 	filedlg.cc 	fixed.cc 	forms.cc 	frame.cc 	handlebox.cc 	image.cc 	label.cc 	menu.cc 	msgdialog.cc 	notebook.cc 	numentry.cc 	paned.cc 	pixdata.cc 	pixmaps.cc 	progressbar.cc 	radiobtngroup.cc 	rawobj.cc 	rawpixbuf.cc 	rawpixmap.cc 	scrolled.cc 	separator.cc 	slider.cc 	spins.cc 	statusbar.cc 	tables.cc 	timer.cc 	toolbar.cc 	tooltips.cc 	vdkcalendar.cc 	vdkclist.cc 	vdkcsortlist.cc 	vdkctree.cc 	vdkcustom.cc 	vdkcustombutton.cc 	vdkdate.cc 	vdkdatabox.cc 	vdkdrawarea.cc 	vdkdnd.cc 	vdkinchannel.cc 	vdkfont.cc 	vdkhlbutton.cc 	vdkhlbuttonbar.cc 	vdkobj.cc 	vdkstring.cc 	vdktextview.cc 	vdktreeview.cc 	vdkthread.cc 	widcontain.cc 	eventbox.cc 	vdkdockable.cc 	FileDialog.cc 	FileSaveAsDialog.cc 	chart.cc 	combo.cc 	folder_collapsed.xpm 	folder_expanded.xpm 	panelbar.cc 	vdkgnomeapp.cc 	vdkgnomeform.cc 	vdkgnomeappbar.cc 	vdkgnomededit.cc 	vdkgnomeentry.cc
-+libvdk_la_SOURCES =  	gtksourcebuffer.c 	gtktextsearch.c 	gtksourcetag.c 	gtksourceview.c 	gtkundomanager.c 	gtksourceview-marshal.c 	gtktextregion.c 	vdkeditor.cc 	gtkdatabox.c 	gtkdataboxmarshal.c 	abstract_button.cc 	application.cc 	boxes.cc 	button.cc 	canvas.cc 	checkbutton.cc 	colors.cc 	entry.cc 	filedlg.cc 	fixed.cc 	forms.cc 	frame.cc 	handlebox.cc 	image.cc 	label.cc 	menu.cc 	msgdialog.cc 	notebook.cc 	numentry.cc 	paned.cc 	pixdata.cc 	pixmaps.cc 	progressbar.cc 	radiobtngroup.cc 	rawobj.cc 	rawpixbuf.cc 	rawpixmap.cc 	scrolled.cc 	separator.cc 	slider.cc 	spins.cc 	statusbar.cc 	tables.cc 	timer.cc 	toolbar.cc 	tooltips.cc 	vdkcalendar.cc 	vdkclist.cc 	vdkcsortlist.cc 	vdkctree.cc 	vdkcustom.cc 	vdkcustombutton.cc 	vdkdate.cc 	vdkdatabox.cc 	vdkdrawarea.cc 	vdkdnd.cc 	vdkinchannel.cc 	vdkfont.cc 	vdkhlbutton.cc 	vdkhlbuttonbar.cc 	vdkobj.cc 	vdkstring.cc 	vdktextview.cc 	vdktreeview.cc 	vdkthread.cc 	widcontain.cc 	eventbox.cc 	vdkdockable.cc 	FileDialog.cc 	FileSaveAsDialog.cc 	chart.cc 	combo.cc 	folder_collapsed.xpm 	folder_expanded.xpm 	panelbar.cc 	vdkgnomeapp.cc 	vdkgnomeform.cc 	vdkgnomeappbar.cc 	vdkgnomededit.cc 	vdkgnomeentry.cc
- 
- 
--libvdk_la_LDFLAGS =  		-version-info $(LT_VDK_CURRENT):$(LT_VDK_REVISION):$(LT_VDK_AGE)
-+libvdk_la_LDFLAGS =  		-version-info 4:0:0
- 
- #		-release $(GTK_RELEASE)
- 
-@@ -195,7 +195,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- libvdk_la_LIBADD = 
--libvdk_la_OBJECTS =  regex.lo gtksourcebuffer.lo gtktextsearch.lo \
-+libvdk_la_OBJECTS =  gtksourcebuffer.lo gtktextsearch.lo \
- gtksourcetag.lo gtksourceview.lo gtkundomanager.lo \
- gtksourceview-marshal.lo gtktextregion.lo vdkeditor.lo gtkdatabox.lo \
- gtkdataboxmarshal.lo abstract_button.lo application.lo boxes.lo \
-@@ -403,7 +403,7 @@
- 	evobjhandle.h siglisthandle.h value_sem_list.h evlisthandle.h \
- 	application.h forms.h boxes.h widcontain.h label.h button.h \
- 	abstract_button.h pixmaps.h vdkeditor.h ../config.h \
--	gtksourceview.h gtksourcebuffer.h regex.h gtksourcetag.h \
-+	gtksourceview.h gtksourcebuffer.h gtksourcetag.h \
- 	rawpixbuf.h separator.h menu.h rawpixmap.h tooltips.h \
- 	vdkclist.h vdkcustom.h vdkarray.h colors.h vdkcsortlist.h \
- 	entry.h numentry.h tables.h vdkdate.h timer.h progressbar.h \
-@@ -437,7 +437,7 @@
- 	value_sem_list.h evlisthandle.h application.h forms.h boxes.h \
- 	widcontain.h label.h button.h abstract_button.h pixmaps.h \
- 	vdkeditor.h ../config.h gtksourceview.h gtksourcebuffer.h \
--	regex.h gtksourcetag.h rawpixbuf.h separator.h menu.h \
-+	gtksourcetag.h rawpixbuf.h separator.h menu.h \
- 	rawpixmap.h tooltips.h vdkclist.h vdkcustom.h vdkarray.h \
- 	colors.h vdkcsortlist.h entry.h numentry.h tables.h vdkdate.h \
- 	timer.h progressbar.h canvas.h vdkcursor.h paned.h notebook.h \
-@@ -457,7 +457,7 @@
- 	vdkfont.h evobjhandle.h siglisthandle.h value_sem_list.h \
- 	evlisthandle.h application.h forms.h boxes.h widcontain.h \
- 	label.h button.h abstract_button.h pixmaps.h vdkeditor.h \
--	../config.h gtksourceview.h gtksourcebuffer.h regex.h \
-+	../config.h gtksourceview.h gtksourcebuffer.h \
- 	gtksourcetag.h rawpixbuf.h separator.h menu.h rawpixmap.h \
- 	tooltips.h vdkclist.h vdkcustom.h vdkarray.h colors.h \
- 	vdkcsortlist.h entry.h numentry.h tables.h vdkdate.h timer.h \
-@@ -482,17 +482,17 @@
- 	gtkdataboxmarshal.h
- gtkdataboxmarshal.lo gtkdataboxmarshal.o : gtkdataboxmarshal.c
- gtksourcebuffer.lo gtksourcebuffer.o : gtksourcebuffer.c \
--	gtkundomanager.h gtksourcebuffer.h regex.h gtksourcetag.h \
-+	gtkundomanager.h gtksourcebuffer.h gtksourcetag.h \
- 	gtksourceview-marshal.h gtktextregion.h
--gtksourcetag.lo gtksourcetag.o : gtksourcetag.c gtksourcetag.h regex.h
-+gtksourcetag.lo gtksourcetag.o : gtksourcetag.c gtksourcetag.h
- gtksourceview-marshal.lo gtksourceview-marshal.o : \
- 	gtksourceview-marshal.c gtksourceview-marshal.h
- gtksourceview.lo gtksourceview.o : gtksourceview.c gtksourceview.h \
--	gtksourcebuffer.h regex.h gtksourcetag.h
-+	gtksourcebuffer.h gtksourcetag.h
- gtktextregion.lo gtktextregion.o : gtktextregion.c gtktextregion.h
- gtktextsearch.lo gtktextsearch.o : gtktextsearch.c gtktextsearch.h
- gtkundomanager.lo gtkundomanager.o : gtkundomanager.c gtkundomanager.h \
--	gtksourcebuffer.h regex.h gtksourcetag.h
-+	gtksourcebuffer.h gtksourcetag.h
- handlebox.lo handlebox.o : handlebox.cc handlebox.h widcontain.h \
- 	vdkobj.h vdktypes.h dlist.h vdkutils.h rawobj.h vdkprops.h \
- 	vdkstring.h vdkfont.h forms.h application.h
-@@ -541,7 +541,6 @@
- rawpixmap.lo rawpixmap.o : rawpixmap.cc rawpixmap.h vdkobj.h vdktypes.h \
- 	dlist.h vdkutils.h rawobj.h vdkprops.h vdkstring.h vdkfont.h \
- 	forms.h application.h
--regex.lo regex.o : regex.c ../config.h regex.h
- scrolled.lo scrolled.o : scrolled.cc scrolled.h vdkobj.h vdktypes.h \
- 	dlist.h vdkutils.h rawobj.h vdkprops.h vdkstring.h vdkfont.h \
- 	widcontain.h forms.h application.h
-@@ -575,7 +574,7 @@
- 	value_sem_list.h evlisthandle.h application.h forms.h boxes.h \
- 	widcontain.h label.h button.h abstract_button.h pixmaps.h \
- 	vdkeditor.h ../config.h gtksourceview.h gtksourcebuffer.h \
--	regex.h gtksourcetag.h rawpixbuf.h separator.h menu.h \
-+	gtksourcetag.h rawpixbuf.h separator.h menu.h \
- 	rawpixmap.h tooltips.h vdkclist.h vdkcustom.h vdkarray.h \
- 	colors.h vdkcsortlist.h entry.h numentry.h tables.h vdkdate.h \
- 	timer.h progressbar.h canvas.h vdkcursor.h paned.h notebook.h \
-@@ -612,7 +611,7 @@
- 	value_sem_list.h evlisthandle.h application.h forms.h boxes.h \
- 	widcontain.h label.h button.h abstract_button.h pixmaps.h \
- 	vdkeditor.h ../config.h gtksourceview.h gtksourcebuffer.h \
--	regex.h gtksourcetag.h rawpixbuf.h separator.h menu.h \
-+	gtksourcetag.h rawpixbuf.h separator.h menu.h \
- 	rawpixmap.h tooltips.h vdkclist.h vdkcustom.h vdkarray.h \
- 	colors.h vdkcsortlist.h entry.h numentry.h tables.h vdkdate.h \
- 	timer.h progressbar.h canvas.h vdkcursor.h paned.h notebook.h \
-@@ -651,7 +650,7 @@
- 	vdkcustombutton.h image.h vdkhlbuttonbar.h vdkfeatures.h \
- 	vdkinchannel.h vdktextview.h vdkdatabox.h gtkdatabox.h vdkdnd.h \
- 	vdktreeview.h vdkdockable.h gtksourceview.h gtksourcebuffer.h \
--	regex.h gtksourcetag.h
-+	gtksourcetag.h
- vdkfont.lo vdkfont.o : vdkfont.cc vdkfont.h rawobj.h forms.h \
- 	application.h vdktypes.h vdkstring.h dlist.h vdkprops.h \
- 	vdkutils.h vdkobj.h
+ libvdk_la_SOURCES = \
+-	regex.c\
+ 	gtksourcebuffer.c\
+ 	gtktextsearch.c \
+ 	gtksourcetag.c\
+@@ -440,7 +438,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+ libvdk_la_LIBADD =
+-am_libvdk_la_OBJECTS = regex.lo gtksourcebuffer.lo gtktextsearch.lo \
++am_libvdk_la_OBJECTS = gtksourcebuffer.lo gtktextsearch.lo \
+ 	gtksourcetag.lo gtksourceview.lo gtkundomanager.lo \
+ 	gtksourceview-marshal.lo gtktextregion.lo vdkeditor.lo \
+ 	gtkdatabox.lo gtkdataboxmarshal.lo abstract_button.lo \
diff --git a/x11-toolkits/vdk/pkg-plist b/x11-toolkits/vdk/pkg-plist
index 8815f4022db9..f39569f15ffc 100644
--- a/x11-toolkits/vdk/pkg-plist
+++ b/x11-toolkits/vdk/pkg-plist
@@ -66,6 +66,7 @@ include/vdk2/vdk/vdkarray.h
 include/vdk2/vdk/vdkbtrees.h
 include/vdk2/vdk/vdkcalendar.h
 include/vdk2/vdk/vdkclist.h
+include/vdk2/vdk/vdkcomboentry.h
 include/vdk2/vdk/vdkcsortlist.h
 include/vdk2/vdk/vdkctree.h
 include/vdk2/vdk/vdkcursor.h
@@ -78,6 +79,7 @@ include/vdk2/vdk/vdkdockable.h
 include/vdk2/vdk/vdkdrawarea.h
 include/vdk2/vdk/vdkeditor.h
 include/vdk2/vdk/vdkfeatures.h
+include/vdk2/vdk/vdkfilechooser.h
 include/vdk2/vdk/vdkfileicondlg.h
 include/vdk2/vdk/vdkfont.h
 include/vdk2/vdk/vdkgnomeapp.h
@@ -100,7 +102,7 @@ include/vdk2/vdk/vdkutils.h
 include/vdk2/vdk/widcontain.h
 lib/libvdk.a
 lib/libvdk.so
-lib/libvdk.so.4
+lib/libvdk.so.6
 share/aclocal/vdk-2.m4
 @dirrm include/vdk2/vdk
 @dirrm include/vdk2