4 files changed, 38 insertions, 12 deletions

diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 33b94f33e94d..63891f3fed33 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -20,15 +20,18 @@ MAN4=		nouveau.4x
 
 MAKE_JOBS_SAFE=	yes
 
-SNAPDATE=	20090514
-SNAPREV=	9656762
-
 post-configure:
 	${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h
 
+post-install:	.SILENT
+	${ECHO_MSG}
+	${CAT} ${PKGMESSAGE}
+	${ECHO_MSG}
+
 GIT_WORK=	${WRKDIR}/${PORTNAME}.git-clone
-GIT_REV=	$$(date -ur$$(git log --pretty=format:%ct -1 \
-			) +%Y%m%d).$$(git log --pretty=format:%h -1)
+GIT_DATE=	$$(date -ur$$(git log --pretty=format:%ct -1 ) +%Y%m%d)
+GIT_REV=	$$(git log --pretty=format:%h -1)
+NEWDISTNAME=	${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_DATE}.${GIT_REV}
 
 maint-gen-distfile:
 	git clone git://anongit.freedesktop.org/nouveau/xf86-video-nouveau \
@@ -37,11 +40,17 @@ maint-gen-distfile:
 	( cd ${GIT_WORK}; \
 	  git log --stat >ChangeLog; \
 	  autoreconf -if; \
-	  ${TAR} cjf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_REV}.tar.bz2 \
-	  	--exclude '.git*' --exclude autogen.sh --exclude autom4te.cache \
-	  	-s "|${GIT_WORK}|${DISTNAME:S/${SNAPDATE}.${SNAPREV}$$//}${GIT_REV}|" \
-	  	${GIT_WORK} )
+	  ${TAR} cjf ${DISTDIR}/${DIST_SUBDIR}/${NEWDISTNAME}${EXTRACT_SUFX} \
+	  	--exclude '.git*' --exclude autogen.sh \
+		--exclude autom4te.cache \
+	  	-s "|${GIT_WORK}|${NEWDISTNAME}|" \
+	  	${GIT_WORK}; \
+	  ${ECHO_CMD} "SNAPDATE=	${GIT_DATE}" \
+		>${MASTERDIR}/Makefile.rev; \
+	  ${ECHO_CMD} "SNAPREV=	${GIT_REV}" \
+		>>${MASTERDIR}/Makefile.rev )
 
 	${RM} -rf ${GIT_WORK}
 
+.include "Makefile.rev"
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-nouveau/Makefile.rev b/x11-drivers/xf86-video-nouveau/Makefile.rev
new file mode 100644
index 000000000000..b8cc5e2bc271
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/Makefile.rev
@@ -0,0 +1,2 @@
+SNAPDATE=	20090728
+SNAPREV=	e259925
diff --git a/x11-drivers/xf86-video-nouveau/distinfo b/x11-drivers/xf86-video-nouveau/distinfo
index fb2c09f90d98..3c1101cf7016 100644
--- a/x11-drivers/xf86-video-nouveau/distinfo
+++ b/x11-drivers/xf86-video-nouveau/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-nouveau-0.0.10.20090514.9656762.tar.bz2) = 86aff4923c1b2143aae0f7f2ac65b5a3
-SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090514.9656762.tar.bz2) = eaa2f230770338c08839d0c6f7211ef9624a19eb305689f3f012df3ab92cb5c7
-SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090514.9656762.tar.bz2) = 556039
+MD5 (xorg/driver/xf86-video-nouveau-0.0.10.20090728.e259925.tar.bz2) = 8e0b3246a8b2a49a9609b1bdf6279e64
+SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090728.e259925.tar.bz2) = 48e328a04a2dc9ea5dfebd21eae7c23987dcf53dcd3db7bee477d873cbb31906
+SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090728.e259925.tar.bz2) = 552302
diff --git a/x11-drivers/xf86-video-nouveau/pkg-message b/x11-drivers/xf86-video-nouveau/pkg-message
new file mode 100644
index 000000000000..34c29a20bf38
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/pkg-message
@@ -0,0 +1,15 @@
+The DRM part is still not in the kernel tree and will not be there
+until it stabilized. It won't happen anytime soon. So, consider using
+the following patch in the meantime unless you don't want any hardware
+accelerated 2D like EXA and Xvideo.
+
+http://people.freebsd.org/~rnoland/drm-nouveau-062309.patch
+
+Installing it should be as simple as below procedure provided you have
+base sources in /usr/src.
+
+    # cd /usr/src/sys
+    # fetch http://people.freebsd.org/~rnoland/drm-nouveau-062309.patch
+    # patch -sp0 -i drm-nouveau-062309.patch
+    # cd modules/drm
+    # make depend all install