Index: x11/XFree86-4-clients/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-clients/Makefile,v retrieving revision 1.97 diff -u -r1.97 Makefile --- x11/XFree86-4-clients/Makefile 20 Mar 2002 00:18:36 -0000 1.97 +++ x11/XFree86-4-clients/Makefile 11 Jul 2002 02:39:56 -0000 @@ -74,6 +74,7 @@ do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include .include "${FILESDIR}/manpages" Index: x11/XFree86-4-libraries/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/Makefile,v retrieving revision 1.105 diff -u -r1.105 Makefile --- x11/XFree86-4-libraries/Makefile 20 Mar 2002 00:33:47 -0000 1.105 +++ x11/XFree86-4-libraries/Makefile 11 Jul 2002 03:03:11 -0000 @@ -7,7 +7,7 @@ PORTNAME= libraries PORTVERSION= 4.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} \ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \ @@ -97,6 +97,7 @@ do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure post-install: @${MKHTMLINDEX} ${X11BASE}/lib/X11/doc/html Index: x11/XFree86-4-libraries/files/patch-bsdLib.rules =================================================================== RCS file: x11/XFree86-4-libraries/files/patch-bsdLib.rules diff -N x11/XFree86-4-libraries/files/patch-bsdLib.rules --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/XFree86-4-libraries/files/patch-bsdLib.rules 11 Jul 2002 00:25:55 -0000 @@ -0,0 +1,37 @@ +--- config/cf/bsdLib.rules.orig Wed Jul 10 17:25:29 2002 ++++ config/cf/bsdLib.rules Wed Jul 10 17:25:32 2002 +@@ -306,6 +306,34 @@ + + #endif /* SharedDepLibraryTarget */ + ++/* ++ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library. ++ */ ++#ifndef SharedDepCplusplusLibraryTarget ++#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\ ++AllTarget(Concat(lib,libname.so.rev)) @@\ ++ @@\ ++Concat(lib,libname.so.rev): deplist @@\ ++ $(RM) $@~ @@\ ++ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\ ++ (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\ ++ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\ ++ LinkBuildSonameLibrary($$SONAME) @@\ ++ $(RM) $@ @@\ ++ $(MV) $@~ $@ @@\ ++ $(RM) Concat(lib,libname.so) @@\ ++ $(LN) $@ Concat(lib,libname.so) @@\ ++ LinkBuildLibrary($@) @@\ ++ LinkBuildLibrary(Concat(lib,libname.so)) @@\ ++ @@\ ++clean:: @@\ ++ @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\ ++ set -x; $(RM) $$SONAME @@\ ++ $(RM) Concat(lib,libname.so) @@\ ++ $(RM) Concat(lib,libname.so.rev) ++ ++#endif /* SharedDepLibraryTarget */ ++ + #ifndef SharedDepModuleTarget + #define SharedDepModuleTarget(name,deps,solist) @@\ + AllTarget(name) @@\ Index: x11/XFree86-4-libraries/files/patch-drilx11 =================================================================== RCS file: x11/XFree86-4-libraries/files/patch-drilx11 diff -N x11/XFree86-4-libraries/files/patch-drilx11 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/XFree86-4-libraries/files/patch-drilx11 8 Jun 2002 23:06:43 -0000 @@ -0,0 +1,99 @@ +--- lib/GL/mesa/src/drv/ffb/Imakefile.orig Sat Jun 8 16:02:28 2002 ++++ lib/GL/mesa/src/drv/ffb/Imakefile Sat Jun 8 16:02:29 2002 +@@ -38,7 +38,7 @@ + SRCS = $(FFBSRCS) + OBJS = $(FFBOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + +--- lib/GL/mesa/src/drv/gamma/Imakefile.orig Sat Jun 8 16:01:51 2002 ++++ lib/GL/mesa/src/drv/gamma/Imakefile Sat Jun 8 16:01:53 2002 +@@ -46,7 +46,7 @@ + OBJS = $(LOWOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(GAMMAOBJS) $(HIOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + +--- lib/GL/mesa/src/drv/i810/Imakefile.orig Sat Jun 8 16:00:38 2002 ++++ lib/GL/mesa/src/drv/i810/Imakefile Sat Jun 8 16:01:32 2002 +@@ -46,7 +46,7 @@ + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(I810OBJS) $(HIOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + +--- lib/GL/mesa/src/drv/i830/Imakefile.orig Sat Jun 8 16:00:43 2002 ++++ lib/GL/mesa/src/drv/i830/Imakefile Sat Jun 8 16:01:31 2002 +@@ -46,7 +46,7 @@ + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(I830OBJS) $(HIOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + +--- lib/GL/mesa/src/drv/mga/Imakefile.orig Sat Jun 8 16:00:31 2002 ++++ lib/GL/mesa/src/drv/mga/Imakefile Sat Jun 8 16:01:29 2002 +@@ -47,7 +47,7 @@ + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(MGAOBJS) $(HIOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + +--- lib/GL/mesa/src/drv/r128/Imakefile.orig Sat Jun 8 16:00:24 2002 ++++ lib/GL/mesa/src/drv/r128/Imakefile Sat Jun 8 16:01:34 2002 +@@ -47,7 +47,7 @@ + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) $(HIOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + +--- lib/GL/mesa/src/drv/radeon/Imakefile.orig Sat Jun 8 15:59:52 2002 ++++ lib/GL/mesa/src/drv/radeon/Imakefile Sat Jun 8 15:59:54 2002 +@@ -47,7 +47,7 @@ + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) $(HIOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + +--- lib/GL/mesa/src/drv/sis/Imakefile.orig Sat Jun 8 16:02:40 2002 ++++ lib/GL/mesa/src/drv/sis/Imakefile Sat Jun 8 16:02:45 2002 +@@ -53,7 +53,7 @@ + OBJS = $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(SISOBJS) $(HIOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + +--- lib/GL/mesa/src/drv/tdfx/Imakefile.orig Sat Jun 8 16:00:17 2002 ++++ lib/GL/mesa/src/drv/tdfx/Imakefile Sat Jun 8 16:01:12 2002 +@@ -47,7 +47,7 @@ + OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \ + $(MESA_ASM_OBJS) $(TDFXOBJS) $(HIOBJS) + +-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) ++REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) + + #include + Index: x11/XFree86-4-libraries/files/patch-xthreads =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/files/patch-xthreads,v retrieving revision 1.2 diff -u -r1.2 patch-xthreads --- x11/XFree86-4-libraries/files/patch-xthreads 12 Jun 2001 14:59:51 -0000 1.2 +++ x11/XFree86-4-libraries/files/patch-xthreads 11 Jul 2002 00:16:46 -0000 @@ -1,25 +1,77 @@ ---- config/cf/FreeBSD.cf.orig Thu Jun 7 16:33:37 2001 -+++ config/cf/FreeBSD.cf Thu Jun 7 16:34:43 2001 -@@ -80,7 +80,6 @@ +--- config/cf/FreeBSD.cf.orig Wed Jul 10 16:27:39 2002 ++++ config/cf/FreeBSD.cf Wed Jul 10 17:14:39 2002 +@@ -43,11 +43,15 @@ + #define GccUsesGas YES + #define UseGas YES + #define GnuCpp YES ++#define HasPoll YES + #define HasNdbm YES + #define HasPutenv YES + #define HasSnprintf YES + #define HasBSD44Sockets YES + #define HasDlopen YES ++#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012) ++#define HasSetProcTitle YES ++#endif + #ifndef HasLibCrypt + # define HasLibCrypt YES + #endif +@@ -78,10 +82,6 @@ + # define HasPosixThreads YES + # define ThreadedX YES /* - * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. - */ +- * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. +- */ -# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE - /* +-/* * FreeBSD has tread-safe api but no getpwnam_r yet. */ -@@ -91,8 +90,12 @@ + # define HasThreadSafeAPI YES +@@ -91,8 +91,15 @@ # else # define BuildThreadStubLibrary YES # define NeedUIThrStubs YES -# define ThreadsCompileFlags -pthread -# define ThreadsLibraries -pthread +# if (OSRelVersion >= 500016) -+# define ThreadsLibraries -lc_r ++# define ThreadsLibraries -lc_r +# else ++ /* ++ * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. ++ */ +# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -+# define ThreadsLibraries -pthread ++# define ThreadsLibraries -pthread +# endif # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) # define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) # endif +@@ -216,6 +223,20 @@ + #endif + #endif + ++/* Katmai (SSE) and 3DNow will be autodetected, so binutils is the only ++ * requirement for enabling this. By 4.2 they were all supported. ++ */ ++#ifdef i386Architecture && \ ++ (OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2)) ++# define HasMMXSupport YES ++# define Has3DNowSupport YES ++# define HasKatmaiSupport YES ++#else ++# define HasMMXSupport NO ++# define Has3DNowSupport NO ++# define HasKatmaiSupport NO ++#endif ++ + /* + * This doesn't work the way it does on every other system. On FreeBSD it's + * only a "hint, not a demand", whatever that means. Note that this is not +@@ -540,7 +561,7 @@ + /* + * A hack to work around an optimization problem with gcc 2.95.2 + */ +-#if OSMajorVersion >= 4 ++#if OSMajorVersion == 4 + #define GccOptBug295 + #endif + Index: x11/XFree86-4-libraries/files/patch-z01 =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/files/patch-z01,v retrieving revision 1.2 diff -u -r1.2 patch-z01 --- x11/XFree86-4-libraries/files/patch-z01 25 Mar 2001 23:04:43 -0000 1.2 +++ x11/XFree86-4-libraries/files/patch-z01 11 Jul 2002 00:37:16 -0000 @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Mar 22 21:23:30 2000 -+++ Makefile Mon Mar 19 20:08:33 2001 -@@ -24,6 +24,12 @@ +--- Makefile.orig Wed Dec 19 13:37:26 2001 ++++ Makefile Wed Jul 10 17:37:14 2002 +@@ -27,6 +27,12 @@ MAKE_CMD = $(MAKE) $(MAKE_OPTS) FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)" @@ -13,7 +13,7 @@ all: @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial @$(MAKE_CMD) $@ -@@ -181,7 +187,7 @@ +@@ -198,7 +204,7 @@ install.ln: $(MAKE_CMD) $@ install.man: @@ -22,26 +22,31 @@ install: $(MAKE_CMD) $@ Makefiles: -@@ -192,3 +198,43 @@ +@@ -209,3 +215,48 @@ $(MAKE_CMD) $@ VerifyOS: $(MAKE_CMD) $@ + +##### -+FreeBSDPortsBuild: ++FreeBSDPortsConfigure: + @echo "" -+ @echo Building $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION) ++ @echo Configuring $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION) + @echo "" + @date + @echo "" -+ cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean + $(MAKE) $(MFLAGS) Makefile.boot + $(MAKE_CMD) $(MFLAGS) VerifyOS + $(MAKE_CMD) $(MFLAGS) Makefiles -+ $(MAKE_CMD) $(MFLAGS) clean BOOTSTRAPSUBDIRS= + $(MAKE_CMD) $(MFLAGS) includes + $(MAKE_CMD) $(MFLAGS) depend -+ $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) $@ ++ ++FreeBSDPortsBuild: ++ @echo "" ++ @echo Building $(RELEASE) of the X Window System: $(PKGNAMEPREFIX)$(PORTNAME)-$(PORTVERSION) ++ @echo "" ++ @date ++ @echo "" ++ $(MAKE_CMD) $(MFLAGS) $@ + @echo "" + @date + @echo "" Index: x11-servers/XFree86-4-FontServer/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-FontServer/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- x11-servers/XFree86-4-FontServer/Makefile 16 Mar 2002 23:40:14 -0000 1.11 +++ x11-servers/XFree86-4-FontServer/Makefile 11 Jul 2002 02:50:24 -0000 @@ -27,5 +27,6 @@ do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include Index: x11-servers/XFree86-4-NestServer/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-NestServer/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- x11-servers/XFree86-4-NestServer/Makefile 16 Mar 2002 23:40:15 -0000 1.12 +++ x11-servers/XFree86-4-NestServer/Makefile 11 Jul 2002 02:51:30 -0000 @@ -36,5 +36,6 @@ do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include Index: x11-servers/XFree86-4-PrintServer/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-PrintServer/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- x11-servers/XFree86-4-PrintServer/Makefile 16 Mar 2002 23:40:15 -0000 1.12 +++ x11-servers/XFree86-4-PrintServer/Makefile 11 Jul 2002 02:51:33 -0000 @@ -34,5 +34,6 @@ do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include Index: x11-servers/XFree86-4-Server/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v retrieving revision 1.112 diff -u -r1.112 Makefile --- x11-servers/XFree86-4-Server/Makefile 9 Jun 2002 02:21:26 -0000 1.112 +++ x11-servers/XFree86-4-Server/Makefile 11 Jul 2002 00:42:40 -0000 @@ -7,7 +7,7 @@ PORTNAME= Server PORTVERSION= 4.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} \ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \ @@ -37,8 +37,7 @@ BuildXF86DRI=${BuildXF86DRI} \ HasGlide3=${HasGlide3} \ HaveMatroxHal=${HaveMatroxHal} -MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS= -MAKE_ARGS= WORLDOPTS= +MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man ALL_TARGET= FreeBSDPortsBuild INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man MAN1= XFree86.1 \ @@ -65,6 +64,7 @@ tdfx.4 \ glint.4 \ s3virge.4 \ + r128.4 \ rendition.4 \ savage.4 \ nv.4 \ @@ -114,7 +114,6 @@ .else PLIST_SUB+= ALPHA_NA="" MAN1+= scanpci.1 -MAN4+= vmware.4 .endif .if ${ARCH} == i386 @@ -129,11 +128,11 @@ i740.4 \ i810.4 \ neomagic.4 \ - r128.4 \ sis.4 \ trident.4 \ tseng.4 \ - vesa.4 + vesa.4 \ + vmware.4 .else PLIST_SUB+= I386:="@comment " .endif @@ -198,6 +197,7 @@ do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure post-build: @${RM} -f ${PKGMESSAGE} Index: x11-servers/XFree86-4-Server/pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/pkg-plist,v retrieving revision 1.42 diff -u -r1.42 pkg-plist --- x11-servers/XFree86-4-Server/pkg-plist 2 Apr 2002 02:03:30 -0000 1.42 +++ x11-servers/XFree86-4-Server/pkg-plist 10 Jul 2002 22:42:59 -0000 @@ -24,7 +24,7 @@ %%I386:%%lib/X11/doc/README.I128 %%I386:%%lib/X11/doc/README.SiS %%I386:%%lib/X11/doc/README.apm -%%I386:%%lib/X11/doc/README.ati +lib/X11/doc/README.ati %%I386:%%lib/X11/doc/README.chips %%I386:%%lib/X11/doc/README.cyrix lib/X11/doc/README.dps @@ -82,14 +82,14 @@ %%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 +%%DRI%%lib/modules/dri/radeon_dri.so +%%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 -%%I386:%%lib/modules/drivers/atimisc_drv.o +lib/modules/drivers/ati_drv.o +lib/modules/drivers/atimisc_drv.o %%I386:%%lib/modules/drivers/chips_drv.o %%I386:%%lib/modules/drivers/cirrus_alpine.o %%I386:%%lib/modules/drivers/cirrus_drv.o @@ -104,8 +104,8 @@ %%MATROX%%lib/modules/drivers/mga_hal_drv.o %%I386:%%lib/modules/drivers/neomagic_drv.o lib/modules/drivers/nv_drv.o -%%I386:%%lib/modules/drivers/r128_drv.o -%%I386:%%lib/modules/drivers/radeon_drv.o +lib/modules/drivers/r128_drv.o +lib/modules/drivers/radeon_drv.o lib/modules/drivers/rendition_drv.o lib/modules/drivers/s3_drv.o lib/modules/drivers/s3virge_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.71 diff -u -r1.71 configure --- x11-servers/XFree86-4-Server/scripts/configure 2 Apr 2002 02:03:31 -0000 1.71 +++ x11-servers/XFree86-4-Server/scripts/configure 10 Jul 2002 23:08:00 -0000 @@ -25,7 +25,7 @@ # It's good for FreeBSD ports/packages system. echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - # Now, We can use this configuration. + # Now, we can use this configuration. # Thanks, Trevor Johnson echo "#define InstallXserverSetUID NO" >> $LOCALDEF @@ -79,25 +79,28 @@ echo "#define XF86Server YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF + + # More of the i386 drivers could probably move to XF86CardDrivers. + # Is fbdev driver useful to us? + # GlideDriver was left out because we have no Glide2 package. cat >> $LOCALDEF <> $LOCALDEF echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF Index: x11-servers/XFree86-4-VirtualFramebufferServer/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- x11-servers/XFree86-4-VirtualFramebufferServer/Makefile 7 Jun 2002 13:55:51 -0000 1.13 +++ x11-servers/XFree86-4-VirtualFramebufferServer/Makefile 11 Jul 2002 02:51:38 -0000 @@ -40,5 +40,6 @@ do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include