Update some more ports to build on 10.0

build-files/ports-overlay/databases/postgresql-libpqxx3/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD: databases/postgresql-libpqxx3/Makefile 327717 2013-09-20 16:13:47Z bapt $
 
 PORTNAME=	libpqxx
-PORTVERSION=	3.1
+PORTVERSION=	3.1.1
 CATEGORIES=	databases
 MASTER_SITES=	http://pqxx.org/download/software/${PORTNAME}/
 PKGNAMEPREFIX=	postgresql-
@@ -21,10 +21,11 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GCC=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
+USE_PYTHON_BUILD=	yes
+USES=shebangfix
+SHEBANG_FILES=	tools/splitconfig
 
-CONFIGURE_ARGS=	--with-postgres=${LOCALBASE} \
-		--enable-shared \
-		--with-postgres-include=${LOCALBASE}/include/postgresql
+CONFIGURE_ARGS=	--enable-shared
 
 NO_STAGE=	yes
 .include <bsd.port.mk>

build-files/ports-overlay/databases/postgresql-libpqxx3/distinfo

@@ -1,2 +1,2 @@
-SHA256 (postgresql/libpqxx-3.1.tar.gz) = 8950433f193e118cfd36ab91391eb174ef48897bacc26197da596988e66796a0
-SIZE (postgresql/libpqxx-3.1.tar.gz) = 1771846
+SHA256 (postgresql/libpqxx-3.1.1.tar.gz) = ce443c7c515623b4a68de5f0657460344b6b6320982d8f8efc657c3746e1ee90
+SIZE (postgresql/libpqxx-3.1.1.tar.gz) = 1563338

build-files/ports-overlay/databases/postgresql-libpqxx3/files/patch-svn_1833

@@ -0,0 +1,42 @@
+--- include/pqxx/largeobject.hxx	(revision 1706)
++++ include/pqxx/largeobject.hxx	(revision 1833)
+@@ -397,5 +397,5 @@
+ 			size_type BufSize=512) :			//[t48]
+     m_BufSize(BufSize),
+-    m_Obj(T, O),
++    m_Obj(T, O, mode),
+     m_G(0),
+     m_P(0)
+@@ -407,5 +407,5 @@
+ 			size_type BufSize=512) :			//[t48]
+     m_BufSize(BufSize),
+-    m_Obj(T, O),
++    m_Obj(T, O, mode),
+     m_G(0),
+     m_P(0)
+--- ChangeLog	(revision 1825)
++++ ChangeLog	(revision 1833)
+@@ -1,2 +1,7 @@
++2012-08-03  Jeroen T. Vermeulen <jtv@xs4all.nl>
++ include/pqxx/largeobject.hxx:
++ - Backported fix for #252: clang++ 3.2 compile error.  Thanks Amy Troschinetz.
++ src/strconv.cxx:
++ - Backported fix for #253: clang++ 3.2 compile error.  Thanks Amy Troschinetz.
+ 2012-03-25  Jeroen T. Vermeulen <jtv@xs4all.nl>
+  test/test002.cxx, test/test007.cxx, test/test011.cxx, test/test012.cxx,
+--- src/strconv.cxx	(revision 1724)
++++ src/strconv.cxx	(revision 1833)
+@@ -7,5 +7,5 @@
+  *      implementation of string conversions
+  *
+- * Copyright (c) 2008, Jeroen T. Vermeulen <jtv@xs4all.nl>
++ * Copyright (c) 2008-2012, Jeroen T. Vermeulen <jtv@xs4all.nl>
+  *
+  * See COPYING for copyright license.  If you did not receive a file called
+@@ -193,5 +193,5 @@
+       S.imbue(locale("C"));
+ #endif
+-      ok = (S >> result);
++      ok = static_cast<bool>(S >> result);
+     }
+     break;

build-files/ports-overlay/databases/postgresql-libpqxx3/pkg-plist

@@ -81,7 +81,7 @@ include/pqxx/util
 include/pqxx/util.hxx
 include/pqxx/version
 include/pqxx/version.hxx
-lib/libpqxx-%%PORTVERSION%%.so
+lib/libpqxx-3.1.so
 lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so

build-files/ports-overlay/emulators/open-vm-tools/Makefile

@@ -6,7 +6,7 @@ PORTVERSION=		${BUILD_VER}
 PORTREVISION=		3
 PORTEPOCH=		1
 CATEGORIES=		emulators kld
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-9.2.x
 DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 
 MAINTAINER=		swills@FreeBSD.org
@@ -15,8 +15,8 @@ COMMENT?=		Open VMware tools for FreeBSD VMware guests
 LICENSE=		LGPL21
 LICENSE_FILE=		${WRKSRC}/COPYING
 
-RELEASE_VER=		8.6.0
-BUILD_VER=		425873
+RELEASE_VER=		9.2.3
+BUILD_VER=		1031360
 
 WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 GNU_CONFIGURE=		yes
@@ -37,12 +37,6 @@ CONFLICTS=		open-vm-tools-[0-9]*
 .if !defined(WITHOUT_LIBNOTIFY)
 LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
 .endif
-.if defined(WITH_UNITY)
-CONFIGURE_ENV+=		CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
-LIB_DEPENDS+=		uriparser.1:${PORTSDIR}/net/uriparser
-.else
-CONFIGURE_ARGS+=	--disable-unity
-.endif
 LIB_DEPENDS+=		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 CONFIGURE_ARGS+=	--with-x
 LDFLAGS+=		-L${LOCALBASE}/lib

build-files/ports-overlay/emulators/open-vm-tools/distinfo

