3 files changed, 29 insertions, 50 deletions

diff --git a/x11/nvidia-xconfig/Makefile b/x11/nvidia-xconfig/Makefile
index cf5d30521558..016ca206180d 100644
--- a/x11/nvidia-xconfig/Makefile
+++ b/x11/nvidia-xconfig/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nvidia-xconfig
-PORTVERSION=	195.36.31
+PORTVERSION=	256.53
 CATEGORIES=	x11
 MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \
 		ftp://download1.nvidia.com/XFree86/nvidia-xconfig/
@@ -14,13 +14,21 @@ MASTER_SITES=	ftp://download.nvidia.com/XFree86/nvidia-xconfig/ \
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Tool to manipulate X configuration files for the NVidia driver
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 
-MAKE_ENV=	ROOT=${PREFIX}
+MAKE_ENV=	NV_VERBOSE= \
+		STRIP_CMD=${TRUE} \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		INSTALL_MAN="${INSTALL_MAN}" \
+		prefix=${PREFIX}
 
-WRKSRC=		${WRKDIR}/nvidia-xconfig-1.0
-
-MAN1=		nvidia-xconfig.1
 PLIST_FILES=	bin/nvidia-xconfig
+MANCOMPRESSED=	yes
+MAN1=		nvidia-xconfig.1
+
+post-patch:	.SILENT
+	${REINPLACE_CMD} -e '/^prefix/s/=/?&/' \
+		 -e '/^mandir/s|share/||' ${WRKSRC}/utils.mk
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-xconfig/distinfo b/x11/nvidia-xconfig/distinfo
index 4e28096ce2b4..8247834d98f1 100644
--- a/x11/nvidia-xconfig/distinfo
+++ b/x11/nvidia-xconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (nvidia-xconfig-195.36.31.tar.gz) = e9925ef1df412c645437f564c4b2a635
-SHA256 (nvidia-xconfig-195.36.31.tar.gz) = b83a9a91d27d36a2b8053f9a88bf46748e8ab01387362b54467c5e0e0bca1d52
-SIZE (nvidia-xconfig-195.36.31.tar.gz) = 121781
+MD5 (nvidia-xconfig-256.53.tar.bz2) = 244c346026d0b562e9fa4ae6fcd40104
+SHA256 (nvidia-xconfig-256.53.tar.bz2) = e8f8ab26cbd2fc90ef1745fb6d9463be3332442e468c8cf89dd1505b69329777
+SIZE (nvidia-xconfig-256.53.tar.bz2) = 96488
diff --git a/x11/nvidia-xconfig/files/patch-Makefile b/x11/nvidia-xconfig/files/patch-Makefile
index 29fdce775392..1f34053521d7 100644
--- a/x11/nvidia-xconfig/files/patch-Makefile
+++ b/x11/nvidia-xconfig/files/patch-Makefile
@@ -1,45 +1,16 @@
---- Makefile.orig	Wed Nov 23 11:58:16 2005
-+++ Makefile	Sat Dec 10 17:21:45 2005
-@@ -56,12 +56,11 @@
-   CFLAGS += -g -DDEBUG
- else
-   STRIP = strip
--  CFLAGS += -O
- endif
+--- Makefile.orig	2010-10-13 22:56:07.000000000 +0900
++++ Makefile	2010-10-13 22:58:01.000000000 +0900
+@@ -95,11 +95,11 @@
  
- # default prefix
- ifdef ROOT
--  prefix = $(ROOT)/usr
-+  prefix = $(ROOT)
- else
-   prefix = /usr/local
- endif
-@@ -80,17 +79,15 @@
- else
- ECHO=echo
- define INSTALL_RULE
--	$(INSTALL) -m 755 $< $(bindir)
--	mkdir -p $(mandir)
--	$(INSTALL) -m 644 $(MANPAGE) $(mandir)
--	gzip -9f $(mandir)/$(MANPAGE)
-+	$(BSD_INSTALL_PROGRAM) $< $(bindir)
-+	$(BSD_INSTALL_MAN) $(MANPAGE) $(mandir)
- endef
- LLSCF=
- endif
+ NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)
+ 	$(MKDIR) $(bindir)
+-	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(bindir)/$(notdir $<)
++	$(INSTALL_PROGRAM) $< $(bindir)/$(notdir $<)
  
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
--mandir = $(exec_prefix)/share/man/man1
-+mandir = $(MANPREFIX)/man/man1
+ MANPAGE_install: $(MANPAGE)
+ 	$(MKDIR) $(mandir)
+-	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(mandir)/$(notdir $<)
++	$(INSTALL_MAN) $< $(mandir)/$(notdir $<)
  
- NVIDIA_XCONFIG = nvidia-xconfig
- NVIDIA_XCONFIG_VERSION = 1.0
-@@ -145,7 +142,6 @@
- all: $(NVIDIA_XCONFIG) $(MANPAGE)
- 
- install: $(NVIDIA_XCONFIG)
--	$(STRIP) $<
- 	$(INSTALL_RULE)
- 
- $(NVIDIA_XCONFIG): $(OBJS) $(LIB)
+ $(NVIDIA_XCONFIG): $(OBJS)
+ 	$(call quiet_cmd,LINK) -o $@ $(OBJS) $(CFLAGS) \