[Midnightbsd-cvs] mports: mports/graphics:

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 15 15:00:37 EDT 2009 

Log Message:
-----------


Modified Files:
--------------
    mports/graphics:
        Makefile (r1.87 -> r1.88)
    mports/graphics/OpenEXR:
        Makefile (r1.3 -> r1.4)
    mports/graphics/dri:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.2 -> r1.3)
        pkg-plist (r1.2 -> r1.3)
    mports/graphics/dri/files:
        patch-mach64_context.h (r1.1 -> r1.2)
        patch-sis_context.h (r1.1 -> r1.2)
    mports/graphics/gnash:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1 -> r1.2)
    mports/graphics/libGL:
        Makefile (r1.1 -> r1.2)
        bsd.mesalib.mk (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/graphics/libGLU:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-descr (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/graphics/libdrm:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.2 -> r1.3)
        pkg-plist (r1.2 -> r1.3)

Added Files:
-----------
    mports/graphics/libGLw:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

Removed Files:
-------------
    mports/graphics/dri/files:
        patch-bin__mklib
        patch-glheader.h
    mports/graphics/libGL/files:
        patch-bin__mklib
    mports/graphics/libGLU/files:
        config
        patch-bin-mklib
        patch-configs
        patch-glu-Makefile

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/dri/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/dri/pkg-plist -L graphics/dri/pkg-plist -u -r1.2 -r1.3
--- graphics/dri/pkg-plist
+++ graphics/dri/pkg-plist
@@ -1,6 +1,7 @@
-%%I386%%lib/dri/i810_dri.so
-%%I386_AMD64%%lib/dri/i915_dri.so
-%%I386%%lib/dri/i965_dri.so
+include/GL/internal/dri_interface.h
+lib/dri/i810_dri.so
+lib/dri/i915_dri.so
+lib/dri/i965_dri.so
 lib/dri/mach64_dri.so
 lib/dri/mga_dri.so
 lib/dri/r128_dri.so
@@ -9,6 +10,10 @@
 lib/dri/radeon_dri.so
 lib/dri/savage_dri.so
 lib/dri/sis_dri.so
-%%I386%%lib/dri/tdfx_dri.so
-%%I386%%lib/dri/unichrome_dri.so
+lib/dri/swrast_dri.so
+lib/dri/tdfx_dri.so
+lib/dri/unichrome_dri.so
+libdata/pkgconfig/dri.pc
 @dirrm lib/dri
+ at dirrmtry include/GL/internal
+ at dirrmtry include/GL
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/dri/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L graphics/dri/Makefile -L graphics/dri/Makefile -u -r1.4 -r1.5
--- graphics/dri/Makefile
+++ graphics/dri/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:    dri
-# Date created:		8 Nov 2003
-# Whom:			anholt at FreeBSD.org
-#
-# $FreeBSD: ports/graphics/dri/Makefile,v 1.24 2007/08/29 10:33:10 flz Exp $
-#
+# $MidnightBSD$
 
 PORTNAME=	dri
 PORTVERSION=	${MESAVERSION}
@@ -11,47 +6,18 @@
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
+LICENSE=	x11
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
 		expat.6:${PORTSDIR}/textproc/expat2
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
-CONFLICTS=	xfree86-dri-* dri-6.2.2005* dri-6.5.2006*
+CONFLICTS=	dri-6.2.2005* dri-6.5.2006*
 
-MAKE_ENV+=	FBSDCC="${CC}" FBSDCXX="${CXX}" \
-		FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \
-		PTHREAD_LIBS=${PTHREAD_LIBS}
-USE_GCC=	3.4+
-
-USE_XORG=	x11
-
-DRIMODDIR=	${PREFIX}/lib/dri
-SRCDIR=		mesa
-
-.if !defined(ARCH)
-ARCH!=	uname -p
-.endif
+USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
 do-install:
-	${MKDIR} ${DRIMODDIR}
-.if ${ARCH} == i386
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/i965_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
-.elif ${ARCH} == amd64
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/r300_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
+	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/dri/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/dri/distinfo -L graphics/dri/distinfo -u -r1.2 -r1.3
--- graphics/dri/distinfo
+++ graphics/dri/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.0.1.tar.bz2) = c056abd763e899114bf745c9eedbf9ad
-SHA256 (MesaLib-7.0.1.tar.bz2) = 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
-SIZE (MesaLib-7.0.1.tar.bz2) = 3343538
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/OpenEXR/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L graphics/OpenEXR/Makefile -L graphics/OpenEXR/Makefile -u -r1.3 -r1.4
--- graphics/OpenEXR/Makefile
+++ graphics/OpenEXR/Makefile
@@ -20,6 +20,7 @@
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=--enable-imfexamples
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd6.0
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
--- graphics/dri/files/patch-glheader.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/mesa/main/glheader.h.orig	Thu Apr 13 01:52:32 2006
-+++ src/mesa/main/glheader.h	Wed Dec 20 15:27:53 2006
-@@ -127,12 +127,15 @@
-  * For now, only used by some DRI hardware drivers for color/texel packing.
-  */
- #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
--#if defined(__linux__)
-+#if defined(__FreeBSD__)
-+#include <sys/endian.h>
-+#define CPU_TO_LE32( x )	bswap32( x )
-+#elif defined(__linux__)
- #include <byteswap.h>
- #define CPU_TO_LE32( x )	bswap_32( x )
--#else /*__linux__*/
--#define CPU_TO_LE32( x )	( x )  /* fix me for non-Linux big-endian! */
--#endif /*__linux__*/
-+#else
-+#error "Add CPU_TO_LE32 macro for this OS."
-+#endif
- #define MESA_BIG_ENDIAN 1
- #else
- #define CPU_TO_LE32( x )	( x )
Index: patch-sis_context.h
===================================================================
RCS file: /home/cvs/mports/graphics/dri/files/patch-sis_context.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/dri/files/patch-sis_context.h -L graphics/dri/files/patch-sis_context.h -u -r1.1 -r1.2
--- graphics/dri/files/patch-sis_context.h
+++ graphics/dri/files/patch-sis_context.h
@@ -1,16 +1,16 @@
---- src/mesa/drivers/dri/sis/sis_context.h.orig	Tue Apr 11 13:41:11 2006
-+++ src/mesa/drivers/dri/sis/sis_context.h	Wed Dec 20 18:32:46 2006
-@@ -401,8 +401,20 @@
+--- src/mesa/drivers/dri/sis/sis_context.h.orig	2008-09-22 13:38:53.000000000 +0100
++++ src/mesa/drivers/dri/sis/sis_context.h	2008-09-22 13:40:51.000000000 +0100
+@@ -401,10 +401,20 @@
  #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
  #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
  
