From jylefort@brutele.be  Mon Aug 15 23:02:17 2005
Return-Path: <jylefort@brutele.be>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9307316A41F;
	Mon, 15 Aug 2005 23:02:17 +0000 (GMT)
	(envelope-from jylefort@brutele.be)
Received: from 212.68.242.136.brutele.be (212.68.242.136.brutele.be [212.68.242.136])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0598143D45;
	Mon, 15 Aug 2005 23:02:16 +0000 (GMT)
	(envelope-from jylefort@brutele.be)
Received: from jsite.lefort.net (jsite.lefort.net [192.168.1.2])
	by gateway.lefort.net (Postfix) with ESMTP id E83E755E8;
	Tue, 16 Aug 2005 01:02:14 +0200 (CEST)
Received: by jsite.lefort.net (Postfix, from userid 1000)
	id D2239C2E4; Tue, 16 Aug 2005 01:02:14 +0200 (CEST)
Message-Id: <20050815230214.D2239C2E4@jsite.lefort.net>
Date: Tue, 16 Aug 2005 01:02:14 +0200 (CEST)
From: Jean-Yves Lefort <jylefort@FreeBSD.org>
Reply-To: Jean-Yves Lefort <jylefort@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bland@FreeBSD.org
Subject: Update port: x11/nvidia-settings
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         84971
>Category:       ports
>Synopsis:       Update port: x11/nvidia-settings
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    bland
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 15 23:10:17 GMT 2005
>Closed-Date:    Fri Sep 02 05:50:51 GMT 2005
>Last-Modified:  Fri Sep 02 05:50:51 GMT 2005
>Originator:     Jean-Yves Lefort
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Wed Jul 27 11:27:58 CEST 2005 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
- Track the in-place distfile change. I am unable to provide a summary
  of changes, as I cannot find the previous distfile. Since updating
  files in place seems to be the rule for this port, I recommend to use
  ${MASTER_SITE_LOCAL} as MASTER_SITES.
- Respect ${CC} and ${X11BASE}
- Remove -O from the vendor's Makefile
- Respect ${INSTALL_PROGRAM}, and do not unconditionally strip the binary
- Install the user's guide
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/x11/nvidia-settings/Makefile nvidia-settings/Makefile
--- /usr/ports/x11/nvidia-settings/Makefile	Mon Jul 25 04:17:45 2005
+++ nvidia-settings/Makefile	Tue Aug 16 00:42:50 2005
@@ -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/
 
@@ -19,9 +19,19 @@
 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 -ruN /usr/ports/x11/nvidia-settings/distinfo nvidia-settings/distinfo
--- /usr/ports/x11/nvidia-settings/distinfo	Mon Jul 25 04:17:45 2005
+++ nvidia-settings/distinfo	Tue Aug 16 00:16:12 2005
@@ -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 -ruN /usr/ports/x11/nvidia-settings/files/patch-Makefile nvidia-settings/files/patch-Makefile
--- /usr/ports/x11/nvidia-settings/files/patch-Makefile	Sun Aug 15 06:57:54 2004
+++ nvidia-settings/files/patch-Makefile	Tue Aug 16 00:48:56 2005
@@ -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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->bland 
Responsible-Changed-By: bland 
Responsible-Changed-When: Wed Aug 17 02:10:28 GMT 2005 
Responsible-Changed-Why:  
It's mine. Thanks for taking care! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84971 
State-Changed-From-To: open->closed 
State-Changed-By: bland 
State-Changed-When: Fri Sep 2 05:49:10 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84971 
>Unformatted:
