Attachment 20515 Details for Bug 36181 – file.diff

[patch] file.diff

file.diff (text/plain), 5.49 KB, created by Eric Anholt on 2002-03-21 23:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Anholt

Created: 2002-03-21 23:40:01 UTC

Size: 5.49 KB

patch

obsolete

>Index: x11/XFree86-4-libraries/files/patch-drmclean
>===================================================================
>RCS file: x11/XFree86-4-libraries/files/patch-drmclean
>diff -N x11/XFree86-4-libraries/files/patch-drmclean
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ x11/XFree86-4-libraries/files/patch-drmclean	20 Mar 2002 01:36:03 -0000
>@@ -0,0 +1,17 @@
>+--- 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
>Index: x11-servers/XFree86-4-Server/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v
>retrieving revision 1.110
>diff -u -r1.110 Makefile
>--- x11-servers/XFree86-4-Server/Makefile	19 Mar 2002 18:22:49 -0000	1.110
>+++ x11-servers/XFree86-4-Server/Makefile	21 Mar 2002 23:34:28 -0000
>@@ -34,7 +34,7 @@
> 			HasPam=${HasPam} \
> 			ExtendedInputDevices=${ExtendedInputDevices} \
> 			BuildXF86DRI=${BuildXF86DRI} \
>-			BuildXF86DRM=${BuildXF86DRM} \
>+			HasGlide3=${HasGlide3} \
> 			HaveMatroxHal=${HaveMatroxHal}
> MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
> MAKE_ARGS=		WORLDOPTS=
>@@ -88,23 +88,24 @@
> HasSecureRPC?=		DEFAULT
> HasPam?=		DEFAULT
> ExtendedInputDevices?=	DEFAULT
>-.if ${ARCH} == i386  && (exists(/sys) || exists(/usr/src/sys))
>+
>+.if ${ARCH} == i386
> BuildXF86DRI=		YES
>-BuildXF86DRM=		YES
> PLIST_SUB+=		DRI=""
>-PLIST_SUB+=		DRI_KMOD=""
>+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
>-BuildXF86DRM=		NO
>+HasGlide3=		NO
> PLIST_SUB+=		DRI="@comment "
>-PLIST_SUB+=		DRI_KMOD="@comment "
>-.endif	# have /sys
>+.endif # i386
> 
> # Some things are not applicable if this machine is an alpha
> .if ${ARCH} == alpha
>@@ -197,16 +198,8 @@
> 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::
>Index: x11-servers/XFree86-4-Server/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/distinfo,v
>retrieving revision 1.34
>diff -u -r1.34 distinfo
>--- x11-servers/XFree86-4-Server/distinfo	17 Mar 2002 23:03:28 -0000	1.34
>+++ x11-servers/XFree86-4-Server/distinfo	21 Mar 2002 21:31:34 -0000
>@@ -1,3 +1,4 @@
> MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
> MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
> MD5 (xc/Wraphelp.c) = IGNORE
>+MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
>\ No newline at end of file
>Index: x11-servers/XFree86-4-Server/pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/pkg-plist,v
>retrieving revision 1.41
>diff -u -r1.41 pkg-plist
>--- x11-servers/XFree86-4-Server/pkg-plist	19 Mar 2002 18:22:49 -0000	1.41
>+++ x11-servers/XFree86-4-Server/pkg-plist	21 Mar 2002 23:27:01 -0000
>@@ -47,12 +47,6 @@
> 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
>@@ -88,9 +82,10 @@
> %%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
> %%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
> %%DRI%%lib/modules/dri/mga_dri.so
>-%%DRI%%lib/modules/dri/radeon_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
>Index: x11-servers/XFree86-4-Server/scripts/configure
>===================================================================
>RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/scripts/configure,v
>retrieving revision 1.70
>diff -u -r1.70 configure
>--- x11-servers/XFree86-4-Server/scripts/configure	16 Mar 2002 23:40:16 -0000	1.70
>+++ x11-servers/XFree86-4-Server/scripts/configure	21 Mar 2002 21:36:30 -0000
>@@ -46,7 +46,9 @@
> 	echo "#define XInputDrivers mouse" >> $LOCALDEF	
>     fi
>     echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
>-    echo "#define BuildXF86DRM ${BuildXF86DRM}" >> $LOCALDEF
>+    echo "#define BuildXF86DRM NO" >> $LOCALDEF
>+    echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
>+    echo "#define Glide3IncDir glide3" >> $LOCALDEF
> 
>     # Matrox driver support
>     echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF

Actions: View | Diff

Attachments on bug 36181: 20515