- Update to 2.5.1

PR:		155852
Submitted by:	Ports Fury

4 files changed, 10 insertions, 32 deletions

diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 681566b41cc3..8117cf190c54 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	vdk
-PORTVERSION=	2.4.3
-PORTREVISION=	2
+PORTVERSION=	2.5.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/${PORTNAME}lib/VDK%20for%20both%20Linux%20and%20Windows%20%28this%20is%20the%20new%20version%29/VDKLIB%20%28C%2B%2B%20wrapper%20for%20GTK%2B%29
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GTK+ toolkit
 
+LICENSE=	LGPL20
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GNOME=	gnomehack gtk20
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-opt=no --enable-doc-html=no --enable-testvdk=no
 USE_LDCONFIG=	yes
 
@@ -35,11 +37,7 @@ post-patch:
 .endfor
 .for file in FileDialog.h gtksourcebuffer.h gtksourcetag.h
 	@${REINPLACE_CMD} -e \
-		's|<regex\.h>|<gnu/regex.h>|g' ${WRKSRC}/include/vdk/${file}
+		's|<.*regex\.h>|<gnu/regex.h>|g' ${WRKSRC}/include/vdk/${file}
 .endfor
-	@${REINPLACE_CMD} -e \
-		's|VDKComboEntry::||g' ${WRKSRC}/include/vdk/vdkcomboentry.h
-	@${REINPLACE_CMD} -e \
-		's|VDKFileChooser::||g' ${WRKSRC}/include/vdk/vdkfilechooser.h
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/vdk/distinfo b/x11-toolkits/vdk/distinfo
index b47243c48e9e..e20943245d92 100644
--- a/x11-toolkits/vdk/distinfo
+++ b/x11-toolkits/vdk/distinfo
@@ -1,3 +1,2 @@
-MD5 (vdk-2.4.3.tar.gz) = d9df3ba4de514945ed0250f49c41ca8f
-SHA256 (vdk-2.4.3.tar.gz) = ac5e2911324651752f258e8972cb4f9b67fe418d855b2c3acf6ebd6615ac2024
-SIZE (vdk-2.4.3.tar.gz) = 1123965
+SHA256 (vdk-2.5.1.tar.gz) = 5d8f6942b8ec2f83b477f24a4e15a9945c1b1b348412d3d22a89627a35130745
+SIZE (vdk-2.5.1.tar.gz) = 1113765
diff --git a/x11-toolkits/vdk/files/patch-src__vdkclist.cc b/x11-toolkits/vdk/files/patch-src__vdkclist.cc
deleted file mode 100644
index 88cdb38b9cbe..000000000000
--- a/x11-toolkits/vdk/files/patch-src__vdkclist.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/vdkclist.cc.orig	2007-08-03 16:19:09.000000000 +0200
-+++ src/vdkclist.cc	2007-08-03 16:20:09.000000000 +0200
-@@ -26,7 +26,7 @@
-  *
-  */
- 
--
-+#include <sys/types.h>
- #include "vdk/vdkclist.h"
- #include "vdk/forms.h"
- #include <cstring>
-@@ -377,7 +377,7 @@
-       // load array;
-       WideSelection = VDKIntArray(listSize);
-       for(t = 0; t < WideSelection.size();t++,list = list->next)
--	WideSelection[t] = (int) list->data;
-+	WideSelection[t] = (intptr_t) list->data;
-     }
-   return WideSelection;
- }
diff --git a/x11-toolkits/vdk/pkg-plist b/x11-toolkits/vdk/pkg-plist
index 3954b2289e50..8e7d29672daf 100644
--- a/x11-toolkits/vdk/pkg-plist
+++ b/x11-toolkits/vdk/pkg-plist
@@ -93,12 +93,13 @@ include/vdk-2/vdk/vdktextview.h
 include/vdk-2/vdk/vdkthread.h
 include/vdk-2/vdk/vdktreeview.h
 include/vdk-2/vdk/vdktypes.h
+include/vdk-2/vdk/vdkustring.h
 include/vdk-2/vdk/vdkutils.h
 include/vdk-2/vdk/widcontain.h
 lib/libvdk-2.a
 lib/libvdk-2.la
 lib/libvdk-2.so
-lib/libvdk-2.so.6
+lib/libvdk-2.so.7
 libdata/pkgconfig/vdk-2.x.pc
 share/aclocal/vdk-2.m4
 @dirrm include/vdk-2/vdk