ports/149143: [patch] x11/nvidia-settings: update to 256.44

[Anonymous]

>Number:         149143
>Category:       ports
>Synopsis:       [patch] x11/nvidia-settings: update to 256.44
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 31 10:30:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
I'm using nvidia-driver-256.44.
>Description:
While there were patches for x11/nvidia-driver circulating I've never
found one for x11/nvidia-settings.

- update
- respect STRIP by using INSTALL_PROGRAM
- use vendor Makefile to build libXNVCtrl.a

>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: x11/nvidia-settings/Makefile
===================================================================
RCS file: /a/.cvsup/ports/x11/nvidia-settings/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- x11/nvidia-settings/Makefile	21 Jun 2010 13:49:53 -0000	1.46
+++ x11/nvidia-settings/Makefile	31 Jul 2010 10:21:34 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvidia-settings
-PORTVERSION=	195.36.31
+PORTVERSION=	256.44
 CATEGORIES=	x11
 MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
 		ftp://download1.nvidia.com/XFree86/nvidia-settings/
@@ -14,27 +14,30 @@ MASTER_SITES=	ftp://download.nvidia.com/
 MAINTAINER=	bland at FreeBSD.org
 COMMENT=	Display Control Panel for X NVidia driver
 
+USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_GL=		gl
 USE_XORG=	xv
 
+MANCOMPRESSED=	yes
 PLIST_FILES=	bin/nvidia-settings
 MAN1=		nvidia-settings.1
 
-MAKE_ENV=	ROOT=${PREFIX} \
+MAKE_ENV=	NV_VERBOSE= \
+		STRIP_CMD=${TRUE} \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_MAN="${INSTALL_MAN}" \
+		prefix=${PREFIX} \
 		X11R6_LIB_DIR=${LOCALBASE}/lib \
 		X11R6_INC_DIR=${LOCALBASE}/include \
 		LDFLAGS="${PTHREAD_LIBS}"
 
-WRKSRC=		${WRKDIR}/nvidia-settings-1.0
+post-extract:	.SILENT
+	${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a
 
-pre-build:
-	cd ${WRKSRC}/src/libXNVCtrl; \
-	${CC} -c -I${LOCALBASE}/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
+post-patch:	.SILENT
+	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \
+		 -e '/^mandir/s|share/||' ${WRKSRC}/utils.mk
 
 .include <bsd.port.mk>
Index: x11/nvidia-settings/distinfo
===================================================================
RCS file: /a/.cvsup/ports/x11/nvidia-settings/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- x11/nvidia-settings/distinfo	21 Jun 2010 13:49:53 -0000	1.30
+++ x11/nvidia-settings/distinfo	31 Jul 2010 08:56:29 -0000
@@ -1,3 +1,3 @@
-MD5 (nvidia-settings-195.36.31.tar.gz) = 30782edbe54e99f678cb73e08cd67470
-SHA256 (nvidia-settings-195.36.31.tar.gz) = 9e2b8d6078da595994e0577390f9e72fc4b866ff5f7131307b4570a12dda660a
-SIZE (nvidia-settings-195.36.31.tar.gz) = 1404726
+MD5 (nvidia-settings-256.44.tar.bz2) = c18cc98749e11ea2f13770a65217be5b
+SHA256 (nvidia-settings-256.44.tar.bz2) = abf8001f4ae2defb2824566a2fc61c27a0b0f5f4db3815d14f0d90069ab01d38
+SIZE (nvidia-settings-256.44.tar.bz2) = 1458780
Index: x11/nvidia-settings/files/patch-Makefile
===================================================================
RCS file: x11/nvidia-settings/files/patch-Makefile
diff -N x11/nvidia-settings/files/patch-Makefile
--- x11/nvidia-settings/files/patch-Makefile	29 Aug 2006 01:56:09 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
---- Makefile.orig	Wed Aug  2 13:29:56 2006
-+++ Makefile	Mon Aug 28 16:15:57 2006
-@@ -84,7 +84,7 @@
- 
- # default prefix
- ifdef ROOT
--  prefix = $(ROOT)/usr
-+  prefix = $(ROOT)
- else
-   prefix = /usr/local
- endif
-@@ -102,16 +102,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)
- 
-@@ -200,7 +198,6 @@
- all: $(NVIDIA_SETTINGS) doc/$(MANPAGE)
- 
- install: all
--	$(STRIP) $(NVIDIA_SETTINGS)
- 	$(INSTALL_RULE)
- 
- $(OBJS_DIR)/%.o: %.c
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: