ports/133557: [patch] x11-drivers/xf86-video-nouveau: update to recent snapshot, 20090408.d8545e6

[Anonymous]

>Number:         133557
>Category:       ports
>Synopsis:       [patch] x11-drivers/xf86-video-nouveau: update to recent snapshot, 20090408.d8545e6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 10 04:20:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD luffy 8.0-CURRENT FreeBSD 8.0-CURRENT #0 r190876M: Fri Apr 10 03:18:56 UTC 2009     root at luffy:/usr/obj/usr/src/sys/PHOENIX  amd64

CPU: Intel(R) Core(TM)2 Duo CPU     E8400  @ 3.00GHz (3216.22-MHz K8-class CPU)
FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs
 cpu0 (BSP): APIC ID:  0
 cpu1 (AP): APIC ID:  1

devel/ccache installed and used
nouveau ddx (20090408.d8545e6) + drm (032109) installed and used on nv50 (9600GT)

tested only on Xserver from git
>Description:
- unbreak and update to 20090408.d8545e6

- add snapshot date and revision in otherwise unused NV_DRIVER_DATE
  to make debugging problems a little bit easier because it appears
  in Xorg.N.log as

    (II) LoadModule: "nouveau"
    (II) Loading /usr/local/lib/xorg/modules/drivers/nouveau_drv.so
    (II) Module nouveau: vendor="X.Org Foundation"
            compiled for 1.6.99.1, module version = 0.0.10
            Module class: X.Org Video Driver
            ABI class: X.Org Video Driver, version 5.0
    (II) NOUVEAU driver 20090408.d8545e6
                        ^^^^^^^^^^^^^^^^
    (II) NOUVEAU driver for NVIDIA chipset families :
            RIVA TNT    (NV04)
            RIVA TNT2   (NV05)

- add maint-gen-distfile in case I get sick and forget to update ;)

- mark as MAKE_JOBS_SAFE: succeeds here with MAKE_JOBS_NUMBER=8

- fix whitespace in port header
>How-To-Repeat:
>Fix:

Frequently updated diff is here:
  ftp://ftp.lissyara.su/users/Guest/xf86-video-nouveau.diff

or a fixed one is attached here:

--- xf86-video-nouveau-20090408.d8545e6.diff begins here ---
Index: x11-drivers/xf86-video-nouveau/Makefile
===================================================================
RCS file: /home/csup/ports/x11-drivers/xf86-video-nouveau/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- x11-drivers/xf86-video-nouveau/Makefile	4 Apr 2009 04:05:08 -0000	1.3
+++ x11-drivers/xf86-video-nouveau/Makefile	10 Apr 2009 03:53:10 -0000
@@ -1,15 +1,15 @@
-# New ports collection makefile for: xf86-video-nouveau
-# Date Created: 29 Jan 2009
-# Whom: Anonymous <swell.k at gmail.com>
+# New ports collection makefile for:	xf86-video-nouveau
+# Date Created:				29 Jan 2009
+# Whom:					Anonymous <swell.k at gmail.com>
 #
 # $FreeBSD: ports/x11-drivers/xf86-video-nouveau/Makefile,v 1.3 2009/04/04 04:05:08 rnoland Exp $
 #
 
 PORTNAME=	xf86-video-nouveau
-PORTVERSION=	0.0.10.20090129
-PORTREVISION=	1
+PORTVERSION=	0.0.10.${SNAPDATE}
+DISTVERSIONSUFFIX=.${SNAPREV}
 CATEGORIES=	x11-drivers
-MASTER_SITES=	ftp://ftp.lissyara.su/users/Guest/
+MASTER_SITES=	ftp://ftp.lissyara.su/users/Guest/distfiles/
 
 MAINTAINER=	x11 at FreeBSD.org
 COMMENT=	Free nouveau display driver for nvidia-based cards
@@ -18,6 +18,30 @@ XORG_CAT=	driver
 USE_XORG=	videoproto xextproto xf86driproto glproto
 MAN4=		nouveau.4x
 
-BROKEN=		does not compile
+MAKE_JOBS_SAFE=	yes
+
+SNAPDATE=	20090408
+SNAPREV=	d8545e6
+
+post-configure:
+	${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h
+
+GIT_WORK=	${WRKDIR}/${PORTNAME}.git-clone
+GIT_REV=	$$(echo $$(date -ur$$(git log --pretty=format:%ct -1 \
+			) +%Y%m%d).$$(git log --pretty=format:%h -1))
+
+maint-gen-distfile:
+	git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau \
+		${GIT_WORK}
+
+	( 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} )
+
+	${RM} -rf ${GIT_WORK}
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-nouveau/distinfo
===================================================================
RCS file: /home/csup/ports/x11-drivers/xf86-video-nouveau/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- x11-drivers/xf86-video-nouveau/distinfo	21 Feb 2009 02:08:17 -0000	1.1
+++ x11-drivers/xf86-video-nouveau/distinfo	10 Apr 2009 03:55:49 -0000
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-nouveau-0.0.10.20090129.tar.bz2) = ea4663197027d798b2d287b315721832
-SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090129.tar.bz2) = a8fe3ba39aa691535c7423134bc6b6224c6bd8fbfdee3ed523301892976c6bdf
-SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090129.tar.bz2) = 569851
+MD5 (xorg/driver/xf86-video-nouveau-0.0.10.20090408.d8545e6.tar.bz2) = 84d00c5524502e618b6629d37aa7190c
+SHA256 (xorg/driver/xf86-video-nouveau-0.0.10.20090408.d8545e6.tar.bz2) = 29b017bb1b8590c967e5472747a177e3ce7af43bbd48b23eb9f6fd95d252c9da
+SIZE (xorg/driver/xf86-video-nouveau-0.0.10.20090408.d8545e6.tar.bz2) = 531494
--- xf86-video-nouveau-20090408.d8545e6.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: