From 6ef550dcec6232dd7ee48be413889d61365bc6cd Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sun, 14 Jul 2002 20:26:33 +0000 Subject: Take over maintainership of XFree86-4 ports. Add patches to fix libGLU on -current, fix the DRI with Wine, update the config files for the X ports, and fix many of them to allow continuing of the X build after interruption (it used to clean and rebuild). Approved by: will, des (mentor) --- x11-servers/XFree86-4-FontServer/Makefile | 3 ++- x11-servers/XFree86-4-NestServer/Makefile | 3 ++- x11-servers/XFree86-4-PrintServer/Makefile | 3 ++- x11-servers/XFree86-4-Server-snap/Makefile | 14 +++++----- x11-servers/XFree86-4-Server-snap/pkg-plist | 14 +++++----- .../XFree86-4-Server-snap/scripts/configure | 31 ++++++++++++---------- x11-servers/XFree86-4-Server/Makefile | 14 +++++----- x11-servers/XFree86-4-Server/pkg-plist | 14 +++++----- x11-servers/XFree86-4-Server/scripts/configure | 31 ++++++++++++---------- .../XFree86-4-VirtualFramebufferServer/Makefile | 3 ++- 10 files changed, 70 insertions(+), 60 deletions(-) (limited to 'x11-servers') diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index 7672cb8c029e..119d217f81a5 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz -MAINTAINER= taguchi@tohoku.iij.ad.jp +MAINTAINER= anholt@freebsd.org XFREE86_VERSION= 4 USE_IMAKE= YES @@ -27,5 +27,6 @@ MAN1= Xserver.1 xfs.1 do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index b975d5fbda0b..8b116a74298f 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -18,7 +18,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz IGNOREFILES= Wraphelp.c -MAINTAINER= taguchi@tohoku.iij.ad.jp +MAINTAINER= anholt@freebsd.org XFREE86_VERSION= 4 USE_IMAKE= YES @@ -36,5 +36,6 @@ HasXdmAuth?= YES do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index f83b9e35eedf..8ce0dab4ea68 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -18,7 +18,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz IGNOREFILES= Wraphelp.c -MAINTAINER= taguchi@tohoku.iij.ad.jp +MAINTAINER= anholt@freebsd.org XFREE86_VERSION= 4 USE_IMAKE= YES @@ -34,5 +34,6 @@ HasXdmAuth?= YES do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 05e15c9e7ffe..981748848552 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -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 \ @@ -19,7 +19,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz IGNOREFILES= Wraphelp.c -MAINTAINER= taguchi@tohoku.iij.ad.jp +MAINTAINER= anholt@freebsd.org XFREE86_VERSION= 4 USE_IMAKE= YES @@ -37,8 +37,7 @@ SCRIPTS_ENV= OSVERSION=${OSVERSION} \ 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 @@ MAN4= mga.4 \ tdfx.4 \ glint.4 \ s3virge.4 \ + r128.4 \ rendition.4 \ savage.4 \ nv.4 \ @@ -114,7 +114,6 @@ PLIST_SUB+= ALPHA_NA="@comment " .else PLIST_SUB+= ALPHA_NA="" MAN1+= scanpci.1 -MAN4+= vmware.4 .endif .if ${ARCH} == i386 @@ -129,11 +128,11 @@ MAN4+= apm.4 \ 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 @@ PLIST_SUB+= MATROX="@comment " do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure post-build: @${RM} -f ${PKGMESSAGE} diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist index d083ffa1510b..a52cea5e9f79 100644 --- a/x11-servers/XFree86-4-Server-snap/pkg-plist +++ b/x11-servers/XFree86-4-Server-snap/pkg-plist @@ -24,7 +24,7 @@ lib/X11/doc/README.DRIcomp %%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 @@ lib/modules/codeconv/libVISCII.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 +%%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 @@ lib/modules/drivers/mga_drv.o %%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 diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index 7b98c307c507..b7f67d6c4d8b 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -25,7 +25,7 @@ configure () { # 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 @@ configure () { 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 diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 05e15c9e7ffe..981748848552 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -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 \ @@ -19,7 +19,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz IGNOREFILES= Wraphelp.c -MAINTAINER= taguchi@tohoku.iij.ad.jp +MAINTAINER= anholt@freebsd.org XFREE86_VERSION= 4 USE_IMAKE= YES @@ -37,8 +37,7 @@ SCRIPTS_ENV= OSVERSION=${OSVERSION} \ 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 @@ MAN4= mga.4 \ tdfx.4 \ glint.4 \ s3virge.4 \ + r128.4 \ rendition.4 \ savage.4 \ nv.4 \ @@ -114,7 +114,6 @@ PLIST_SUB+= ALPHA_NA="@comment " .else PLIST_SUB+= ALPHA_NA="" MAN1+= scanpci.1 -MAN4+= vmware.4 .endif .if ${ARCH} == i386 @@ -129,11 +128,11 @@ MAN4+= apm.4 \ 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 @@ PLIST_SUB+= MATROX="@comment " do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure post-build: @${RM} -f ${PKGMESSAGE} diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index d083ffa1510b..a52cea5e9f79 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -24,7 +24,7 @@ lib/X11/doc/README.DRIcomp %%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 @@ lib/modules/codeconv/libVISCII.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 +%%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 @@ lib/modules/drivers/mga_drv.o %%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 diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 7b98c307c507..b7f67d6c4d8b 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -25,7 +25,7 @@ configure () { # 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 @@ configure () { 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 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index e439640af901..e5bf29b32052 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -19,7 +19,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz IGNOREFILES= Wraphelp.c -MAINTAINER= taguchi@tohoku.iij.ad.jp +MAINTAINER= anholt@freebsd.org RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps @@ -40,5 +40,6 @@ HasXdmAuth?= YES do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure + @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure .include -- cgit v1.2.3