@@ -1,2 +1,2 @@
-SHA256 (open-vm-tools-8.6.0-425873.tar.gz) = 205768023fdf77962684f275f74c98644fba97961cb2afaa0a7d8aec5d074ebf
-SIZE (open-vm-tools-8.6.0-425873.tar.gz) = 3648242
+SHA256 (open-vm-tools-9.2.3-1031360.tar.gz) = 1a004ea1675101fd44cddda299e2e9ac254388769b69f41b7ff5d1797549c8f1
+SIZE (open-vm-tools-9.2.3-1031360.tar.gz) = 3565935

build-files/ports-overlay/emulators/open-vm-tools/files/patch-vmhgfs-Makefile

@@ -1,27 +1,51 @@
---- ./modules/freebsd/vmhgfs/Makefile.orig	2010-10-20 05:19:54.000000000 +0900
-+++ ./modules/freebsd/vmhgfs/Makefile	2010-11-11 23:06:07.000000000 +0900
-@@ -90,22 +90,7 @@
-    CFLAGS += -Ishared
- .endif
-
--#
--# FreeBSD's kernel module build system defines a bunch of additional warning
--# flags for the compiler in addition to -Wall -Werror.  However, some of these,
--# like -Wredundant-decls, are overkill.  To get around this, I copied their list
--# of warning flags, but explicitly disabled a few.
--#
--CWARNFLAGS := -Wall
--CWARNFLAGS += -Werror
--CWARNFLAGS += -Wno-redundant-decls
--CWARNFLAGS += -Wnested-externs
--CWARNFLAGS += -Wstrict-prototypes
--CWARNFLAGS += -Wno-missing-prototypes
--CWARNFLAGS += -Wpointer-arith
--CWARNFLAGS += -Winline
--CWARNFLAGS += -Wcast-qual
--
- EXPORT_SYMS = NO
-
-+.include <bsd.own.mk>
- .include <bsd.kmod.mk>
-
+*** modules/freebsd/vmhgfs/Makefile.orig	Wed Apr 17 17:12:22 2013
+--- modules/freebsd/vmhgfs/Makefile	Thu Jul 11 01:14:46 2013
+***************
+*** 47,53 ****
+  .endif
+
+  COMMON_HGFS_SRCS := debug.c
+! COMMON_HGFS_SRCS := bdhandler.c
+  COMMON_HGFS_SRCS += request.c
+  COMMON_HGFS_SRCS += worker.c
+  COMMON_HGFS_SRCS += fsutil.c
+--- 47,53 ----
+  .endif
+
+  COMMON_HGFS_SRCS := debug.c
+! COMMON_HGFS_SRCS += bdhandler.c
+  COMMON_HGFS_SRCS += request.c
+  COMMON_HGFS_SRCS += worker.c
+  COMMON_HGFS_SRCS += fsutil.c
+***************
+*** 93,114 ****
+     CFLAGS += -Ishared
+  .endif
+
+- #
+- # FreeBSD's kernel module build system defines a bunch of additional warning
+- # flags for the compiler in addition to -Wall -Werror.  However, some of these,
+- # like -Wredundant-decls, are overkill.  To get around this, I copied their list
+- # of warning flags, but explicitly disabled a few.
+- #
+- CWARNFLAGS := -Wall
+- CWARNFLAGS += -Werror
+- CWARNFLAGS += -Wno-redundant-decls
+- CWARNFLAGS += -Wnested-externs
+- CWARNFLAGS += -Wstrict-prototypes
+- CWARNFLAGS += -Wno-missing-prototypes
+- CWARNFLAGS += -Wpointer-arith
+- CWARNFLAGS += -Winline
+- CWARNFLAGS += -Wcast-qual
+- 
+  EXPORT_SYMS = NO
+
+  .include <bsd.kmod.mk>
+--- 93,99 ----
+     CFLAGS += -Ishared
+  .endif
+
+  EXPORT_SYMS = NO
+
++ .include <bsd.own.mk>
+  .include <bsd.kmod.mk>

build-files/ports-overlay/emulators/open-vm-tools/pkg-plist

@@ -14,7 +14,6 @@ lib/open-vm-tools/plugins/common/libhgfsServer.la
 lib/open-vm-tools/plugins/common/libvix.so
 lib/open-vm-tools/plugins/common/libvix.la
 %%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
-%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so
 %%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
 %%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
 lib/libhgfs.a
@@ -41,16 +40,12 @@ include/vmGuestLib/vmSessionId.h
 include/vmGuestLib/vm_basic_types.h
 @exec mkdir -p %D/lib/vmware-tools/modules/input
 sbin/mount_vmhgfs
-%%X11%%bin/vmware-toolbox
 %%X11%%bin/vmware-user-suid-wrapper
 share/vmware-tools/poweroff-vm-default
 share/vmware-tools/poweron-vm-default
 share/vmware-tools/resume-vm-default
 share/vmware-tools/suspend-vm-default
 share/vmware-tools/vm-support
-share/open-vm-tools/messages/de/toolbox.vmsg
-share/open-vm-tools/messages/ja/toolbox.vmsg
-share/open-vm-tools/messages/zh_CN/toolbox.vmsg
 share/vmware-tools/statechange.subr
 share/vmware-tools/scripts/vmware/network
 @exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true

build-files/ports-overlay/graphics/kcoloredit/Makefile

@@ -12,7 +12,8 @@ DIST_SUBDIR=	KDE/extragear
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Palette files editor for KDE
 
-USE_GCC=	yes
+USE_GCC=	4.7+
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build