From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 23 15:30:07 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 495CF1065673 for ; Mon, 23 Apr 2012 15:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 164118FC12 for ; Mon, 23 Apr 2012 15:30:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q3NFU6g8094096 for ; Mon, 23 Apr 2012 15:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q3NFU6wT094095; Mon, 23 Apr 2012 15:30:06 GMT (envelope-from gnats) Resent-Date: Mon, 23 Apr 2012 15:30:06 GMT Resent-Message-Id: <201204231530.q3NFU6wT094095@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jan Beich Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5037D106566C for ; Mon, 23 Apr 2012 15:20:36 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id 170F98FC0C for ; Mon, 23 Apr 2012 15:20:35 +0000 (UTC) Received: from musashi.geonosis.org ([88.198.107.171]:50723 helo=internal.tormail.net) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1SML3y-002c8S-Hp for FreeBSD-gnats-submit@freebsd.org; Mon, 23 Apr 2012 11:20:27 -0400 Received: from jbeich by internal.tormail.net with local (Exim 4.63) (envelope-from ) id 1SML2a-000OjE-Go for FreeBSD-gnats-submit@freebsd.org; Mon, 23 Apr 2012 15:19:04 +0000 Message-Id: <1SML2a-000OjE-Go@internal.tormail.net> Date: Mon, 23 Apr 2012 13:18:16 -0200 From: Jan Beich To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/167229: [patch] x11/nvidia-settings: install sample tools (optionally) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Apr 2012 15:30:07 -0000 >Number: 167229 >Category: ports >Synopsis: [patch] x11/nvidia-settings: install sample tools (optionally) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 23 15:30:06 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Jan Beich >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: scale one display for a lowres game (starcraft?) $ fgrep nv-control ~/.xinitrc nv-control-dpy --add-metamode nvidia-auto-select,640x480 # game right (4:3) nv-control-dpy --add-metamode 1280x720,nvidia-auto-select # game left (16:9) >Description: Install nv-control samples. For example, nv-control-dpy allows modifying metamodes from CLI without restarting Xserver. >How-To-Repeat: >Fix: --- samples.diff begins here --- Index: x11/nvidia-settings/Makefile =================================================================== RCS file: /a/.csup/ports/x11/nvidia-settings/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- x11/nvidia-settings/Makefile 7 Apr 2012 15:39:05 -0000 1.53 +++ x11/nvidia-settings/Makefile 23 Apr 2012 14:30:03 -0000 @@ -35,6 +34,27 @@ MAKE_ENV= NV_VERBOSE= \ X_CFLAGS=-I${LOCALBASE}/include \ X_LDLAGS=-L${LOCALBASE}/lib +OPTIONS= SAMPLES "install sample programs" OFF + +.include + +.ifdef WITH_SAMPLES +ALL_TARGET= all samples +PLIST_FILES+= bin/nv-control-3dvisionpro \ + bin/nv-control-dpy \ + bin/nv-control-dvc \ + bin/nv-control-events \ + bin/nv-control-framelock \ + bin/nv-control-gvi \ + bin/nv-control-info \ + bin/nv-control-targets + +post-install: + cd ${WRKSRC}/samples/_out/${OPSYS}_${ARCH} && \ + ${RM} -f *.d *.o && \ + ${INSTALL_PROGRAM} * ${PREFIX}/bin +.endif + post-extract: .SILENT ${RM} -f ${WRKSRC}/src/libXNVCtrl/libXNVCtrl.a Index: x11/nvidia-settings/files/patch-Makefile =================================================================== RCS file: /a/.csup/ports/x11/nvidia-settings/files/patch-Makefile,v retrieving revision 1.6 diff -u -p -r1.6 patch-Makefile --- x11/nvidia-settings/files/patch-Makefile 13 Oct 2010 14:07:04 -0000 1.6 +++ x11/nvidia-settings/files/patch-Makefile 23 Apr 2012 14:09:40 -0000 @@ -1,6 +1,16 @@ --- Makefile.orig +++ Makefile -@@ -149,11 +149,14 @@ install: NVIDIA_SETTINGS_install MANPAGE +@@ -146,18 +146,24 @@ $(call BUILD_OBJECT_LIST,$(GTK_SRC)): CF + ############################################################################## + + .PNONY: all install NVIDIA_SETTINGS_install MANPAGE_install clean clobber ++.PHONY: samples + + all: $(NVIDIA_SETTINGS) $(MANPAGE) ++samples: $(XNVCTRL_ARCHIVE) ++ $(MAKE) -C samples + + install: NVIDIA_SETTINGS_install MANPAGE_install NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS) $(MKDIR) $(bindir) --- samples.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: