7 files changed, 30 insertions, 51 deletions

diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index c859a578519e..16f930e28d05 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vdkbuilder
-PORTVERSION=	2.0.5
-PORTREVISION=	2
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +15,13 @@ DISTNAME=	${PORTNAME}2-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A general ide tool for GTK+/VDK
 
-LIB_DEPENDS=	vdk.4:${PORTSDIR}/x11-toolkits/vdk
+LIB_DEPENDS=	vdk.6:${PORTSDIR}/x11-toolkits/vdk
 
 USE_X_PREFIX=	yes
-WANT_GNOME=	yes
-USE_GNOME=	gnometarget gtk20
+USE_GNOME=	gnometarget gtk20 lthack
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-opt=no
@@ -30,4 +29,8 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		vdkb2.1
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|cflag="-s"|cflag="$$CXXFLAGS"|g' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/vdkbuilder/distinfo b/x11-toolkits/vdkbuilder/distinfo
index 8c66c6c5714c..4677aaa2b0ba 100644
--- a/x11-toolkits/vdkbuilder/distinfo
+++ b/x11-toolkits/vdkbuilder/distinfo
@@ -1,2 +1,2 @@
-MD5 (vdkbuilder2-2.0.5.tar.gz) = e0bce6157133e35139cd2925c2bce65b
-SIZE (vdkbuilder2-2.0.5.tar.gz) = 962844
+MD5 (vdkbuilder2-2.4.0.tar.gz) = 91216ce6659e447862b2bdc7335074fc
+SIZE (vdkbuilder2-2.4.0.tar.gz) = 1079112
diff --git a/x11-toolkits/vdkbuilder/files/patch-configure b/x11-toolkits/vdkbuilder/files/patch-configure
deleted file mode 100644
index d857e815211e..000000000000
--- a/x11-toolkits/vdkbuilder/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Sat May 17 14:09:44 2003
-+++ configure	Mon Nov 17 13:47:23 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'
-@@ -12106,7 +12107,7 @@
- _ACEOF
- 
- else
--  cflag="-s"
-+  cflag="$CXXFLAGS"
- fi
- 
- if test "x$enable_opt" != "xno"; then
diff --git a/x11-toolkits/vdkbuilder/files/patch-data::res::Makefile.in b/x11-toolkits/vdkbuilder/files/patch-data::res::Makefile.in
index ea51245ac4d7..d9cfbc01c6d5 100644
--- a/x11-toolkits/vdkbuilder/files/patch-data::res::Makefile.in
+++ b/x11-toolkits/vdkbuilder/files/patch-data::res::Makefile.in
@@ -1,11 +1,11 @@
---- data/res/Makefile.in.bak	Mon May 19 18:01:38 2003
-+++ data/res/Makefile.in	Mon Nov 17 18:24:27 2003
-@@ -231,7 +231,7 @@
- install-exec-am:
- install-exec: install-exec-am
+--- data/res/Makefile.in.orig	Tue May 18 21:34:34 2004
++++ data/res/Makefile.in	Fri Jul  9 02:22:41 2004
+@@ -360,7 +360,7 @@
+ 
+ info-am:
  
 -install-data-am: install-IconsDATA install-vdkbdataDATA
 +install-data-am: install-vdkbdataDATA
- install-data: install-data-am
  
- install-am: all-am
+ install-exec-am:
+ 
diff --git a/x11-toolkits/vdkbuilder/files/patch-plugins::Makefile.in b/x11-toolkits/vdkbuilder/files/patch-plugins::Makefile.in
index f3d0c3ad8d27..e0e5158289d4 100644
--- a/x11-toolkits/vdkbuilder/files/patch-plugins::Makefile.in
+++ b/x11-toolkits/vdkbuilder/files/patch-plugins::Makefile.in
@@ -1,11 +1,11 @@
---- plugins/Makefile.in.bak	Mon May 19 18:01:31 2003
-+++ plugins/Makefile.in	Mon Nov 17 18:29:59 2003
-@@ -141,7 +141,7 @@
- 
+--- plugins/Makefile.in.orig	Tue May 18 21:34:34 2004
++++ plugins/Makefile.in	Fri Jul  9 02:25:16 2004
+@@ -203,7 +203,7 @@
  
  libvdkbdclock_la_SOURCES = vdkb_dclock.cc
--libvdkbdclock_la_LDFLAGS = $(VDK_LIBS) -rpath $(libdir) 	-L$(top_srcdir)/plugins/ -lvdkdclock -version-info $(PLUGIN_VERSION) -module
-+libvdkbdclock_la_LDFLAGS = $(VDK_LIBS) -rpath $(libdir) 	$(top_srcdir)/plugins/libvdkdclock.la -version-info $(PLUGIN_VERSION) -module
+ libvdkbdclock_la_LDFLAGS = $(VDK_LIBS) -rpath $(libdir) \
+-	-L$(top_srcdir)/plugins/ -lvdkdclock -version-info $(PLUGIN_VERSION) -module
++	$(top_srcdir)/plugins/libvdkdclock.la -version-info $(PLUGIN_VERSION) -module
  
  
  libvdkbtreeview_la_SOURCES = vdkb_treeview.cc
diff --git a/x11-toolkits/vdkbuilder/files/patch-vdkbuilder::vdkb_templates.cc b/x11-toolkits/vdkbuilder/files/patch-vdkbuilder::vdkb_templates.cc
deleted file mode 100644
index e4f5eb14735b..000000000000
--- a/x11-toolkits/vdkbuilder/files/patch-vdkbuilder::vdkb_templates.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- vdkbuilder/vdkb_templates.cc.orig	Tue Jun  4 16:56:35 2002
-+++ vdkbuilder/vdkb_templates.cc	Tue Nov 18 11:13:16 2003
-@@ -873,7 +873,7 @@
- \n$(TARGET): $(OBJECTS)\
- \n\t$(LINK)  -o $(TARGET) $(OBJECTS) $(OTHERS_OBJECTS) $(LIBS)\
- \n\
--\n####### Running (used by builder)
-+\n####### Running (used by builder)\
- \nrun: $(TARGET)\
- \n\tcd %s\
- \n\t%s $(PRG_ARGS)\
diff --git a/x11-toolkits/vdkbuilder/pkg-plist b/x11-toolkits/vdkbuilder/pkg-plist
index 965b3bd59eb9..f2a73528dd5e 100644
--- a/x11-toolkits/vdkbuilder/pkg-plist
+++ b/x11-toolkits/vdkbuilder/pkg-plist
@@ -12,6 +12,7 @@ include/vdkb2/vdkb_clipdlg.h
 include/vdkb2/vdkb_clistdlg.h
 include/vdkb2/vdkb_clistdlg_gui.h
 include/vdkb2/vdkb_combo.h
+include/vdkb2/vdkb_comboentry.h
 include/vdkb2/vdkb_compodb.h
 include/vdkb2/vdkb_custombutton.h
 include/vdkb2/vdkb_customlist.h
@@ -104,7 +105,12 @@ include/vdkb2/waitcursor.h
 lib/libvdkbcalendar.a
 lib/libvdkbcalendar.so
 lib/libvdkbcalendar.so.2
+lib/libvdkbcomboentry.a
+lib/libvdkbcomboentry.so
+lib/libvdkbcomboentry.so.2
 lib/libvdkbdclock.a
+lib/libvdkbdclock.so
+lib/libvdkbdclock.so.2
 lib/libvdkbdrawarea.a
 lib/libvdkbdrawarea.so
 lib/libvdkbdrawarea.so.2