Attachment #20515 for bug #36181

View | Details | Raw Unified | Return to bug 36181
Collapse All | Expand All




--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig	Tue Mar 19 17:35:44 2002
+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile	Tue Mar 19 17:35:50 2002
@@ -11,10 +11,11 @@
 
 install::
 	$(MAKE) -f Makefile.bsd install
+	
+clean::
+	$(MAKE) -f Makefile.bsd clean
+
 #else
 all::
 	@echo 'Use "make -f Makefile.bsd" to manually build the modules'
 #endif
-
-clean::
-	$(MAKE) -f Makefile.bsd clean




			HasPam=${HasPam} \
			ExtendedInputDevices=${ExtendedInputDevices} \
			BuildXF86DRI=${BuildXF86DRI} \
			HasGlide3=${HasGlide3} \
			HaveMatroxHal=${HaveMatroxHal}
MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
MAKE_ARGS=		WORLDOPTS=

HasSecureRPC?=		DEFAULT
HasPam?=		DEFAULT
ExtendedInputDevices?=	DEFAULT

.if ${ARCH} == i386
BuildXF86DRI=		YES
BuildXF86DRM=		YES
PLIST_SUB+=		DRI=""
MASTER_SITES+=		http://gladstone.uoregon.edu/~eanholt/dri/:glide
DISTFILES+=		freebsd-glide3headers.tar.gz:glide
HasGlide3=		YES

post-extract:
	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
.else
pre-fetch::
.if ${ARCH} == i386
	@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
.else
	@${ECHO_MSG} "DRI only built on i386"
.endif # i386
BuildXF86DRI=		NO
HasGlide3=		NO
PLIST_SUB+=		DRI="@comment "
.endif # i386
.endif	# have /sys

# Some things are not applicable if this machine is an alpha
.if ${ARCH} == alpha

do-configure:
	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure

.if ${BuildXF86DRM} == "YES"
pre-install:
	${MKDIR} ${PREFIX}/lib/X11/kernel
.endif

post-build:
	@${RM} -f ${PKGMESSAGE}
.if ${BuildXF86DRM} == "YES"
	@${CAT} ${.CURDIR}/pkg-message-drm > ${PKGMESSAGE}
.endif
	@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}

post-install::

Lines 1-3 Link Here

(-)x11-servers/XFree86-4-Server/distinfo (+1 lines)
1	MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f	1	MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
2	MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d	2	MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
3	MD5 (xc/Wraphelp.c) = IGNORE	3	MD5 (xc/Wraphelp.c) = IGNORE
		4	MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b




lib/X11/etc/sun.termcap
lib/X11/etc/sun.terminfo
lib/X11/etc/xmodmap.std
%%DRI_KMOD%%lib/X11/kernel/gamma.ko
%%DRI_KMOD%%lib/X11/kernel/mga.ko
%%DRI_KMOD%%lib/X11/kernel/r128.ko
%%DRI_KMOD%%lib/X11/kernel/radeon.ko
%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
%%DRI_KMOD%%@dirrm lib/X11/kernel
lib/X11/xserver/SecurityPolicy
lib/modules/codeconv/libARABIC.a
lib/modules/codeconv/libARMSCII8.a

%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
%%DRI%%lib/modules/dri/mga_dri.so
%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
%%DRI%%lib/modules/dri/tdfx_dri.so
%%I386:%%lib/modules/drivers/apm_drv.o
%%I386:%%lib/modules/drivers/ark_drv.o
%%I386:%%lib/modules/drivers/ati_drv.o

Lines 46-52 Link Here

(-)x11-servers/XFree86-4-Server/scripts/configure (-1 / +3 lines)
46	echo "#define XInputDrivers mouse" >> $LOCALDEF	46	echo "#define XInputDrivers mouse" >> $LOCALDEF
47	fi	47	fi
48	echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF	48	echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
49	echo "#define BuildXF86DRM ${BuildXF86DRM}" >> $LOCALDEF	49	echo "#define BuildXF86DRM NO" >> $LOCALDEF
		50	echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
		51	echo "#define Glide3IncDir glide3" >> $LOCALDEF
50		52
51	# Matrox driver support	53	# Matrox driver support
52	echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF	54	echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF

Return to bug 36181

Added Link Here

(-)x11/XFree86-4-libraries/files/patch-drmclean (+17 lines)
1	--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig Tue Mar 19 17:35:44 2002
2	+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile Tue Mar 19 17:35:50 2002
3	@@ -11,10 +11,11 @@
4
5	install::
6	$(MAKE) -f Makefile.bsd install
7	+
8	+clean::
9	+ $(MAKE) -f Makefile.bsd clean
10	+
11	#else
12	all::
13	@echo 'Use "make -f Makefile.bsd" to manually build the modules'
14	#endif
15	-
16	-clean::
17	- $(MAKE) -f Makefile.bsd clean

Lines 34-40 Link Here