--#if defined(__i386__) || defined(__amd64__)
+-#if defined(__i386__) || defined(__x86_64__)
 +#if defined(__alpha__)
 +#define MMIO_WMB()	__asm __volatile("wmb" : : : "memory")
-+#elif defined(__amd64__) || defined(__i386__)
++#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
  #define MMIO_WMB()	__asm __volatile("" : : : "memory")
-+#elif defined(__ia64__)
-+#define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
+ #elif defined(__ia64__)
+ #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
 +#elif defined(__powerpc__)
 +#define MMIO_WMB()	__asm __volatile("eieio" : : : "memory")
 +#elif defined(__sparc64__)
Index: patch-mach64_context.h
===================================================================
RCS file: /home/cvs/mports/graphics/dri/files/patch-mach64_context.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/dri/files/patch-mach64_context.h -L graphics/dri/files/patch-mach64_context.h -u -r1.1 -r1.2
--- graphics/dri/files/patch-mach64_context.h
+++ graphics/dri/files/patch-mach64_context.h
@@ -1,6 +1,6 @@
---- src/mesa/drivers/dri/mach64/mach64_context.h.orig	Mon Nov 28 13:17:16 2005
-+++ src/mesa/drivers/dri/mach64/mach64_context.h	Wed Dec 20 15:37:34 2006
-@@ -331,25 +331,28 @@
+--- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2009-01-21 10:55:48.000000000 -0500
++++ src/mesa/drivers/dri/mach64/mach64_context.h	2009-01-22 13:48:00.000000000 -0500
+@@ -288,17 +288,20 @@
  /* ================================================================
   * Byte ordering
   */
@@ -11,27 +11,17 @@
  #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
  #define LE32_OUT_FLOAT( x, y )	do { *(GLfloat *)(x) = (y); } while (0)
  #else
+-#ifndef __OpenBSD__
 -#include <byteswap.h>
