Update to 340.24

PR:	192543

6 files changed, 23 insertions, 57 deletions

diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index 45b2683a8b21..5cb5a9bf3162 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -2,16 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	nvidia-settings
-PORTVERSION=	310.14
+PORTVERSION=	340.24
 CATEGORIES=	x11
-MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
-		ftp://download1.nvidia.com/XFree86/nvidia-settings/
+MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings \
+		ftp://download1.nvidia.com/XFree86/nvidia-settings
 
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Display Control Panel for X NVidia driver
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
+		libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+
 USE_GNOME=	gtk20
 USES=		gmake pkgconfig tar:bzip2
 USE_GL=		gl
@@ -20,7 +23,8 @@ USE_XORG=	xv xext
 PLIST_FILES=	bin/nvidia-settings \
 		man/man1/nvidia-settings.1.gz
 
-MAKE_ENV=	NV_VERBOSE= \
+MAKE_ENV=	NV_USE_BUNDLED_LIBJANSSON=0 \
+		NV_VERBOSE= \
 		STRIP_CMD=${TRUE} \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
diff --git a/x11/nvidia-settings/distinfo b/x11/nvidia-settings/distinfo
index 027ba02697bf..0055010f21cd 100644
--- a/x11/nvidia-settings/distinfo
+++ b/x11/nvidia-settings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nvidia-settings-310.14.tar.bz2) = 3859513192e4ae921bdb71818ca329e6b9d5e11f1b72aa7f48e4fc7fd16d7626
-SIZE (nvidia-settings-310.14.tar.bz2) = 1477588
+SHA256 (nvidia-settings-340.24.tar.bz2) = 255697cb8558c7ceba0838ecaf1168747ea4718144039c534ff4a45afcf42b88
+SIZE (nvidia-settings-340.24.tar.bz2) = 1549714
diff --git a/x11/nvidia-settings/files/patch-doc__Makefile b/x11/nvidia-settings/files/patch-doc__Makefile
index 16a3febc56e9..780160afb1ea 100644
--- a/x11/nvidia-settings/files/patch-doc__Makefile
+++ b/x11/nvidia-settings/files/patch-doc__Makefile
@@ -1,10 +1,10 @@
---- doc/Makefile.orig	2012-10-13 19:37:40.000000000 +0900
-+++ doc/Makefile	2012-10-13 19:38:21.000000000 +0900
+--- doc/Makefile.orig	2014-08-10 20:37:40.000000000 -0700
++++ doc/Makefile	2014-08-10 20:38:21.000000000 -0700
 @@ -74,7 +74,7 @@
  
  MANPAGE_install: $(MANPAGE)
  	$(MKDIR) $(MANDIR)
--	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(MANDIR)/$(notdir $<)
+-	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
 +	$(INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
  
  clean clobber:
diff --git a/x11/nvidia-settings/files/patch-src__Makefile b/x11/nvidia-settings/files/patch-src__Makefile
deleted file mode 100644
index 871fc3dfd65c..000000000000
--- a/x11/nvidia-settings/files/patch-src__Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.orig	2012-09-19 10:51:18.000000000 +0900
-+++ src/Makefile	2012-10-13 20:13:29.000000000 +0900
-@@ -155,13 +155,16 @@
- 
- NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)
- 	$(MKDIR) $(BINDIR)
--	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
-+	$(INSTALL_PROGRAM) $< $(BINDIR)/$(notdir $<)
- 
- $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
- 	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \
- 	    $(XNVCTRL_ARCHIVE) $(LIBS)
- 	$(call quiet_cmd,STRIP_CMD) $@
- 
-+$(XNVCTRL_ARCHIVE):
-+	$(MAKE) -C libXNVCtrl
-+
- # define the rule to build each object file
- $(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
- 
diff --git a/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c b/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c
deleted file mode 100644
index c26add5cd9bf..000000000000
--- a/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/gtk+-2.x/ctkdisplayconfig-utils.c.orig	2011-09-24 11:57:57.000000000 +0900
-+++ src/gtk+-2.x/ctkdisplayconfig-utils.c	2012-04-08 00:33:01.000000000 +0900
-@@ -1391,7 +1391,7 @@
-                                        NvCtrlGetTargetId(screen->gpu->handle),
-                                        orig_mode_str);
-             nv_error_msg(*err_str);
--            goto fail;
-+            continue;
-         }
- 
- 
---- src/gtk+-2.x/ctkdisplayconfig-utils.c.orig	2012-08-21 23:36:11.000000000 +0900
-+++ src/gtk+-2.x/ctkdisplayconfig-utils.c	2012-08-21 23:36:46.000000000 +0900
-@@ -2534,11 +2534,14 @@
-     /* See if the screen is set to not scanout */
-     ret = NvCtrlGetAttribute(screen->handle, NV_CTRL_NO_SCANOUT, &val);
-     if (ret != NvCtrlSuccess) {
-+#if 0
-         *err_str = g_strdup_printf("Failed to query NoScanout for "
-                                    "screen %d.",
-                                    screen_id);
-         nv_warning_msg(*err_str);
-         goto fail;
-+#endif
-+        val = NV_CTRL_NO_SCANOUT_DISABLED;
-     }
-     screen->no_scanout = (val == NV_CTRL_NO_SCANOUT_ENABLED);
- 
diff --git a/x11/nvidia-settings/files/patch-utils.mk b/x11/nvidia-settings/files/patch-utils.mk
new file mode 100644
index 000000000000..4c21302924fe
--- /dev/null
+++ b/x11/nvidia-settings/files/patch-utils.mk
@@ -0,0 +1,10 @@
+--- utils.mk.orig	2014-08-09 21:23:23.872132403 -0700
++++ utils.mk	2014-08-09 21:25:03.537126421 -0700
+@@ -34,6 +34,7 @@
+ CFLAGS                += -fno-strict-aliasing -fno-omit-frame-pointer -Wformat=2
+ CC_ONLY_CFLAGS        ?=
+ LDFLAGS               ?=
++LDFLAGS               += -Wl,--as-needed
+ BIN_LDFLAGS           ?=
+
+ HOST_CC               ?= $(CC)