diff options
| -rw-r--r-- | x11-servers/Makefile | 1 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 182 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/distinfo | 4 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf | 39 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-GL-Imakefile | 11 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c | 13 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::FreeType | 62 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::fontfile | 185 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-xfree86.cf | 11 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-descr | 4 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-message | 5 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-plist | 201 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 108 |
13 files changed, 0 insertions, 826 deletions
diff --git a/x11-servers/Makefile b/x11-servers/Makefile index b7e7fab3dc7b..91f802f6788f 100644 --- a/x11-servers/Makefile +++ b/x11-servers/Makefile @@ -7,7 +7,6 @@ SUBDIR += XFree86-4-NestServer SUBDIR += XFree86-4-PrintServer SUBDIR += XFree86-4-Server - SUBDIR += XFree86-4-Server-snap SUBDIR += XFree86-4-VirtualFramebufferServer SUBDIR += Xfstt SUBDIR += driglide diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile deleted file mode 100644 index 9437a1b214e1..000000000000 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ /dev/null @@ -1,182 +0,0 @@ -# New ports collection makefile for: XFree86-Server -# Date created: 10 Oct 1999 -# Whom: taguchi@tohoku.iij.ad.jp -# -# $FreeBSD$ -# - -PORTNAME= Server -PORTVERSION= 4.3.99.15 -PORTREVISION= 2 -CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S|source/||:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= develsnaps/:x \ - anholt/:local -PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-${PORTVERSION}${EXTRACT_SUFX}:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-${PORTVERSION}${EXTRACT_SUFX} - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-4 X server and related programs - -CONFLICTS= xorg-server-* -IGNORE= Obsolete now that XFree86-4-Server has been updated to 4.4.0 - -# Override default from XFree86-4-libraries/Makefile.inc -PATCHDIR= ${MASTERDIR}/files - -.for pf in patch-Imake.cf patch-Imake.rules \ - patch-Imake.tmpl patch-X11.tmpl patch-Xcursor-Imakefile \ - patch-c2 patch-dri-Imakefile \ - patch-f patch-imake.c \ - patch-texteroids patch-xditview-Imakefile patch-xdm \ - patch-xdm_session.c patch-xf86.tmpl \ - patch-xterm-Imakefile patch-z05 patch-z14 \ - patch-z15 patch-z30 patch-z32 patch-z34 patch-z35 \ - patch-z41 patch-z44 patch-z45 -# patch-startx - -EXTRA_PATCHES+= ${.CURDIR}/../../x11/XFree86-4-libraries/files/${pf} -.endfor - -NO_LATEST_LINK= yes -USE_BZIP2= yes -SCRIPTS_ENV= OSVERSION=${OSVERSION} \ - BuildXF86DRI=${BuildXF86DRI} \ - WITH_DEBUG="${WITH_DEBUG}" -MAN1= XFree86.1 \ - Xserver.1 \ - gtf.1 \ - kbd_mode.1 \ - pcitweak.1 \ - xf86cfg.1 \ - xf86config.1 -MAN3= XF86VidMode.3 \ - XF86VidModeDeleteModeLine.3 \ - XF86VidModeGetAllModeLines.3 \ - XF86VidModeGetDotClocks.3 \ - XF86VidModeGetGamma.3 \ - XF86VidModeGetGammaRamp.3 \ - XF86VidModeGetGammaRampSize.3 \ - XF86VidModeGetModeLine.3 \ - XF86VidModeGetMonitor.3 \ - XF86VidModeGetPermissions.3 \ - XF86VidModeGetViewPort.3 \ - XF86VidModeLockModeSwitch.3 \ - XF86VidModeModModeLine.3 \ - XF86VidModeQueryExtension.3 \ - XF86VidModeQueryVersion.3 \ - XF86VidModeSetClientVersion.3 \ - XF86VidModeSetGamma.3 \ - XF86VidModeSetGammaRamp.3 \ - XF86VidModeSetViewPort.3 \ - XF86VidModeSwitchMode.3 \ - XF86VidModeSwitchToMode.3 \ - XF86VidModeValidateModeLine.3 -MAN4= citron.4 \ - dynapro.4 \ - elographics.4 \ - fbdevhw.4 \ - kbd.4 \ - keyboard.4 \ - microtouch.4 \ - mouse.4 \ - mutouch.4 \ - nv.4 \ - r128.4 \ - radeon.4 \ - void.4 \ - wacom.4 -MAN5= XF86Config.5 -PKGMESSAGE= ${WRKDIR}/.pkg-message -XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver -XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= lib/font programs/Xserver -XINSTALL_MAN_DIRS= programs/Xserver - -NOT_FOR_ARCHS= ia64 - -.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include <bsd.port.pre.mk> - -.if ${ARCH} == amd64 -BROKEN= "Does not build on amd64" -.endif - -.if ${ARCH} == i386 || ${ARCH} == alpha -RUN_DEPENDS+= ${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri -BuildXF86DRI= YES -PLIST_SUB+= DRI="" -.else -BuildXF86DRI= NO -PLIST_SUB+= DRI="@comment " -.endif - -.if ${ARCH} == alpha -PLIST_SUB+= ALPHA_NA="@comment " -.else -PLIST_SUB+= ALPHA_NA="" -.endif - -.if ${ARCH} == ia64 -PLIST_SUB+= IA64_NA="@comment " -.else -PLIST_SUB+= IA64_NA="" -.endif - -.if ${ARCH} == sparc64 -PLIST_SUB+= SPARC64_NA="@comment " -PLIST_SUB+= SPARC64="" -MAN4+= sunffb.4 -.else -PLIST_SUB+= SPARC64="@comment " -PLIST_SUB+= SPARC64_NA="" -MAN4+= glint.4 \ - mga.4 \ - rendition.4 \ - s3virge.4 \ - savage.4 \ - siliconmotion.4 \ - tdfx.4 \ - vga.4 -.endif - -.if ${ARCH} == i386 -PLIST_SUB+= I386="" -MAN1+= scanpci.1 -MAN4+= apm.4 \ - chips.4 \ - cirrus.4 \ - cyrix.4 \ - i128.4 \ - i740.4 \ - i810.4 \ - neomagic.4 \ - nsc.4 \ - sis.4 \ - trident.4 \ - tseng.4 \ - vesa.4 \ - via.4 \ - vmware.4 -.else -PLIST_SUB+= I386="@comment " -.endif - -post-extract:: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - -post-build: - @${RM} -f ${PKGMESSAGE} - @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} - -post-install:: - @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} - @if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \ - ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ - fi; - -.include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo deleted file mode 100644 index 0b0de2c7dfd1..000000000000 --- a/x11-servers/XFree86-4-Server-snap/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (xc/XFree86-4.3.99.15.tar.bz2) = ae7ec191348888bc9f83318e55a009e1 -SIZE (xc/XFree86-4.3.99.15.tar.bz2) = 41882733 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf b/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf deleted file mode 100644 index bcbd69901253..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf +++ /dev/null @@ -1,39 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Sat Nov 1 20:38:01 2003 -+++ config/cf/FreeBSD.cf Tue Nov 11 20:47:11 2003 -@@ -172,11 +172,11 @@ - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ -+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX - #else --# define CcCmd cc --# define CplusplusCmd c++ -+# define CcCmd FreeBSDCC -+# define CplusplusCmd FreeBSDCXX - #endif - - #define CppCmd /usr/bin/cpp -@@ -393,18 +393,8 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags FreeBSDCFLAGS - - #ifndef PreIncDir - # define PreIncDir /usr/include diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-GL-Imakefile b/x11-servers/XFree86-4-Server-snap/files/patch-GL-Imakefile deleted file mode 100644 index 40560c382274..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-GL-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/GL/Imakefile.orig Thu Oct 23 00:33:15 2003 -+++ lib/GL/Imakefile Thu Oct 23 00:35:49 2003 -@@ -110,7 +110,7 @@ - #if BuildXF86DRI && GlxUseBuiltInDRIDriver - SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) - #else --SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) -+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) /*$(LIBGLBUILDDIR) $(OSMESADIRS) */ $(DRIVERDIRS) - #endif - - MakeSubdirs($(SUBDIRS)) diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c deleted file mode 100644 index e5007f851932..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Feb 25 11:04:10 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Feb 25 11:04:50 2004 -@@ -483,7 +483,7 @@ - writeSparse32(int Value, pointer Base, register unsigned long Offset); - - #ifdef __FreeBSD__ --extern int sysarch(int, char *); -+extern int sysarch(int, void *); - #endif - - struct parms { diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::FreeType b/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::FreeType deleted file mode 100644 index 37fe46add21b..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::FreeType +++ /dev/null @@ -1,62 +0,0 @@ ---- lib/font/FreeType/ftenc.c.orig Mon Mar 22 11:30:03 2004 -+++ lib/font/FreeType/ftenc.c Mon Mar 22 11:30:20 2004 -@@ -35,7 +35,8 @@ - - #include "fontmisc.h" - #include "fontenc.h" --#include "freetype/freetype.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include "freetype/ttnameid.h" - #include "freetype/tttables.h" - #include "freetype/t1tables.h" ---- lib/font/FreeType/ftfuncs.c.orig Sat Nov 1 23:43:24 2003 -+++ lib/font/FreeType/ftfuncs.c Mon Mar 22 12:53:58 2004 -@@ -42,7 +42,8 @@ - #include "fntfilst.h" - #include "fontutil.h" - #include "FSproto.h" --#include "freetype/freetype.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include "freetype/ftsizes.h" - #include "freetype/ttnameid.h" - #include "freetype/tttables.h" -@@ -50,7 +51,7 @@ - #include "freetype/ftxf86.h" - #include "freetype/ftbbox.h" - #include "freetype/internal/tttypes.h" --#include "extras/freetype2/src/truetype/ttobjs.h" -+#include "ttobjs.h" - /* - * If you want to use FT_Outline_Get_CBox instead of - * FT_Outline_Get_BBox, define here. ---- lib/font/FreeType/fttools.c.orig Mon Mar 22 11:37:36 2004 -+++ lib/font/FreeType/fttools.c Mon Mar 22 11:37:53 2004 -@@ -34,7 +34,8 @@ - #endif - - #include "font.h" --#include "freetype/freetype.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include "freetype/ftsnames.h" - #include "freetype/ttnameid.h" - #include "ft.h" ---- lib/font/FreeType/Imakefile.orig Mon Mar 22 13:01:24 2004 -+++ lib/font/FreeType/Imakefile Mon Mar 22 13:02:44 2004 -@@ -9,10 +9,11 @@ - - DEFINES = ServerExtraDefines StrcasecmpDefines Freetype2BuildDefines - --FT2INCS = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/include -+FT2SOURCEDIR = $(TOP)/extras/freetype2/src -+FT2INCS = $(FREETYPE2INCLUDES) - --INCLUDES = -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ -- -I$(SERVERSRC)/include $(FT2INCS) -I$(INCLUDESRC) -+INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ -+ -I$(SERVERSRC)/include $(FT2INCS) -I$(FT2SOURCEDIR)/truetype -I$(INCLUDESRC) - - SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c - OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::fontfile b/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::fontfile deleted file mode 100644 index def6a519f7c1..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::fontfile +++ /dev/null @@ -1,185 +0,0 @@ -Index: lib/font/fontfile/dirfile.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/dirfile.c,v -retrieving revision 3.15 -diff -u -r3.15 dirfile.c ---- dirfile.c 31 May 2002 18:45:50 -0000 3.15 -+++ dirfile.c 11 Feb 2004 21:17:20 -0000 -@@ -68,6 +68,9 @@ - - FontDirectoryPtr dir = NullFontDirectory; - -+ if (strlen(directory) + 1 + sizeof(FontDirFile) > sizeof(dir_file)) -+ return BadFontPath; -+ - #ifdef FONTDIRATTRIB - /* Check for font directory attributes */ - #ifndef __UNIXOS2__ -@@ -154,6 +157,9 @@ - char dir_file[MAXFONTFILENAMELEN]; - struct stat statb; - -+ if (strlen(dir->directory) + sizeof(FontDirFile) > sizeof(dir_file)) -+ return FALSE; -+ - strcpy (dir_file, dir->directory); - strcat (dir_file, FontDirFile); - if (stat (dir_file, &statb) == -1) -@@ -202,6 +208,8 @@ - continue; - - len = strlen (fileName) - renderer->fileSuffixLen; -+ if (len >= sizeof(copy)) -+ continue; - CopyISOLatin1Lowered (copy, fileName, len); - copy[len] = '\0'; - name.name = copy; -@@ -251,9 +259,13 @@ - int status = Successful; - struct stat statb; - -+ if (strlen(directory) >= sizeof(alias_file)) -+ return BadFontPath; - dir = *pdir; - strcpy(alias_file, directory); - if (!isFile) { -+ if (strlen(directory) + 1 + sizeof(FontAliasFile) > sizeof(alias_file)) -+ return BadFontPath; - if (directory[strlen(directory) - 1] != '/') - strcat(alias_file, "/"); - strcat(alias_file, FontAliasFile); -@@ -286,6 +298,10 @@ - status = AllocError; - break; - case NAME: -+ if (strlen(lexToken) >= sizeof(alias)) { -+ status = BadFontPath; -+ break; -+ } - strcpy(alias, lexToken); - token = lexAlias(file, &lexToken); - switch (token) { -@@ -302,6 +318,10 @@ - status = AllocError; - break; - case NAME: -+ if (strlen(lexToken) >= sizeof(font_name)) { -+ status = BadFontPath; -+ break; -+ } - CopyISOLatin1Lowered(alias, alias, strlen(alias)); - CopyISOLatin1Lowered(font_name, lexToken, strlen(lexToken)); - if (!FontFileAddFontAlias (dir, alias, font_name)) -Index: lib/font/fontfile/encparse.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/encparse.c,v -retrieving revision 1.18 -diff -u -r1.18 encparse.c ---- encparse.c 2 Nov 2001 03:06:40 -0000 1.18 -+++ encparse.c 11 Feb 2004 21:17:20 -0000 -@@ -833,6 +833,7 @@ - char file_name[MAXFONTFILENAMELEN], encoding_name[MAXFONTNAMELEN], - buf[MAXFONTFILENAMELEN]; - int count, n; -+ static char format[24] = ""; - - /* As we don't really expect to open encodings that often, we don't - take the trouble of caching encodings directories. */ -@@ -848,8 +849,12 @@ - } - - encoding = NULL; -+ if (!format[0]) { -+ sprintf(format, "%%%ds %%%d[^\n]\n", sizeof(encoding_name) - 1, -+ sizeof(file_name) - 1); -+ } - for(;;) { -- count = fscanf(file, "%s %[^\n]\n", encoding_name, file_name); -+ count = fscanf(file, format, encoding_name, file_name); - if(count == EOF) - break; - if(count != 2) -Index: lib/font/fontfile/fontfile.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/fontfile.c,v -retrieving revision 3.16 -diff -u -r3.16 fontfile.c ---- fontfile.c 31 May 2002 18:45:50 -0000 3.16 -+++ fontfile.c 11 Feb 2004 21:17:20 -0000 -@@ -424,11 +424,16 @@ - vals.ranges = ranges; - vals.nranges = nranges; - -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->OpenScalable) (fpe, pFont, -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->OpenScalable) (fpe, pFont, - flags, entry, fileName, &vals, format, fmask, - non_cachable_font); -+ } - - /* In case rasterizer does something bad because of - charset subsetting... */ -@@ -497,6 +502,8 @@ - - dir = (FontDirectoryPtr) fpe->private; - bitmap = &entry->u.bitmap; -+ if (strlen(dir->directory) + strlen(bitmap->fileName) >= sizeof(fileName)) -+ return BadFontName; - strcpy (fileName, dir->directory); - strcat (fileName, bitmap->fileName); - ret = (*bitmap->renderer->OpenBitmap) -@@ -530,6 +537,8 @@ - - dir = (FontDirectoryPtr) fpe->private; - bitmap = &entry->u.bitmap; -+ if (strlen(dir->directory) + strlen(bitmap->fileName) >= sizeof(fileName)) -+ return BadFontName; - strcpy (fileName, dir->directory); - strcat (fileName, bitmap->fileName); - ret = (*bitmap->renderer->GetInfoBitmap) (fpe, pFontInfo, entry, fileName); -@@ -891,10 +900,15 @@ - vals.ranges = FontParseRanges(origName, &vals.nranges); - ranges = vals.ranges; - /* Make a new scaled instance */ -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->GetInfoScalable) -- (fpe, *pFontInfo, entry, &tmpName, fileName, &vals); -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->GetInfoScalable) -+ (fpe, *pFontInfo, entry, &tmpName, fileName, &vals); -+ } - if (ranges) xfree(ranges); - } - } -@@ -931,10 +945,15 @@ - bc = &entry->u.bc; - entry = bc->entry; - /* Make a new scaled instance */ -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->GetInfoScalable) -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->GetInfoScalable) - (fpe, *pFontInfo, entry, tmpName, fileName, &bc->vals); -+ } - break; - #endif - default: diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xfree86.cf b/x11-servers/XFree86-4-Server-snap/files/patch-xfree86.cf deleted file mode 100644 index 063d04517c7d..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xfree86.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/xfree86.cf.orig Sat Nov 1 20:38:05 2003 -+++ config/cf/xfree86.cf Fri Nov 21 11:33:46 2003 -@@ -1748,6 +1748,8 @@ - #ifndef XFree86ConsoleDefines - # if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) - # define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT -+# elif defined(FreeBSDArchitecture) -+# define XFree86ConsoleDefines -DSYSCONS_SUPPORT - # else - # define XFree86ConsoleDefines /**/ - # endif diff --git a/x11-servers/XFree86-4-Server-snap/pkg-descr b/x11-servers/XFree86-4-Server-snap/pkg-descr deleted file mode 100644 index 7bb168d1f581..000000000000 --- a/x11-servers/XFree86-4-Server-snap/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains X server and its related programs, -such as xf86cfg, xf86config, kbd_mode, and so on. - -WWW: http://www.xfree86.org/ diff --git a/x11-servers/XFree86-4-Server-snap/pkg-message b/x11-servers/XFree86-4-Server-snap/pkg-message deleted file mode 100644 index ea2e24612085..000000000000 --- a/x11-servers/XFree86-4-Server-snap/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -************************************************************************ -* 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 deleted file mode 100644 index 15770fe3ae0f..000000000000 --- a/x11-servers/XFree86-4-Server-snap/pkg-plist +++ /dev/null @@ -1,201 +0,0 @@ -bin/X -bin/XFree86 -bin/getconfig -bin/getconfig.pl -bin/gtf -%%SPARC64_NA%%bin/inb -%%SPARC64_NA%%bin/inl -%%SPARC64_NA%%bin/inw -%%SPARC64_NA%%bin/ioport -bin/kbd_mode -bin/mmapr -bin/mmapw -%%SPARC64_NA%%bin/outb -%%SPARC64_NA%%bin/outl -%%SPARC64_NA%%bin/outw -bin/pcitweak -%%I386%%bin/scanpci -bin/xf86cfg -bin/xf86config -include/X11/bitmaps/card.xbm -include/X11/bitmaps/down.xbm -include/X11/bitmaps/keyboard.xbm -include/X11/bitmaps/left.xbm -include/X11/bitmaps/monitor.xbm -include/X11/bitmaps/mouse.xbm -include/X11/bitmaps/narrower.xbm -include/X11/bitmaps/right.xbm -include/X11/bitmaps/shorter.xbm -include/X11/bitmaps/taller.xbm -include/X11/bitmaps/up.xbm -include/X11/bitmaps/wider.xbm -include/X11/pixmaps/card.xpm -include/X11/pixmaps/computer.xpm -include/X11/pixmaps/keyboard.xpm -include/X11/pixmaps/monitor.xpm -include/X11/pixmaps/mouse.xpm -lib/X11/Cards -lib/X11/Options -lib/X11/XF86Config.98 -lib/X11/XF86Config.eg -lib/X11/app-defaults/XF86Cfg -lib/X11/doc/BUILD -lib/X11/doc/BugReport -lib/X11/doc/DESIGN -lib/X11/doc/Install -lib/X11/doc/LICENSE -lib/X11/doc/README -lib/X11/doc/README.DECtga -lib/X11/doc/README.DGA -lib/X11/doc/README.DRI -lib/X11/doc/README.DRIcomp -%%I386%%lib/X11/doc/README.I128 -%%I386%%lib/X11/doc/README.SiS -lib/X11/doc/README.XKB-Config -lib/X11/doc/README.XKB-Enhancing -%%I386%%lib/X11/doc/README.apm -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 -lib/X11/doc/README.r128 -lib/X11/doc/README.rapidaccess -%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition -%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge -lib/X11/doc/RELNOTES -lib/X11/doc/Status -lib/X11/doc/Versions -lib/X11/doc/VideoBoard98 -lib/X11/etc/Xinstall.sh -lib/X11/etc/sun.termcap -lib/X11/etc/sun.terminfo -lib/X11/etc/xmodmap.std -lib/X11/getconfig/cfg.sample -lib/X11/getconfig/xfree86.cfg -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/libGB18030.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 -lib/modules/codeconv/libISO8859_11.a -lib/modules/codeconv/libISO8859_13.a -lib/modules/codeconv/libISO8859_14.a -lib/modules/codeconv/libISO8859_15.a -lib/modules/codeconv/libISO8859_2.a -lib/modules/codeconv/libISO8859_3.a -lib/modules/codeconv/libISO8859_4.a -lib/modules/codeconv/libISO8859_5.a -lib/modules/codeconv/libISO8859_6.a -lib/modules/codeconv/libISO8859_7.a -lib/modules/codeconv/libISO8859_8.a -lib/modules/codeconv/libISO8859_9.a -lib/modules/codeconv/libJISX0201.a -lib/modules/codeconv/libJISX0208.a -lib/modules/codeconv/libJISX0212.a -lib/modules/codeconv/libKOI8.a -lib/modules/codeconv/libKSC5601.a -lib/modules/codeconv/libKSCJOHAB.a -lib/modules/codeconv/libMULEENCODING.a -lib/modules/codeconv/libTCVN.a -lib/modules/codeconv/libVISCII.a -%%I386%%lib/modules/drivers/apm_drv.o -%%I386%%lib/modules/drivers/ark_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 -%%I386%%lib/modules/drivers/cirrus_laguna.o -%%I386%%lib/modules/drivers/cyrix_drv.o -%%SPARC64_NA%%lib/modules/drivers/glint_drv.o -%%I386%%lib/modules/drivers/i128_drv.o -%%I386%%lib/modules/drivers/i740_drv.o -%%I386%%lib/modules/drivers/i810_drv.o -%%SPARC64_NA%%lib/modules/drivers/mga_drv.o -%%I386%%lib/modules/drivers/neomagic_drv.o -%%I386%%lib/modules/drivers/nsc_drv.o -lib/modules/drivers/nv_drv.o -lib/modules/drivers/r128_drv.o -lib/modules/drivers/radeon_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o -lib/modules/drivers/riva128.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o -%%I386%%lib/modules/drivers/sis_drv.o -%%SPARC64%%lib/modules/drivers/sunffb_drv.o -%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o -%%I386%%lib/modules/drivers/trident_drv.o -%%I386%%lib/modules/drivers/tseng_drv.o -%%I386%%lib/modules/drivers/vesa_drv.o -%%SPARC64_NA%%lib/modules/drivers/vga_drv.o -%%I386%%lib/modules/drivers/via_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 -lib/modules/extensions/libextmod.a -lib/modules/extensions/libglx.a -lib/modules/extensions/librecord.a -lib/modules/extensions/libxtrap.a -lib/modules/fonts/libbitmap.a -lib/modules/fonts/libfreetype.a -lib/modules/fonts/libspeedo.a -lib/modules/fonts/libtype1.a -lib/modules/fonts/libxtt.a -%%DRI%%lib/modules/freebsd/libdrm.a -lib/modules/input/citron_drv.o -lib/modules/input/digitaledge_drv.o -lib/modules/input/dynapro_drv.o -lib/modules/input/elo2300_drv.o -lib/modules/input/elographics_drv.o -lib/modules/input/kbd_drv.o -lib/modules/input/magellan_drv.o -lib/modules/input/microtouch_drv.o -lib/modules/input/mouse_drv.o -lib/modules/input/mutouch_drv.o -lib/modules/input/spaceorb_drv.o -lib/modules/input/summa_drv.o -lib/modules/input/void_drv.o -lib/modules/input/wacom_drv.o -%%I386%%lib/modules/libafb.a -lib/modules/libcfb.a -lib/modules/libcfb16.a -lib/modules/libcfb24.a -lib/modules/libcfb32.a -lib/modules/libddc.a -lib/modules/libfb.a -lib/modules/libi2c.a -lib/modules/libint10.a -lib/modules/liblayer.a -lib/modules/libmfb.a -lib/modules/libpcidata.a -lib/modules/librac.a -lib/modules/libramdac.a -lib/modules/libscanpci.a -lib/modules/libshadow.a -lib/modules/libshadowfb.a -lib/modules/libvbe.a -lib/modules/libvgahw.a -lib/modules/libxaa.a -lib/modules/libxf1bpp.a -lib/modules/libxf24_32bpp.a -lib/modules/libxf4bpp.a -lib/modules/libxf8_16bpp.a -lib/modules/libxf8_32bpp.a -%%SPARC64_NA%%lib/modules/v10002d.uc -%%SPARC64_NA%%lib/modules/v20002d.uc diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure deleted file mode 100644 index 7776a550ccd3..000000000000 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh - -# This script does the following: -# (1) cp xf86site.def, installed by imake-4 port, -# to ${WRKDIR}/xc/config/cf. -# this provides settings for the ports system. -# (2) Create a host.def for this specific port, using -# host.def as a base. - -ORIGDEF=$PREFIX/lib/X11/config/xf86site.def -DESTDEF=$WRKDIR/xc/config/cf/xf86site.def -ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -HOSTDEF=$WRKDIR/xc/config/cf/host.def - -# Use original host.def as initial config file -rm -f $LOCALDEF -grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF -echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - -# This is also defined in xf86site.def, but doesn't get -# picked up for some reason. -echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - -# Now, we can use this configuration. -# Thanks, Trevor Johnson -echo "#define InstallXserverSetUID NO" >> $LOCALDEF - -echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \ - elographics magellan \ - microtouch mutouch spaceorb summa \ - wacom void citron" >> $LOCALDEF -echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF -echo "#define BuildXF86DRM NO" >> $LOCALDEF -echo "#define HasGlide3 YES" >> $LOCALDEF - -# disable some options -for i in \ - BuildFonts \ - Build75DpiFonts \ - Build100DpiFonts \ - BuildSpeedoFonts \ - BuildType1Fonts \ - BuildCIDFonts \ - BuildCyrillicFonts \ - JoystickSupport \ - XnestServer \ - BuildFontServer \ - XVirtualFramebufferServer \ - XprtServer \ - LibHeaders \ - LibInstall \ - ForceNormalLib \ - XTrueTypeInstallCConvHeaders -do \ - echo "#define $i NO" >> $LOCALDEF -done - -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define LibInstallBuild YES" >> $LOCALDEF -echo "#define ModInstall YES" >> $LOCALDEF -echo "#define XF86Server YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define BuildGLXLibrary YES" >> $LOCALDEF -echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define UseInstalledLibraries YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF -#echo "#define UsrLibDir ${PREFIX}/lib" >> $LOCALDEF - -echo "#define FreeBSDCC ${CC}" >> $LOCALDEF -echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF -if [ X$WITH_DEBUG != X ]; then - echo "#define FreeBSDCFLAGS -g ${CFLAGS}" >> $LOCALDEF - echo "#define InstPgmFlags" >> $LOCALDEF -else - echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF -fi - -# We need to test cards on these architectures and see what can be added -# to the other architectures. -cat >> $LOCALDEF <<END -#if defined(i386Architecture) -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident via chips apm \ - i128 nsc ati i810 ark cyrix siliconmotion \ - vesa vga -#elif defined(ia64Architecture) -# define XF86CardDrivers mga nv tdfx glint ati vga -#elif defined(AlphaArchitecture) -# define XF86CardDrivers mga glint nv tga s3 s3virge rendition \ - tdfx savage cirrus ati siliconmotion vga -#elif defined(Sparc64Architecture) -# define XF86CardDrivers nv ati sunffb -#endif -END - -echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF - -# Copy ORIGDEF to DESTDEF -rm -f $DESTDEF -cp -f $ORIGDEF $DESTDEF - -# copy generated config to host.def -cp -f $LOCALDEF $HOSTDEF - -exit 0 |