Attachment #66026 for bug #97711




# New ports collection makefile for:    dri
# Date created:		8 Nov 2003
# Whom:			anholt@FreeBSD.org
#
# $FreeBSD: ports/graphics/dri/Makefile,v 1.15 2006/01/21 18:55:03 lesi Exp $
#

PORTNAME=	dri
PORTVERSION=	6.4.1
PORTEPOCH=	2
CATEGORIES=	graphics
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=mesa3d
DISTNAME=	MesaLib-${PORTVERSION}

MAINTAINER=	anholt@FreeBSD.org
COMMENT=	OpenGL hardware acceleration drivers for the DRI

LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}

CONFLICTS=	xfree86-dri-* dri-6.2.2005*
NO_BUILD=	yes

WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
USE_X_PREFIX=	yes
USE_BZIP2=	yes
USE_GMAKE=	yes
MAKE_ENV+=	FBSDCC="${CC}" FBSDCXX="${CXX}" \
		FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \
		PTHREAD_LIBS=${PTHREAD_LIBS}

ONLY_FOR_ARCHS=	i386 alpha amd64

DRIMODDIR=	${PREFIX}/lib/modules/dri

.include <bsd.port.pre.mk>

.if ${X_WINDOW_SYSTEM:L} != xorg
IGNORE=	requires libGL from X.Org.
.endif

do-install:
	${MKDIR} ${DRIMODDIR}
.if ${ARCH} == i386
	${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
	${INSTALL_PROGRAM} ${WRKSRC}/lib/i830_dri.so ${DRIMODDIR}
	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_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}

.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
.else
PLIST_SUB+=	I386="@comment "
PLIST_SUB+=	I386_AMD64="@comment "
ALL_TARGET=	freebsd-dri
.endif
.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)ports/graphics/dri/distinfo (-3 / +3 lines)
1	MD5 (driconf-0.2.6.tar.gz) = 92058855dbf48442d3e3b86f153b40cb	1	MD5 (MesaLib-6.4.1.tar.bz2) = ea148c828ec6f645526451db1b8556f1
2	SHA256 (driconf-0.2.6.tar.gz) = e7f25a8b04f5b2042197b5410fe086048db4fd504ef21085a754a700da375a1f	2	SHA256 (MesaLib-6.4.1.tar.bz2) = 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf
3	SIZE (driconf-0.2.6.tar.gz) = 80749	3	SIZE (MesaLib-6.4.1.tar.bz2) = 2913887




--- configs/freebsd-dri.orig	Tue Oct 25 01:11:57 2005
+++ configs/freebsd-dri	Fri Dec 30 00:58:57 2005
@@ -6,32 +6,32 @@
 CONFIG_NAME = freebsd-dri
 
 # Compiler and flags
-CC = gcc
-CXX = g++
+CC = $(FBSDCC)
+CXX = $(FBSDCXX)
 WARN_FLAGS = -Wall
-OPT_FLAGS = -O
+OPT_FLAGS = $(FBSDCFLAGS)
 
-EXPAT_INCLUDES = -I/usr/local/include
-X11_INCLUDES = -I/usr/X11R6/include
+EXPAT_INCLUDES = -I${LOCALBASE}/include
+X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions
 DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC \
-	-ffast-math $(X11_INCLUDES)
+CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef \
+	-fPIC -ffast-math $(X11_INCLUDES)
 CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
 
 ASM_SOURCES = 
 
 # Library/program dependencies
 LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB)
+DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS} $(LIBDRM_LIB)
 
-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
+GLUT_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGL -lXt -lXm -lX11
 
 
 # Directories
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
+SRC_DIRS = mesa
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri

Lines 1-6 Link Here

(-)ports/graphics/dri/pkg-descr (-4 / +3 lines)
1	driconf is an application for configuring DRI drivers at a system or user level,	1	This package contains the current stable release of the client drivers for the
2	with choices applicable to all or to specific applications. Options are	2	DRI. With an X Server configured for the DRI they allow direct rendering of
3	advertised to driconf by the DRI drivers.	3	hardware-accelerated OpenGL.
4		4
5	WWW: http://dri.freedesktop.org/wiki/DriConf