--#define LE32_IN( x )		bswap_32( *(GLuint *)(x) )
-+#define LE32_IN( x )		CPU_TO_LE32( *(GLuint *)(x) )
- #define LE32_IN_FLOAT( x )						\
- ({									\
--   GLuint __tmp = bswap_32( *(GLuint *)(x) );				\
-+   GLuint __tmp = CPU_TO_LE32( *(GLuint *)(x) );			\
-    *(GLfloat *)&__tmp;							\
- })
--#define LE32_OUT( x, y )	do { *(GLuint *)(x) = bswap_32( y ); } while (0)
-+#define LE32_OUT( x, y )	do { *(GLuint *)(x) = CPU_TO_LE32( y ); } while (0)
-+#define LE32_OUT( x, y )						\
-+do {									\
-+   *(GLuint *)(x) = CPU_TO_LE32( y );					\
-+} while (0)
- #define LE32_OUT_FLOAT( x, y )						\
- do {									\
-    GLuint __tmp;							\
-    *(GLfloat *)&__tmp = (y);						\
--   *(GLuint *)(x) = bswap_32( __tmp );					\
-+   *(GLuint *)(x) = CPU_TO_LE32( __tmp );				\
- } while (0)
+-#else
++#if defined(__OpenBSD__)
+ #include <machine/endian.h>
+ #define bswap_32 bswap32
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define bswap_32 bswap32
++#else
++#include <byteswap.h>
  #endif
  
+ #define LE32_IN( x )		bswap_32( *(GLuint *)(x) )
--- graphics/dri/files/patch-bin__mklib
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/mklib.orig	Mon Oct  1 03:11:55 2007
-+++ ./bin/mklib	Mon Oct  1 03:12:02 2007
-@@ -356,7 +356,7 @@
- 	fi
- 	;;
- 
--    'FreeBSD')
-+    'FreeBSD' | 'MidnightBSD')
- 	# we assume gcc
- 
- 	if [ "x$LINK" = "x" ] ; then
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/gnash/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L graphics/gnash/Makefile -L graphics/gnash/Makefile -u -r1.3 -r1.4
--- graphics/gnash/Makefile
+++ graphics/gnash/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gnash
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8.4
 PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/gnash/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/gnash/distinfo -L graphics/gnash/distinfo -u -r1.1 -r1.2
--- graphics/gnash/distinfo
+++ graphics/gnash/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnash-0.7.1.tar.bz2) = d860981aeaac0fc941a28abc3c24223c
-SHA256 (gnash-0.7.1.tar.bz2) = 48fcb533e3989757c23af2b9130c8b490a4d40375be4813ce425efea82ae0f62
-SIZE (gnash-0.7.1.tar.bz2) = 1089794
+MD5 (gnash-0.8.4.tar.bz2) = b47a7ed4b7c66b8c2ebacc2286ef0d4b
+SHA256 (gnash-0.8.4.tar.bz2) = 6ffe4bdbc22de712e59205a27b46aa93a5372c67829c7f02d6b1c1778e9f9224
+SIZE (gnash-0.8.4.tar.bz2) = 2887666
Index: bsd.mesalib.mk
===================================================================
RCS file: /home/cvs/mports/graphics/libGL/bsd.mesalib.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/libGL/bsd.mesalib.mk -L graphics/libGL/bsd.mesalib.mk -u -r1.2 -r1.3
--- graphics/libGL/bsd.mesalib.mk
+++ graphics/libGL/bsd.mesalib.mk
@@ -5,6 +5,8 @@
 #
 # Created by: Florent Thoumie <flz at FreeBSD.org>
 #
+# !!! Here be dragons !!! (they seem to be everywhere these days)
+#
 # Remember to upgrade the following ports everytime you bump MESAVERSION:
 #
 #    - graphics/libGL
@@ -12,74 +14,92 @@
 #    - graphics/libGLw
 #    - graphics/dri
 #
-# $FreeBSD: ports/graphics/libGL/bsd.mesalib.mk,v 1.1 2007/08/29 10:33:09 flz Exp $
 # $MidnightBSD$
-#
 
-MESAVERSION=	7.0.1
+MESAVERSION=	7.3
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
 MASTER_SITE_SUBDIR=	mesa3d
-DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX}
-MAINTAINER=	ports at MidnightBSD.org
-LICENSE?=	x11
-CONFLICTS?=	XFree86-libraries-* xorg-libraries-6.*
+DISTFILES=	MesaLib-${MESAVERSION}${EXTRACT_SUFX}
+MAINTAINER?=	x11 at FreeBSD.org
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
 
-MAKE_ARGS=	SHELL=${SH}
-CFLAGS+=	-DUSE_XSHM -DHZ=100
+ALL_TARGET=	default
 
