svn commit: r364536 - in head/x11/nvidia-settings: . files

[Alexander Nedotsukov]

Author: bland
Date: Sun Aug 10 13:09:32 2014
New Revision: 364536
URL: http://svnweb.freebsd.org/changeset/ports/364536
QAT: https://qat.redports.org/buildarchive/r364536/

Log:
  Update to 340.24
  
  PR:	192543

Added:
  head/x11/nvidia-settings/files/patch-utils.mk   (contents, props changed)
Deleted:
  head/x11/nvidia-settings/files/patch-src__Makefile
  head/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c
Modified:
  head/x11/nvidia-settings/Makefile
  head/x11/nvidia-settings/distinfo
  head/x11/nvidia-settings/files/patch-doc__Makefile

Modified: head/x11/nvidia-settings/Makefile
==============================================================================
--- head/x11/nvidia-settings/Makefile	Sun Aug 10 13:04:34 2014	(r364535)
+++ head/x11/nvidia-settings/Makefile	Sun Aug 10 13:09:32 2014	(r364536)
@@ -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 at 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}" \

Modified: head/x11/nvidia-settings/distinfo
==============================================================================
--- head/x11/nvidia-settings/distinfo	Sun Aug 10 13:04:34 2014	(r364535)
+++ head/x11/nvidia-settings/distinfo	Sun Aug 10 13:09:32 2014	(r364536)
@@ -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

Modified: head/x11/nvidia-settings/files/patch-doc__Makefile
==============================================================================
--- head/x11/nvidia-settings/files/patch-doc__Makefile	Sun Aug 10 13:04:34 2014	(r364535)
+++ head/x11/nvidia-settings/files/patch-doc__Makefile	Sun Aug 10 13:09:32 2014	(r364536)
@@ -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:

Added: head/x11/nvidia-settings/files/patch-utils.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/nvidia-settings/files/patch-utils.mk	Sun Aug 10 13:09:32 2014	(r364536)
@@ -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)