%%I386%%lib/modules/dri/i810_dri.so
%%I386%%lib/modules/dri/i830_dri.so
%%I386_AMD64%%lib/modules/dri/i915_dri.so
lib/modules/dri/mach64_dri.so
lib/modules/dri/mga_dri.so
lib/modules/dri/r128_dri.so
lib/modules/dri/r200_dri.so
lib/modules/dri/r300_dri.so
lib/modules/dri/radeon_dri.so
lib/modules/dri/savage_dri.so
lib/modules/dri/sis_dri.so
%%I386%%lib/modules/dri/tdfx_dri.so
%%I386%%lib/modules/dri/unichrome_dri.so
@dirrm lib/modules/dri
@dirrmtry lib/modules

Return to bug 97711

Lines 1-30 Link Here

(-)ports/graphics/dri/Makefile (-19 / +64 lines)
1	# New ports collection makefile for: driconf	1	# New ports collection makefile for: dri
2	# Date created: 1 Apr, 2005	2	# Date created: 8 Nov 2003
3	# Whom: anholt@FreeBSD.org	3	# Whom: anholt@FreeBSD.org
4	#	4	#
5	# $FreeBSD: ports/graphics/driconf/Makefile,v 1.4 2006/05/07 23:45:56 edwin Exp $	5	# $FreeBSD: ports/graphics/dri/Makefile,v 1.15 2006/01/21 18:55:03 lesi Exp $
6	#	6	#
7		7
8	PORTNAME= driconf	8	PORTNAME= dri
9	PORTVERSION= 0.2.6	9	PORTVERSION= 6.4.1
10	PORTREVISION= 1	10	PORTEPOCH= 2
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= http://dri.freedesktop.org/~fxkuehl/driconf/	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
		13	MASTER_SITE_SUBDIR=mesa3d
		14	DISTNAME= MesaLib-${PORTVERSION}
13		15
14	MAINTAINER= anholt@FreeBSD.org	16	MAINTAINER= anholt@FreeBSD.org
15	COMMENT= Configuration program for DRI drivers	17	COMMENT= OpenGL hardware acceleration drivers for the DRI
16		18
17	LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut	19	LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
18	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2	20	BUILD_DEPENDS= makedepend:${X_IMAKE_PORT}
19		21
20	USE_PYTHON= yes	22	CONFLICTS= xfree86-dri-* dri-6.2.2005*
21	NO_BUILD= yes
22		23
23	pre-patch:	24	WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}
24	@${FIND} ${WRKSRC} -type f \| ${XARGS} ${REINPLACE_CMD} \	25	USE_X_PREFIX= yes
25	-e 's\|/usr/local\|${PREFIX}\|'	26	USE_BZIP2= yes
		27	USE_GMAKE= yes
		28	MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" \
		29	FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \
		30	PTHREAD_LIBS=${PTHREAD_LIBS}
26		31
27	do-install:	32	ONLY_FOR_ARCHS= i386 alpha amd64
28	@(cd ${WRKSRC} && ${PYTHON_CMD} setup.py install)	33
		34	DRIMODDIR= ${PREFIX}/lib/modules/dri
		35
		36	.include <bsd.port.pre.mk>