-PREFIX=		${X11BASE}
-FILESDIR=	${.CURDIR}/../../graphics/libGL/files
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
-CONFDIR=	${WRKSRC}/configs
+#MAKE_ARGS=	SHELL=${SH}
+#CFLAGS+=	-DUSE_XSHM -DHZ=100
 
-SHVER?=		1
+#FILESDIR=	${.CURDIR}/../../graphics/libGL/files
+WRKSRC=		${WRKDIR}/Mesa-${MESAVERSION}
 
 .if !defined(ARCH)
 ARCH!=		uname -p
 .endif
 
-.if ${ARCH} == i386
-PLIST_SUB+=	I386=""
-PLIST_SUB+=	I386_AMD64=""
-ALL_TARGET=	freebsd-dri-x86
-.elif ${ARCH} == amd64
-PLIST_SUB+=	I386="@comment "
-PLIST_SUB+=	I386_AMD64=""
-ALL_TARGET=	freebsd-dri-amd64
+.if ${ARCH} == alpha
+FAST_MATH=
 .else
-PLIST_SUB+=	I386="@comment "
-PLIST_SUB+=	I386_AMD64="@comment "
-ALL_TARGET=	freebsd-dri
-.endif
-
-pre-patch:
-	@${REINPLACE_CMD} \
-		-e '/^CC =/d' -e '/^CXX =/d' \
-		-e 's|/usr/X11R6|${X11BASE}|g' \
-		-e 's|/usr/local|${LOCALBASE}|g' \
-		-e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		-e 's|CFLAGS = |CFLAGS = ${CFLAGS} |g' \
-		-e 's|OPT_FLAGS = .*|OPT_FLAGS = ${CFLAGS}|g' \
-		-e "s|SRC_DIRS = .*|SRC_DIRS = ${SRCDIR}|g" \
-		-e 's|-DHAVE_POSIX_MEMALIGN||' \
-		${CONFDIR}/freebsd-dri
-	@${REINPLACE_CMD} \
-		-e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${X11BASE}/include|' \
-		-e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${X11BASE}/lib|' \
-		-e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${X11BASE}/lib/dri|' \
-		${CONFDIR}/default
-
-.if !target(do-install)
-do-install:
-	${MKDIR} ${PREFIX}/include/GL/
-.for i in ${HEADERS}
-	${INSTALL_DATA} ${WRKSRC}/${HEADERSDIR}/${i} ${PREFIX}/include/GL/
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/${PORTNAME}.so.${SHVER} ${PREFIX}/lib
-	${LN} -sf ${PORTNAME}.so.${SHVER} ${PREFIX}/lib/${PORTNAME}.so
+FAST_MATH=      -ffast-math
+.endif
+
+COMPONENT=	${PORTNAME:L:C/^lib//:C/mesa-//}
+
+.if ${COMPONENT:Mglut} == ""
+. if ${COMPONENT:Mglu} == ""
+CONFIGURE_ARGS+=	--disable-glu --disable-glut
+. else
+CONFIGURE_ARGS+=	--disable-glut
+. endif
+.else
+DISTFILES+=	MesaGLUT-${MESAVERSION}${EXTRACT_SUFX}
+.endif
+
+.if ${COMPONENT:Mglw} == ""
+CONFIGURE_ARGS+=	--disable-glw
+.else
+CONFIGURE_ARGS+=	--enable-motif
+.endif
+
+.if ${COMPONENT:Mdemos} == ""
+CONFIGURE_ARGS+=	--with-demos=no
+.else
+DISTFILES+=	MesaDemos-${MESAVERSION}${EXTRACT_SUFX}
+CONFIGURE_ARGS+=	--with-demos=demos,xdemos
+.endif
+
+.if ${COMPONENT:Mdri} == ""
+CONFIGURE_ARGS+=	--with-dri-drivers=no
+.endif
+
+.if defined(WITHOUT_XCB)
+CONFIGURE_ARGS+=	--disable-xcb
+.else
+CONFIGURE_ARGS+=	--enable-xcb
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/src/glu/Makefile \
+		${WRKSRC}/src/glw/Makefile \
+		${WRKSRC}/src/mesa/Makefile \
+		${WRKSRC}/src/mesa/drivers/dri/Makefile
+.if ${COMPONENT:Mglut} != ""
+	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/src/glut/glx/Makefile
+.endif
+.if ${COMPONENT:Mdemos} != ""
+	@${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
+		-e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
+		-e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
+		-e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
+			${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
 .endif
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/libGL/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libGL/pkg-plist -L graphics/libGL/pkg-plist -u -r1.1 -r1.2
--- graphics/libGL/pkg-plist
+++ graphics/libGL/pkg-plist
@@ -1,7 +1,19 @@
+include/GL/dmesa.h
+include/GL/ggimesa.h
+include/GL/gl_mangle.h
 include/GL/gl.h
 include/GL/glext.h
+include/GL/glfbdev.h
+include/GL/glx_mangle.h
 include/GL/glx.h
 include/GL/glxext.h
+include/GL/mesa_wgl.h
+include/GL/mglmesa.h
+include/GL/osmesa.h
+include/GL/svgamesa.h
+include/GL/vms_x_fix.h
+include/GL/wmesa.h
 lib/libGL.so
 lib/libGL.so.1
+libdata/pkgconfig/gl.pc
 @dirrmtry include/GL
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/libGL/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libGL/Makefile -L graphics/libGL/Makefile -u -r1.1 -r1.2
--- graphics/libGL/Makefile
+++ graphics/libGL/Makefile
@@ -1,10 +1,4 @@
-# New ports collection makefile for:    xorg-server
-# Date created:		7 May 2004
-# Whom:			anholt at FreeBSD.org
-#
-# $FreeBSD: ports/graphics/libGL/Makefile,v 1.6 2007/08/29 10:33:09 flz Exp $
 # $MidnightBSD$
-#
 
 PORTNAME=	libGL
 PORTVERSION=	${MESAVERSION}
@@ -14,14 +8,14 @@
 LICENSE=	x11
 
 BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
-LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm
+LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm \
+		expat.6:${PORTSDIR}/textproc/expat2
 
-USE_XORG=	glproto xxf86vm xext xfixes xdamage
-CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/drm
+USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
 
-SRCDIR=		glx/x11
-HEADERS=	gl.h glext.h glx.h glxext.h
-HEADERSDIR=	include/GL
+do-install:
+	${RM} ${WRKSRC}/include/GL/glu*.h
+	cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/libGL/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libGL/distinfo -L graphics/libGL/distinfo -u -r1.1 -r1.2
--- graphics/libGL/distinfo
+++ graphics/libGL/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.0.1.tar.bz2) = c056abd763e899114bf745c9eedbf9ad
-SHA256 (MesaLib-7.0.1.tar.bz2) = 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
-SIZE (MesaLib-7.0.1.tar.bz2) = 3343538
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
--- graphics/libGL/files/patch-bin__mklib
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/mklib.orig	Mon Oct  1 03:11:55 2007
-+++ ./bin/mklib	Mon Oct  1 03:12:02 2007
-@@ -356,7 +356,7 @@
- 	fi
- 	;;
- 
--    'FreeBSD')
-+    'FreeBSD' | 'MidnightBSD')
- 	# we assume gcc
- 
- 	if [ "x$LINK" = "x" ] ; then
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/graphics/libGLU/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libGLU/pkg-descr -L graphics/libGLU/pkg-descr -u -r1.1 -r1.2
--- graphics/libGLU/pkg-descr
+++ graphics/libGLU/pkg-descr
@@ -1,3 +1,6 @@
 This package contains the OpenGL utility library.
 
 WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt at FreeBSD.org
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/libGLU/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libGLU/pkg-plist -L graphics/libGLU/pkg-plist -u -r1.1 -r1.2
--- graphics/libGLU/pkg-plist
+++ graphics/libGLU/pkg-plist
@@ -1,4 +1,5 @@
 include/GL/glu.h
