From 1516abf3be275356b3cc7d33aaa7e59ba3f18645 Mon Sep 17 00:00:00 2001
From: bland <bland@FreeBSD.org>
Date: Sun, 4 Nov 2012 09:26:16 +0000
Subject: Update to 310.14

Feature safe:	yes
---
 x11/nvidia-xconfig/Makefile             | 4 +---
 x11/nvidia-xconfig/distinfo             | 4 ++--
 x11/nvidia-xconfig/files/patch-Makefile | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'x11')

diff --git a/x11/nvidia-xconfig/Makefile b/x11/nvidia-xconfig/Makefile
index 35e5fae80e0b..36b4ec07f043 100644
--- a/x11/nvidia-xconfig/Makefile
+++ b/x11/nvidia-xconfig/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvidia-xconfig
-PORTVERSION=	304.51
+PORTVERSION=	310.14
 CATEGORIES=	x11
 MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \
 		ftp://download1.nvidia.com/XFree86/nvidia-xconfig/
@@ -23,8 +23,6 @@ MAKE_ENV=	NV_VERBOSE= \
 		STRIP_CMD=${TRUE} \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
-		INSTALL_BIN_ARGS= \
-		INSTALL_DOC_ARGS= \
 		prefix=${PREFIX}
 
 PLIST_FILES=	bin/nvidia-xconfig
diff --git a/x11/nvidia-xconfig/distinfo b/x11/nvidia-xconfig/distinfo
index 9df8ccce2328..fdb88e16aea6 100644
--- a/x11/nvidia-xconfig/distinfo
+++ b/x11/nvidia-xconfig/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nvidia-xconfig-304.51.tar.bz2) = dd2f0495d960c05faba1ddb2f3d25571078f8ce358336dcd782397df6559eeb4
-SIZE (nvidia-xconfig-304.51.tar.bz2) = 101542
+SHA256 (nvidia-xconfig-310.14.tar.bz2) = 34524033eac86a422bbf813a309f218368dd9f95265cf730ef425b1edd1fe364
+SIZE (nvidia-xconfig-310.14.tar.bz2) = 101116
diff --git a/x11/nvidia-xconfig/files/patch-Makefile b/x11/nvidia-xconfig/files/patch-Makefile
index e644bcc415e6..7e1e3d9a51ab 100644
--- a/x11/nvidia-xconfig/files/patch-Makefile
+++ b/x11/nvidia-xconfig/files/patch-Makefile
@@ -1,16 +1,16 @@
 --- Makefile.orig	2012-09-19 10:51:22.000000000 +0900
-+++ Makefile	2012-10-13 19:09:46.000000000 +0900
++++ Makefile	2012-10-13 20:24:14.000000000 +0900
 @@ -112,11 +112,11 @@
  
  NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)
  	$(MKDIR) $(BINDIR)
 -	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
-+	$(INSTALL_PROGRAM) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
++	$(INSTALL_PROGRAM) $< $(BINDIR)/$(notdir $<)
  
  MANPAGE_install: $(MANPAGE)
  	$(MKDIR) $(MANDIR)
 -	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
-+	$(INSTALL_MAN) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
++	$(INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
  
  $(NVIDIA_XCONFIG): $(OBJS)
  	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
-- 
cgit