29		37
30	.include <bsd.port.mk>	38	.if ${X_WINDOW_SYSTEM:L} != xorg
		39	IGNORE= requires libGL from X.Org.
		40	.endif
		41
		42	do-install:
		43	${MKDIR} ${DRIMODDIR}
		44	.if ${ARCH} == i386
		45	${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
		46	${INSTALL_PROGRAM} ${WRKSRC}/lib/i830_dri.so ${DRIMODDIR}
		47	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
		48	${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
		49	${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
		50	.elif ${ARCH} == amd64
		51	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
		52	.endif
		53	${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR}
		54	${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR}
		55	${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR}
		56	${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR}
		57	${INSTALL_PROGRAM} ${WRKSRC}/lib/r300_dri.so ${DRIMODDIR}
		58	${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR}
		59	${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
		60	${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
		61
		62	.if ${ARCH} == i386
		63	PLIST_SUB+= I386=""
		64	PLIST_SUB+= I386_AMD64=""
		65	ALL_TARGET= freebsd-dri-x86
		66	.elif ${ARCH} == amd64
		67	PLIST_SUB+= I386="@comment "
		68	PLIST_SUB+= I386_AMD64=""
		69	ALL_TARGET= freebsd-dri
		70	.else
		71	PLIST_SUB+= I386="@comment "
		72	PLIST_SUB+= I386_AMD64="@comment "
		73	ALL_TARGET= freebsd-dri
		74	.endif
		75	.include <bsd.port.post.mk>

Line 0 Link Here

(-)ports/graphics/dri/files/patch-freebsd-dri (+47 lines)
	1	--- configs/freebsd-dri.orig Tue Oct 25 01:11:57 2005
	2	+++ configs/freebsd-dri Fri Dec 30 00:58:57 2005
	3	@@ -6,32 +6,32 @@
	4	CONFIG_NAME = freebsd-dri
	5
	6	# Compiler and flags
	7	-CC = gcc
	8	-CXX = g++
	9	+CC = $(FBSDCC)
	10	+CXX = $(FBSDCXX)
	11	WARN_FLAGS = -Wall
	12	-OPT_FLAGS = -O
	13	+OPT_FLAGS = $(FBSDCFLAGS)
	14
	15	-EXPAT_INCLUDES = -I/usr/local/include
	16	-X11_INCLUDES = -I/usr/X11R6/include
	17	+EXPAT_INCLUDES = -I${LOCALBASE}/include
	18	+X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions
	19	DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
	20	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
	21	-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \
	22	- -ffast-math $(X11_INCLUDES)
	23	+CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef \
	24	+ -fPIC -ffast-math $(X11_INCLUDES)
	25	CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
	26
	27	ASM_SOURCES =
	28
	29	# Library/program dependencies
	30	LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
	31	-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
	32	-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB)
	33	+DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat $(LIBDRM_LIB)
	34	+GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS} $(LIBDRM_LIB)
	35
	36	-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
	37	-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
	38	+GLUT_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
	39	+GLW_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGL -lXt -lXm -lX11
	40
	41
	42	# Directories
	43	-SRC_DIRS = glx/x11 mesa glu glut/glx glw
	44	+SRC_DIRS = mesa
	45	DRIVER_DIRS = dri
	46	PROGRAM_DIRS =
	47	WINDOW_SYSTEM=dri

Lines 1-12 Link Here

(-)ports/graphics/dri/pkg-plist (-12 / +15 lines)
1	bin/driconf	1	%%I386%%lib/modules/dri/i810_dri.so
2	%%PYTHON_SITELIBDIR%%/dri.py	2	%%I386%%lib/modules/dri/i830_dri.so
3	%%PYTHON_SITELIBDIR%%/dri.pyc	3	%%I386_AMD64%%lib/modules/dri/i915_dri.so
4	%%PYTHON_SITELIBDIR%%/driconf.py	4	lib/modules/dri/mach64_dri.so
5	%%PYTHON_SITELIBDIR%%/driconf.pyc	5	lib/modules/dri/mga_dri.so
6	share/locale/de/LC_MESSAGES/driconf.mo	6	lib/modules/dri/r128_dri.so
7	share/locale/es/LC_MESSAGES/driconf.mo	7	lib/modules/dri/r200_dri.so
8	%%DATADIR%%/card.png	8	lib/modules/dri/r300_dri.so
9	%%DATADIR%%/screen.png	9	lib/modules/dri/radeon_dri.so
10	%%DATADIR%%/screencard.png	10	lib/modules/dri/savage_dri.so
11	%%DATADIR%%/drilogo.jpg	11	lib/modules/dri/sis_dri.so
12	@dirrm %%DATADIR%%	12	%%I386%%lib/modules/dri/tdfx_dri.so
		13	%%I386%%lib/modules/dri/unichrome_dri.so
		14	@dirrm lib/modules/dri
		15	@dirrmtry lib/modules