Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Oct 2012 11:23:22 +0000 (UTC)
From:      Alexander Nedotsukov <bland@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305827 - in head/x11/nvidia-settings: . files
Message-ID:  <201210131123.q9DBNMfp001769@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bland
Date: Sat Oct 13 11:23:22 2012
New Revision: 305827
URL: http://svn.freebsd.org/changeset/ports/305827

Log:
  Update to 304.51
  
  Feature safe:	yes

Added:
  head/x11/nvidia-settings/files/patch-doc__Makefile   (contents, props changed)
  head/x11/nvidia-settings/files/patch-src__Makefile   (contents, props changed)
Deleted:
  head/x11/nvidia-settings/files/patch-Makefile
Modified:
  head/x11/nvidia-settings/Makefile
  head/x11/nvidia-settings/distinfo

Modified: head/x11/nvidia-settings/Makefile
==============================================================================
--- head/x11/nvidia-settings/Makefile	Sat Oct 13 10:28:24 2012	(r305826)
+++ head/x11/nvidia-settings/Makefile	Sat Oct 13 11:23:22 2012	(r305827)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nvidia-settings
-PORTVERSION=	295.71
-PORTREVISION=	1
+PORTVERSION=	304.51
 CATEGORIES=	x11
 MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-settings/ \
 		ftp://download1.nvidia.com/XFree86/nvidia-settings/
@@ -40,6 +39,6 @@ post-extract:	.SILENT
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \
-		 -e '/^mandir/s|share/||' ${WRKSRC}/utils.mk
+		 -e '/^MANDIR/s|share/||' ${WRKSRC}/utils.mk
 
 .include <bsd.port.mk>

Modified: head/x11/nvidia-settings/distinfo
==============================================================================
--- head/x11/nvidia-settings/distinfo	Sat Oct 13 10:28:24 2012	(r305826)
+++ head/x11/nvidia-settings/distinfo	Sat Oct 13 11:23:22 2012	(r305827)
@@ -1,2 +1,2 @@
-SHA256 (nvidia-settings-295.71.tar.bz2) = c8987510fe81b2ec5a02b1ae9028f4663446f0e611a59827b47bd35fe4ffe519
-SIZE (nvidia-settings-295.71.tar.bz2) = 1545560
+SHA256 (nvidia-settings-304.51.tar.bz2) = 998182b1e83e77f98cb2eec532cdbbb9331e0601c3c83f08c4d5709f63556e05
+SIZE (nvidia-settings-304.51.tar.bz2) = 1478898

Added: head/x11/nvidia-settings/files/patch-doc__Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/nvidia-settings/files/patch-doc__Makefile	Sat Oct 13 11:23:22 2012	(r305827)
@@ -0,0 +1,11 @@
+--- doc/Makefile.orig	2012-10-13 19:37:40.000000000 +0900
++++ doc/Makefile	2012-10-13 19:38:21.000000000 +0900
+@@ -74,7 +74,7 @@
+ 
+ MANPAGE_install: $(MANPAGE)
+ 	$(MKDIR) $(MANDIR)
+-	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(MANDIR)/$(notdir $<)
++	$(INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
+ 
+ clean clobber:
+ 	rm -rf $(MANPAGE) *~ $(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d \

Added: head/x11/nvidia-settings/files/patch-src__Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/nvidia-settings/files/patch-src__Makefile	Sat Oct 13 11:23:22 2012	(r305827)
@@ -0,0 +1,20 @@
+--- src/Makefile.orig	2012-09-19 10:51:18.000000000 +0900
++++ src/Makefile	2012-10-13 20:13:29.000000000 +0900
+@@ -155,13 +155,16 @@
+ 
+ NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)
+ 	$(MKDIR) $(BINDIR)
+-	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
++	$(INSTALL_PROGRAM) $< $(BINDIR)/$(notdir $<)
+ 
+ $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
+ 	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) -o $@ $(OBJS) \
+ 	    $(XNVCTRL_ARCHIVE) $(LIBS)
+ 	$(call quiet_cmd,STRIP_CMD) $@
+ 
++$(XNVCTRL_ARCHIVE):
++	$(MAKE) -C libXNVCtrl
++
+ # define the rule to build each object file
+ $(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210131123.q9DBNMfp001769>