+include/GL/glu_mangle.h
 lib/libGLU.so
 lib/libGLU.so.1
- at dirrmtry include/GL
+libdata/pkgconfig/glu.pc
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/libGLU/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libGLU/Makefile -L graphics/libGLU/Makefile -u -r1.1 -r1.2
--- graphics/libGLU/Makefile
+++ graphics/libGLU/Makefile
@@ -1,38 +1,18 @@
-# New ports collection makefile for:    libGLU
-# Date created:		15 Oct 2007
-# Whom:			luke at MidnightBSD.org
-#
 # $MidnightBSD$
-#
 
 PORTNAME=	libGLU
-PORTVERSION=	7.0
+PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	 mesa3d
-DISTNAME=	MesaLib-${PORTVERSION}
 
-MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	OpenGL utility library
-LICENSE=	lgpl
 
-CONFLICTS=	xorg-libraries-6.*
-
-USE_BZIP2=	yes
-USE_LDCONFIG= yes
 USE_GL=		gl
-
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/src/glu/sgi
-
-ALL_TARGET=	libGLU.so
-
-post-patch:
-	${CP} ${FILESDIR}/config ${WRKDIR}/Mesa-${PORTVERSION}/configs/current
+USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so.1 ${PREFIX}/lib
-	${LN} -sf libGLU.so.1 ${PREFIX}/lib/libGLU.so
-	${MKDIR} ${PREFIX}/include/GL
-	${INSTALL_DATA} ${WRKDIR}/Mesa-${PORTVERSION}/include/GL/glu.h ${PREFIX}/include/GL
+	cd ${WRKSRC}/src/glu; ${GMAKE} install
+	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
+	cd ${WRKSRC}/src/glu; ${GMAKE} install
 
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/libGLU/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libGLU/distinfo -L graphics/libGLU/distinfo -u -r1.1 -r1.2
--- graphics/libGLU/distinfo
+++ graphics/libGLU/distinfo
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.0.tar.bz2) = 50c371455fa7532c04aa0a970f9bc51f
-SHA256 (MesaLib-7.0.tar.bz2) = dc4dcd24712c4bdafc430f281e7200b9b7d9a6de1995223275def1d1bf012c08
-SIZE (MesaLib-7.0.tar.bz2) = 3366124
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
--- graphics/libGLU/files/patch-configs
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -urN configs.orig/midnightbsd configs/midnightbsd
---- configs.orig/midnightbsd	Wed Dec 31 19:00:00 1969
-+++ configs/midnightbsd	Mon Oct 15 00:02:01 2007
-@@ -0,0 +1,27 @@
-+# Configuration for MidnightBSD
-+
-+include $(TOP)/configs/default
-+
-+CONFIG_NAME = MidnightBSD
-+
-+# Compiler and flags
-+CC = cc
-+CXX = c++
-+MAKE = gmake
-+
-+OPT_FLAGS  = -O2
-+PIC_FLAGS  = -fPIC
-+
-+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
-+	-DHZ=100 -DHAVE_POSIX_MEMALIGN
-+
-+X11_INCLUDES = -I/usr/local/include
-+
-+CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ffast-math -pedantic
-+
-+CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
-+
-+GLUT_CFLAGS = -fexceptions
-+
-+EXTRA_LIB_PATH = -L/usr/local/lib
-+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
-diff -urN configs.orig/midnightbsd-dri configs/midnightbsd-dri
---- configs.orig/midnightbsd-dri	Wed Dec 31 19:00:00 1969
-+++ configs/midnightbsd-dri	Mon Oct 15 00:03:41 2007
-@@ -0,0 +1,50 @@
-+# -*-makefile-*-
-+# Configuration for midnight-dri: MidnightBSD DRI hardware drivers
-+
-+include $(TOP)/configs/midnightbsd
-+
-+CONFIG_NAME = midnightbsd-dri
-+
-+# Compiler and flags
-+CC = gcc
-+CXX = g++
-+WARN_FLAGS = -Wall
-+OPT_FLAGS = -O
-+
-+EXPAT_INCLUDES = -I/usr/local/include
-+X11_INCLUDES = -I/usr/local/include
-+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-+	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-+
-+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
-+	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
-+
-+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
-+
-+ASM_SOURCES = 
-+
-+# Library/program dependencies
-+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
-+LIBDRM_LIB = `pkg-config --libs libdrm`
-+DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
-+GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-+	-lm -pthread $(LIBDRM_LIB)
-+
-+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
-+
-+
-+# Directories
-+SRC_DIRS = glx/x11 mesa glu glut/glx glw
-+DRIVER_DIRS = dri
-+PROGRAM_DIRS = 
-+WINDOW_SYSTEM=dri
-+
-+DRM_SOURCE_PATH=$(TOP)/../drm
-+
-+# ffb and gamma are missing because they have not been converted to use the new
-+# interface.
-+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
-+	   unichrome savage sis
-+
-diff -urN configs.orig/midnightbsd-dri-amd64 configs/midnightbsd-dri-amd64
---- configs.orig/midnightbsd-dri-amd64	Wed Dec 31 19:00:00 1969
-+++ configs/midnightbsd-dri-amd64	Mon Oct 15 00:04:40 2007
-@@ -0,0 +1,10 @@
-+# -*-makefile-*-
-+# Configuration for midnightbsd-dri-amd64: MidnightBSD DRI hardware drivers
-+
-+include $(TOP)/configs/midnightbsd-dri
-+
-+CONFIG_NAME = midnightbsd-dri-x86-64
-+
-+ASM_FLAGS = -DUSE_X86_64_ASM
-+ASM_SOURCES = $(X86-64_SOURCES)
-+ASM_API = $(X86-64_API)
-diff -urN configs.orig/midnightbsd-dri-x86 configs/midnightbsd-dri-x86
---- configs.orig/midnightbsd-dri-x86	Wed Dec 31 19:00:00 1969
-+++ configs/midnightbsd-dri-x86	Mon Oct 15 00:05:25 2007
-@@ -0,0 +1,13 @@
-+# -*-makefile-*-
-+# Configuration for midnightbsd-dri: MidnightBSD DRI hardware drivers
-+
-+include $(TOP)/configs/midnightbsd-dri
-+
-+CONFIG_NAME = midnightbsd-dri-x86
-+
-+# Unnecessary on x86, generally.
-+PIC_FLAGS = 
-+
-+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-+ASM_SOURCES = $(X86_SOURCES)
-+ASM_API = $(X86_API)
--- graphics/libGLU/files/patch-glu-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	Wed Jul 12 19:43:20 2006
-+++ Makefile	Tue Oct  3 00:22:56 2006
-@@ -135,10 +135,10 @@
- 	-mkdir $(TOP)/$(LIB_DIR)
- 
- # Make the library:
--$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
--	$(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
-+$(GLU_LIB_NAME): $(OBJECTS)
-+	${TOP}/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
- 		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
--		-cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
-+		-cplusplus $(MKLIB_OPTIONS) \
- 		$(GLU_LIB_DEPS) $(OBJECTS)
- 
- 
--- graphics/libGLU/files/patch-bin-mklib
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../../../bin/mklib	Mon Oct 15 01:14:29 2007
-+++ ../../../bin/mklib	Mon Oct 15 01:14:39 2007
-@@ -356,7 +356,7 @@
- 	fi
- 	;;
- 
--    'FreeBSD')
-+    'FreeBSD' | 'MidnightBSD' )
- 	# we assume gcc
- 
- 	if [ "x$LINK" = "x" ] ; then
--- graphics/libGLU/files/config
+++ /dev/null
@@ -1,31 +0,0 @@
-# Configuration for mesa-demos port for FreeBSD
-# Taken from Mesa CVS mesa/Mesa/configs/freebsd Rev 1.2
-# $FreeBSD: ports/graphics/libGLU/files/config,v 1.1 2007/05/19 20:09:44 flz Exp $
-#
-
-# Set and remember $CFLAGS, $CXXFLAGS, $CC and $CXX before they are
-# overriden in default include
-
-_CC := $(CC)
-_CXX := $(CXX)
-_CFLAGS := -fPIC -pedantic -I$(X11BASE)/include -DUSE_XSHM -DHZ=100 $(CFLAGS)
-_CXXFLAGS := -fPIC -pedantic $(CXXFLAGS)
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = MidnightBSD
-
-# Now reset compiler and flags
-CC = $(_CC)
-CXX = $(_CXX)
-CFLAGS = $(_CFLAGS)
-CXXFLAGS = $(_CXXFLAGS)
-
-GLUT_CFLAGS = -fexceptions
-
-LIB_DIR = $(X11BASE)/lib
-
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
-
--- /dev/null
+++ graphics/libGLw/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the OpenGL widgets library.
+
+WWW: http://www.mesa3d.org/
--- /dev/null
+++ graphics/libGLw/pkg-plist
@@ -0,0 +1,8 @@
+include/GL/GLwDrawA.h
+include/GL/GLwDrawAP.h
+include/GL/GLwMDrawA.h
+include/GL/GLwMDrawAP.h
+lib/libGLw.so
+lib/libGLw.so.1
+libdata/pkgconfig/glw.pc
+ at dirrmtry include/GL
--- /dev/null
+++ graphics/libGLw/Makefile
@@ -0,0 +1,19 @@
+# $MidnightBSD: mports/graphics/libGLw/Makefile,v 1.1 2009/03/15 19:00:34 laffer1 Exp $
+
+PORTNAME=	libGLw
+PORTVERSION=	${MESAVERSION}
+CATEGORIES=	graphics
+
+COMMENT=	OpenGL widgets library
+
+BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend
+LIB_DEPENDS+=	Xm.3:${PORTSDIR}/x11-toolkits/open-motif
+
+USE_GL=		gl
+USE_XORG=	glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
+
+do-install:
+	cd ${WRKSRC}/src/glw; ${GMAKE} install
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include <bsd.port.mk>
--- /dev/null
+++ graphics/libGLw/distinfo
@@ -0,0 +1,3 @@
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/Makefile,v
retrieving revision 1.87
retrieving revision 1.88
diff -L graphics/Makefile -L graphics/Makefile -u -r1.87 -r1.88
--- graphics/Makefile
+++ graphics/Makefile
@@ -46,6 +46,7 @@
     SUBDIR += lcms
     SUBDIR += libGL
     SUBDIR += libGLU
