- Track yet another silent in-place update.

  ~100K diff shows switching over to information returned by driver rather
  than built-in static tables. UI fixes. Generic code cleanup.
- Respect $(CC) and ${X11BASE}
- Remove -O from vendor's Makefile
- Respect ${INSTALL_PROGRAM}, and do not unconditionally strip the binary
- Install user's guide

PR:		84971
Submitted by:	jylefort

3 files changed, 39 insertions, 7 deletions

diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index cd22df6daec2..dac6088797d5 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nvidia-settings
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://download.nvidia.com/XFree86/nvidia-settings/ \
 		${MASTER_SITE_LOCAL}
@@ -21,9 +21,19 @@ USE_GNOME=	gtk20
 USE_GMAKE=	yes
 
 PLIST_FILES=	bin/nvidia-settings
+PORTDOCS=	nvidia-settings-user-guide.txt
 
-MAKE_ENV=	ROOT=${PREFIX}
+MAKE_ENV=	ROOT=${PREFIX} \
+		CC=${CC} \
+		X11R6_LIB_DIR=${X11BASE}/lib \
+		X11R6_INC_DIR=${X11BASE}/include
 
 ONLY_FOR_ARCHS=	i386
 
+.if !defined(NOPORTDOCS)
+post-install:
+	${MKDIR} ${DOCSDIR}
+	${INSTALL} ${WRKSRC}/doc/${PORTDOCS} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/nvidia-settings/distinfo b/x11/nvidia-settings/distinfo
index 139faa4a4da7..ef18169c666e 100644
--- a/x11/nvidia-settings/distinfo
+++ b/x11/nvidia-settings/distinfo
@@ -1,2 +1,2 @@
-MD5 (nvidia-settings-1.0.tar.gz) = e0c413a6fde25d3c78193a7f73273354
-SIZE (nvidia-settings-1.0.tar.gz) = 1048551
+MD5 (nvidia-settings-1.0.tar.gz) = d07a1226260b94a2122cd811eb696126
+SIZE (nvidia-settings-1.0.tar.gz) = 1056908
diff --git a/x11/nvidia-settings/files/patch-Makefile b/x11/nvidia-settings/files/patch-Makefile
index 4d8e66d60aeb..2f67e24c11d3 100644
--- a/x11/nvidia-settings/files/patch-Makefile
+++ b/x11/nvidia-settings/files/patch-Makefile
@@ -1,6 +1,20 @@
---- Makefile.orig	Sun Aug 15 13:15:04 2004
-+++ Makefile	Sun Aug 15 13:38:32 2004
-@@ -70,7 +70,7 @@
+--- Makefile.orig	Fri Jul 29 22:30:54 2005
++++ Makefile	Tue Aug 16 00:48:33 2005
+@@ -37,7 +37,7 @@
+ # default definitions; can be overwritten by users
+ 
+ SHELL = /bin/sh
+-INSTALL = install -m 755
++INSTALL = $(BSD_INSTALL_PROGRAM)
+ BUILD_OS := $(shell uname)
+ BUILD_ARCH := $(shell uname -m)
+ 
+@@ -74,12 +74,11 @@
+   ifndef STRIP
+     STRIP = strip
+   endif
+-  CFLAGS += -O
+ endif
  
  # default prefix
  ifdef ROOT
@@ -9,3 +23,11 @@
  else
    prefix = /usr/local
  endif
+@@ -177,7 +176,6 @@
+ all: $(NVIDIA_SETTINGS)
+ 
+ install: $(NVIDIA_SETTINGS)
+-	$(STRIP) $<
+ 	$(INSTALL_RULE)
+ 
+ $(OBJS_DIR)/%.o: %.c
\ No newline at end of file