(-)x11-servers/XFree86-4-Server/Makefile (-19 / +12 lines)
34	HasPam=${HasPam} \	34	HasPam=${HasPam} \
35	ExtendedInputDevices=${ExtendedInputDevices} \	35	ExtendedInputDevices=${ExtendedInputDevices} \
36	BuildXF86DRI=${BuildXF86DRI} \	36	BuildXF86DRI=${BuildXF86DRI} \
37	BuildXF86DRM=${BuildXF86DRM} \	37	HasGlide3=${HasGlide3} \
38	HaveMatroxHal=${HaveMatroxHal}	38	HaveMatroxHal=${HaveMatroxHal}
39	MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=	39	MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
40	MAKE_ARGS= WORLDOPTS=	40	MAKE_ARGS= WORLDOPTS=
Lines 88-110 Link Here
88	HasSecureRPC?= DEFAULT	88	HasSecureRPC?= DEFAULT
89	HasPam?= DEFAULT	89	HasPam?= DEFAULT
90	ExtendedInputDevices?= DEFAULT	90	ExtendedInputDevices?= DEFAULT
91	.if ${ARCH} == i386 && (exists(/sys) \|\| exists(/usr/src/sys))	91
		92	.if ${ARCH} == i386
92	BuildXF86DRI= YES	93	BuildXF86DRI= YES
93	BuildXF86DRM= YES
94	PLIST_SUB+= DRI=""	94	PLIST_SUB+= DRI=""
95	PLIST_SUB+= DRI_KMOD=""	95	MASTER_SITES+= http://gladstone.uoregon.edu/~eanholt/dri/:glide
		96	DISTFILES+= freebsd-glide3headers.tar.gz:glide
		97	HasGlide3= YES
		98
		99	post-extract:
		100	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
		101	tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
96	.else	102	.else
97	pre-fetch::	103	pre-fetch::
98	.if ${ARCH} == i386
99	@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
100	.else
101	@${ECHO_MSG} "DRI only built on i386"	104	@${ECHO_MSG} "DRI only built on i386"
102	.endif # i386
103	BuildXF86DRI= NO	105	BuildXF86DRI= NO
104	BuildXF86DRM= NO	106	HasGlide3= NO
105	PLIST_SUB+= DRI="@comment "	107	PLIST_SUB+= DRI="@comment "
106	PLIST_SUB+= DRI_KMOD="@comment "	108	.endif # i386
107	.endif # have /sys
108		109
109	# Some things are not applicable if this machine is an alpha	110	# Some things are not applicable if this machine is an alpha
110	.if ${ARCH} == alpha	111	.if ${ARCH} == alpha
Lines 197-212 Link Here
197	do-configure:	198	do-configure:
198	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure	199	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
199		200
200	.if ${BuildXF86DRM} == "YES"
201	pre-install:
202	${MKDIR} ${PREFIX}/lib/X11/kernel
203	.endif
204
205	post-build:	201	post-build:
206	@${RM} -f ${PKGMESSAGE}	202	@${RM} -f ${PKGMESSAGE}
207	.if ${BuildXF86DRM} == "YES"
208	@${CAT} ${.CURDIR}/pkg-message-drm > ${PKGMESSAGE}
209	.endif
210	@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}	203	@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
211		204
212	post-install::	205	post-install::

Lines 47-58 Link Here

(-)x11-servers/XFree86-4-Server/pkg-plist (-7 / +2 lines)
47	lib/X11/etc/sun.termcap	47	lib/X11/etc/sun.termcap
48	lib/X11/etc/sun.terminfo	48	lib/X11/etc/sun.terminfo
49	lib/X11/etc/xmodmap.std	49	lib/X11/etc/xmodmap.std
50	%%DRI_KMOD%%lib/X11/kernel/gamma.ko
51	%%DRI_KMOD%%lib/X11/kernel/mga.ko
52	%%DRI_KMOD%%lib/X11/kernel/r128.ko
53	%%DRI_KMOD%%lib/X11/kernel/radeon.ko
54	%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
55	%%DRI_KMOD%%@dirrm lib/X11/kernel
56	lib/X11/xserver/SecurityPolicy	50	lib/X11/xserver/SecurityPolicy
57	lib/modules/codeconv/libARABIC.a	51	lib/modules/codeconv/libARABIC.a
58	lib/modules/codeconv/libARMSCII8.a	52	lib/modules/codeconv/libARMSCII8.a
Lines 88-96 Link Here
88	%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so	82	%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
89	%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so	83	%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
90	%%DRI%%lib/modules/dri/mga_dri.so	84	%%DRI%%lib/modules/dri/mga_dri.so
91	%%DRI%%lib/modules/dri/radeon_dri.so	85	%%I386:%%%%DRI%%lib/modules/dri/radeon_dri.so
92	%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so	86	%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
93	%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so	87	%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
		88	%%DRI%%lib/modules/dri/tdfx_dri.so
94	%%I386:%%lib/modules/drivers/apm_drv.o	89	%%I386:%%lib/modules/drivers/apm_drv.o
95	%%I386:%%lib/modules/drivers/ark_drv.o	90	%%I386:%%lib/modules/drivers/ark_drv.o
96	%%I386:%%lib/modules/drivers/ati_drv.o	91	%%I386:%%lib/modules/drivers/ati_drv.o