From root@pin.if.uz.zgora.pl  Wed Sep 27 16:22:20 2006
Return-Path: <root@pin.if.uz.zgora.pl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 66E1616A417
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Sep 2006 16:22:20 +0000 (UTC)
	(envelope-from root@pin.if.uz.zgora.pl)
Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BFDC743D7C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Sep 2006 16:22:18 +0000 (GMT)
	(envelope-from root@pin.if.uz.zgora.pl)
Received: by pin.if.uz.zgora.pl (Postfix, from userid 0)
	id A24AD3A3E6; Wed, 27 Sep 2006 18:23:27 +0200 (CEST)
Message-Id: <20060927162327.A24AD3A3E6@pin.if.uz.zgora.pl>
Date: Wed, 27 Sep 2006 18:23:27 +0200 (CEST)
From: trasz <trasz@pin.if.uz.zgora.pl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] graphics/mesa-demos: unbreak and update to 6.5.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         103720
>Category:       ports
>Synopsis:       [PATCH] graphics/mesa-demos: unbreak and update to 6.5.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 27 16:30:17 GMT 2006
>Closed-Date:    Thu Sep 28 15:05:27 GMT 2006
>Last-Modified:  Thu Sep 28 15:10:23 GMT 2006
>Originator:     trasz
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat Jun  3 01:12:10 CEST
>Description:
Update to 6.5.1 and unbroke.  Note that unbreaking was done by removing
(not building and not installing) problematic (offscreen) demo.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- mesa-demos-6.5.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/mesa-demos/Makefile /home/trasz/mesa-demos/Makefile
--- /usr/ports/graphics/mesa-demos/Makefile	Sat Sep  2 18:51:00 2006
+++ /home/trasz/mesa-demos/Makefile	Wed Sep 27 18:14:43 2006
@@ -2,11 +2,11 @@
 # Date created:         7 Nov 2003
 # Whom:                 anholt@FreeBSD.org
 #
-# $FreeBSD: ports/graphics/mesa-demos/Makefile,v 1.11 2006/09/02 16:51:00 kris Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	demos
-PORTVERSION=	6.4.1
+PORTVERSION=	6.5.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mesa3d/
@@ -19,31 +19,29 @@
 
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
-BROKEN=		Does not compile
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 ALL_TARGET=
-MAKE_ARGS=	SUBDIRS="progs/demos progs/osdemos"
+MAKE_ARGS=	SUBDIRS="progs/demos"
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
 DATADIR=	${PREFIX}/share/mesa-demos
 
-DEMO_PROGS=	bounce clearspd cubemap drawpix fire gamma gears geartrain \
-		glinfo gloss gltestperf glutfx ipers isosurf lodbias morph3d \
-		multiarb occlude paltex pixeltex pointblast ray \
-		readpix reflect renormal shadowtex spectex stex3d teapot \
-		terrain tessdemo texcyl texdown texenv texobj trispd tunnel \
-		tunnel2
-DEMO_IMAGES=	bw.rgb girl.rgb reflect.rgb s128.rgb tile.rgb tree2.rgba \
-		tree3.rgb wrs_logo.rgb
+DEMO_PROGS=	glinfo winpos gamma renormal glutfx paltex clearspd glslnoise \
+		singlebuffer bounce spectex readpix arbocclude texobj texdown \
+		lodbias texcyl vao_demo arbfslight fplight fogcoord trispd \
+		drawpix multiarb cubemap tessdemo pointblast gltestperf \
+		arbfplight gears spriteblast gloss terrain gearbox teapot \
+		ipers reflect shadowtex texenv fire stex3d ray morph3d \
+		isosurf engine tunnel tunnel2 geartrain
+
+DEMO_IMAGES=	arch.rgb bw.rgb girl.rgb girl2.rgb reflect.rgb s128.rgb \
+		tile.rgb tree2.rgba tree3.rgb wrs_logo.rgb
 DEMO_DATA=	geartrain.dat isosurf.dat terrain.dat
 
 # Generate packing list
-PLIST_FILES=	bin/osdemo
+PLIST_FILES=
 .for prog in ${DEMO_PROGS}
 PLIST_FILES+=	bin/${prog}
 .endfor
@@ -68,8 +66,6 @@
 		${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \
 			${PREFIX}/bin ; \
 	done
-	${INSTALL_PROGRAM} ${WRKSRC}/progs/osdemos/osdemo \
-		${PREFIX}/bin ; \
 	${MKDIR} ${PREFIX}/share/mesa-demos/images
 	${MKDIR} ${PREFIX}/share/mesa-demos/data
 	@for img in ${DEMO_IMAGES}; do \
@@ -83,7 +79,7 @@
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=         does not build with XFree86
+IGNORE=		does not build with XFree86
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/mesa-demos/distinfo /home/trasz/mesa-demos/distinfo
--- /usr/ports/graphics/mesa-demos/distinfo	Thu Jan 12 13:56:16 2006
+++ /home/trasz/mesa-demos/distinfo	Wed Sep 27 18:14:44 2006
@@ -1,6 +1,6 @@
-MD5 (MesaDemos-6.4.1.tar.bz2) = 99df1fdcb98d391666b476ca6f1dda8a
-SHA256 (MesaDemos-6.4.1.tar.bz2) = f716751f1b750b186c08295cd40762ba98ece01f87eaf5b8db22fcb91c14bb14
-SIZE (MesaDemos-6.4.1.tar.bz2) = 819391
-MD5 (MesaLib-6.4.1.tar.bz2) = ea148c828ec6f645526451db1b8556f1
-SHA256 (MesaLib-6.4.1.tar.bz2) = 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf
-SIZE (MesaLib-6.4.1.tar.bz2) = 2913887
+MD5 (MesaDemos-6.5.1.tar.bz2) = 0f2794baf7a9d98b22caea9f78c6942d
+SHA256 (MesaDemos-6.5.1.tar.bz2) = a12ad72a123c39ee3412d76690dd2c077216811065f06431c68677957a7e919e
+SIZE (MesaDemos-6.5.1.tar.bz2) = 1319453
+MD5 (MesaLib-6.5.1.tar.bz2) = c46f2c6646a270911b791dd8e1c2d977
+SHA256 (MesaLib-6.5.1.tar.bz2) = e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
+SIZE (MesaLib-6.5.1.tar.bz2) = 3138257
--- mesa-demos-6.5.1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: thierry 
State-Changed-When: Thu Sep 28 15:04:29 UTC 2006 
State-Changed-Why:  

Committed, thanks! 

Note: I have also used DATADIR. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=103720 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103720: commit references a PR
Date: Thu, 28 Sep 2006 15:04:05 +0000 (UTC)

 thierry     2006-09-28 15:03:57 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/mesa-demos  Makefile distinfo 
   Log:
   Update to 6.5.1 and unbreake. Note that unbreaking was done by removing
   (not building and not installing) problematic (offscreen) demo.
   
   PR:             ports/103720
   Submitted by:   trasz <trasz (at) pin.if.uz.zgora.pl>
   
   Revision  Changes    Path
   1.12      +18 -23    ports/graphics/mesa-demos/Makefile
   1.7       +6 -6      ports/graphics/mesa-demos/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
