diff -ruN nvidia-driver.orig/Makefile nvidia-driver/Makefile
--- nvidia-driver.orig/Makefile	2011-02-25 22:59:48.000000000 +0600
+++ nvidia-driver/Makefile	2011-03-09 08:33:04.000000000 +0600
@@ -2,22 +2,27 @@
 # Date created:				4 December 2002
 # Whom:					Stijn Hoop <stijn@win.tue.nl>
 #
-# $FreeBSD: ports/x11/nvidia-driver/Makefile,v 1.103 2011/02/25 16:59:48 miwi Exp $
+# $FreeBSD: ports/x11/nvidia-driver/Makefile,v 1.102 2010/12/08 03:28:28 danfe Exp $
 #
 
 PORTNAME=	nvidia-driver
-DISTVERSION?=	256.53
-PORTREVISION?=	1			# As a reminder it can be overridden
+DISTVERSION?=	260.19.44
+PORTREVISION?=	0			# As a reminder it can be overridden
 CATEGORIES=	x11 kld
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
-ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
 # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
 DISTNAME=	NVIDIA-FreeBSD-x86${ARCH_SUFX}-${DISTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
 
-NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
+LICENSE=	NVIDIA
+LICENSE_NAME=	License For Customer Use of NVIDIA Software
+LICENSE_FILE=	${WRKSRC}/doc/license.txt
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
+
+ARCH_SUFX=	${ARCH:S/i386//:S/amd/_/}
+USE_XORG=	xorg-server
 USE_GL=		gl
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
@@ -57,14 +62,8 @@
 
 .include <bsd.port.pre.mk>
 
-# XXX Should use ${PKG_INFO} but it does not expand for some reason XXX
-#
-XSERVVERSION!=	/usr/sbin/pkg_info -qO x11-servers/xorg-server 2>/dev/null || true
-LIBGLVERSION!=	/usr/sbin/pkg_info -qO graphics/libGL 2>/dev/null || true
-
-.if empty(XSERVVERSION)
-IGNORE=		needs an X server implementation installed
-.endif
+XSERVVERSION!=	${PKG_INFO} -qO x11-servers/xorg-server 2>/dev/null || true
+LIBGLVERSION!=	${PKG_INFO} -qO graphics/libGL 2>/dev/null || true
 
 PLIST_SUB+=	XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \
 		LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \
@@ -138,6 +137,7 @@
 pre-su-install:
 # XXX This port silently assumes PREFIX == LOCALBASE XXX
 	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
+	@${MKDIR} ${PREFIX}/${MODULESDIR}/extensions
 
 post-install: .SILENT
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
diff -ruN nvidia-driver.orig/distinfo nvidia-driver/distinfo
--- nvidia-driver.orig/distinfo	2010-12-08 13:37:21.000000000 +0600
+++ nvidia-driver/distinfo	2011-03-09 08:34:22.000000000 +0600
@@ -1,7 +1,7 @@
-SHA256 (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 3c3d3a96f6ec79b86815423c4be38c819b2ff26124a8885421e34f60a3c70655
-SIZE (NVIDIA-FreeBSD-x86-256.53.tar.gz) = 26347367
-SHA256 (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 2b849ec63dca049a36ba3d2d97fdf8af06bd3d9c0051ebeec1e0cb60bec416a2
-SIZE (NVIDIA-FreeBSD-x86_64-256.53.tar.gz) = 26963917
+SHA256 (NVIDIA-FreeBSD-x86-260.19.44.tar.gz) = ab92ef78feee2926a77300695a27b01873e7d03d9bf41417626c5eef5af42cf3
+SIZE (NVIDIA-FreeBSD-x86-260.19.44.tar.gz) = 27280416
+SHA256 (NVIDIA-FreeBSD-x86_64-260.19.44.tar.gz) = 3ee90d1541a9774268e08b1ce9ad8daf223f6bcc6c942f5c39fd589351cf1749
+SIZE (NVIDIA-FreeBSD-x86_64-260.19.44.tar.gz) = 27949566
 SHA256 (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 3389c1b2faf68bab3ebd55593539580e418ef3beba29428ae2fe11a9a5154ebb
 SIZE (NVIDIA-FreeBSD-x86-173.14.28.tar.gz) = 17555603
 SHA256 (NVIDIA-FreeBSD-x86-96.43.19.tar.gz) = b5dce181cc654a729ba06dd528a180d14a792b0328fcfbf86bb0f819285c0dd5
diff -ruN nvidia-driver.orig/pkg-plist nvidia-driver/pkg-plist
--- nvidia-driver.orig/pkg-plist	2010-09-25 02:11:00.000000000 +0700
+++ nvidia-driver/pkg-plist	2011-01-16 06:12:05.000000000 +0600
@@ -1,14 +1,10 @@
-@comment I can't add the below files to the package because pkg_delete
-@comment will complain when removing this package:
-@comment     %%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
-@comment     %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
-@comment     lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
-@comment They are however restored when this package is removed:
 @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
 @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
+%%MODULESDIR%%/extensions/libglx.so
 @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
 @exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%%
+lib/libGL.so.1
 @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1
 lib/libnvidia-tls.so.1
 lib/libnvidia-tls.so