+    SUBDIR += libGLw
     SUBDIR += libart
     SUBDIR += libart_lgpl
     SUBDIR += libcaca
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/libdrm/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/libdrm/pkg-plist -L graphics/libdrm/pkg-plist -u -r1.2 -r1.3
--- graphics/libdrm/pkg-plist
+++ graphics/libdrm/pkg-plist
@@ -1,8 +1,10 @@
 include/drm/drm.h
+include/drm/drm_mode.h
 include/drm/drm_sarea.h
 include/drm/i915_drm.h
 include/drm/mach64_drm.h
 include/drm/mga_drm.h
+include/drm/nouveau_drm.h
 include/drm/r128_drm.h
 include/drm/r300_reg.h
 include/drm/radeon_drm.h
@@ -10,10 +12,16 @@
 include/drm/sis_drm.h
 include/drm/via_3d_reg.h
 include/drm/via_drm.h
+include/drm/xgi_drm.h
+include/intel_bufmgr.h
 include/xf86drm.h
-include/xf86mm.h
+include/xf86drmMode.h
 lib/libdrm.la
 lib/libdrm.so
 lib/libdrm.so.2
+lib/libdrm_intel.la
+lib/libdrm_intel.so
+lib/libdrm_intel.so.1
 libdata/pkgconfig/libdrm.pc
