Date: Tue, 19 Mar 2002 17:59:36 -0800 (PST) From: Eric Anholt <eanholt@gladstone.uoregon.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36121: Removes installed sys requirement (and drm kmod compiling) from XFree86-4-Server Message-ID: <200203200159.g2K1xa868844@anholt.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 36121
>Category: ports
>Synopsis: Removes installed sys requirement (and drm kmod compiling) from XFree86-4-Server
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 19 18:00:03 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Eric Anholt
>Release: FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD anholt.dyndns.org 4.5-STABLE FreeBSD 4.5-STABLE #0: Wed Feb 27 23:40:21 PST 2002 anholt@:/usr/src/stable/sys/compile/MYKERNEL i386
>Description:
Because of the drm modules in the XFree86-4-Server port, XServer with DRI+DRM compiling needed
an installed sys source. DRM compiling is removed (Better code is in the drm-kmod port) and
the need for sys is removed.
tdfx DRI is still not compiled. That is the next task.
>How-To-Repeat:
>Fix:
Two patches.
Apply from XFree86-4-libraries:
diff -ruN ../XFree86-4-libraries.orig/files/patch-drmclean ./files/patch-drmclean
--- ../XFree86-4-libraries.orig/files/patch-drmclean Wed Dec 31 16:00:00 1969
+++ ./files/patch-drmclean Tue Mar 19 17:36:03 2002
@@ -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
Patch from XFree86-4-Server:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v
retrieving revision 1.110
diff -u -r1.110 Makefile
--- Makefile 19 Mar 2002 18:22:49 -0000 1.110
+++ Makefile 20 Mar 2002 01:33:02 -0000
@@ -34,7 +34,7 @@
HasPam=${HasPam} \
ExtendedInputDevices=${ExtendedInputDevices} \
BuildXF86DRI=${BuildXF86DRI} \
- BuildXF86DRM=${BuildXF86DRM} \
+ BuildXF86DRM=NO \
HaveMatroxHal=${HaveMatroxHal}
MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS=
MAKE_ARGS= WORLDOPTS=
@@ -88,23 +88,17 @@
HasSecureRPC?= DEFAULT
HasPam?= DEFAULT
ExtendedInputDevices?= DEFAULT
-.if ${ARCH} == i386 && (exists(/sys) || exists(/usr/src/sys))
+# && (exists(/sys) || exists(/usr/src/sys))
+
+.if ${ARCH} == i386
BuildXF86DRI= YES
-BuildXF86DRM= YES
PLIST_SUB+= DRI=""
-PLIST_SUB+= DRI_KMOD=""
.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
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 +191,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: 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
--- pkg-plist 19 Mar 2002 18:22:49 -0000 1.41
+++ pkg-plist 20 Mar 2002 01:29:50 -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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203200159.g2K1xa868844>