3 files changed, 40 insertions, 28 deletions

diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index a56a7c841d3c..ce793944e3d8 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	sisctrl
+# New ports collection makefile for:	nvidia-settings
 # Date created:				15 Aug 2004
 # Whom:					Alexander Nedotsukov <bland@FreeBSD.org>
 #
@@ -7,33 +7,33 @@
 
 PORTNAME=	nvidia-settings
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	http://download.nvidia.com/XFree86/nvidia-settings/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=     bland
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=     bland/:local
 
 MAINTAINER=	bland@FreeBSD.org
-COMMENT=	Display Control Panel for XFree86/X.org NVidia driver
+COMMENT=	Display Control Panel for X NVidia driver
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 
 PLIST_FILES=	bin/nvidia-settings
-PORTDOCS=	nvidia-settings-user-guide.txt
+MAN1=		nvidia-settings.1
 
 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
+pre-build:
+	cd ${WRKSRC}/src/libXNVCtrl; \
+	${CC} -c -I${X11BASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \
+		-DXTHREADS -DXUSE_MTSAFE_API -DMALLOC_0_RETURNS_NULL NVCtrl.c; \
+	${RM} -f libXNVCtrl.a; \
+	ar clq libXNVCtrl.a NVCtrl.o; \
+	ranlib libXNVCtrl.a
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-settings/distinfo b/x11/nvidia-settings/distinfo
index ef18169c666e..8166a021963f 100644
--- a/x11/nvidia-settings/distinfo
+++ b/x11/nvidia-settings/distinfo
@@ -1,2 +1,3 @@
-MD5 (nvidia-settings-1.0.tar.gz) = d07a1226260b94a2122cd811eb696126
-SIZE (nvidia-settings-1.0.tar.gz) = 1056908
+MD5 (nvidia-settings-1.0.tar.gz) = 36f53ad25a171cf4be4c9912445cfcdb
+SHA256 (nvidia-settings-1.0.tar.gz) = d9df3d743f39a5e6961a4f42f77fcf10e57e61b2af68cec03630a1edf5a0a8b1
+SIZE (nvidia-settings-1.0.tar.gz) = 1091361
diff --git a/x11/nvidia-settings/files/patch-Makefile b/x11/nvidia-settings/files/patch-Makefile
index 2f67e24c11d3..5f32c39b6829 100644
--- a/x11/nvidia-settings/files/patch-Makefile
+++ b/x11/nvidia-settings/files/patch-Makefile
@@ -1,14 +1,5 @@
---- 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)
- 
+--- Makefile.orig	Sat Dec 10 17:52:43 2005
++++ Makefile	Sat Dec 10 17:56:28 2005
 @@ -74,12 +74,11 @@
    ifndef STRIP
      STRIP = strip
@@ -23,11 +14,31 @@
  else
    prefix = /usr/local
  endif
-@@ -177,7 +176,6 @@
+@@ -97,16 +96,14 @@
+ else
+ ECHO=echo
+ define INSTALL_RULE
+-	$(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
+-	mkdir -p $(mandir)
+-	$(INSTALL) -m 644 doc/$(MANPAGE) $(mandir)
+-	gzip -9f $(mandir)/$(MANPAGE)
++	$(BSD_INSTALL_PROGRAM) $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
++	$(BSD_INSTALL_MAN) doc/$(MANPAGE) $(mandir)
+ endef
+ endif
+ 
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+-mandir = $(exec_prefix)/share/man/man1
++mandir = $(MANPREFIX)/man/man1
+ 
+ X11R6_CFLAGS = -I $(X11R6_INC_DIR)
+ 
+@@ -189,7 +186,6 @@
  all: $(NVIDIA_SETTINGS)
  
  install: $(NVIDIA_SETTINGS)
 -	$(STRIP) $<
  	$(INSTALL_RULE)
  
- $(OBJS_DIR)/%.o: %.c
\ No newline at end of file
+ $(OBJS_DIR)/%.o: %.c