+libdata/pkgconfig/libdrm_intel.pc
 @dirrm include/drm
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/libdrm/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L graphics/libdrm/Makefile -L graphics/libdrm/Makefile -u -r1.3 -r1.4
--- graphics/libdrm/Makefile
+++ graphics/libdrm/Makefile
@@ -1,26 +1,25 @@
-# New ports collection makefile for:    libdrm
-# Date created:                         29 Dec 2005
-# Whom:                                 lesi at FreeBSD.org
-#
-# $FreeBSD: ports/graphics/libdrm/Makefile,v 1.8 2007/05/19 20:09:46 flz Exp $
 # $MidnightBSD$
-#
 
-PORTNAME=       libdrm
-PORTVERSION=    2.3.0
-CATEGORIES=     graphics x11
-MASTER_SITES=   http://dri.freedesktop.org/libdrm/
-
-MAINTAINER=     ports at MidnightBSD.org
-COMMENT=        Userspace interface to kernel Direct Rendering Module services
-LICENSE=        x11
+PORTNAME=	libdrm
+PORTVERSION=	2.4.5
+CATEGORIES=	graphics x11
+MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
-GNU_CONFIGURE=  yes
-USE_LDCONFIG=   yes
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Userspace interface to kernel Direct Rendering Module services
+LICENSE=	x11
+
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+
+#CONFIGURE_ARGS=	--enable-nouveau-experimental-api
 
 pre-patch:
 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
-		${WRKSRC}/configure
-                    
-.include <bsd.port.mk>
+	    ${WRKSRC}/configure
 
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/libdrm/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/libdrm/distinfo -L graphics/libdrm/distinfo -u -r1.2 -r1.3
--- graphics/libdrm/distinfo
+++ graphics/libdrm/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdrm-2.3.0.tar.gz) = f2f5d3186bee51be49e1389bed39a7ed
-SHA256 (libdrm-2.3.0.tar.gz) = 76f90a22e141832bccea3fabf14e2b2a53e1ff72fe8414e2836ea8ac7e2e3dab
-SIZE (libdrm-2.3.0.tar.gz) = 391509
+MD5 (libdrm-2.4.5.tar.bz2) = 0d09025f069ff1a986cf3339e51908b3
+SHA256 (libdrm-2.4.5.tar.bz2) = 95daf23bce3fc7fc644e68ac17f1415a85c671511eb227183834204fec43a094
+SIZE (libdrm-2.4.5.tar.bz2) = 387733

More information about the Midnightbsd-cvs mailing list