5 files changed, 35 insertions, 24 deletions

diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index f3691f084e44..0321c6347600 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -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>
diff --git a/x11/nvidia-settings/distinfo b/x11/nvidia-settings/distinfo
index 9b9c9990c3b4..df3c90e239ba 100644
--- a/x11/nvidia-settings/distinfo
+++ b/x11/nvidia-settings/distinfo
@@ -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
diff --git a/x11/nvidia-settings/files/patch-Makefile b/x11/nvidia-settings/files/patch-Makefile
deleted file mode 100644
index ef0100dff88e..000000000000
--- a/x11/nvidia-settings/files/patch-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -149,11 +149,14 @@ install: NVIDIA_SETTINGS_install MANPAGE
- 
- NVIDIA_SETTINGS_install: $(NVIDIA_SETTINGS)
- 	$(MKDIR) $(bindir)
--	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(bindir)/$(notdir $<)
-+	$(INSTALL_PROGRAM) $< $(bindir)/$(notdir $<)
- 
- MANPAGE_install: $(MANPAGE)
- 	$(MKDIR) $(mandir)
--	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(mandir)/$(notdir $<)
-+	$(INSTALL_MAN) $< $(mandir)/$(notdir $<)
-+
-+$(XNVCTRL_ARCHIVE):
-+	$(MAKE) -C $(XNVCTRL_DIR)
- 
- $(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
- 	$(call quiet_cmd,LINK) -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) \
diff --git a/x11/nvidia-settings/files/patch-doc__Makefile b/x11/nvidia-settings/files/patch-doc__Makefile
new file mode 100644
index 000000000000..16a3febc56e9
--- /dev/null
+++ b/x11/nvidia-settings/files/patch-doc__Makefile
@@ -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 \
diff --git a/x11/nvidia-settings/files/patch-src__Makefile b/x11/nvidia-settings/files/patch-src__Makefile
new file mode 100644
index 000000000000..871fc3dfd65c
--- /dev/null
+++ b/x11/nvidia-settings/files/patch-src__Makefile
@@ -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))))
+