diff options
Diffstat (limited to 'x11-servers/XFree86-4-Server-snap')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 54 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/distinfo | 4 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-comment | 2 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-install | 3 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-message | 5 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-plist | 14 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 5 |
7 files changed, 49 insertions, 38 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index a71b3af294f8..12751f78a052 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: XFree86XServer-4.0.1 +# New ports collection makefile for: XFree86-Server # Date created: 10 Oct 1999 # Whom: taguchi@tohoku.iij.ad.jp # @@ -6,17 +6,12 @@ # PORTNAME= Server -PORTVERSION= 4.0.3 -PORTREVISION= 1 +PORTVERSION= 4.1.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} -MASTER_SITE_SUBDIR= 4.0.2 +MASTER_SITE_SUBDIR= 4.1.0 PKGNAMEPREFIX= XFree86- -DISTFILES= X402src-1.tgz - -PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g} -PATCHFILES= 4.0.2-4.0.3.diff.gz -PATCH_DIST_STRIP= -p1 +DISTFILES= X410src-1.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp @@ -33,15 +28,16 @@ SCRIPTS_ENV= OSVERSION=${OSVERSION} \ BuildXF86DRI=${BuildXF86DRI} \ BuildXF86DRM=${BuildXF86DRM} \ HaveMatroxHal=${HaveMatroxHal} -MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man +MAKE_ENV= MAN_INSTALL_TARGET=FreeBSDPortsInstall.man WORLDOPTS= +MAKE_ARGS= WORLDOPTS= ALL_TARGET= FreeBSDPortsBuild INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man -MAN1= SuperProbe.1 \ - XFree86.1 \ +MAN1= XFree86.1 \ Xserver.1 \ kbd_mode.1 \ pcitweak.1 \ scanpci.1 \ + xf86cfg.1 \ xf86config.1 MAN3= XF86VidMode.3 \ XF86VidModeDeleteModeLine.3 \ @@ -65,9 +61,11 @@ MAN4= mga.4 \ nv.4 \ siliconmotion.4 \ vga.4 \ + vmware.4 \ keyboard.4 \ mouse.4 MAN5= XF86Config.5 +PKGMESSAGE= ${WRKDIR}/.pkg-message .include <bsd.port.pre.mk> @@ -83,23 +81,28 @@ HasXdmAuth?= DEFAULT HasSecureRPC?= DEFAULT HasPam?= DEFAULT ExtendedInputDevices?= DEFAULT -.if (exists(/sys) || exists(/usr/src/sys)) && ${OSVERSION} < 500013 +.if !defined(I_WANT_TO_FIX_BUILDING_DRI_MODULES) +BuildXF86DRI= NO +BuildXF86DRM= NO +PLIST_SUB+= DRI="@comment " +.else +.if ${OSVERSION} < 500013 && ${MACHINE} != alpha +.if (exists(/sys) || exists(/usr/src/sys)) BuildXF86DRI= YES BuildXF86DRM= YES PLIST_SUB+= DRI="" -PKGMESSAGE= ${.CURDIR}/pkg-message-drm +.else +_pre-fetch:: + @${ECHO_MSG} "DRI would not build: kernel source required in /sys." +.endif # have /sys .else BuildXF86DRI= NO BuildXF86DRM= NO PLIST_SUB+= DRI="@comment " -.if ${OSVERSION} < 500013 -pre-fetch:: - @${ECHO_MSG} "DRI would not build: kernel source required in /sys." -.else -pre-fetch:: - @${ECHO_MSG} "DRI would not build: incompatible with SMPng." -.endif -.endif +_pre-fetch:: + @${ECHO_MSG} "DRI would not build: incompatible with SMPng and alpha" +.endif # PRE_SMPNG && !alpha +.endif # DRI is totally broken .if ${ARCH} == i386 PLIST_SUB+= I386:="" @@ -135,10 +138,11 @@ MAN4+= citron.4 \ PLIST_SUB+= XIE:="@comment " .endif +.if !defined(INCOMPATIBLE_WITH_4_1_0) .if !defined(WITH_MATROX_GXX_DRIVER) HaveMatroxHal= NO PLIST_SUB+= MATROX="@comment " -pre-fetch:: +_pre-fetch:: @${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to enable the official Matrox drivers for" @${ECHO_MSG} "the G200, G400 and G450 graphic adapters." .else @@ -146,7 +150,7 @@ HaveMatroxHal= YES MGA_DRIVER_VERSION= 1_2_0beta MASTER_SITES+= ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_${MGA_DRIVER_VERSION:S/beta//}/ DISTFILES+= mga-${MGA_DRIVER_VERSION}.tgz -EXTRACT_ONLY= X402src-1.tgz +EXTRACT_ONLY= X410src-1.tgz PLIST_SUB+= MATROX="" post-patch:: @${MV} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga \ @@ -154,6 +158,7 @@ post-patch:: @${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/mga-${MGA_DRIVER_VERSION}.tgz \ -C ${WRKSRC}/programs/Xserver/hw/xfree86/drivers .endif # !WITH_MATROX_GXX_DRIVER +.endif # INCOMPATIBLE_WITH_4_1_0 do-configure: cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure @@ -166,6 +171,7 @@ pre-install: post-install: strip ${PREFIX}/bin/XFree86 .if ${BuildXF86DRM} == "YES" + @(cd ${.CURDIR}; ${CAT} pkg-message pkg-message-drm > ${PKGMESSAGE}) @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} .endif diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo index d78dc40cdb06..e4b5e84b9421 100644 --- a/x11-servers/XFree86-4-Server-snap/distinfo +++ b/x11-servers/XFree86-4-Server-snap/distinfo @@ -1,3 +1 @@ -MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4 -MD5 (xc/mga-1_2_0beta.tgz) = ef6e33551a2fad0a58d41c1bca2325f4 -MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4 +MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32 diff --git a/x11-servers/XFree86-4-Server-snap/pkg-comment b/x11-servers/XFree86-4-Server-snap/pkg-comment index 523b914a62ec..95c42489bb45 100644 --- a/x11-servers/XFree86-4-Server-snap/pkg-comment +++ b/x11-servers/XFree86-4-Server-snap/pkg-comment @@ -1 +1 @@ -X11R6.4/XFree86-4.0 X server and related programs +X11R6.4/XFree86-4 X server and related programs diff --git a/x11-servers/XFree86-4-Server-snap/pkg-install b/x11-servers/XFree86-4-Server-snap/pkg-install deleted file mode 100644 index a48c22846390..000000000000 --- a/x11-servers/XFree86-4-Server-snap/pkg-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/bin/dialog --yesno "XFree86 4.0 may contain vulnerabilities yielding root privileges to local users, due to insecure coding of the setuid root X server. It is not recommended that this port be installed on multi-user systems. Do you wish to accept the security risk and build XFree86 4.0 anyway?" 10 60 || /usr/bin/false diff --git a/x11-servers/XFree86-4-Server-snap/pkg-message b/x11-servers/XFree86-4-Server-snap/pkg-message new file mode 100644 index 000000000000..ea2e24612085 --- /dev/null +++ b/x11-servers/XFree86-4-Server-snap/pkg-message @@ -0,0 +1,5 @@ +************************************************************************ +* To improve security, the X server is installed without an SUID bit. * +* This is suitable for use with xdm, but not with a startx script. * +* If you need to use a startx script, install the x11/wrapper package. * +************************************************************************ diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist index 06de591dd1d5..1fe8887c9b29 100644 --- a/x11-servers/XFree86-4-Server-snap/pkg-plist +++ b/x11-servers/XFree86-4-Server-snap/pkg-plist @@ -1,12 +1,14 @@ -bin/SuperProbe bin/X bin/XFree86 %%XIE:%%bin/joycal bin/kbd_mode bin/pcitweak bin/scanpci +bin/xf86cfg bin/xf86config +lib/X11/app-defaults/XF86Cfg lib/X11/Cards +lib/X11/Options lib/X11/XF86Config.98 lib/X11/XF86Config.eg lib/X11/doc/BugReport @@ -24,15 +26,16 @@ lib/X11/doc/README.DRIcomp %%I386:%%lib/X11/doc/README.ati %%I386:%%lib/X11/doc/README.chips %%I386:%%lib/X11/doc/README.cyrix +lib/X11/doc/README.dps lib/X11/doc/README.fonts %%I386:%%lib/X11/doc/README.i740 %%I386:%%lib/X11/doc/README.i810 lib/X11/doc/README.mouse %%I386:%%lib/X11/doc/README.newport %%I386:%%lib/X11/doc/README.r128 +lib/X11/doc/README.rapidaccess lib/X11/doc/README.rendition lib/X11/doc/README.s3virge -lib/X11/doc/RELNOTES lib/X11/doc/ServersOnly lib/X11/doc/Status lib/X11/doc/Versions @@ -41,19 +44,19 @@ lib/X11/etc/Xinstall.sh lib/X11/etc/sun.termcap lib/X11/etc/sun.terminfo lib/X11/etc/xmodmap.std -lib/X11/etc/xterm.termcap -lib/X11/etc/xterm.terminfo %%DRI%%lib/X11/kernel/drm.ko %%DRI%%lib/X11/kernel/gamma.ko %%DRI%%lib/X11/kernel/mga.ko %%DRI%%lib/X11/kernel/tdfx.ko -@dirrm lib/X11/kernel +%%DRI%%@dirrm lib/X11/kernel lib/X11/xserver/SecurityPolicy lib/modules/codeconv/libARABIC.a lib/modules/codeconv/libARMSCII8.a lib/modules/codeconv/libBIG5.a +lib/modules/codeconv/libBIG5HKSCS.a lib/modules/codeconv/libDOSENCODING.a lib/modules/codeconv/libGB2312.a +lib/modules/codeconv/libGBK.a lib/modules/codeconv/libGEORGIAN.a lib/modules/codeconv/libISO8859_1.a lib/modules/codeconv/libISO8859_10.a @@ -113,6 +116,7 @@ lib/modules/drivers/tga_drv.o %%I386:%%lib/modules/drivers/tseng_drv.o %%I386:%%lib/modules/drivers/vesa_drv.o lib/modules/drivers/vga_drv.o +%%I386:%%lib/modules/drivers/vmware_drv.o lib/modules/extensions/libGLcore.a lib/modules/extensions/libdbe.a %%DRI%%lib/modules/extensions/libdri.a diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index 5ddde0a40ff9..ab0e0c187806 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -60,7 +60,6 @@ configure () { BuildType1Fonts \ BuildCIDFonts \ BuildCyrillicFonts \ - BuildLatin2Fonts \ XnestServer \ BuildFontServer \ XVirtualFramebufferServer \ @@ -77,12 +76,13 @@ configure () { echo "#define ModInstall YES" >> $LOCALDEF echo "#define XF86Server YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF + echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF cat >> $LOCALDEF <<END #ifndef XF86CardDrivers #ifdef i386Architecture #define XF86CardDrivers mga glint nv tga s3virge sis rendition \ neomagic i740 tdfx savage \ - cirrus tseng trident chips apm \ + cirrus vmware tseng trident chips apm \ GlideDriver fbdev i128 \ ati AgpGartDrivers DevelDrivers ark cyrix \ siliconmotion \ @@ -129,5 +129,6 @@ END cp -f $LOCALDEF $HOSTDEF } +cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf configure exit 0 |