diff options
| author | anholt <anholt@FreeBSD.org> | 2004-12-23 09:35:49 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-12-23 09:35:49 +0800 |
| commit | 65440fcd9bcb20a1d534ae744432598de80568e0 (patch) | |
| tree | 9c8108a587ba53bd91384e5c3a89b90f40ff9344 | |
| parent | 941f91a0158ef5a224f924902fa9c60d2b342648 (diff) | |
| download | freebsd-ports-gnome-65440fcd9bcb20a1d534ae744432598de80568e0.tar.gz freebsd-ports-gnome-65440fcd9bcb20a1d534ae744432598de80568e0.tar.zst freebsd-ports-gnome-65440fcd9bcb20a1d534ae744432598de80568e0.zip | |
Update X.Org ports to 6.8.1, and the DRI port to use Mesa 6.2. Because Mesa 6.2
DRI drivers are incompatible with the old libGL in XFree86, they have been
repocopied to graphics/xfree86-dri. Also note that with this commit the html
manpages are going away, and with it the runtime dependency on perl for the
imake port.
Release notes at: http://www.x.org/X11R6.8.1/RELNOTES.txt
Props to: kris (multiple cluster runs and sorting through logs)
lesi (fixing all the issues in those logs, and more)
135 files changed, 1848 insertions, 2098 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 5ac2b3f6718f..f5e84dfd6aa7 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1571,14 +1571,15 @@ PKG_IGNORE_DEPENDS?= '^XFree86-3\.' .else -.if defined(USE_IMAKE) -RUN_DEPENDS+= mkhtmlindex:${X_IMAKE_PORT} -.endif .if defined(USE_XPM) || defined(USE_GL) USE_XLIB= yes .endif +.if ${X_WINDOW_SYSTEM:L} == xorg +XAWVER= 8 +.else XAWVER= 7 +.endif PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' .endif @@ -1772,7 +1773,6 @@ NONEXISTENT?= /nonexistent # Miscellaneous overridable commands: GMAKE?= gmake XMKMF?= xmkmf -a -MKHTMLINDEX?= ${X11BASE}/bin/mkhtmlindex .if exists(/sbin/md5) MD5?= /sbin/md5 .elif exists(/bin/md5) @@ -2638,16 +2638,6 @@ INFO_PATH?= share/info INFO_PATH?= info .endif -.if ${X_WINDOW_SYSTEM:L} == xfree86-3 -XFREE86_HTML_MAN= no -.else -.if defined(USE_IMAKE) -XFREE86_HTML_MAN?= yes -.else -XFREE86_HTML_MAN?= no -.endif -.endif - DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} DATADIR?= ${PREFIX}/share/${PORTNAME} @@ -3284,9 +3274,6 @@ do-install: @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES) @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man) -.if ${XFREE86_HTML_MAN:L} == yes - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html -.endif .endif .else # !defined(USE_GMAKE) .if defined(PERL_MODBUILD) @@ -3295,9 +3282,6 @@ do-install: @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) .if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES) @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install.man) -.if ${XFREE86_HTML_MAN:L} == yes - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html -.endif .endif .endif .endif @@ -4712,21 +4696,6 @@ generate-plist: @for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \ ${ECHO_CMD} "@unexec rm -f %D/$${i%.gz} %D/$${i%.gz}.gz" >> ${TMPPLIST}; \ done -.if ${XFREE86_HTML_MAN:L} == "yes" -.for mansect in 1 2 3 4 5 6 7 8 9 L N -.for man in ${MAN${mansect}} - @${ECHO_CMD} lib/X11/doc/html/${man}.html >> ${TMPPLIST} -.endfor -.endfor - @${ECHO_CMD} "@unexec %D/bin/mkhtmlindex %D/lib/X11/doc/html" >> ${TMPPLIST} - @${ECHO_CMD} "@exec %D/bin/mkhtmlindex %D/lib/X11/doc/html" >> ${TMPPLIST} -.if defined(MLINKS) - @${ECHO_CMD} ${MLINKS} | ${AWK} \ - '{ for (i=1; i<=NF; i++) { \ - if (i % 2 == 0) { printf "lib/X11/doc/html/%s.html\n", $$i } \ - } }' >> ${TMPPLIST} -.endif -.endif .endfor @if [ -f ${PLIST} ]; then \ ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \ diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile index bb859fead7a1..607e2a835dca 100644 --- a/devel/imake-4/Makefile +++ b/devel/imake-4/Makefile @@ -73,7 +73,4 @@ pre-configure: s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ ${WRKSRC}/cf/FreeBSD.cf -post-install: - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html - .include <bsd.port.post.mk> diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure index efbd8e1e5bee..d4fd250860b1 100644 --- a/devel/imake-4/scripts/configure +++ b/devel/imake-4/scripts/configure @@ -47,6 +47,7 @@ echo "#define HasFontconfig YES" >> $F echo "#define FontconfigDir ${PREFIX}" >> $F echo "#define HasLibpng YES" >> $F echo "#define LibpngDir ${LOCALBASE}" >> $F +echo "#define BuildHtmlManPages NO" >> $F # Never install something to outside ${X11BASE} echo "#define NothingOutsideProjectRoot YES" >> $F diff --git a/devel/imake-6/Makefile b/devel/imake-6/Makefile index 0a9bc8c6150f..b9e8787133af 100644 --- a/devel/imake-6/Makefile +++ b/devel/imake-6/Makefile @@ -6,14 +6,12 @@ # PORTNAME= imake -PORTVERSION= 6.7.0 -PORTREVISION= 2 +PORTVERSION= 6.8.1 CATEGORIES= devel -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} \ -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Imake and other utilities from X.Org @@ -57,9 +55,6 @@ pre-configure: s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ ${WRKSRC}/cf/FreeBSD.cf -post-install: - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html - .if ${X_WINDOW_SYSTEM:L} != xorg IGNORE= is part of X.Org. For switching to X.Org, read UPDATING entry 20040723 .endif diff --git a/devel/imake-6/distinfo b/devel/imake-6/distinfo index de8ed629db2a..62c1647dc07b 100644 --- a/devel/imake-6/distinfo +++ b/devel/imake-6/distinfo @@ -1,6 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/devel/imake-6/files/patch-FreeBSD.cf b/devel/imake-6/files/patch-FreeBSD.cf index 8b0bf8f8202e..520a175ed6dd 100644 --- a/devel/imake-6/files/patch-FreeBSD.cf +++ b/devel/imake-6/files/patch-FreeBSD.cf @@ -1,46 +1,31 @@ ---- cf/FreeBSD.cf.orig Fri Apr 2 13:47:10 2004 -+++ cf/FreeBSD.cf Fri Jun 18 19:26:35 2004 -@@ -109,32 +109,20 @@ - # endif - # define HasPosixThreads YES - # define ThreadedX YES --# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE --/* -- * FreeBSD has tread-safe api but no getpwnam_r yet. -- */ -+# define SystemMTDefines %%PTHREAD_CFLAGS%% - # define HasThreadSafeAPI YES - # if OSRelVersion < 501000 - # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI - # else - # define MTSafeAPIDefines -DXUSE_MTSAFE_API +--- cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 ++++ cf/FreeBSD.cf Fri Sep 10 19:52:31 2004 +@@ -78,6 +78,7 @@ + #define HasIssetugid YES + #define HasPoll YES + #endif ++#define BuildHtmlManPages NO + + #if OSMajorVersion >= 4 + #define HasGetIfAddrs YES +@@ -117,14 +118,8 @@ + # if (OSRelVersion < 500043) + # define NeedUIThrStubs YES # endif --# if HasLibPthread +-# if (OSRelVersion >= 502102) -# define ThreadsLibraries -lpthread -+# define ThreadsLibraries %%PTHREAD_LIBS%% -+# if OSRelVersion >= 500043 -+# define BuildThreadStubLibrary NO -+# define NeedUIThrStubs NO - # else --# if OSRelVersion >= 500043 --# define BuildThreadStubLibrary NO --# define NeedUIThrStubs NO --# else --# define BuildThreadStubLibrary YES --# define NeedUIThrStubs YES --# endif --# if (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r --# define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc --# else --# define ThreadsLibraries -pthread --# endif -+# define BuildThreadStubLibrary YES -+# define NeedUIThrStubs YES - # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) - # endif -@@ -359,7 +347,7 @@ +-# elif (OSRelVersion >= 500016) +-# define ThreadsLibraries -lc_r +-# else +-# define ThreadsLibraries -pthread +-# endif +-# define SystemMTDefines -D_THREAD_SAFE ++# define ThreadsLibraries -lpthread ++# define SystemMTDefines + #endif + + /* This fixes linking C programs against libGLU on FreeBSD 3.x */ +@@ -338,7 +333,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -49,7 +34,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -455,14 +443,14 @@ +@@ -466,14 +461,14 @@ /* 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) diff --git a/devel/imake-6/files/patch-Imake.tmpl b/devel/imake-6/files/patch-Imake.tmpl index 93412ae23182..04114110a2b9 100644 --- a/devel/imake-6/files/patch-Imake.tmpl +++ b/devel/imake-6/files/patch-Imake.tmpl @@ -1,6 +1,6 @@ ---- cf/Imake.tmpl.orig Fri Apr 2 13:47:10 2004 -+++ cf/Imake.tmpl Thu Jul 22 22:51:21 2004 -@@ -1776,7 +1776,7 @@ +--- cf/Imake.tmpl.orig Tue Jul 27 20:24:29 2004 ++++ cf/Imake.tmpl Fri Sep 10 18:45:12 2004 +@@ -1798,7 +1798,7 @@ CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) @@ -9,13 +9,11 @@ #endif COMPRESS = CompressCmd GZIPCMD = GzipCmd -@@ -2015,8 +2015,8 @@ - * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile +@@ -2038,7 +2038,7 @@ */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) -- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) $(VENDOR_DEFINES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) + CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib $(INSTALLED_LIBS) diff --git a/devel/imake-6/files/patch-cf-Imakefile b/devel/imake-6/files/patch-cf-Imakefile deleted file mode 100644 index 67a6bbb2e345..000000000000 --- a/devel/imake-6/files/patch-cf-Imakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- cf/Imakefile.orig Sun Jun 6 19:06:47 2004 -+++ cf/Imakefile Sun Jun 6 19:07:11 2004 -@@ -79,7 +79,8 @@ - sv3Lib.tmpl \ - sv4Lib.tmpl \ - xf86.tmpl \ --xorg.tmpl -+xorg.tmpl \ -+xttMod.tmpl - - CFFILES = \ - Imake.cf \ diff --git a/devel/imake-6/files/patch-imake.c b/devel/imake-6/files/patch-imake.c deleted file mode 100644 index f8117c91e000..000000000000 --- a/devel/imake-6/files/patch-imake.c +++ /dev/null @@ -1,22 +0,0 @@ ---- imake/imake.c.orig Tue Dec 17 04:21:38 2002 -+++ imake/imake.c Sat Jan 4 15:57:23 2003 -@@ -1384,6 +1384,19 @@ - name = &uts_name; - } - #endif -+# ifdef __FreeBSD__ -+ /* Hack for FreeBSD ports "Cross Version" compiling system. */ -+ { -+ char *e; -+ if ((e = getenv("OSREL")) != NULL && -+ strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) { -+ strcpy(name->release, e); -+ strcpy(name->version, name->sysname); -+ strcat(name->version, " "); -+ strcat(name->version, e); -+ } -+ } -+# endif - - # if defined DEFAULT_OS_NAME - # if defined CROSSCOMPILE diff --git a/devel/imake-6/pkg-plist b/devel/imake-6/pkg-plist index adf8e6fe6d06..1a45d762e398 100644 --- a/devel/imake-6/pkg-plist +++ b/devel/imake-6/pkg-plist @@ -121,19 +121,3 @@ lib/X11/config/xfree86.cf lib/X11/config/xorg.cf lib/X11/config/xorg.tmpl lib/X11/config/xorgsite.def -lib/X11/config/xttMod.tmpl -lib/X11/doc/html/ccmakedep.1.html -lib/X11/doc/html/cleanlinks.1.html -lib/X11/doc/html/gccmakedep.1.html -lib/X11/doc/html/imake.1.html -lib/X11/doc/html/lndir.1.html -lib/X11/doc/html/makedepend.1.html -lib/X11/doc/html/makeg.1.html -lib/X11/doc/html/makestrs.1.html -lib/X11/doc/html/mergelib.1.html -lib/X11/doc/html/mkdirhier.1.html -lib/X11/doc/html/mkhtmlindex.1.html -lib/X11/doc/html/pswrap.1.html -lib/X11/doc/html/revpath.1.html -lib/X11/doc/html/rman.1.html -lib/X11/doc/html/xmkmf.1.html diff --git a/graphics/Makefile b/graphics/Makefile index 8569fa226887..77d293324ed1 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -516,6 +516,7 @@ SUBDIR += xfig SUBDIR += xfpovray SUBDIR += xfractint + SUBDIR += xfree86-dri SUBDIR += xglurbules SUBDIR += xgrasp SUBDIR += xli diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile index 0ee67b64098b..235efd0f4b5d 100644 --- a/graphics/dri-devel/Makefile +++ b/graphics/dri-devel/Makefile @@ -28,6 +28,8 @@ LATEST_LINK= ${PORTNAME}-devel ONLY_FOR_ARCHS= alpha i386 +IGNORE= is currently older than graphics/dri. Please use that one instead + do-configure: @${RM} -f ${WRKSRC}/config/cf/projectroot.def @${ECHO} "#define ProjectRoot ${X11BASE}" > ${WRKSRC}/config/cf/projectroot.def diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index f2de8ba34ce5..185b49b01748 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -6,35 +6,52 @@ # PORTNAME= dri -PORTVERSION= 5.0.2 +PORTVERSION= 6.2 PORTEPOCH= 2 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITE_SUBDIR= anholt +DISTFILES= Mesa-6.2-20041124.tar.bz2 \ + drm-20041124.tar.bz2 MAINTAINER= anholt@FreeBSD.org COMMENT= OpenGL hardware acceleration drivers for the DRI -EXTRA_PATCHES+= ${CF_PATCHES} +BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} -USE_XLIB= yes +CONFLICTS= xfree86-dri-* -ONLY_FOR_ARCHS= i386 alpha amd64 +WRKSRC= ${WRKDIR}/Mesa +USE_X_PREFIX= yes +USE_BZIP2= yes +USE_GMAKE= yes -XBUILD_DIRS= lib/GL -XINSTALL_DIRS= lib/GL/mesa/src/drv +ONLY_FOR_ARCHS= i386 alpha amd64 + +DRIMODDIR= ${PREFIX}/lib/modules/dri -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> +do-install: +.if ${ARCH} == i386 + ${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/i830_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR} +.endif + ${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR} + .if ${ARCH} == i386 PLIST_SUB+= I386="" +ALL_TARGET= freebsd-dri-x86 .else PLIST_SUB+= I386="@comment " -.endif -.if ${ARCH} == amd64 -PLIST_SUB+= NO_AMD64="@comment " -.else -PLIST_SUB+= NO_AMD64="" +ALL_TARGET= freebsd-dri .endif .include <bsd.port.post.mk> diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo index b9025936ccb4..e03af941ae18 100644 --- a/graphics/dri/distinfo +++ b/graphics/dri/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (Mesa-6.2-20041124.tar.bz2) = e6c93d64e34720c6ba617f811be5824d +SIZE (Mesa-6.2-20041124.tar.bz2) = 4127945 +MD5 (drm-20041124.tar.bz2) = fdb9347f62d248edefadf6b7141e85ed +SIZE (drm-20041124.tar.bz2) = 479029 diff --git a/graphics/dri/files/patch-GL-Imakefile b/graphics/dri/files/patch-GL-Imakefile deleted file mode 100644 index 94e8b7e8875a..000000000000 --- a/graphics/dri/files/patch-GL-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/GL/Imakefile.orig Sat Nov 8 23:54:33 2003 -+++ lib/GL/Imakefile Sat Nov 8 23:55:05 2003 -@@ -106,7 +106,7 @@ - #if BuildXF86DRI && GlxUseBuiltInDRIDriver - SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) - #else --SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) -+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(DRIVERDIRS) - #endif - - MakeSubdirs($(SUBDIRS)) diff --git a/graphics/dri/files/patch-localvars b/graphics/dri/files/patch-localvars new file mode 100644 index 000000000000..15affd3f6a47 --- /dev/null +++ b/graphics/dri/files/patch-localvars @@ -0,0 +1,44 @@ +--- configs/freebsd-dri.orig Wed Nov 24 23:14:01 2004 ++++ configs/freebsd-dri Wed Nov 24 23:14:20 2004 +@@ -11,7 +11,7 @@ + WARN_FLAGS = -Wall + OPT_FLAGS = -O + +-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions ++CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c9x -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions + CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC + + ASM_SOURCES = +--- src/mesa/drivers/dri/r200/r200_tcl.c.orig Thu Nov 25 01:38:38 2004 ++++ src/mesa/drivers/dri/r200/r200_tcl.c Thu Nov 25 01:39:09 2004 +@@ -101,7 +101,7 @@ + }; + + +-#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx); (void)rmesa ++#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx) + #define ELT_TYPE GLushort + + #define ELT_INIT(prim, hw_prim) \ +--- src/mesa/drivers/dri/radeon/radeon_swtcl.c.orig Thu Nov 25 01:54:49 2004 ++++ src/mesa/drivers/dri/radeon/radeon_swtcl.c Thu Nov 25 01:55:10 2004 +@@ -508,7 +508,7 @@ + + + +-#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx); (void)rmesa ++#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx) + #define ELTS_VARS( buf ) GLushort *dest = buf + #define INIT( prim ) radeonDmaPrimitive( rmesa, prim ) + #define ELT_INIT(prim) radeonEltPrimitive( rmesa, prim ) +--- src/mesa/drivers/dri/radeon/radeon_tcl.c.orig Thu Nov 25 01:47:13 2004 ++++ src/mesa/drivers/dri/radeon/radeon_tcl.c Thu Nov 25 01:47:30 2004 +@@ -105,7 +105,7 @@ + }; + + +-#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx); (void)rmesa ++#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx) + #define ELT_TYPE GLushort + + #define ELT_INIT(prim, hw_prim) \ diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist index c3fcecbdcb66..d6382c88c7cf 100644 --- a/graphics/dri/pkg-plist +++ b/graphics/dri/pkg-plist @@ -1,9 +1,12 @@ -lib/modules/dri/gamma_dri.so %%I386%%lib/modules/dri/i810_dri.so %%I386%%lib/modules/dri/i830_dri.so +%%I386%%lib/modules/dri/i915_dri.so +lib/modules/dri/mach64_dri.so lib/modules/dri/mga_dri.so lib/modules/dri/r128_dri.so lib/modules/dri/r200_dri.so lib/modules/dri/radeon_dri.so -%%I386%%lib/modules/dri/sis_dri.so -%%NO_AMD64%%lib/modules/dri/tdfx_dri.so +lib/modules/dri/savage_dri.so +lib/modules/dri/sis_dri.so +%%I386%%lib/modules/dri/tdfx_dri.so +lib/modules/dri/unichrome_dri.so diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile index a7c5b85712dd..1a1be44044ab 100644 --- a/graphics/libGLU/Makefile +++ b/graphics/libGLU/Makefile @@ -7,9 +7,10 @@ PORTNAME= libGLU PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= graphics -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +DISTNAME= X11R6.8.1-src1 MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL utility library diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo index b9025936ccb4..1078854f7373 100644 --- a/graphics/libGLU/distinfo +++ b/graphics/libGLU/distinfo @@ -1,4 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index f70b8c3f270c..09e5bc9aab16 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -31,6 +31,12 @@ ALL_TARGET= targets WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/demos SHAREDIR= ${PREFIX}/share/mesa-demos +.include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} == xorg +IGNORE= does not build with X.Org +.endif + post-extract: ${REINPLACE_CMD} -e 's|../images/|${SHAREDIR}/images/|g' \ -e 's|geartrain.dat|${SHAREDIR}/data/geartrain.dat|g' \ @@ -48,4 +54,4 @@ post-install: ${INSTALL_DATA} $$dat ${SHAREDIR}/data ; \ done -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/graphics/xfree86-dri/Makefile b/graphics/xfree86-dri/Makefile index f2de8ba34ce5..90fa5d05371a 100644 --- a/graphics/xfree86-dri/Makefile +++ b/graphics/xfree86-dri/Makefile @@ -5,36 +5,47 @@ # $FreeBSD$ # -PORTNAME= dri -PORTVERSION= 5.0.2 -PORTEPOCH= 2 +PORTNAME= xfree86-dri +PORTVERSION= 4.4.0 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} +DISTFILES= XFree86-4.4.0-src-1.tgz \ + XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz -MAINTAINER= anholt@FreeBSD.org -COMMENT= OpenGL hardware acceleration drivers for the DRI +MAINTAINER= x11@FreeBSD.org +COMMENT= OpenGL hardware acceleration drivers for XFree86 -EXTRA_PATCHES+= ${CF_PATCHES} +CONFLICTS= dri-[5-9].* -USE_XLIB= yes +EXTRA_PATCHES+= ${FILESDIR}/patch-GL-Imakefile ONLY_FOR_ARCHS= i386 alpha amd64 XBUILD_DIRS= lib/GL XINSTALL_DIRS= lib/GL/mesa/src/drv -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86. For X.Org use graphics/dri port. See ports/UPDATING entry 20040723 for further information. +.endif + .if ${ARCH} == i386 PLIST_SUB+= I386="" .else PLIST_SUB+= I386="@comment " .endif +.if ${ARCH} == alpha +PLIST_SUB+= ALPHA_NA="@comment " +.else +PLIST_SUB+= ALPHA_NA="" +.endif .if ${ARCH} == amd64 -PLIST_SUB+= NO_AMD64="@comment " +PLIST_SUB+= AMD64_NA="@comment " .else -PLIST_SUB+= NO_AMD64="" +PLIST_SUB+= AMD64_NA="" .endif .include <bsd.port.post.mk> diff --git a/graphics/xfree86-dri/distinfo b/graphics/xfree86-dri/distinfo index b9025936ccb4..ba2d5d81e5e3 100644 --- a/graphics/xfree86-dri/distinfo +++ b/graphics/xfree86-dri/distinfo @@ -1,4 +1,6 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 +SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 +SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 +MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d +SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 diff --git a/graphics/xfree86-dri/pkg-plist b/graphics/xfree86-dri/pkg-plist index c3fcecbdcb66..fc64212b98f0 100644 --- a/graphics/xfree86-dri/pkg-plist +++ b/graphics/xfree86-dri/pkg-plist @@ -1,9 +1,9 @@ lib/modules/dri/gamma_dri.so -%%I386%%lib/modules/dri/i810_dri.so +%%ALPHA_NA%%lib/modules/dri/i810_dri.so %%I386%%lib/modules/dri/i830_dri.so lib/modules/dri/mga_dri.so lib/modules/dri/r128_dri.so lib/modules/dri/r200_dri.so lib/modules/dri/radeon_dri.so %%I386%%lib/modules/dri/sis_dri.so -%%NO_AMD64%%lib/modules/dri/tdfx_dri.so +%%AMD64_NA%%lib/modules/dri/tdfx_dri.so diff --git a/japanese/kdrill/pkg-plist b/japanese/kdrill/pkg-plist index cae0e7b4c616..d49f9d7d26e2 100644 --- a/japanese/kdrill/pkg-plist +++ b/japanese/kdrill/pkg-plist @@ -6,5 +6,5 @@ share/dict/kdrill/hira.edic share/dict/kdrill/hiraplus.edic share/dict/kdrill/kata.edic share/dict/kdrill/kataplus.edic -lib/X11/doc/html/kdrill.1.html +lib/X11/app-defaults/KDrill @dirrm share/dict/kdrill diff --git a/news/xrn/Makefile b/news/xrn/Makefile index 5c9ad56a8a34..6d1ae885ceb8 100644 --- a/news/xrn/Makefile +++ b/news/xrn/Makefile @@ -19,7 +19,6 @@ USE_REINPLACE= yes USE_IMAKE= yes MAN1= xrn.1 MANCOMPRESSED= no -XFREE86_HTML_MAN= no DOCS= COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog @@ -29,7 +28,6 @@ post-patch: do-install: ${INSTALL_MAN} ${WRKSRC}/xrn.man ${PREFIX}/man/man1/xrn.1 - ${INSTALL_MAN} ${WRKSRC}/xrn.1.html ${PREFIX}/lib/X11/doc/html/ ${INSTALL_PROGRAM} ${WRKSRC}/xrn ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/XRn.ad ${PREFIX}/lib/X11/app-defaults/XRn .if !defined(NOPORTDOCS) diff --git a/news/xrn/pkg-plist b/news/xrn/pkg-plist index 9304ef4e4ce7..1d338cd88f4c 100644 --- a/news/xrn/pkg-plist +++ b/news/xrn/pkg-plist @@ -1,6 +1,5 @@ bin/xrn lib/X11/app-defaults/XRn -lib/X11/doc/html/xrn.1.html %%PORTDOCS%%share/doc/xrn/COMMON-PROBLMS %%PORTDOCS%%share/doc/xrn/COPYRIGHT %%PORTDOCS%%share/doc/xrn/CREDITS diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 633aa5e3b32c..05a37a85afd4 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xorg-fontserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src2.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src2.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X font server from X.Org diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo index 5407fad4d658..dd8c450c9273 100644 --- a/x11-fonts/xfs/distinfo +++ b/x11-fonts/xfs/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed +SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949 diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index 745bd3781c4d..ce88bda544d2 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -1,2 +1,3 @@ bin/xfs +@unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi lib/X11/fs/config.default diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 58221ada6048..915b435513a9 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -6,12 +6,11 @@ # PORTNAME= xorg-fonts-100dpi -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-fonts -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org 100dpi bitmap fonts diff --git a/x11-fonts/xorg-fonts-100dpi/distinfo b/x11-fonts/xorg-fonts-100dpi/distinfo index 3b6121dc89e0..1078854f7373 100644 --- a/x11-fonts/xorg-fonts-100dpi/distinfo +++ b/x11-fonts/xorg-fonts-100dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 new file mode 100644 index 000000000000..8b89779ba476 --- /dev/null +++ b/x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 @@ -0,0 +1,56 @@ +Index: fonts/bdf/100dpi/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/fonts/bdf/100dpi/Imakefile,v +retrieving revision 1.3 +diff -u -r1.3 Imakefile +--- fonts/bdf/100dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 ++++ fonts/bdf/100dpi/Imakefile 8 Oct 2004 10:00:50 -0000 +@@ -11,8 +11,10 @@ + + OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) + OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) ++OBJS3 = $(DERIVEDOBJS3) ++OBJS4 = $(DERIVEDOBJS4) + +-OBJS = $(OBJS1) $(OBJS2) ++OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) + + FONTINSTDIR = $(FONTDIR)/100dpi + +@@ -21,6 +23,8 @@ + #ifndef LynxOSArchitecture + InstallFontObjs($(OBJS1),$(FONTINSTDIR)) + InstallFontObjs($(OBJS2),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS3),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS4),$(FONTINSTDIR)) + InstallFontAliases($(FONTINSTDIR)) + InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) + #else +Index: fonts/bdf/75dpi/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/fonts/bdf/75dpi/Imakefile,v +retrieving revision 1.3 +diff -u -r1.3 Imakefile +--- fonts/bdf/75dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 ++++ fonts/bdf/75dpi/Imakefile 8 Oct 2004 10:00:50 -0000 +@@ -11,8 +11,10 @@ + + OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) + OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) ++OBJS3 = $(DERIVEDOBJS3) ++OBJS4 = $(DERIVEDOBJS4) + +-OBJS = $(OBJS1) $(OBJS2) ++OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) + + FONTINSTDIR = $(FONTDIR)/75dpi + +@@ -21,6 +23,8 @@ + #ifndef LynxOSArchitecture + InstallFontObjs($(OBJS1),$(FONTINSTDIR)) + InstallFontObjs($(OBJS2),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS3),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS4),$(FONTINSTDIR)) + InstallFontAliases($(FONTINSTDIR)) + InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) + #else diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index f3c478552c20..18087eb74a05 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -6,12 +6,11 @@ # PORTNAME= xorg-fonts-75dpi -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-fonts -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org 75dpi bitmap fonts diff --git a/x11-fonts/xorg-fonts-75dpi/distinfo b/x11-fonts/xorg-fonts-75dpi/distinfo index 3b6121dc89e0..1078854f7373 100644 --- a/x11-fonts/xorg-fonts-75dpi/distinfo +++ b/x11-fonts/xorg-fonts-75dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 b/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 new file mode 100644 index 000000000000..8b89779ba476 --- /dev/null +++ b/x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 @@ -0,0 +1,56 @@ +Index: fonts/bdf/100dpi/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/fonts/bdf/100dpi/Imakefile,v +retrieving revision 1.3 +diff -u -r1.3 Imakefile +--- fonts/bdf/100dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 ++++ fonts/bdf/100dpi/Imakefile 8 Oct 2004 10:00:50 -0000 +@@ -11,8 +11,10 @@ + + OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) + OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) ++OBJS3 = $(DERIVEDOBJS3) ++OBJS4 = $(DERIVEDOBJS4) + +-OBJS = $(OBJS1) $(OBJS2) ++OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) + + FONTINSTDIR = $(FONTDIR)/100dpi + +@@ -21,6 +23,8 @@ + #ifndef LynxOSArchitecture + InstallFontObjs($(OBJS1),$(FONTINSTDIR)) + InstallFontObjs($(OBJS2),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS3),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS4),$(FONTINSTDIR)) + InstallFontAliases($(FONTINSTDIR)) + InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) + #else +Index: fonts/bdf/75dpi/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/fonts/bdf/75dpi/Imakefile,v +retrieving revision 1.3 +diff -u -r1.3 Imakefile +--- fonts/bdf/75dpi/Imakefile 26 Aug 2004 11:58:05 -0000 1.3 ++++ fonts/bdf/75dpi/Imakefile 8 Oct 2004 10:00:50 -0000 +@@ -11,8 +11,10 @@ + + OBJS1 = $(UCSOBJS1) $(DERIVEDOBJS1) $(PREDERIVEDOBJS1) + OBJS2 = $(UCSOBJS2) $(DERIVEDOBJS2) $(PREDERIVEDOBJS2) $(MISCOBJS) ++OBJS3 = $(DERIVEDOBJS3) ++OBJS4 = $(DERIVEDOBJS4) + +-OBJS = $(OBJS1) $(OBJS2) ++OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) + + FONTINSTDIR = $(FONTDIR)/75dpi + +@@ -21,6 +23,8 @@ + #ifndef LynxOSArchitecture + InstallFontObjs($(OBJS1),$(FONTINSTDIR)) + InstallFontObjs($(OBJS2),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS3),$(FONTINSTDIR)) ++InstallFontObjs($(OBJS4),$(FONTINSTDIR)) + InstallFontAliases($(FONTINSTDIR)) + InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) + #else diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index 4a1735acea2b..cdf25cf198b7 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -6,12 +6,11 @@ # PORTNAME= xorg-fonts-cyrillic -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-fonts -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Cyrillic bitmap fonts diff --git a/x11-fonts/xorg-fonts-cyrillic/distinfo b/x11-fonts/xorg-fonts-cyrillic/distinfo index 3b6121dc89e0..1078854f7373 100644 --- a/x11-fonts/xorg-fonts-cyrillic/distinfo +++ b/x11-fonts/xorg-fonts-cyrillic/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/x11-fonts/xorg-fonts-encodings/Makefile b/x11-fonts/xorg-fonts-encodings/Makefile index cdded6cd29ef..d5db4af45e1f 100644 --- a/x11-fonts/xorg-fonts-encodings/Makefile +++ b/x11-fonts/xorg-fonts-encodings/Makefile @@ -6,12 +6,11 @@ # PORTNAME= xorg-fonts-encodings -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-fonts -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org font encoding files diff --git a/x11-fonts/xorg-fonts-encodings/distinfo b/x11-fonts/xorg-fonts-encodings/distinfo index 3b6121dc89e0..1078854f7373 100644 --- a/x11-fonts/xorg-fonts-encodings/distinfo +++ b/x11-fonts/xorg-fonts-encodings/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/x11-fonts/xorg-fonts-encodings/pkg-plist b/x11-fonts/xorg-fonts-encodings/pkg-plist index 60a995f12bc5..a4b627981846 100644 --- a/x11-fonts/xorg-fonts-encodings/pkg-plist +++ b/x11-fonts/xorg-fonts-encodings/pkg-plist @@ -16,6 +16,9 @@ lib/X11/fonts/encodings/iso8859-6.16.enc lib/X11/fonts/encodings/iso8859-6.8x.enc lib/X11/fonts/encodings/large/big5.eten-0.enc.gz lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz +lib/X11/fonts/encodings/large/cns11643-1.enc.gz +lib/X11/fonts/encodings/large/cns11643-2.enc.gz +lib/X11/fonts/encodings/large/cns11643-3.enc.gz lib/X11/fonts/encodings/large/encodings.dir lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz @@ -41,6 +44,7 @@ lib/X11/fonts/encodings/mulearabic-0.enc lib/X11/fonts/encodings/mulearabic-1.enc lib/X11/fonts/encodings/mulearabic-2.enc lib/X11/fonts/encodings/mulelao-1.enc +lib/X11/fonts/encodings/suneu-greek.enc lib/X11/fonts/encodings/tcvn-0.enc lib/X11/fonts/encodings/tis620-2.enc lib/X11/fonts/encodings/viscii1.1-1.enc.gz diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index 13289263cf89..c17b3cd7ee00 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -6,12 +6,11 @@ # PORTNAME= xorg-fonts-miscbitmaps -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-fonts -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous bitmap fonts diff --git a/x11-fonts/xorg-fonts-miscbitmaps/distinfo b/x11-fonts/xorg-fonts-miscbitmaps/distinfo index 3b6121dc89e0..1078854f7373 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/distinfo +++ b/x11-fonts/xorg-fonts-miscbitmaps/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index da9b83cbd422..63917a0d98fb 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -6,12 +6,11 @@ # PORTNAME= xorg-fonts-truetype -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-fonts -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org TrueType fonts diff --git a/x11-fonts/xorg-fonts-truetype/distinfo b/x11-fonts/xorg-fonts-truetype/distinfo index 3b6121dc89e0..1078854f7373 100644 --- a/x11-fonts/xorg-fonts-truetype/distinfo +++ b/x11-fonts/xorg-fonts-truetype/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index d8df64a5bde0..884dd35f415b 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -6,12 +6,11 @@ # PORTNAME= xorg-fonts-type1 -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-fonts -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTNAME= X11R6.7.0-src1 +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTNAME= X11R${PORTVERSION}-src1 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Type1 fonts diff --git a/x11-fonts/xorg-fonts-type1/distinfo b/x11-fonts/xorg-fonts-type1/distinfo index 3b6121dc89e0..1078854f7373 100644 --- a/x11-fonts/xorg-fonts-type1/distinfo +++ b/x11-fonts/xorg-fonts-type1/distinfo @@ -1,2 +1,2 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure index d7ff8bbdbfec..fb6e7475f125 100644 --- a/x11-servers/XFree86-4-FontServer/scripts/configure +++ b/x11-servers/XFree86-4-FontServer/scripts/configure @@ -31,6 +31,7 @@ for i in BuildFonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ XF86Server \ XnestServer \ XVirtualFramebufferServer \ diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure index 8fc815ae2bc3..63f1ce26feed 100644 --- a/x11-servers/XFree86-4-NestServer/scripts/configure +++ b/x11-servers/XFree86-4-NestServer/scripts/configure @@ -31,6 +31,7 @@ for i in BuildFonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ XF86Server \ BuildFontServer \ XVirtualFramebufferServer \ diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure index 9d48ed85c7eb..2dafb5a3dc33 100644 --- a/x11-servers/XFree86-4-PrintServer/scripts/configure +++ b/x11-servers/XFree86-4-PrintServer/scripts/configure @@ -31,6 +31,7 @@ for i in BuildFonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ XF86Server \ BuildFontServer \ XnestServer \ diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 6cb146e0a8f5..56650d6df900 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -44,6 +44,7 @@ for i in \ BuildType1Fonts \ BuildCIDFonts \ BuildCyrillicFonts \ + BuildHtmlManPages \ JoystickSupport \ XnestServer \ BuildFontServer \ diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure index 337ae27342e8..159baea5aff2 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure @@ -32,6 +32,7 @@ for i in BuildFonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ XF86Server \ BuildFontServer \ XnestServer \ diff --git a/x11-servers/xorg-fontserver/Makefile b/x11-servers/xorg-fontserver/Makefile index 633aa5e3b32c..05a37a85afd4 100644 --- a/x11-servers/xorg-fontserver/Makefile +++ b/x11-servers/xorg-fontserver/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xorg-fontserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src2.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src2.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X font server from X.Org diff --git a/x11-servers/xorg-fontserver/distinfo b/x11-servers/xorg-fontserver/distinfo index 5407fad4d658..dd8c450c9273 100644 --- a/x11-servers/xorg-fontserver/distinfo +++ b/x11-servers/xorg-fontserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed +SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949 diff --git a/x11-servers/xorg-fontserver/pkg-plist b/x11-servers/xorg-fontserver/pkg-plist index 745bd3781c4d..ce88bda544d2 100644 --- a/x11-servers/xorg-fontserver/pkg-plist +++ b/x11-servers/xorg-fontserver/pkg-plist @@ -1,2 +1,3 @@ bin/xfs +@unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi lib/X11/fs/config.default diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index 384393fb3a59..7bdc061a8c92 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -6,12 +6,12 @@ # PORTNAME= xorg-nestserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Nesting X server from X.Org @@ -22,7 +22,7 @@ EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} USE_XLIB= yes -XBUILD_DIRS= lib/font programs/Xserver +XBUILD_DIRS= lib/font programs/Xserver/miext/damage programs/Xserver XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver/hw/xnest diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo index b9025936ccb4..62c1647dc07b 100644 --- a/x11-servers/xorg-nestserver/distinfo +++ b/x11-servers/xorg-nestserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-nestserver/scripts/configure b/x11-servers/xorg-nestserver/scripts/configure index bd755d6c6e17..b3d181fc51d9 100644 --- a/x11-servers/xorg-nestserver/scripts/configure +++ b/x11-servers/xorg-nestserver/scripts/configure @@ -6,6 +6,7 @@ rm -f $LOCALDEF echo "#define BuildServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define XprtServer NO" >> $LOCALDEF +echo "#define BuildXprint NO" >> $LOCALDEF echo "#define XnestServer YES" >> $LOCALDEF echo "#define XorgServer NO" >> $LOCALDEF echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile index 6a6e8a904edd..e0eff898c59d 100644 --- a/x11-servers/xorg-printserver/Makefile +++ b/x11-servers/xorg-printserver/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xorg-printserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X Print server from X.Org @@ -27,6 +26,8 @@ XBUILD_DIRS= lib/font programs/Xserver XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver +MAN7= Xprint.7 + .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xorg diff --git a/x11-servers/xorg-printserver/distinfo b/x11-servers/xorg-printserver/distinfo index b9025936ccb4..62c1647dc07b 100644 --- a/x11-servers/xorg-printserver/distinfo +++ b/x11-servers/xorg-printserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist index 0646e79271d4..9903b9835f79 100644 --- a/x11-servers/xorg-printserver/pkg-plist +++ b/x11-servers/xorg-printserver/pkg-plist @@ -1 +1,890 @@ bin/Xprt +etc/rc.d/xprint +lib/X11/xserver/C/print/Xprinters +lib/X11/xserver/C/print/attributes/document +lib/X11/xserver/C/print/attributes/job +lib/X11/xserver/C/print/attributes/printer +lib/X11/xserver/C/print/ddx-config/raster/pcl +lib/X11/xserver/C/print/ddx-config/raster/postscript +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Book.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-BookOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Demi.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-DemiOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-Bold.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-BoldOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-Oblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-Bold.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-BoldOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-Oblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-Book.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-BookOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-Demi.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-DemiOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Bold.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-BoldItalic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Italic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Roman.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-Demi.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-DemiItalic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-Light.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-LightItalic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Symbol.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Bold.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-BoldItalic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Italic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/model-config +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00051.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00052.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00053.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00054.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00055.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00056.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00057.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00058.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00059.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00060.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00061.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00062.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00063.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00064.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00065.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00066.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00067.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00068.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00069.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00070.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00071.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00072.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00073.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00074.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00075.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00076.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00077.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00079.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00080.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00081.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00082.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00083.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00084.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00085.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00086.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00087.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00088.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00089.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00090.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00091.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00092.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00093.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00094.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/README +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.alias +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.dir +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/model-config +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Book.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-BookOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Demi.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-DemiOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-Bold.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-BoldOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-Oblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-Bold.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-BoldOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-Oblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-Book.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-BookOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-Demi.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-DemiOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Bold.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-BoldItalic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Italic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Roman.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-Demi.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-DemiItalic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-Light.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-LightItalic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Symbol.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Bold.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-BoldItalic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Italic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/model-config +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00051.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00052.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00053.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00054.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00055.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00056.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00057.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00058.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00059.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00060.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00061.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00062.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00063.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00064.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00065.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00066.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00067.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00068.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00069.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00070.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00071.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00072.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00073.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00074.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00075.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00076.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00077.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00079.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00080.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00081.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00082.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00083.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00084.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00085.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00086.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00087.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00088.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00089.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00090.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00091.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00092.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00093.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00094.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/README +lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.alias +lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir +lib/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf +lib/X11/xserver/C/print/models/HPLJ4family/model-config +lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-Bold.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-Oblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Courier.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Light.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Symbol.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Bold.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Italic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/PSdefault/model-config +lib/X11/xserver/C/print/models/PSspooldir/fonts +lib/X11/xserver/C/print/models/PSspooldir/model-config +lib/X11/xserver/C/print/models/PSspooldir/spooltodir.sh +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-BoldOblique.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Oblique.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-Bold.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-BoldOblique.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-Oblique.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Symbol.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Bold.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Italic.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/SPSPARC2/model-config +lib/X11/xserver/POSIX +lib/X11/xserver/README +lib/X11/xserver/SecurityPolicy +lib/X11/xserver/af_ZA +lib/X11/xserver/af_ZA.iso88591 +lib/X11/xserver/ar +lib/X11/xserver/ar_AE +lib/X11/xserver/ar_AE.iso88596 +lib/X11/xserver/ar_AE.utf8 +lib/X11/xserver/ar_BH +lib/X11/xserver/ar_BH.iso88596 +lib/X11/xserver/ar_BH.utf8 +lib/X11/xserver/ar_DZ +lib/X11/xserver/ar_DZ.iso88596 +lib/X11/xserver/ar_DZ.utf8 +lib/X11/xserver/ar_EG +lib/X11/xserver/ar_EG.ISO8859-6 +lib/X11/xserver/ar_EG.UTF-8 +lib/X11/xserver/ar_EG.iso88596 +lib/X11/xserver/ar_EG.utf8 +lib/X11/xserver/ar_IN.utf8 +lib/X11/xserver/ar_IQ +lib/X11/xserver/ar_IQ.iso88596 +lib/X11/xserver/ar_IQ.utf8 +lib/X11/xserver/ar_JO +lib/X11/xserver/ar_JO.iso88596 +lib/X11/xserver/ar_JO.utf8 +lib/X11/xserver/ar_KW +lib/X11/xserver/ar_KW.iso88596 +lib/X11/xserver/ar_KW.utf8 +lib/X11/xserver/ar_LB +lib/X11/xserver/ar_LB.iso88596 +lib/X11/xserver/ar_LB.utf8 +lib/X11/xserver/ar_LY +lib/X11/xserver/ar_LY.iso88596 +lib/X11/xserver/ar_LY.utf8 +lib/X11/xserver/ar_MA +lib/X11/xserver/ar_MA.iso88596 +lib/X11/xserver/ar_MA.utf8 +lib/X11/xserver/ar_OM +lib/X11/xserver/ar_OM.iso88596 +lib/X11/xserver/ar_OM.utf8 +lib/X11/xserver/ar_QA +lib/X11/xserver/ar_QA.iso88596 +lib/X11/xserver/ar_QA.utf8 +lib/X11/xserver/ar_SA +lib/X11/xserver/ar_SA.iso88596 +lib/X11/xserver/ar_SA.utf8 +lib/X11/xserver/ar_SD +lib/X11/xserver/ar_SD.iso88596 +lib/X11/xserver/ar_SD.utf8 +lib/X11/xserver/ar_SY +lib/X11/xserver/ar_SY.iso88596 +lib/X11/xserver/ar_SY.utf8 +lib/X11/xserver/ar_TN +lib/X11/xserver/ar_TN.iso88596 +lib/X11/xserver/ar_TN.utf8 +lib/X11/xserver/ar_YE +lib/X11/xserver/ar_YE.iso88596 +lib/X11/xserver/ar_YE.utf8 +lib/X11/xserver/be_BY +lib/X11/xserver/be_BY.cp1251 +lib/X11/xserver/be_BY.utf8 +lib/X11/xserver/bg_BG +lib/X11/xserver/bg_BG.ISO8859-5 +lib/X11/xserver/bg_BG.cp1251 +lib/X11/xserver/bg_BG.utf8 +lib/X11/xserver/bokmal +lib/X11/xserver/br_FR +lib/X11/xserver/br_FR.iso88591 +lib/X11/xserver/bs_BA +lib/X11/xserver/bs_BA.iso88592 +lib/X11/xserver/ca +lib/X11/xserver/ca.ISO8859-1 +lib/X11/xserver/ca.ISO8859-15 +lib/X11/xserver/ca_ES +lib/X11/xserver/ca_ES.ISO8859-1 +lib/X11/xserver/ca_ES.ISO8859-15 +lib/X11/xserver/ca_ES.iso88591 +lib/X11/xserver/ca_ES.iso885915@euro +lib/X11/xserver/ca_ES.utf8 +lib/X11/xserver/ca_ES@euro +lib/X11/xserver/catalan +lib/X11/xserver/croatian +lib/X11/xserver/cs_CZ +lib/X11/xserver/cs_CZ.ISO8859-2 +lib/X11/xserver/cs_CZ.iso88592 +lib/X11/xserver/cs_CZ.utf8 +lib/X11/xserver/cy_GB +lib/X11/xserver/cy_GB.iso885914 +lib/X11/xserver/cz +lib/X11/xserver/cz.ISO8859-2 +lib/X11/xserver/czech +lib/X11/xserver/da +lib/X11/xserver/da.ISO8859-1 +lib/X11/xserver/da.ISO8859-15 +lib/X11/xserver/da_DK +lib/X11/xserver/da_DK.ISO8859-1 +lib/X11/xserver/da_DK.ISO8859-15 +lib/X11/xserver/da_DK.iso88591 +lib/X11/xserver/da_DK.iso885915 +lib/X11/xserver/da_DK.utf8 +lib/X11/xserver/danish +lib/X11/xserver/dansk +lib/X11/xserver/de +lib/X11/xserver/de.ISO8859-1 +lib/X11/xserver/de.ISO8859-15 +lib/X11/xserver/de.UTF-8 +lib/X11/xserver/de_AT +lib/X11/xserver/de_AT.ISO8859-1 +lib/X11/xserver/de_AT.ISO8859-15 +lib/X11/xserver/de_AT.iso88591 +lib/X11/xserver/de_AT.iso885915@euro +lib/X11/xserver/de_AT.utf8 +lib/X11/xserver/de_AT@euro +lib/X11/xserver/de_BE +lib/X11/xserver/de_BE.iso88591 +lib/X11/xserver/de_BE.iso885915@euro +lib/X11/xserver/de_BE@euro +lib/X11/xserver/de_CH +lib/X11/xserver/de_CH.ISO8859-1 +lib/X11/xserver/de_CH.iso88591 +lib/X11/xserver/de_CH.utf8 +lib/X11/xserver/de_DE +lib/X11/xserver/de_DE.ISO8859-1 +lib/X11/xserver/de_DE.ISO8859-15 +lib/X11/xserver/de_DE.UTF-8 +lib/X11/xserver/de_DE.iso88591 +lib/X11/xserver/de_DE.iso885915@euro +lib/X11/xserver/de_DE.utf8 +lib/X11/xserver/de_DE@euro +lib/X11/xserver/de_LU +lib/X11/xserver/de_LU.iso88591 +lib/X11/xserver/de_LU.iso885915@euro +lib/X11/xserver/de_LU.utf8 +lib/X11/xserver/de_LU@euro +lib/X11/xserver/deutsch +lib/X11/xserver/el_GR +lib/X11/xserver/el_GR.ISO8859-7 +lib/X11/xserver/el_GR.ISO8859-7@euro +lib/X11/xserver/el_GR.iso88597 +lib/X11/xserver/el_GR.utf8 +lib/X11/xserver/en_AU +lib/X11/xserver/en_AU.ISO8859-1 +lib/X11/xserver/en_AU.iso88591 +lib/X11/xserver/en_AU.utf8 +lib/X11/xserver/en_BW +lib/X11/xserver/en_BW.iso88591 +lib/X11/xserver/en_CA +lib/X11/xserver/en_CA.ISO8859-1 +lib/X11/xserver/en_CA.iso88591 +lib/X11/xserver/en_CA.utf8 +lib/X11/xserver/en_DK +lib/X11/xserver/en_DK.iso88591 +lib/X11/xserver/en_GB +lib/X11/xserver/en_GB.ISO8859-1 +lib/X11/xserver/en_GB.ISO8859-15 +lib/X11/xserver/en_GB.iso88591 +lib/X11/xserver/en_GB.iso885915 +lib/X11/xserver/en_GB.utf8 +lib/X11/xserver/en_HK +lib/X11/xserver/en_HK.iso88591 +lib/X11/xserver/en_IE +lib/X11/xserver/en_IE.ISO8859-1 +lib/X11/xserver/en_IE.ISO8859-15 +lib/X11/xserver/en_IE.iso88591 +lib/X11/xserver/en_IE.iso885915@euro +lib/X11/xserver/en_IE.utf8 +lib/X11/xserver/en_IE@euro +lib/X11/xserver/en_IN +lib/X11/xserver/en_IN.utf8 +lib/X11/xserver/en_NZ +lib/X11/xserver/en_NZ.ISO8859-1 +lib/X11/xserver/en_NZ.iso88591 +lib/X11/xserver/en_NZ.utf8 +lib/X11/xserver/en_PH +lib/X11/xserver/en_PH.iso88591 +lib/X11/xserver/en_SG +lib/X11/xserver/en_SG.iso88591 +lib/X11/xserver/en_US.ISO8859-1 +lib/X11/xserver/en_US.ISO8859-15 +lib/X11/xserver/en_US.UTF-8 +lib/X11/xserver/en_US.iso88591 +lib/X11/xserver/en_US.iso885915 +lib/X11/xserver/en_US.utf8 +lib/X11/xserver/en_US/print/Xprinters +lib/X11/xserver/en_US/print/attributes/document +lib/X11/xserver/en_US/print/attributes/job +lib/X11/xserver/en_US/print/attributes/printer +lib/X11/xserver/en_US/print/ddx-config +lib/X11/xserver/en_US/print/models +lib/X11/xserver/en_ZA +lib/X11/xserver/en_ZA.iso88591 +lib/X11/xserver/en_ZA.utf8 +lib/X11/xserver/en_ZW +lib/X11/xserver/en_ZW.iso88591 +lib/X11/xserver/es_AR +lib/X11/xserver/es_AR.ISO8859-1 +lib/X11/xserver/es_AR.iso88591 +lib/X11/xserver/es_AR.utf8 +lib/X11/xserver/es_BO +lib/X11/xserver/es_BO.ISO8859-1 +lib/X11/xserver/es_BO.iso88591 +lib/X11/xserver/es_BO.utf8 +lib/X11/xserver/es_CL +lib/X11/xserver/es_CL.ISO8859-1 +lib/X11/xserver/es_CL.iso88591 +lib/X11/xserver/es_CL.utf8 +lib/X11/xserver/es_CO +lib/X11/xserver/es_CO.ISO8859-1 +lib/X11/xserver/es_CO.iso88591 +lib/X11/xserver/es_CO.utf8 +lib/X11/xserver/es_CR +lib/X11/xserver/es_CR.ISO8859-1 +lib/X11/xserver/es_CR.iso88591 +lib/X11/xserver/es_CR.utf8 +lib/X11/xserver/es_DO +lib/X11/xserver/es_DO.iso88591 +lib/X11/xserver/es_DO.utf8 +lib/X11/xserver/es_EC +lib/X11/xserver/es_EC.ISO8859-1 +lib/X11/xserver/es_EC.iso88591 +lib/X11/xserver/es_EC.utf8 +lib/X11/xserver/es_ES +lib/X11/xserver/es_ES.ISO8859-1 +lib/X11/xserver/es_ES.ISO8859-15 +lib/X11/xserver/es_ES.UTF-8 +lib/X11/xserver/es_ES.iso88591 +lib/X11/xserver/es_ES.iso885915@euro +lib/X11/xserver/es_ES.utf8 +lib/X11/xserver/es_ES@euro +lib/X11/xserver/es_GT +lib/X11/xserver/es_GT.ISO8859-1 +lib/X11/xserver/es_GT.iso88591 +lib/X11/xserver/es_GT.utf8 +lib/X11/xserver/es_HN +lib/X11/xserver/es_HN.iso88591 +lib/X11/xserver/es_HN.utf8 +lib/X11/xserver/es_MX +lib/X11/xserver/es_MX.ISO8859-1 +lib/X11/xserver/es_MX.iso88591 +lib/X11/xserver/es_MX.utf8 +lib/X11/xserver/es_NI +lib/X11/xserver/es_NI.ISO8859-1 +lib/X11/xserver/es_NI.iso88591 +lib/X11/xserver/es_NI.utf8 +lib/X11/xserver/es_PA +lib/X11/xserver/es_PA.ISO8859-1 +lib/X11/xserver/es_PA.iso88591 +lib/X11/xserver/es_PA.utf8 +lib/X11/xserver/es_PE +lib/X11/xserver/es_PE.ISO8859-1 +lib/X11/xserver/es_PE.iso88591 +lib/X11/xserver/es_PE.utf8 +lib/X11/xserver/es_PR +lib/X11/xserver/es_PR.iso88591 +lib/X11/xserver/es_PR.utf8 +lib/X11/xserver/es_PY +lib/X11/xserver/es_PY.ISO8859-1 +lib/X11/xserver/es_PY.iso88591 +lib/X11/xserver/es_PY.utf8 +lib/X11/xserver/es_SV +lib/X11/xserver/es_SV.ISO8859-1 +lib/X11/xserver/es_SV.iso88591 +lib/X11/xserver/es_SV.utf8 +lib/X11/xserver/es_US +lib/X11/xserver/es_US.iso88591 +lib/X11/xserver/es_UY +lib/X11/xserver/es_UY.ISO8859-1 +lib/X11/xserver/es_UY.iso88591 +lib/X11/xserver/es_UY.utf8 +lib/X11/xserver/es_VE +lib/X11/xserver/es_VE.ISO8859-1 +lib/X11/xserver/es_VE.iso88591 +lib/X11/xserver/es_VE.utf8 +lib/X11/xserver/et_EE +lib/X11/xserver/et_EE.ISO8859-15 +lib/X11/xserver/et_EE.iso88591 +lib/X11/xserver/et_EE.utf8 +lib/X11/xserver/eu_ES +lib/X11/xserver/eu_ES.iso88591 +lib/X11/xserver/eu_ES.iso885915@euro +lib/X11/xserver/eu_ES@euro +lib/X11/xserver/fa_IR.utf8 +lib/X11/xserver/fi_FI +lib/X11/xserver/fi_FI.ISO8859-1 +lib/X11/xserver/fi_FI.ISO8859-15 +lib/X11/xserver/fi_FI.UTF-8 +lib/X11/xserver/fi_FI.iso88591 +lib/X11/xserver/fi_FI.iso885915@euro +lib/X11/xserver/fi_FI.utf8 +lib/X11/xserver/fi_FI@euro +lib/X11/xserver/fo_FO +lib/X11/xserver/fo_FO.iso88591 +lib/X11/xserver/fo_FO.utf8 +lib/X11/xserver/fr_BE +lib/X11/xserver/fr_BE.ISO8859-1 +lib/X11/xserver/fr_BE.ISO8859-15 +lib/X11/xserver/fr_BE.UTF-8 +lib/X11/xserver/fr_BE.iso88591 +lib/X11/xserver/fr_BE.iso885915@euro +lib/X11/xserver/fr_BE.utf8 +lib/X11/xserver/fr_BE@euro +lib/X11/xserver/fr_CA +lib/X11/xserver/fr_CA.ISO8859-1 +lib/X11/xserver/fr_CA.iso88591 +lib/X11/xserver/fr_CA.utf8 +lib/X11/xserver/fr_CH +lib/X11/xserver/fr_CH.ISO8859-1 +lib/X11/xserver/fr_CH.iso88591 +lib/X11/xserver/fr_CH.utf8 +lib/X11/xserver/fr_FR +lib/X11/xserver/fr_FR.ISO8859-1 +lib/X11/xserver/fr_FR.ISO8859-15 +lib/X11/xserver/fr_FR.UTF-8 +lib/X11/xserver/fr_FR.iso88591 +lib/X11/xserver/fr_FR.iso885915@euro +lib/X11/xserver/fr_FR.utf8 +lib/X11/xserver/fr_FR@euro +lib/X11/xserver/fr_LU +lib/X11/xserver/fr_LU.iso88591 +lib/X11/xserver/fr_LU.iso885915@euro +lib/X11/xserver/fr_LU.utf8 +lib/X11/xserver/fr_LU@euro +lib/X11/xserver/ga_IE +lib/X11/xserver/ga_IE.iso88591 +lib/X11/xserver/ga_IE.iso885915@euro +lib/X11/xserver/ga_IE.utf8 +lib/X11/xserver/ga_IE@euro +lib/X11/xserver/gl_ES +lib/X11/xserver/gl_ES.iso88591 +lib/X11/xserver/gl_ES.iso885915@euro +lib/X11/xserver/gl_ES.utf8 +lib/X11/xserver/gl_ES@euro +lib/X11/xserver/gv_GB +lib/X11/xserver/gv_GB.iso88591 +lib/X11/xserver/he +lib/X11/xserver/he_IL +lib/X11/xserver/he_IL.ISO8859-8 +lib/X11/xserver/he_IL.UTF-8 +lib/X11/xserver/he_IL.iso88598 +lib/X11/xserver/he_IL.utf8 +lib/X11/xserver/hebrew +lib/X11/xserver/hi_IN.UTF-8 +lib/X11/xserver/hi_IN.utf8 +lib/X11/xserver/hr_HR +lib/X11/xserver/hr_HR.ISO8859-2 +lib/X11/xserver/hr_HR.iso88592 +lib/X11/xserver/hr_HR.utf8 +lib/X11/xserver/hu_HU +lib/X11/xserver/hu_HU.ISO8859-2 +lib/X11/xserver/hu_HU.iso88592 +lib/X11/xserver/hu_HU.utf8 +lib/X11/xserver/id_ID +lib/X11/xserver/id_ID.iso88591 +lib/X11/xserver/id_ID.utf8 +lib/X11/xserver/is_IS +lib/X11/xserver/is_IS.ISO8859-1 +lib/X11/xserver/is_IS.iso88591 +lib/X11/xserver/is_IS.utf8 +lib/X11/xserver/it +lib/X11/xserver/it.ISO8859-1 +lib/X11/xserver/it.ISO8859-15 +lib/X11/xserver/it.UTF-8 +lib/X11/xserver/it_CH +lib/X11/xserver/it_CH.iso88591 +lib/X11/xserver/it_CH.utf8 +lib/X11/xserver/it_IT +lib/X11/xserver/it_IT.ISO8859-1 +lib/X11/xserver/it_IT.ISO8859-15 +lib/X11/xserver/it_IT.UTF-8 +lib/X11/xserver/it_IT.iso88591 +lib/X11/xserver/it_IT.iso885915@euro +lib/X11/xserver/it_IT.utf8 +lib/X11/xserver/it_IT@euro +lib/X11/xserver/italian +lib/X11/xserver/iw_IL +lib/X11/xserver/iw_IL.iso88598 +lib/X11/xserver/ja +lib/X11/xserver/ja_JP +lib/X11/xserver/ja_JP.EUC +lib/X11/xserver/ja_JP.PCK +lib/X11/xserver/ja_JP.UTF-8 +lib/X11/xserver/ja_JP.eucJP +lib/X11/xserver/ja_JP.eucjp +lib/X11/xserver/ja_JP.sjis +lib/X11/xserver/ja_JP.ujis +lib/X11/xserver/ja_JP.utf8 +lib/X11/xserver/japan +lib/X11/xserver/japanese +lib/X11/xserver/japanese.euc +lib/X11/xserver/japanese.sjis +lib/X11/xserver/ka_GE +lib/X11/xserver/ka_GE.georgianps +lib/X11/xserver/kl_GL +lib/X11/xserver/kl_GL.iso88591 +lib/X11/xserver/kl_GL.utf8 +lib/X11/xserver/ko +lib/X11/xserver/ko.UTF-8 +lib/X11/xserver/ko_KR +lib/X11/xserver/ko_KR.EUC +lib/X11/xserver/ko_KR.EUC@dict +lib/X11/xserver/ko_KR.UTF-8 +lib/X11/xserver/ko_KR.UTF-8@dict +lib/X11/xserver/ko_KR.euckr +lib/X11/xserver/ko_KR.utf8 +lib/X11/xserver/korean +lib/X11/xserver/korean.euc +lib/X11/xserver/kw_GB +lib/X11/xserver/kw_GB.iso88591 +lib/X11/xserver/lithuanian +lib/X11/xserver/lt +lib/X11/xserver/lt.ISO8859-13 +lib/X11/xserver/lt_LT +lib/X11/xserver/lt_LT.ISO8859-13 +lib/X11/xserver/lt_LT.iso885913 +lib/X11/xserver/lt_LT.utf8 +lib/X11/xserver/lv +lib/X11/xserver/lv.ISO8859-13 +lib/X11/xserver/lv_LV +lib/X11/xserver/lv_LV.ISO8859-13 +lib/X11/xserver/lv_LV.iso885913 +lib/X11/xserver/lv_LV.utf8 +lib/X11/xserver/mi_NZ +lib/X11/xserver/mi_NZ.iso885913 +lib/X11/xserver/mk_MK +lib/X11/xserver/mk_MK.ISO8859-5 +lib/X11/xserver/mk_MK.iso88595 +lib/X11/xserver/mk_MK.utf8 +lib/X11/xserver/mr_IN.utf8 +lib/X11/xserver/ms_MY +lib/X11/xserver/ms_MY.iso88591 +lib/X11/xserver/mt_MT +lib/X11/xserver/mt_MT.iso88593 +lib/X11/xserver/nb_NO +lib/X11/xserver/nb_NO.ISO-8859-1 +lib/X11/xserver/nl +lib/X11/xserver/nl.ISO8859-1 +lib/X11/xserver/nl.ISO8859-15 +lib/X11/xserver/nl_BE +lib/X11/xserver/nl_BE.ISO8859-1 +lib/X11/xserver/nl_BE.ISO8859-15 +lib/X11/xserver/nl_BE.iso88591 +lib/X11/xserver/nl_BE.iso885915@euro +lib/X11/xserver/nl_BE.utf8 +lib/X11/xserver/nl_BE@euro +lib/X11/xserver/nl_NL +lib/X11/xserver/nl_NL.ISO8859-1 +lib/X11/xserver/nl_NL.ISO8859-15 +lib/X11/xserver/nl_NL.iso88591 +lib/X11/xserver/nl_NL.iso885915@euro +lib/X11/xserver/nl_NL.utf8 +lib/X11/xserver/nl_NL@euro +lib/X11/xserver/nn_NO +lib/X11/xserver/nn_NO.iso88591 +lib/X11/xserver/no +lib/X11/xserver/no.ISO8859-1 +lib/X11/xserver/no_NO +lib/X11/xserver/no_NO.ISO8859-1@bokmal +lib/X11/xserver/no_NO.ISO8859-1@nynorsk +lib/X11/xserver/no_NO.iso88591 +lib/X11/xserver/no_NO.utf8 +lib/X11/xserver/norwegian +lib/X11/xserver/oc_FR +lib/X11/xserver/oc_FR.iso88591 +lib/X11/xserver/pl_PL +lib/X11/xserver/pl_PL.ISO8859-2 +lib/X11/xserver/pl_PL.UTF-8 +lib/X11/xserver/pl_PL.iso88592 +lib/X11/xserver/pl_PL.utf8 +lib/X11/xserver/polish +lib/X11/xserver/portuguese +lib/X11/xserver/pt +lib/X11/xserver/pt.ISO8859-1 +lib/X11/xserver/pt.ISO8859-15 +lib/X11/xserver/pt_BR +lib/X11/xserver/pt_BR.ISO8859-1 +lib/X11/xserver/pt_BR.UTF-8 +lib/X11/xserver/pt_BR.iso88591 +lib/X11/xserver/pt_BR.utf8 +lib/X11/xserver/pt_PT +lib/X11/xserver/pt_PT.ISO8859-1 +lib/X11/xserver/pt_PT.ISO8859-15 +lib/X11/xserver/pt_PT.iso88591 +lib/X11/xserver/pt_PT.iso885915@euro +lib/X11/xserver/pt_PT.utf8 +lib/X11/xserver/pt_PT@euro +lib/X11/xserver/ro_RO +lib/X11/xserver/ro_RO.ISO8859-2 +lib/X11/xserver/ro_RO.iso88592 +lib/X11/xserver/ro_RO.utf8 +lib/X11/xserver/romanian +lib/X11/xserver/ru +lib/X11/xserver/ru.ISO8859-5 +lib/X11/xserver/ru.UTF-8 +lib/X11/xserver/ru.ansi1251 +lib/X11/xserver/ru.koi8-r +lib/X11/xserver/ru_RU +lib/X11/xserver/ru_RU.ANSI1251 +lib/X11/xserver/ru_RU.ISO8859-5 +lib/X11/xserver/ru_RU.KOI8-R +lib/X11/xserver/ru_RU.UTF-8 +lib/X11/xserver/ru_RU.iso88595 +lib/X11/xserver/ru_RU.koi8r +lib/X11/xserver/ru_RU.utf8 +lib/X11/xserver/ru_SU +lib/X11/xserver/ru_UA +lib/X11/xserver/ru_UA.koi8u +lib/X11/xserver/russian +lib/X11/xserver/se_NO +lib/X11/xserver/se_NO.utf8 +lib/X11/xserver/sh +lib/X11/xserver/sh.ISO8859-2 +lib/X11/xserver/sh_BA.ISO8859-2@bosnia +lib/X11/xserver/sh_YU +lib/X11/xserver/sh_YU.iso88592 +lib/X11/xserver/sh_YU.utf8 +lib/X11/xserver/sk +lib/X11/xserver/sk.ISO8859-2 +lib/X11/xserver/sk_SK +lib/X11/xserver/sk_SK.ISO8859-2 +lib/X11/xserver/sk_SK.iso88592 +lib/X11/xserver/sk_SK.utf8 +lib/X11/xserver/sl_SI +lib/X11/xserver/sl_SI.ISO8859-2 +lib/X11/xserver/sl_SI.iso88592 +lib/X11/xserver/sl_SI.utf8 +lib/X11/xserver/slovak +lib/X11/xserver/slovene +lib/X11/xserver/slovenian +lib/X11/xserver/spanish +lib/X11/xserver/sq_AL +lib/X11/xserver/sq_AL.ISO8859-2 +lib/X11/xserver/sq_AL.iso88591 +lib/X11/xserver/sq_AL.utf8 +lib/X11/xserver/sr_SP +lib/X11/xserver/sr_SP.ISO8859-5 +lib/X11/xserver/sr_YU +lib/X11/xserver/sr_YU.ISO8859-5 +lib/X11/xserver/sr_YU.iso88592 +lib/X11/xserver/sr_YU.iso88595@cyrillic +lib/X11/xserver/sr_YU.utf8 +lib/X11/xserver/sr_YU@cyrillic +lib/X11/xserver/su +lib/X11/xserver/su.ISO8859-1 +lib/X11/xserver/sv +lib/X11/xserver/sv.ISO8859-1 +lib/X11/xserver/sv.ISO8859-15 +lib/X11/xserver/sv.UTF-8 +lib/X11/xserver/sv_FI +lib/X11/xserver/sv_FI.iso88591 +lib/X11/xserver/sv_FI.iso885915@euro +lib/X11/xserver/sv_FI.utf8 +lib/X11/xserver/sv_FI@euro +lib/X11/xserver/sv_SE +lib/X11/xserver/sv_SE.ISO8859-1 +lib/X11/xserver/sv_SE.ISO8859-15 +lib/X11/xserver/sv_SE.UTF-8 +lib/X11/xserver/sv_SE.iso88591 +lib/X11/xserver/sv_SE.iso885915 +lib/X11/xserver/sv_SE.utf8 +lib/X11/xserver/swedish +lib/X11/xserver/ta_IN +lib/X11/xserver/ta_IN.utf8 +lib/X11/xserver/te_IN +lib/X11/xserver/te_IN.utf8 +lib/X11/xserver/tg_TJ +lib/X11/xserver/tg_TJ.koi8t +lib/X11/xserver/th +lib/X11/xserver/th_TH +lib/X11/xserver/th_TH.ISO8859-11 +lib/X11/xserver/th_TH.TIS620 +lib/X11/xserver/th_TH.UTF-8 +lib/X11/xserver/th_TH.tis620 +lib/X11/xserver/th_TH.utf8 +lib/X11/xserver/thai +lib/X11/xserver/tl_PH +lib/X11/xserver/tl_PH.iso88591 +lib/X11/xserver/tr +lib/X11/xserver/tr.ISO8859-9 +lib/X11/xserver/tr_TR +lib/X11/xserver/tr_TR.ISO8859-9 +lib/X11/xserver/tr_TR.UTF-8 +lib/X11/xserver/tr_TR.iso88599 +lib/X11/xserver/tr_TR.utf8 +lib/X11/xserver/turkish +lib/X11/xserver/uk_UA +lib/X11/xserver/uk_UA.koi8u +lib/X11/xserver/uk_UA.utf8 +lib/X11/xserver/ur_PK +lib/X11/xserver/ur_PK.utf8 +lib/X11/xserver/uz_UZ +lib/X11/xserver/uz_UZ.iso88591 +lib/X11/xserver/vi_VN +lib/X11/xserver/vi_VN.tcvn +lib/X11/xserver/vi_VN.utf8 +lib/X11/xserver/wa_BE +lib/X11/xserver/wa_BE.iso88591 +lib/X11/xserver/wa_BE.iso885915@euro +lib/X11/xserver/wa_BE@euro +lib/X11/xserver/yi_US +lib/X11/xserver/yi_US.cp1255 +lib/X11/xserver/zh +lib/X11/xserver/zh.GBK +lib/X11/xserver/zh.UTF-8 +lib/X11/xserver/zh_CN +lib/X11/xserver/zh_CN.EUC +lib/X11/xserver/zh_CN.EUC@pinyin +lib/X11/xserver/zh_CN.EUC@radical +lib/X11/xserver/zh_CN.EUC@stroke +lib/X11/xserver/zh_CN.GB18030 +lib/X11/xserver/zh_CN.GB18030@pinyin +lib/X11/xserver/zh_CN.GB18030@radical +lib/X11/xserver/zh_CN.GB18030@stroke +lib/X11/xserver/zh_CN.GBK +lib/X11/xserver/zh_CN.GBK@pinyin +lib/X11/xserver/zh_CN.GBK@radical +lib/X11/xserver/zh_CN.GBK@stroke +lib/X11/xserver/zh_CN.UTF-8 +lib/X11/xserver/zh_CN.UTF-8@pinyin +lib/X11/xserver/zh_CN.UTF-8@radical +lib/X11/xserver/zh_CN.UTF-8@stroke +lib/X11/xserver/zh_CN.gb18030 +lib/X11/xserver/zh_CN.gb2312 +lib/X11/xserver/zh_CN.gbk +lib/X11/xserver/zh_CN.utf8 +lib/X11/xserver/zh_HK +lib/X11/xserver/zh_HK.BIG5HK +lib/X11/xserver/zh_HK.BIG5HK@radical +lib/X11/xserver/zh_HK.BIG5HK@stroke +lib/X11/xserver/zh_HK.UTF-8 +lib/X11/xserver/zh_HK.UTF-8@radical +lib/X11/xserver/zh_HK.UTF-8@stroke +lib/X11/xserver/zh_HK.big5hkscs +lib/X11/xserver/zh_HK.utf8 +lib/X11/xserver/zh_TW +lib/X11/xserver/zh_TW.BIG5 +lib/X11/xserver/zh_TW.BIG5@pinyin +lib/X11/xserver/zh_TW.BIG5@radical +lib/X11/xserver/zh_TW.BIG5@stroke +lib/X11/xserver/zh_TW.BIG5@zhuyin +lib/X11/xserver/zh_TW.EUC +lib/X11/xserver/zh_TW.EUC@pinyin +lib/X11/xserver/zh_TW.EUC@radical +lib/X11/xserver/zh_TW.EUC@stroke +lib/X11/xserver/zh_TW.EUC@zhuyin +lib/X11/xserver/zh_TW.UTF-8 +lib/X11/xserver/zh_TW.UTF-8@pinyin +lib/X11/xserver/zh_TW.UTF-8@radical +lib/X11/xserver/zh_TW.UTF-8@stroke +lib/X11/xserver/zh_TW.UTF-8@zhuyin +lib/X11/xserver/zh_TW.big5 +lib/X11/xserver/zh_TW.euctw +lib/X11/xserver/zh_TW.utf8 +@dirrm lib/X11/xserver/C/print/attributes +@dirrm lib/X11/xserver/C/print/ddx-config/raster +@dirrm lib/X11/xserver/C/print/ddx-config +@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts +@dirrm lib/X11/xserver/C/print/models/PSdefault +@dirrm lib/X11/xserver/C/print/models/SPSPARC2/fonts +@dirrm lib/X11/xserver/C/print/models/SPSPARC2 +@dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts +@dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS +@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts +@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS +@dirrm lib/X11/xserver/C/print/models/PSspooldir +@dirrm lib/X11/xserver/C/print/models/HPDJ1600C/fonts +@dirrm lib/X11/xserver/C/print/models/HPDJ1600C +@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts +@dirrm lib/X11/xserver/C/print/models/HPLJ4family +@dirrm lib/X11/xserver/C/print/models +@dirrm lib/X11/xserver/C/print +@dirrm lib/X11/xserver/en_US/print/attributes +@dirrm lib/X11/xserver/en_US/print +@dirrm lib/X11/xserver/en_US +@dirrm lib/X11/xserver/C diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index f69043a31cc9..cf6cfb301ca3 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -5,16 +5,13 @@ # $FreeBSD$ # -PORTNAME= server -PORTVERSION= 6.7.0 -PORTREVISION= 9 +PORTNAME= xorg-server +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -PKGNAMEPREFIX= xorg- -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs diff --git a/x11-servers/xorg-server-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc index 79a81701d363..7d7e1cf76d11 100644 --- a/x11-servers/xorg-server-snap/Makefile.inc +++ b/x11-servers/xorg-server-snap/Makefile.inc @@ -16,6 +16,7 @@ DIST_SUBDIR?= xorg WRKSRC?= ${WRKDIR}/xc USE_X_PREFIX?= no PREFIX?= ${X11BASE} +MTREE_FILE= /etc/mtree/BSD.x11-4.dist USE_IMAKE= YES .if defined(XMAN_DIRS) @@ -41,17 +42,10 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-bus-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-loadmod.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86Events.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86fbman.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c @@ -91,6 +85,5 @@ do-install: @for dir in ${XMAN_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ done - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html .endif diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo index 971093cb9d9e..62c1647dc07b 100644 --- a/x11-servers/xorg-server-snap/distinfo +++ b/x11-servers/xorg-server-snap/distinfo @@ -1,8 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 -MD5 (xorg/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xorg/Wraphelp2.gz) = 3376 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf index c0139fdbeec7..391afe1b7cae 100644 --- a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf +++ b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf @@ -1,54 +1,44 @@ ---- config/cf/FreeBSD.cf.orig Fri Apr 2 13:47:10 2004 -+++ config/cf/FreeBSD.cf Fri May 7 17:32:47 2004 -@@ -109,7 +109,7 @@ - # endif - # define HasPosixThreads YES - # define ThreadedX YES --# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -+# define SystemMTDefines FreeBSDPTHREAD_CFLAGS - /* - * FreeBSD has tread-safe api but no getpwnam_r yet. - */ -@@ -119,9 +119,8 @@ - # else - # define MTSafeAPIDefines -DXUSE_MTSAFE_API +--- config/cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 ++++ config/cf/FreeBSD.cf Sat Sep 11 15:18:01 2004 +@@ -78,6 +78,7 @@ + #define HasIssetugid YES + #define HasPoll YES + #endif ++#define BuildHtmlManPages NO + + #if OSMajorVersion >= 4 + #define HasGetIfAddrs YES +@@ -117,14 +118,8 @@ + # if (OSRelVersion < 500043) + # define NeedUIThrStubs YES # endif --# if HasLibPthread +-# if (OSRelVersion >= 502102) -# define ThreadsLibraries -lpthread +-# elif (OSRelVersion >= 500016) +-# define ThreadsLibraries -lc_r -# else +-# define ThreadsLibraries -pthread +-# endif +-# define SystemMTDefines -D_THREAD_SAFE +# define ThreadsLibraries FreeBSDPTHREAD_LIBS -+# if !HasLibPthread - # if OSRelVersion >= 500043 - # define BuildThreadStubLibrary NO - # define NeedUIThrStubs NO -@@ -130,10 +129,7 @@ - # define NeedUIThrStubs YES - # endif - # if (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r - # define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc --# else --# define ThreadsLibraries -pthread - # endif - # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) -@@ -192,11 +188,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 ++# define SystemMTDefines FreeBSDPTHREAD_CFLAGS + #endif + + /* This fixes linking C programs against libGLU on FreeBSD 3.x */ +@@ -173,10 +168,10 @@ #endif + #ifndef CcCmd +-#define CcCmd cc ++#define CcCmd FreeBSDCC + #endif + #ifndef CplusplusCmd +-#define CplusplusCmd c++ ++#define CplusplusCmd FreeBSDCXX + #endif #define CppCmd /usr/bin/cpp -@@ -359,7 +355,7 @@ + #define PreProcessCmd CppCmd +@@ -338,7 +333,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -57,7 +47,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -452,18 +450,8 @@ +@@ -463,18 +458,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif diff --git a/x11-servers/xorg-server-snap/files/patch-Library.tmpl b/x11-servers/xorg-server-snap/files/patch-Library.tmpl index bbebc76c13e0..e94aae3bfc60 100644 --- a/x11-servers/xorg-server-snap/files/patch-Library.tmpl +++ b/x11-servers/xorg-server-snap/files/patch-Library.tmpl @@ -1,21 +1,21 @@ ---- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 -+++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 -@@ -300,6 +300,10 @@ +--- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004 ++++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004 +@@ -389,7 +389,7 @@ */ #ifndef MakeStringsDependency -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define MakeStringsDependency @@\ -+MAKESTRS = makestrs -+#else - # define MakeStringsDependency @@\ +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define MakeStringsDependency @@\ MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -308,6 +312,7 @@ - cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ +@@ -399,7 +399,8 @@ @@\ includes:: HostProgramTargetName($(MAKESTRS)) -+#endif + # else +-# define MakeStringsDependency /**/ ++# define MakeStringsDependency @@\ ++MAKESTRS = makestrs + # endif #endif - #ifndef ToolkitMakeStrings diff --git a/x11-servers/xorg-server-snap/files/patch-X11.tmpl b/x11-servers/xorg-server-snap/files/patch-X11.tmpl index 4e1eb1b9d227..bdd12fbbb3e2 100644 --- a/x11-servers/xorg-server-snap/files/patch-X11.tmpl +++ b/x11-servers/xorg-server-snap/files/patch-X11.tmpl @@ -1,6 +1,6 @@ ---- config/cf/X11.tmpl.orig Fri Apr 2 13:47:10 2004 -+++ config/cf/X11.tmpl Sun May 30 12:46:35 2004 -@@ -576,7 +576,7 @@ +--- config/cf/X11.tmpl.orig Fri Sep 3 09:18:18 2004 ++++ config/cf/X11.tmpl Fri Sep 10 20:29:12 2004 +@@ -616,7 +616,7 @@ #define BuildXft1Library BuildRenderLibrary #endif #ifndef UseFontconfig @@ -9,27 +9,21 @@ #endif #ifndef BuildFontconfigLibrary #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -1543,7 +1543,14 @@ +@@ -1606,7 +1606,7 @@ #endif #ifndef PsWrap -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define PsWrap pswrap -+#define PsWrapDependency /**/ -+#else - #define PsWrap $(PSWRAPSRC)/pswrap -+#define PsWrapDependency HostProgramTargetName($(PSWRAP)) -+#endif -+ PSWRAP = PsWrap - #endif - - #ifndef ResourceConfigurationManagement -@@ -1615,7 +1622,7 @@ +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define PsWrap $(PSWRAPSRC)/pswrap + # else + # define PsWrap pswrap +@@ -1683,7 +1683,7 @@ INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ -#if UseInstalledX11 +#if UseInstalledX11 || UseInstalledClients - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTSCALE = $(BINDIR)/mkfontscale + RGB = $(XBINDIR)/rgb + FONTC = $(XBINDIR)/bdftopcf + MKFONTSCALE = $(XBINDIR)/mkfontscale diff --git a/x11-servers/xorg-server-snap/files/patch-bus-Imakefile b/x11-servers/xorg-server-snap/files/patch-bus-Imakefile deleted file mode 100644 index eb44640c816e..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-bus-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ -Index: programs/Xserver/hw/xfree86/os-support/bus/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v -retrieving revision 1.2 -diff -u -r1.2 Imakefile ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile 23 Apr 2004 19:54:08 -0000 1.2 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile 11 May 2004 07:58:43 -0000 -@@ -80,8 +80,8 @@ - PCIDRVRSRC = ix86Pci.c linuxPci.c - PCIDRVROBJ = ix86Pci.o linuxPci.o - --#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) -- -+#elif defined(FreeBSDArchitecture) && \ -+ (defined(AlphaArchitecture) || defined(AMD64Architecture)) - - XCOMM generic FreeBSD PCI driver (using /dev/pci) - diff --git a/x11-servers/xorg-server-snap/files/patch-fb-renderfixes.diff b/x11-servers/xorg-server-snap/files/patch-fb-renderfixes.diff deleted file mode 100644 index 6adf66689453..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-fb-renderfixes.diff +++ /dev/null @@ -1,320 +0,0 @@ -Index: programs/Xserver/fb/fbcompose.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbcompose.c,v -retrieving revision 1.2 -diff -u -r1.2 fbcompose.c ---- programs/Xserver/fb/fbcompose.c 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbcompose.c 11 May 2004 22:58:12 -0000 -@@ -191,15 +191,15 @@ - a = (*msk->fetcha) (msk); - if (!a) - return 0; -- -- x = (*src->fetcha) (src); -- if (a == 0xffffffff) -- return x; -- -- m = FbInC(x,0,a,t); -- n = FbInC(x,8,a,t); -- o = FbInC(x,16,a,t); -- p = FbInC(x,24,a,t); -+ -+ x = (*src->fetch) (src) >> 24; -+ if (x == 0xff) -+ return a; -+ -+ m = FbInU(a,0,x,t); -+ n = FbInU(a,8,x,t); -+ o = FbInU(a,16,x,t); -+ p = FbInU(a,24,x,t); - return m|n|o|p; - } - -@@ -608,7 +608,7 @@ - cs = fbCombineMaskC (src, msk); - d = (*dst->fetch) (dst); - s = cs.value; -- ad = cs.alpha; -+ ad = ~cs.alpha; - as = d >> 24; - m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v); - n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v); -@@ -698,10 +698,10 @@ - s = cs.value; - ad = ~cs.alpha; - as = ~d >> 24; -- m = FbGen(s,d,0,as,ad,t,u,v); -- n = FbGen(s,d,8,as,ad,t,u,v); -- o = FbGen(s,d,16,as,ad,t,u,v); -- p = FbGen(s,d,24,as,ad,t,u,v); -+ m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v); -+ n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v); -+ o = FbGen(s,d,16,as,FbGet8(ad,16),t,u,v); -+ p = FbGen(s,d,24,as,FbGet8(ad,24),t,u,v); - (*dst->store) (dst, m|n|o|p); - } - -@@ -763,10 +763,9 @@ - FbCompositeOperand *dst) - { - CARD32 s = fbCombineMaskU (src, msk), d; --#if 0 - CARD16 sa, da; - CARD16 ad, as; -- CARD16 t; -+ CARD16 t, u, v; - CARD32 m,n,o,p; - - d = (*dst->fetch) (dst); -@@ -789,16 +788,6 @@ - p = FbGen(s,d,24,as,ad,t,u,v); - } - (*dst->store) (dst, m|n|o|p); --#else -- if ((s >> 24) == 0xff) -- (*dst->store) (dst, s); -- else -- { -- d = (*dst->fetch) (dst); -- if ((s >> 24) > (d >> 24)) -- (*dst->store) (dst, s); -- } --#endif - } - - void -@@ -831,7 +820,7 @@ - else - n = FbGen (s, d, 8, (da << 8) / sg, 0xff, t, u, v); - -- if (sr < da) -+ if (sr <= da) - o = FbAdd(s,d,16,t); - else - o = FbGen (s, d, 16, (da << 8) / sr, 0xff, t, u, v); -@@ -972,8 +961,8 @@ - FbCompSrc cs; - CARD32 s, d; - CARD32 m,n,o,p; -- CARD32 Fa; -- CARD16 Fb, t, u, v; -+ CARD32 Fa, Fb; -+ CARD16 t, u, v; - CARD32 sa; - CARD8 da; - -@@ -996,10 +985,10 @@ - Fa = m|n|o|p; - break; - case CombineAIn: -- m = fbCombineDisjointOutPart ((CARD8) (sa >> 0), da); -- n = fbCombineDisjointOutPart ((CARD8) (sa >> 8), da) << 8; -- o = fbCombineDisjointOutPart ((CARD8) (sa >> 16), da) << 16; -- p = fbCombineDisjointOutPart ((CARD8) (sa >> 24), da) << 24; -+ m = fbCombineDisjointInPart ((CARD8) (sa >> 0), da); -+ n = fbCombineDisjointInPart ((CARD8) (sa >> 8), da) << 8; -+ o = fbCombineDisjointInPart ((CARD8) (sa >> 16), da) << 16; -+ p = fbCombineDisjointInPart ((CARD8) (sa >> 24), da) << 24; - Fa = m|n|o|p; - break; - case CombineA: -@@ -1012,19 +1001,27 @@ - Fb = 0; - break; - case CombineBOut: -- Fb = fbCombineDisjointOutPart (da, sa); -+ m = fbCombineDisjointOutPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineDisjointOutPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineDisjointOutPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineDisjointOutPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineBIn: -- Fb = fbCombineDisjointInPart (da, sa); -+ m = fbCombineDisjointInPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineDisjointInPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineDisjointInPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineDisjointInPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineB: -- Fb = 0xff; -+ Fb = 0xffffffff; - break; - } -- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v); -- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v); -- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v); -- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v); -+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v); -+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v); -+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v); -+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v); - s = m|n|o|p; - (*dst->store) (dst, s); - } -@@ -1065,21 +1062,6 @@ - fbCombineDisjointGeneralC (src, msk, dst, CombineAOver); - } - --void --fbCombineDisjointOverReverseU (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst) --{ -- fbCombineDisjointGeneralU (src, msk, dst, CombineBOver); --} -- --void --fbCombineDisjointOverReverseC (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst) --{ -- fbCombineDisjointGeneralC (src, msk, dst, CombineBOver); --} - - void - fbCombineDisjointInU (FbCompositeOperand *src, -@@ -1281,8 +1263,8 @@ - FbCompSrc cs; - CARD32 s, d; - CARD32 m,n,o,p; -- CARD32 Fa; -- CARD16 Fb, t, u, v; -+ CARD32 Fa, Fb; -+ CARD16 t, u, v; - CARD32 sa; - CARD8 da; - -@@ -1305,10 +1287,10 @@ - Fa = m|n|o|p; - break; - case CombineAIn: -- m = fbCombineConjointOutPart ((CARD8) (sa >> 0), da); -- n = fbCombineConjointOutPart ((CARD8) (sa >> 8), da) << 8; -- o = fbCombineConjointOutPart ((CARD8) (sa >> 16), da) << 16; -- p = fbCombineConjointOutPart ((CARD8) (sa >> 24), da) << 24; -+ m = fbCombineConjointInPart ((CARD8) (sa >> 0), da); -+ n = fbCombineConjointInPart ((CARD8) (sa >> 8), da) << 8; -+ o = fbCombineConjointInPart ((CARD8) (sa >> 16), da) << 16; -+ p = fbCombineConjointInPart ((CARD8) (sa >> 24), da) << 24; - Fa = m|n|o|p; - break; - case CombineA: -@@ -1321,19 +1303,27 @@ - Fb = 0; - break; - case CombineBOut: -- Fb = fbCombineConjointOutPart (da, sa); -+ m = fbCombineConjointOutPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineConjointOutPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineConjointOutPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineConjointOutPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineBIn: -- Fb = fbCombineConjointInPart (da, sa); -+ m = fbCombineConjointInPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineConjointInPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineConjointInPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineConjointInPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineB: -- Fb = 0xff; -+ Fb = 0xffffffff; - break; - } -- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v); -- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v); -- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v); -- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v); -+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v); -+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v); -+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v); -+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v); - s = m|n|o|p; - (*dst->store) (dst, s); - } -@@ -1519,14 +1509,14 @@ - fbCombineAtopReverseU, - fbCombineXorU, - fbCombineAddU, -- fbCombineDisjointOverU, /* Saturate */ -+ fbCombineSaturateU, - 0, - 0, - fbCombineClear, - fbCombineSrcU, - fbCombineDst, - fbCombineDisjointOverU, -- fbCombineDisjointOverReverseU, -+ fbCombineSaturateU, /* DisjointOverReverse */ - fbCombineDisjointInU, - fbCombineDisjointInReverseU, - fbCombineDisjointOutU, -@@ -1566,14 +1556,14 @@ - fbCombineAtopReverseC, - fbCombineXorC, - fbCombineAddC, -- fbCombineDisjointOverC, /* Saturate */ -+ fbCombineSaturateC, - 0, - 0, - fbCombineClear, /* 0x10 */ - fbCombineSrcC, - fbCombineDst, - fbCombineDisjointOverC, -- fbCombineDisjointOverReverseC, -+ fbCombineSaturateC, /* DisjointOverReverse */ - fbCombineDisjointInC, - fbCombineDisjointInReverseC, - fbCombineDisjointOutC, -Index: programs/Xserver/fb/fbpict.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.c,v -retrieving revision 1.2 -diff -u -r1.2 fbpict.c ---- programs/Xserver/fb/fbpict.c 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbpict.c 12 May 2004 00:45:56 -0000 -@@ -1001,7 +1001,6 @@ - { - switch (pSrc->format) { - case PICT_a8r8g8b8: -- case PICT_x8r8g8b8: - switch (pDst->format) { - case PICT_a8r8g8b8: - case PICT_x8r8g8b8: -@@ -1016,7 +1015,6 @@ - } - break; - case PICT_a8b8g8r8: -- case PICT_x8b8g8r8: - switch (pDst->format) { - case PICT_a8b8g8r8: - case PICT_x8b8g8r8: -Index: programs/Xserver/fb/fbpict.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.h,v -retrieving revision 1.2 -diff -u -r1.2 fbpict.h ---- programs/Xserver/fb/fbpict.h 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbpict.h 11 May 2004 18:46:20 -0000 -@@ -333,15 +333,8 @@ - FbCompositeOperand *msk, - FbCompositeOperand *dst); - --void --fbCombineDisjointOverReverseU (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst); -- --void --fbCombineDisjointOverReverseC (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst); -+#define fbCombineDisjointOverReverseU fbCombineSaturateU -+#define fbCombineDisjointOverReverseC fbCombineSaturateC - - void - fbCombineDisjointInU (FbCompositeOperand *src, diff --git a/x11-servers/xorg-server-snap/files/patch-kernel-Imakefile b/x11-servers/xorg-server-snap/files/patch-kernel-Imakefile deleted file mode 100644 index ab5ca0b01406..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-kernel-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig Sun May 9 21:27:57 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile Sun May 9 21:28:16 2004 -@@ -20,6 +20,7 @@ - @echo 'Use "make -f Makefile.bsd" to manually build the modules' - #endif - -+#if 0 - SRCS_DRM = \ - drm.h \ - drmP.h \ -@@ -130,6 +131,7 @@ - InstallNamedNonExec(radeon/Makefile,Makefile,$(DRMSRCDIR)/radeon) - InstallNamedNonExec(sis/Makefile,Makefile,$(DRMSRCDIR)/sis) - InstallNamedNonExec(tdfx/Makefile,Makefile,$(DRMSRCDIR)/tdfx) -+#endif /* 0 */ - - LinkSourceFile(drm.h,$(XF86OSSRC)/shared/drm/kernel) - LinkSourceFile(drm_sarea.h,$(XF86OSSRC)/shared/drm/kernel) diff --git a/x11-servers/xorg-server-snap/files/patch-linux.cf b/x11-servers/xorg-server-snap/files/patch-linux.cf deleted file mode 100644 index 4d6ff268910b..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-linux.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/linux.cf.orig Fri May 7 15:51:10 2004 -+++ config/cf/linux.cf Fri May 7 15:51:17 2004 -@@ -747,7 +747,7 @@ - #endif - - #ifndef XF86OSCardDrivers --# define XF86OSCardDrivers v4l -+# define XF86OSCardDrivers fbdev v4l - #endif - - #ifndef OSXInputDrivers diff --git a/x11-servers/xorg-server-snap/files/patch-loadmod.c b/x11-servers/xorg-server-snap/files/patch-loadmod.c deleted file mode 100644 index ea1c4862bfe4..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-loadmod.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/loadmod.c.orig Fri May 7 18:46:10 2004 -+++ programs/Xserver/hw/xfree86/loader/loadmod.c Fri May 7 18:46:12 2004 -@@ -62,7 +62,6 @@ - #include "xf86Xinput.h" - #endif - #include "loader.h" --#include "xf86Optrec.h" - - #include <sys/types.h> - #include <regex.h> diff --git a/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile new file mode 100644 index 000000000000..5728d915fb48 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile @@ -0,0 +1,11 @@ +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004 +@@ -25,6 +25,8 @@ + SNPRINTFOBJS = snprintf.o + #endif + ++XAWLIB = -lXaw ++ + SRCS =\ + accessx.c\ + card-cfg.c\ diff --git a/x11-servers/xorg-server-snap/files/patch-xf86drmCompat.c b/x11-servers/xorg-server-snap/files/patch-xf86drmCompat.c deleted file mode 100644 index 98d4c84a0a03..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86drmCompat.c +++ /dev/null @@ -1,28 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig Sun Aug 22 17:35:50 2004 -+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c Sun Aug 22 17:36:11 2004 -@@ -77,8 +77,8 @@ - #include "mga_drm.h" - #include "r128_drm.h" - #include "radeon_drm.h" --#ifndef __FreeBSD__ - #include "sis_drm.h" -+#ifndef __FreeBSD__ - #include "i810_drm.h" - #include "i830_drm.h" - #endif -@@ -1012,7 +1012,6 @@ - } - } - --#ifndef __FreeBSD__ - /* SiS */ - - Bool drmSiSAgpInit(int driSubFD, int offset, int size) -@@ -1026,6 +1025,7 @@ - return 1; /* TRUE */ - } - -+#ifndef __FreeBSD__ - /* I830 */ - - Bool drmI830CleanupDma(int driSubFD) diff --git a/x11-servers/xorg-server-snap/files/patch-xf86fbman.c b/x11-servers/xorg-server-snap/files/patch-xf86fbman.c deleted file mode 100644 index 1d6fcc88f041..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86fbman.c +++ /dev/null @@ -1,17 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig Wed Nov 26 23:48:58 2003 -+++ programs/Xserver/hw/xfree86/common/xf86fbman.c Wed Sep 1 21:15:58 2004 -@@ -1095,12 +1095,10 @@ - - *size = 0; - -- if (!offman->LinearAreas) return FALSE; -- - pLink = offman->LinearAreas; -- pLinkRet = pLink; - -- if (!pLink->area) { -+ if (pLink && !pLink->area) { -+ pLinkRet = pLink; - while (pLink) { - if (pLink->free) { - if (pLink->linear.size > pLinkRet->linear.size) diff --git a/x11-servers/xorg-server-snap/files/patch-xorg.cf b/x11-servers/xorg-server-snap/files/patch-xorg.cf deleted file mode 100644 index b3f55760761f..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xorg.cf +++ /dev/null @@ -1,29 +0,0 @@ ---- config/cf/xorg.cf.orig Wed Aug 25 04:46:40 2004 -+++ config/cf/xorg.cf Wed Aug 25 04:53:17 2004 -@@ -388,7 +388,7 @@ - GlideDriver i128 NscDriver \ - ati i810 AgpGartDrivers DevelDrivers ark \ - cyrix siliconmotion via \ -- fbdev vesa vga \ -+ vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers - # endif - -@@ -485,7 +485,7 @@ - # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ - chips apm i128 ati ark cyrix siliconmotion \ -- vga dummy fbdev vesa -+ vga dummy vesa - # endif - - /* DRI tdfx driver needs Glide, which is not available for AMD64 */ -@@ -589,7 +589,7 @@ - /* Pure SBUS and PCI drivers should go first */ - # ifndef XF86CardDrivers - # define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ -- sunbw2 glint mga tdfx ati vesa vga fbdev \ -+ sunbw2 glint mga tdfx ati vesa vga \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers - # endif diff --git a/x11-servers/xorg-server-snap/files/patch-xorgconfig.c b/x11-servers/xorg-server-snap/files/patch-xorgconfig.c index c1391e8c1b63..650360ec75fe 100644 --- a/x11-servers/xorg-server-snap/files/patch-xorgconfig.c +++ b/x11-servers/xorg-server-snap/files/patch-xorgconfig.c @@ -1,11 +1,11 @@ ---- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Wed Nov 3 20:05:48 2004 -+++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Wed Nov 3 20:06:16 2004 -@@ -838,8 +838,7 @@ +--- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Mon Nov 8 22:18:58 2004 ++++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Mon Nov 8 22:19:22 2004 +@@ -854,8 +854,7 @@ "which is the rate at which scanlines are displayed.\n" "\n" "The valid range for horizontal sync and vertical sync should be documented\n" -"in the manual of your monitor. If in doubt, check the monitor database\n" --TREEROOTLX "/doc/Monitors to see if your monitor is there.\n" +-TREEROOTDOC "/Monitors to see if your monitor is there.\n" +"in the manual of your monitor.\n" "\n"; diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist index 56a3728fbaa8..e69e46d0ec56 100644 --- a/x11-servers/xorg-server-snap/pkg-plist +++ b/x11-servers/xorg-server-snap/pkg-plist @@ -36,18 +36,23 @@ 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/XOrgCfg lib/X11/doc/BUILD lib/X11/doc/BugReport lib/X11/doc/DESIGN lib/X11/doc/Install lib/X11/doc/LICENSE +lib/X11/doc/OS2.Notes lib/X11/doc/README lib/X11/doc/README.DECtga +lib/X11/doc/README.Darwin lib/X11/doc/README.I128 +lib/X11/doc/README.LynxOS +lib/X11/doc/README.NetBSD +lib/X11/doc/README.OpenBSD +lib/X11/doc/README.SCO lib/X11/doc/README.SiS +lib/X11/doc/README.Solaris lib/X11/doc/README.XKB-Config lib/X11/doc/README.XKB-Enhancing lib/X11/doc/README.apm @@ -72,38 +77,6 @@ lib/X11/etc/xmodmap.std lib/X11/getconfig/cfg.sample lib/X11/getconfig/xorg.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 %%AMD64_I386%%lib/modules/drivers/apm_drv.o %%AMD64_I386%%lib/modules/drivers/ark_drv.o lib/modules/drivers/ati_drv.o @@ -155,9 +128,7 @@ lib/modules/extensions/librecord.a lib/modules/extensions/libxtrap.a lib/modules/fonts/libbitmap.a lib/modules/fonts/libfreetype.so -lib/modules/fonts/libspeedo.a lib/modules/fonts/libtype1.a -lib/modules/fonts/libxtt.a lib/modules/freebsd/libdrm.a lib/modules/input/acecad_drv.o lib/modules/input/calcomp_drv.o @@ -170,6 +141,7 @@ lib/modules/input/fpit_drv.o lib/modules/input/hyperpen_drv.o lib/modules/input/js_x_drv.o lib/modules/input/kbd_drv.o +lib/modules/input/keyboard_drv.o lib/modules/input/magellan_drv.o lib/modules/input/microtouch_drv.o lib/modules/input/mouse_drv.o @@ -181,11 +153,13 @@ lib/modules/input/summa_drv.o lib/modules/input/tek4957_drv.o lib/modules/input/void_drv.o lib/modules/input/wacom_drv.o -%%I386%%lib/modules/libafb.a +%%ALPHA_NA%%lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a lib/modules/libcfb24.a lib/modules/libcfb32.a +lib/modules/libcw.a +lib/modules/libdamage.a lib/modules/libddc.a lib/modules/libfb.a lib/modules/libi2c.a @@ -209,3 +183,4 @@ lib/modules/libxf8_32bpp.a %%SPARC64%%lib/modules/libxf8_32wid.a %%SPARC64_NA%%lib/modules/v10002d.uc %%SPARC64_NA%%lib/modules/v20002d.uc +@dirrm lib/X11/getconfig diff --git a/x11-servers/xorg-server-snap/scripts/configure b/x11-servers/xorg-server-snap/scripts/configure index 02215f320916..ba6b214f80d3 100644 --- a/x11-servers/xorg-server-snap/scripts/configure +++ b/x11-servers/xorg-server-snap/scripts/configure @@ -14,6 +14,8 @@ echo "#define LibInstall NO" >> $LOCALDEF echo "#define ForceNormalLib NO" >> $LOCALDEF echo "#define XTrueTypeInstallCConvHeaders NO" >> $LOCALDEF echo "#define BuildServer YES" >> $LOCALDEF +echo "#define BuildXprint NO" >> $LOCALDEF +echo "#define BuildLibraries NO" >> $LOCALDEF echo "#define LibInstallBuild YES" >> $LOCALDEF echo "#define ModInstall YES" >> $LOCALDEF echo "#define XF86Server NO" >> $LOCALDEF diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index f69043a31cc9..cf6cfb301ca3 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -5,16 +5,13 @@ # $FreeBSD$ # -PORTNAME= server -PORTVERSION= 6.7.0 -PORTREVISION= 9 +PORTNAME= xorg-server +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -PKGNAMEPREFIX= xorg- -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 79a81701d363..7d7e1cf76d11 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -16,6 +16,7 @@ DIST_SUBDIR?= xorg WRKSRC?= ${WRKDIR}/xc USE_X_PREFIX?= no PREFIX?= ${X11BASE} +MTREE_FILE= /etc/mtree/BSD.x11-4.dist USE_IMAKE= YES .if defined(XMAN_DIRS) @@ -41,17 +42,10 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-bus-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-loadmod.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86Events.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86fbman.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c @@ -91,6 +85,5 @@ do-install: @for dir in ${XMAN_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ done - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html .endif diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 971093cb9d9e..62c1647dc07b 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,8 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 -MD5 (xorg/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xorg/Wraphelp2.gz) = 3376 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-server/files/patch-FreeBSD.cf b/x11-servers/xorg-server/files/patch-FreeBSD.cf index c0139fdbeec7..391afe1b7cae 100644 --- a/x11-servers/xorg-server/files/patch-FreeBSD.cf +++ b/x11-servers/xorg-server/files/patch-FreeBSD.cf @@ -1,54 +1,44 @@ ---- config/cf/FreeBSD.cf.orig Fri Apr 2 13:47:10 2004 -+++ config/cf/FreeBSD.cf Fri May 7 17:32:47 2004 -@@ -109,7 +109,7 @@ - # endif - # define HasPosixThreads YES - # define ThreadedX YES --# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -+# define SystemMTDefines FreeBSDPTHREAD_CFLAGS - /* - * FreeBSD has tread-safe api but no getpwnam_r yet. - */ -@@ -119,9 +119,8 @@ - # else - # define MTSafeAPIDefines -DXUSE_MTSAFE_API +--- config/cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 ++++ config/cf/FreeBSD.cf Sat Sep 11 15:18:01 2004 +@@ -78,6 +78,7 @@ + #define HasIssetugid YES + #define HasPoll YES + #endif ++#define BuildHtmlManPages NO + + #if OSMajorVersion >= 4 + #define HasGetIfAddrs YES +@@ -117,14 +118,8 @@ + # if (OSRelVersion < 500043) + # define NeedUIThrStubs YES # endif --# if HasLibPthread +-# if (OSRelVersion >= 502102) -# define ThreadsLibraries -lpthread +-# elif (OSRelVersion >= 500016) +-# define ThreadsLibraries -lc_r -# else +-# define ThreadsLibraries -pthread +-# endif +-# define SystemMTDefines -D_THREAD_SAFE +# define ThreadsLibraries FreeBSDPTHREAD_LIBS -+# if !HasLibPthread - # if OSRelVersion >= 500043 - # define BuildThreadStubLibrary NO - # define NeedUIThrStubs NO -@@ -130,10 +129,7 @@ - # define NeedUIThrStubs YES - # endif - # if (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r - # define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc --# else --# define ThreadsLibraries -pthread - # endif - # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) -@@ -192,11 +188,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 ++# define SystemMTDefines FreeBSDPTHREAD_CFLAGS + #endif + + /* This fixes linking C programs against libGLU on FreeBSD 3.x */ +@@ -173,10 +168,10 @@ #endif + #ifndef CcCmd +-#define CcCmd cc ++#define CcCmd FreeBSDCC + #endif + #ifndef CplusplusCmd +-#define CplusplusCmd c++ ++#define CplusplusCmd FreeBSDCXX + #endif #define CppCmd /usr/bin/cpp -@@ -359,7 +355,7 @@ + #define PreProcessCmd CppCmd +@@ -338,7 +333,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -57,7 +47,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -452,18 +450,8 @@ +@@ -463,18 +458,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif diff --git a/x11-servers/xorg-server/files/patch-Library.tmpl b/x11-servers/xorg-server/files/patch-Library.tmpl index bbebc76c13e0..e94aae3bfc60 100644 --- a/x11-servers/xorg-server/files/patch-Library.tmpl +++ b/x11-servers/xorg-server/files/patch-Library.tmpl @@ -1,21 +1,21 @@ ---- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 -+++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 -@@ -300,6 +300,10 @@ +--- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004 ++++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004 +@@ -389,7 +389,7 @@ */ #ifndef MakeStringsDependency -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define MakeStringsDependency @@\ -+MAKESTRS = makestrs -+#else - # define MakeStringsDependency @@\ +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define MakeStringsDependency @@\ MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -308,6 +312,7 @@ - cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ +@@ -399,7 +399,8 @@ @@\ includes:: HostProgramTargetName($(MAKESTRS)) -+#endif + # else +-# define MakeStringsDependency /**/ ++# define MakeStringsDependency @@\ ++MAKESTRS = makestrs + # endif #endif - #ifndef ToolkitMakeStrings diff --git a/x11-servers/xorg-server/files/patch-X11.tmpl b/x11-servers/xorg-server/files/patch-X11.tmpl index 4e1eb1b9d227..bdd12fbbb3e2 100644 --- a/x11-servers/xorg-server/files/patch-X11.tmpl +++ b/x11-servers/xorg-server/files/patch-X11.tmpl @@ -1,6 +1,6 @@ ---- config/cf/X11.tmpl.orig Fri Apr 2 13:47:10 2004 -+++ config/cf/X11.tmpl Sun May 30 12:46:35 2004 -@@ -576,7 +576,7 @@ +--- config/cf/X11.tmpl.orig Fri Sep 3 09:18:18 2004 ++++ config/cf/X11.tmpl Fri Sep 10 20:29:12 2004 +@@ -616,7 +616,7 @@ #define BuildXft1Library BuildRenderLibrary #endif #ifndef UseFontconfig @@ -9,27 +9,21 @@ #endif #ifndef BuildFontconfigLibrary #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -1543,7 +1543,14 @@ +@@ -1606,7 +1606,7 @@ #endif #ifndef PsWrap -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define PsWrap pswrap -+#define PsWrapDependency /**/ -+#else - #define PsWrap $(PSWRAPSRC)/pswrap -+#define PsWrapDependency HostProgramTargetName($(PSWRAP)) -+#endif -+ PSWRAP = PsWrap - #endif - - #ifndef ResourceConfigurationManagement -@@ -1615,7 +1622,7 @@ +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define PsWrap $(PSWRAPSRC)/pswrap + # else + # define PsWrap pswrap +@@ -1683,7 +1683,7 @@ INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ -#if UseInstalledX11 +#if UseInstalledX11 || UseInstalledClients - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTSCALE = $(BINDIR)/mkfontscale + RGB = $(XBINDIR)/rgb + FONTC = $(XBINDIR)/bdftopcf + MKFONTSCALE = $(XBINDIR)/mkfontscale diff --git a/x11-servers/xorg-server/files/patch-bus-Imakefile b/x11-servers/xorg-server/files/patch-bus-Imakefile deleted file mode 100644 index eb44640c816e..000000000000 --- a/x11-servers/xorg-server/files/patch-bus-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ -Index: programs/Xserver/hw/xfree86/os-support/bus/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v -retrieving revision 1.2 -diff -u -r1.2 Imakefile ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile 23 Apr 2004 19:54:08 -0000 1.2 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile 11 May 2004 07:58:43 -0000 -@@ -80,8 +80,8 @@ - PCIDRVRSRC = ix86Pci.c linuxPci.c - PCIDRVROBJ = ix86Pci.o linuxPci.o - --#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) -- -+#elif defined(FreeBSDArchitecture) && \ -+ (defined(AlphaArchitecture) || defined(AMD64Architecture)) - - XCOMM generic FreeBSD PCI driver (using /dev/pci) - diff --git a/x11-servers/xorg-server/files/patch-fb-renderfixes.diff b/x11-servers/xorg-server/files/patch-fb-renderfixes.diff deleted file mode 100644 index 6adf66689453..000000000000 --- a/x11-servers/xorg-server/files/patch-fb-renderfixes.diff +++ /dev/null @@ -1,320 +0,0 @@ -Index: programs/Xserver/fb/fbcompose.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbcompose.c,v -retrieving revision 1.2 -diff -u -r1.2 fbcompose.c ---- programs/Xserver/fb/fbcompose.c 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbcompose.c 11 May 2004 22:58:12 -0000 -@@ -191,15 +191,15 @@ - a = (*msk->fetcha) (msk); - if (!a) - return 0; -- -- x = (*src->fetcha) (src); -- if (a == 0xffffffff) -- return x; -- -- m = FbInC(x,0,a,t); -- n = FbInC(x,8,a,t); -- o = FbInC(x,16,a,t); -- p = FbInC(x,24,a,t); -+ -+ x = (*src->fetch) (src) >> 24; -+ if (x == 0xff) -+ return a; -+ -+ m = FbInU(a,0,x,t); -+ n = FbInU(a,8,x,t); -+ o = FbInU(a,16,x,t); -+ p = FbInU(a,24,x,t); - return m|n|o|p; - } - -@@ -608,7 +608,7 @@ - cs = fbCombineMaskC (src, msk); - d = (*dst->fetch) (dst); - s = cs.value; -- ad = cs.alpha; -+ ad = ~cs.alpha; - as = d >> 24; - m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v); - n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v); -@@ -698,10 +698,10 @@ - s = cs.value; - ad = ~cs.alpha; - as = ~d >> 24; -- m = FbGen(s,d,0,as,ad,t,u,v); -- n = FbGen(s,d,8,as,ad,t,u,v); -- o = FbGen(s,d,16,as,ad,t,u,v); -- p = FbGen(s,d,24,as,ad,t,u,v); -+ m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v); -+ n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v); -+ o = FbGen(s,d,16,as,FbGet8(ad,16),t,u,v); -+ p = FbGen(s,d,24,as,FbGet8(ad,24),t,u,v); - (*dst->store) (dst, m|n|o|p); - } - -@@ -763,10 +763,9 @@ - FbCompositeOperand *dst) - { - CARD32 s = fbCombineMaskU (src, msk), d; --#if 0 - CARD16 sa, da; - CARD16 ad, as; -- CARD16 t; -+ CARD16 t, u, v; - CARD32 m,n,o,p; - - d = (*dst->fetch) (dst); -@@ -789,16 +788,6 @@ - p = FbGen(s,d,24,as,ad,t,u,v); - } - (*dst->store) (dst, m|n|o|p); --#else -- if ((s >> 24) == 0xff) -- (*dst->store) (dst, s); -- else -- { -- d = (*dst->fetch) (dst); -- if ((s >> 24) > (d >> 24)) -- (*dst->store) (dst, s); -- } --#endif - } - - void -@@ -831,7 +820,7 @@ - else - n = FbGen (s, d, 8, (da << 8) / sg, 0xff, t, u, v); - -- if (sr < da) -+ if (sr <= da) - o = FbAdd(s,d,16,t); - else - o = FbGen (s, d, 16, (da << 8) / sr, 0xff, t, u, v); -@@ -972,8 +961,8 @@ - FbCompSrc cs; - CARD32 s, d; - CARD32 m,n,o,p; -- CARD32 Fa; -- CARD16 Fb, t, u, v; -+ CARD32 Fa, Fb; -+ CARD16 t, u, v; - CARD32 sa; - CARD8 da; - -@@ -996,10 +985,10 @@ - Fa = m|n|o|p; - break; - case CombineAIn: -- m = fbCombineDisjointOutPart ((CARD8) (sa >> 0), da); -- n = fbCombineDisjointOutPart ((CARD8) (sa >> 8), da) << 8; -- o = fbCombineDisjointOutPart ((CARD8) (sa >> 16), da) << 16; -- p = fbCombineDisjointOutPart ((CARD8) (sa >> 24), da) << 24; -+ m = fbCombineDisjointInPart ((CARD8) (sa >> 0), da); -+ n = fbCombineDisjointInPart ((CARD8) (sa >> 8), da) << 8; -+ o = fbCombineDisjointInPart ((CARD8) (sa >> 16), da) << 16; -+ p = fbCombineDisjointInPart ((CARD8) (sa >> 24), da) << 24; - Fa = m|n|o|p; - break; - case CombineA: -@@ -1012,19 +1001,27 @@ - Fb = 0; - break; - case CombineBOut: -- Fb = fbCombineDisjointOutPart (da, sa); -+ m = fbCombineDisjointOutPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineDisjointOutPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineDisjointOutPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineDisjointOutPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineBIn: -- Fb = fbCombineDisjointInPart (da, sa); -+ m = fbCombineDisjointInPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineDisjointInPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineDisjointInPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineDisjointInPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineB: -- Fb = 0xff; -+ Fb = 0xffffffff; - break; - } -- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v); -- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v); -- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v); -- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v); -+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v); -+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v); -+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v); -+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v); - s = m|n|o|p; - (*dst->store) (dst, s); - } -@@ -1065,21 +1062,6 @@ - fbCombineDisjointGeneralC (src, msk, dst, CombineAOver); - } - --void --fbCombineDisjointOverReverseU (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst) --{ -- fbCombineDisjointGeneralU (src, msk, dst, CombineBOver); --} -- --void --fbCombineDisjointOverReverseC (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst) --{ -- fbCombineDisjointGeneralC (src, msk, dst, CombineBOver); --} - - void - fbCombineDisjointInU (FbCompositeOperand *src, -@@ -1281,8 +1263,8 @@ - FbCompSrc cs; - CARD32 s, d; - CARD32 m,n,o,p; -- CARD32 Fa; -- CARD16 Fb, t, u, v; -+ CARD32 Fa, Fb; -+ CARD16 t, u, v; - CARD32 sa; - CARD8 da; - -@@ -1305,10 +1287,10 @@ - Fa = m|n|o|p; - break; - case CombineAIn: -- m = fbCombineConjointOutPart ((CARD8) (sa >> 0), da); -- n = fbCombineConjointOutPart ((CARD8) (sa >> 8), da) << 8; -- o = fbCombineConjointOutPart ((CARD8) (sa >> 16), da) << 16; -- p = fbCombineConjointOutPart ((CARD8) (sa >> 24), da) << 24; -+ m = fbCombineConjointInPart ((CARD8) (sa >> 0), da); -+ n = fbCombineConjointInPart ((CARD8) (sa >> 8), da) << 8; -+ o = fbCombineConjointInPart ((CARD8) (sa >> 16), da) << 16; -+ p = fbCombineConjointInPart ((CARD8) (sa >> 24), da) << 24; - Fa = m|n|o|p; - break; - case CombineA: -@@ -1321,19 +1303,27 @@ - Fb = 0; - break; - case CombineBOut: -- Fb = fbCombineConjointOutPart (da, sa); -+ m = fbCombineConjointOutPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineConjointOutPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineConjointOutPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineConjointOutPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineBIn: -- Fb = fbCombineConjointInPart (da, sa); -+ m = fbCombineConjointInPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineConjointInPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineConjointInPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineConjointInPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineB: -- Fb = 0xff; -+ Fb = 0xffffffff; - break; - } -- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v); -- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v); -- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v); -- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v); -+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v); -+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v); -+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v); -+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v); - s = m|n|o|p; - (*dst->store) (dst, s); - } -@@ -1519,14 +1509,14 @@ - fbCombineAtopReverseU, - fbCombineXorU, - fbCombineAddU, -- fbCombineDisjointOverU, /* Saturate */ -+ fbCombineSaturateU, - 0, - 0, - fbCombineClear, - fbCombineSrcU, - fbCombineDst, - fbCombineDisjointOverU, -- fbCombineDisjointOverReverseU, -+ fbCombineSaturateU, /* DisjointOverReverse */ - fbCombineDisjointInU, - fbCombineDisjointInReverseU, - fbCombineDisjointOutU, -@@ -1566,14 +1556,14 @@ - fbCombineAtopReverseC, - fbCombineXorC, - fbCombineAddC, -- fbCombineDisjointOverC, /* Saturate */ -+ fbCombineSaturateC, - 0, - 0, - fbCombineClear, /* 0x10 */ - fbCombineSrcC, - fbCombineDst, - fbCombineDisjointOverC, -- fbCombineDisjointOverReverseC, -+ fbCombineSaturateC, /* DisjointOverReverse */ - fbCombineDisjointInC, - fbCombineDisjointInReverseC, - fbCombineDisjointOutC, -Index: programs/Xserver/fb/fbpict.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.c,v -retrieving revision 1.2 -diff -u -r1.2 fbpict.c ---- programs/Xserver/fb/fbpict.c 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbpict.c 12 May 2004 00:45:56 -0000 -@@ -1001,7 +1001,6 @@ - { - switch (pSrc->format) { - case PICT_a8r8g8b8: -- case PICT_x8r8g8b8: - switch (pDst->format) { - case PICT_a8r8g8b8: - case PICT_x8r8g8b8: -@@ -1016,7 +1015,6 @@ - } - break; - case PICT_a8b8g8r8: -- case PICT_x8b8g8r8: - switch (pDst->format) { - case PICT_a8b8g8r8: - case PICT_x8b8g8r8: -Index: programs/Xserver/fb/fbpict.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.h,v -retrieving revision 1.2 -diff -u -r1.2 fbpict.h ---- programs/Xserver/fb/fbpict.h 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbpict.h 11 May 2004 18:46:20 -0000 -@@ -333,15 +333,8 @@ - FbCompositeOperand *msk, - FbCompositeOperand *dst); - --void --fbCombineDisjointOverReverseU (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst); -- --void --fbCombineDisjointOverReverseC (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst); -+#define fbCombineDisjointOverReverseU fbCombineSaturateU -+#define fbCombineDisjointOverReverseC fbCombineSaturateC - - void - fbCombineDisjointInU (FbCompositeOperand *src, diff --git a/x11-servers/xorg-server/files/patch-kernel-Imakefile b/x11-servers/xorg-server/files/patch-kernel-Imakefile deleted file mode 100644 index ab5ca0b01406..000000000000 --- a/x11-servers/xorg-server/files/patch-kernel-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig Sun May 9 21:27:57 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile Sun May 9 21:28:16 2004 -@@ -20,6 +20,7 @@ - @echo 'Use "make -f Makefile.bsd" to manually build the modules' - #endif - -+#if 0 - SRCS_DRM = \ - drm.h \ - drmP.h \ -@@ -130,6 +131,7 @@ - InstallNamedNonExec(radeon/Makefile,Makefile,$(DRMSRCDIR)/radeon) - InstallNamedNonExec(sis/Makefile,Makefile,$(DRMSRCDIR)/sis) - InstallNamedNonExec(tdfx/Makefile,Makefile,$(DRMSRCDIR)/tdfx) -+#endif /* 0 */ - - LinkSourceFile(drm.h,$(XF86OSSRC)/shared/drm/kernel) - LinkSourceFile(drm_sarea.h,$(XF86OSSRC)/shared/drm/kernel) diff --git a/x11-servers/xorg-server/files/patch-linux.cf b/x11-servers/xorg-server/files/patch-linux.cf deleted file mode 100644 index 4d6ff268910b..000000000000 --- a/x11-servers/xorg-server/files/patch-linux.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/linux.cf.orig Fri May 7 15:51:10 2004 -+++ config/cf/linux.cf Fri May 7 15:51:17 2004 -@@ -747,7 +747,7 @@ - #endif - - #ifndef XF86OSCardDrivers --# define XF86OSCardDrivers v4l -+# define XF86OSCardDrivers fbdev v4l - #endif - - #ifndef OSXInputDrivers diff --git a/x11-servers/xorg-server/files/patch-loadmod.c b/x11-servers/xorg-server/files/patch-loadmod.c deleted file mode 100644 index ea1c4862bfe4..000000000000 --- a/x11-servers/xorg-server/files/patch-loadmod.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/loadmod.c.orig Fri May 7 18:46:10 2004 -+++ programs/Xserver/hw/xfree86/loader/loadmod.c Fri May 7 18:46:12 2004 -@@ -62,7 +62,6 @@ - #include "xf86Xinput.h" - #endif - #include "loader.h" --#include "xf86Optrec.h" - - #include <sys/types.h> - #include <regex.h> diff --git a/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile new file mode 100644 index 000000000000..5728d915fb48 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile @@ -0,0 +1,11 @@ +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004 +@@ -25,6 +25,8 @@ + SNPRINTFOBJS = snprintf.o + #endif + ++XAWLIB = -lXaw ++ + SRCS =\ + accessx.c\ + card-cfg.c\ diff --git a/x11-servers/xorg-server/files/patch-xf86drmCompat.c b/x11-servers/xorg-server/files/patch-xf86drmCompat.c deleted file mode 100644 index 98d4c84a0a03..000000000000 --- a/x11-servers/xorg-server/files/patch-xf86drmCompat.c +++ /dev/null @@ -1,28 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig Sun Aug 22 17:35:50 2004 -+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c Sun Aug 22 17:36:11 2004 -@@ -77,8 +77,8 @@ - #include "mga_drm.h" - #include "r128_drm.h" - #include "radeon_drm.h" --#ifndef __FreeBSD__ - #include "sis_drm.h" -+#ifndef __FreeBSD__ - #include "i810_drm.h" - #include "i830_drm.h" - #endif -@@ -1012,7 +1012,6 @@ - } - } - --#ifndef __FreeBSD__ - /* SiS */ - - Bool drmSiSAgpInit(int driSubFD, int offset, int size) -@@ -1026,6 +1025,7 @@ - return 1; /* TRUE */ - } - -+#ifndef __FreeBSD__ - /* I830 */ - - Bool drmI830CleanupDma(int driSubFD) diff --git a/x11-servers/xorg-server/files/patch-xf86fbman.c b/x11-servers/xorg-server/files/patch-xf86fbman.c deleted file mode 100644 index 1d6fcc88f041..000000000000 --- a/x11-servers/xorg-server/files/patch-xf86fbman.c +++ /dev/null @@ -1,17 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig Wed Nov 26 23:48:58 2003 -+++ programs/Xserver/hw/xfree86/common/xf86fbman.c Wed Sep 1 21:15:58 2004 -@@ -1095,12 +1095,10 @@ - - *size = 0; - -- if (!offman->LinearAreas) return FALSE; -- - pLink = offman->LinearAreas; -- pLinkRet = pLink; - -- if (!pLink->area) { -+ if (pLink && !pLink->area) { -+ pLinkRet = pLink; - while (pLink) { - if (pLink->free) { - if (pLink->linear.size > pLinkRet->linear.size) diff --git a/x11-servers/xorg-server/files/patch-xorg.cf b/x11-servers/xorg-server/files/patch-xorg.cf deleted file mode 100644 index b3f55760761f..000000000000 --- a/x11-servers/xorg-server/files/patch-xorg.cf +++ /dev/null @@ -1,29 +0,0 @@ ---- config/cf/xorg.cf.orig Wed Aug 25 04:46:40 2004 -+++ config/cf/xorg.cf Wed Aug 25 04:53:17 2004 -@@ -388,7 +388,7 @@ - GlideDriver i128 NscDriver \ - ati i810 AgpGartDrivers DevelDrivers ark \ - cyrix siliconmotion via \ -- fbdev vesa vga \ -+ vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers - # endif - -@@ -485,7 +485,7 @@ - # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ - chips apm i128 ati ark cyrix siliconmotion \ -- vga dummy fbdev vesa -+ vga dummy vesa - # endif - - /* DRI tdfx driver needs Glide, which is not available for AMD64 */ -@@ -589,7 +589,7 @@ - /* Pure SBUS and PCI drivers should go first */ - # ifndef XF86CardDrivers - # define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ -- sunbw2 glint mga tdfx ati vesa vga fbdev \ -+ sunbw2 glint mga tdfx ati vesa vga \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers - # endif diff --git a/x11-servers/xorg-server/files/patch-xorgconfig.c b/x11-servers/xorg-server/files/patch-xorgconfig.c index c1391e8c1b63..650360ec75fe 100644 --- a/x11-servers/xorg-server/files/patch-xorgconfig.c +++ b/x11-servers/xorg-server/files/patch-xorgconfig.c @@ -1,11 +1,11 @@ ---- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Wed Nov 3 20:05:48 2004 -+++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Wed Nov 3 20:06:16 2004 -@@ -838,8 +838,7 @@ +--- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Mon Nov 8 22:18:58 2004 ++++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Mon Nov 8 22:19:22 2004 +@@ -854,8 +854,7 @@ "which is the rate at which scanlines are displayed.\n" "\n" "The valid range for horizontal sync and vertical sync should be documented\n" -"in the manual of your monitor. If in doubt, check the monitor database\n" --TREEROOTLX "/doc/Monitors to see if your monitor is there.\n" +-TREEROOTDOC "/Monitors to see if your monitor is there.\n" +"in the manual of your monitor.\n" "\n"; diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 56a3728fbaa8..e69e46d0ec56 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -36,18 +36,23 @@ 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/XOrgCfg lib/X11/doc/BUILD lib/X11/doc/BugReport lib/X11/doc/DESIGN lib/X11/doc/Install lib/X11/doc/LICENSE +lib/X11/doc/OS2.Notes lib/X11/doc/README lib/X11/doc/README.DECtga +lib/X11/doc/README.Darwin lib/X11/doc/README.I128 +lib/X11/doc/README.LynxOS +lib/X11/doc/README.NetBSD +lib/X11/doc/README.OpenBSD +lib/X11/doc/README.SCO lib/X11/doc/README.SiS +lib/X11/doc/README.Solaris lib/X11/doc/README.XKB-Config lib/X11/doc/README.XKB-Enhancing lib/X11/doc/README.apm @@ -72,38 +77,6 @@ lib/X11/etc/xmodmap.std lib/X11/getconfig/cfg.sample lib/X11/getconfig/xorg.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 %%AMD64_I386%%lib/modules/drivers/apm_drv.o %%AMD64_I386%%lib/modules/drivers/ark_drv.o lib/modules/drivers/ati_drv.o @@ -155,9 +128,7 @@ lib/modules/extensions/librecord.a lib/modules/extensions/libxtrap.a lib/modules/fonts/libbitmap.a lib/modules/fonts/libfreetype.so -lib/modules/fonts/libspeedo.a lib/modules/fonts/libtype1.a -lib/modules/fonts/libxtt.a lib/modules/freebsd/libdrm.a lib/modules/input/acecad_drv.o lib/modules/input/calcomp_drv.o @@ -170,6 +141,7 @@ lib/modules/input/fpit_drv.o lib/modules/input/hyperpen_drv.o lib/modules/input/js_x_drv.o lib/modules/input/kbd_drv.o +lib/modules/input/keyboard_drv.o lib/modules/input/magellan_drv.o lib/modules/input/microtouch_drv.o lib/modules/input/mouse_drv.o @@ -181,11 +153,13 @@ lib/modules/input/summa_drv.o lib/modules/input/tek4957_drv.o lib/modules/input/void_drv.o lib/modules/input/wacom_drv.o -%%I386%%lib/modules/libafb.a +%%ALPHA_NA%%lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a lib/modules/libcfb24.a lib/modules/libcfb32.a +lib/modules/libcw.a +lib/modules/libdamage.a lib/modules/libddc.a lib/modules/libfb.a lib/modules/libi2c.a @@ -209,3 +183,4 @@ lib/modules/libxf8_32bpp.a %%SPARC64%%lib/modules/libxf8_32wid.a %%SPARC64_NA%%lib/modules/v10002d.uc %%SPARC64_NA%%lib/modules/v20002d.uc +@dirrm lib/X11/getconfig diff --git a/x11-servers/xorg-server/scripts/configure b/x11-servers/xorg-server/scripts/configure index 02215f320916..ba6b214f80d3 100644 --- a/x11-servers/xorg-server/scripts/configure +++ b/x11-servers/xorg-server/scripts/configure @@ -14,6 +14,8 @@ echo "#define LibInstall NO" >> $LOCALDEF echo "#define ForceNormalLib NO" >> $LOCALDEF echo "#define XTrueTypeInstallCConvHeaders NO" >> $LOCALDEF echo "#define BuildServer YES" >> $LOCALDEF +echo "#define BuildXprint NO" >> $LOCALDEF +echo "#define BuildLibraries NO" >> $LOCALDEF echo "#define LibInstallBuild YES" >> $LOCALDEF echo "#define ModInstall YES" >> $LOCALDEF echo "#define XF86Server NO" >> $LOCALDEF diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index f0344b3fda0e..8677424daa26 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xorg-vfbserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X virtual framebuffer server from X.Org @@ -23,7 +22,7 @@ EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} USE_XLIB= yes -XBUILD_DIRS= lib/font programs/Xserver +XBUILD_DIRS= lib/font programs/Xserver/miext/damage programs/Xserver XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo index b9025936ccb4..62c1647dc07b 100644 --- a/x11-servers/xorg-vfbserver/distinfo +++ b/x11-servers/xorg-vfbserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-vfbserver/scripts/configure b/x11-servers/xorg-vfbserver/scripts/configure index b36ded9e7e84..7ab6562143f3 100644 --- a/x11-servers/xorg-vfbserver/scripts/configure +++ b/x11-servers/xorg-vfbserver/scripts/configure @@ -6,6 +6,7 @@ rm -f $LOCALDEF echo "#define BuildServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define XprtServer NO" >> $LOCALDEF +echo "#define BuildXprint NO" >> $LOCALDEF echo "#define XnestServer NO" >> $LOCALDEF echo "#define XorgServer NO" >> $LOCALDEF echo "#define XVirtualFramebufferServer YES" >> $LOCALDEF diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile index e35ad1b0512a..f4db55a0ae8b 100644 --- a/x11-wm/tvtwm/Makefile +++ b/x11-wm/tvtwm/Makefile @@ -25,6 +25,5 @@ PLIST_FILES= bin/tvtwm do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tvtwm ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/tvtwm.man ${MANPREFIX}/man/man1/tvtwm.1 - ${INSTALL_DATA} ${WRKSRC}/tvtwm.1.html ${PREFIX}/lib/X11/doc/html .include <bsd.port.mk> diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index 91b7305e1d59..6ed34b344561 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -47,6 +47,7 @@ for i in \ BuildCyrillicFonts \ BuildLatin2Fonts \ BuildPlugin \ + BuildHtmlManPages \ LibHeaders \ LibInstall \ ForceNormalLib \ diff --git a/x11/XFree86-4-libraries/Makefile.inc b/x11/XFree86-4-libraries/Makefile.inc index 06c202678136..f23204170a72 100644 --- a/x11/XFree86-4-libraries/Makefile.inc +++ b/x11/XFree86-4-libraries/Makefile.inc @@ -69,6 +69,5 @@ do-install: @for dir in ${XINSTALL_MAN_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ done - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html .endif diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index a78d6103fd98..ed6fff32962e 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -43,6 +43,7 @@ for i in \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ BuildPlugin do \ echo "#define $i NO" >> $LOCALDEF diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile index 7846831e8aac..b965bdf7a611 100644 --- a/x11/XFree86-4-manuals/Makefile +++ b/x11/XFree86-4-manuals/Makefile @@ -25,13 +25,19 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${EXTRACT_TARGET} PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc/doc/man +CFGDIR= ${WRKDIR}/xc/config INSTALL_TARGET= install.man +pre-configure: + @${MKDIR} ${CFGDIR} + @${CP} ${PREFIX}/lib/X11/config/* ${CFGDIR} + @${ECHO} "#define BuildHtmlManPages NO" >>${CFGDIR}/xf86site.def + do-configure: (cd ${WRKSRC} && \ - imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \ + imake -DUseInstalled ${PROJECTROOT} -I${CFGDIR} \ -DTOPDIR=../.. -DCURDIR=.; \ - ${MAKE} Makefiles ; \ + ${MAKE} Makefiles CONFIGDIR=${CFGDIR} ; \ ${MAKE} includes ; \ ${MAKE} depend) diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 22792f171ecd..aba5780232b0 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -20,7 +20,7 @@ COMMENT= X11/XFree86 core distribution (complete, using mini/meta-ports) LIB_DEPENDS= X11.6:${PORTSDIR}/x11/XFree86-4-libraries RUN_DEPENDS= xvinfo:${PORTSDIR}/x11/XFree86-4-clients \ ${X11BASE}/lib/X11/doc/ddx.txt:${PORTSDIR}/x11/XFree86-4-documents \ - ${X11BASE}/lib/X11/doc/html/X.7.html:${PORTSDIR}/x11/XFree86-4-manuals \ + ${X11BASE}/man/man7/X.7.gz:${PORTSDIR}/x11/XFree86-4-manuals \ ${FONT100DPI}:${PORTSDIR}/x11-fonts/XFree86-4-font100dpi \ ${FONT75DPI}:${PORTSDIR}/x11-fonts/XFree86-4-font75dpi \ ${FONTCYR}:${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic \ diff --git a/x11/libGL/Makefile b/x11/libGL/Makefile index 2cdea87d155a..af90016b6843 100644 --- a/x11/libGL/Makefile +++ b/x11/libGL/Makefile @@ -7,11 +7,13 @@ PORTNAME= libGL PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= x11 -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz -EXTRACT_ONLY= X11R6.7.0-src1.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R6.8.1-src1.tar.gz \ + X11R6.8.1-src3.tar.gz +EXTRACT_ONLY= X11R6.8.1-src1.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL library that renders using GLX or DRI @@ -36,7 +38,7 @@ BROKEN= Requires libXThrStub, which should be part of libX11 post-extract: (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/X11R6.7.0-src3.tar.gz | \ + ${DISTDIR}/${DIST_SUBDIR}/X11R6.8.1-src3.tar.gz | \ ${TAR} -xf - xc/programs/Xserver/hw/xfree86/os-support \ xc/programs/Xserver/GL) diff --git a/x11/libGL/distinfo b/x11/libGL/distinfo index b9025936ccb4..62c1647dc07b 100644 --- a/x11/libGL/distinfo +++ b/x11/libGL/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index f2eec453b845..83a0d933bc04 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -6,15 +6,13 @@ # PORTNAME= xorg-clients -PORTVERSION= 6.7.0 -PORTREVISION= 5 +PORTVERSION= 6.8.1 CATEGORIES= x11 -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src2.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src2.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X client programs and related files from X.Org diff --git a/x11/xorg-clients/distinfo b/x11/xorg-clients/distinfo index de8ed629db2a..0c514cc6b0f3 100644 --- a/x11/xorg-clients/distinfo +++ b/x11/xorg-clients/distinfo @@ -1,6 +1,6 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed +SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11/xorg-clients/files/manpages b/x11/xorg-clients/files/manpages index 483513027ba4..f7708cfc60b1 100644 --- a/x11/xorg-clients/files/manpages +++ b/x11/xorg-clients/files/manpages @@ -50,6 +50,7 @@ MAN1= Xmark.1 \ xditview.1 \ xdm.1 \ xdpyinfo.1 \ + xdriinfo.1 \ xedit.1 \ xev.1 \ xeyes.1 \ @@ -76,8 +77,14 @@ MAN1= Xmark.1 \ xmessage.1 \ xmh.1 \ xmodmap.1 \ + xmore.1 \ xon.1 \ + xphelloworld.1 \ + xplsprinters.1 \ + xprehashprinterlist.1 \ xprop.1 \ + xpsimplehelloworld.1 \ + xpxthelloworld.1 \ xrandr.1 \ xrdb.1 \ xrefresh.1 \ diff --git a/x11/xorg-clients/files/patch-dpsinfo-Imakefile b/x11/xorg-clients/files/patch-dpsinfo-Imakefile index 03f08a4f2138..b8bb1b853432 100644 --- a/x11/xorg-clients/files/patch-dpsinfo-Imakefile +++ b/x11/xorg-clients/files/patch-dpsinfo-Imakefile @@ -1,23 +1,15 @@ ---- programs/dpsinfo/Imakefile.orig Thu Mar 4 09:48:47 2004 -+++ programs/dpsinfo/Imakefile Sat May 29 16:21:20 2004 -@@ -3,7 +3,6 @@ - - DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXONLYLIB) - LOCAL_LIBRARIES = $(DPSLIB) $(XTOOLLIB) $(XONLYLIB) -- PSWRAP = PsWrap - - SRCS = iwraps.psw dpsinfo.c - -@@ -13,10 +12,10 @@ +--- programs/dpsinfo/Imakefile.orig Fri Apr 23 12:54:31 2004 ++++ programs/dpsinfo/Imakefile Tue Oct 19 20:05:08 2004 +@@ -13,10 +13,10 @@ .SUFFIXES: .psw .h -.psw.c : ProgramTargetName($(PSWRAP)) -+.psw.c : PsWrapDependency ++.psw.c : RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) -.psw.h : ProgramTargetName($(PSWRAP)) -+.psw.h : PsWrapDependency ++.psw.h : RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) depend:: $(DERIVED_FILES) diff --git a/x11/xorg-clients/files/patch-programs_Imakefile b/x11/xorg-clients/files/patch-programs_Imakefile deleted file mode 100644 index b2d7c924544b..000000000000 --- a/x11/xorg-clients/files/patch-programs_Imakefile +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- programs/Imakefile.orig Sat Jul 24 02:13:01 2004 -+++ programs/Imakefile Sat Jul 24 02:13:23 2004 -@@ -57,7 +57,6 @@ - XRXSRCDIR = xrx - #endif - XSMSRCDIR = xsm -- XTERMSRCDIR = xterm - SCRIPTSDIR = scripts - #endif - #if BuildCID -@@ -129,7 +128,7 @@ - xlsclients xlsfonts xmag xman xmessage xmh xmodmap xprop xrdb \ - xrefresh $(XRXSRCDIR) xset \ - xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \ -- $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \ -+ $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \ - $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \ - $(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \ - $(GLXCLIENTDIRS) $(XRANDRDIR) $(XCURSORGENDIR) diff --git a/x11/xorg-clients/files/patch-texteroids b/x11/xorg-clients/files/patch-texteroids index 335883a8dde4..13240cf33c2a 100644 --- a/x11/xorg-clients/files/patch-texteroids +++ b/x11/xorg-clients/files/patch-texteroids @@ -1,23 +1,15 @@ ---- programs/texteroids/Imakefile.orig Mon Sep 2 13:23:43 2002 -+++ programs/texteroids/Imakefile Mon Sep 2 13:27:13 2002 -@@ -3,7 +3,6 @@ - DEPLIBS = $(DEPDPSLIB) $(DEPXTOOLLIB) $(DEPXLIB) - LOCAL_LIBRARIES = $(XTOOLLIB) $(DPSLIB) $(XLIB) - SYS_LIBRARIES = MathLibrary -- PSWRAP = PsWrap - - SRCS = twraps.psw texteroids.c - -@@ -13,10 +12,10 @@ +--- programs/texteroids/Imakefile.orig Fri Apr 23 12:54:37 2004 ++++ programs/texteroids/Imakefile Tue Oct 19 20:07:40 2004 +@@ -13,10 +13,10 @@ .SUFFIXES: .psw .h -.psw.c : ProgramTargetName($(PSWRAP)) -+.psw.c : PsWrapDependency ++.psw.c : RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) -.psw.h : ProgramTargetName($(PSWRAP)) -+.psw.h : PsWrapDependency ++.psw.h : RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) depend:: $(DERIVED_FILES) diff --git a/x11/xorg-clients/files/patch-xdm-socket.c b/x11/xorg-clients/files/patch-xdm-socket.c deleted file mode 100644 index 01c00e51e607..000000000000 --- a/x11/xorg-clients/files/patch-xdm-socket.c +++ /dev/null @@ -1,17 +0,0 @@ -Index: programs/xdm/socket.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xdm/socket.c,v -retrieving revision 1.2 -diff -u -r1.2 socket.c ---- programs/xdm/socket.c 23 Apr 2004 19:54:42 -0000 1.2 -+++ programs/xdm/socket.c 6 Jul 2004 00:28:43 -0000 -@@ -67,6 +67,9 @@ - char *name = localHostname (); - registerHostname (name, strlen (name)); - -+ if (request_port == 0) -+ return; -+ - #if defined(IPv6) && defined(AF_INET6) - chooserFd = socket (AF_INET6, SOCK_STREAM, 0); - if (chooserFd == -1) diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist index e3f83b4a5a4b..27e0adb88a33 100644 --- a/x11/xorg-clients/pkg-plist +++ b/x11/xorg-clients/pkg-plist @@ -52,6 +52,7 @@ bin/xcutsel bin/xditview bin/xdm bin/xdpyinfo +bin/xdriinfo bin/xedit bin/xev bin/xeyes @@ -81,8 +82,14 @@ bin/xman bin/xmessage bin/xmh bin/xmodmap +bin/xmore bin/xon +bin/xphelloworld +bin/xplsprinters +bin/xprehashprinterlist bin/xprop +bin/xpsimplehelloworld +bin/xpxthelloworld bin/xrandr bin/xrdb bin/xrefresh @@ -141,6 +148,7 @@ lib/X11/app-defaults/XFontSel lib/X11/app-defaults/XLoad lib/X11/app-defaults/XLogo lib/X11/app-defaults/XLogo-color +lib/X11/app-defaults/XMore lib/X11/app-defaults/XSm lib/X11/app-defaults/Xditview lib/X11/app-defaults/Xditview-chrtr @@ -344,17 +352,26 @@ lib/X11/twm/system.twmrc lib/X11/x11perfcomp/fillblnk lib/X11/x11perfcomp/perfboth lib/X11/x11perfcomp/perfratio +@unexec if cmp -s %D/lib/X11/xdm/GiveConsole.default %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi lib/X11/xdm/GiveConsole.default +@unexec if cmp -s %D/lib/X11/xdm/TakeConsole.default %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi lib/X11/xdm/TakeConsole.default +@unexec if cmp -s %D/lib/X11/xdm/Xaccess.default %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi lib/X11/xdm/Xaccess.default +@unexec if cmp -s %D/lib/X11/xdm/Xresources.default %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi lib/X11/xdm/Xresources.default +@unexec if cmp -s %D/lib/X11/xdm/Xservers.default %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi lib/X11/xdm/Xservers.default +@unexec if cmp -s %D/lib/X11/xdm/Xsession.default %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi lib/X11/xdm/Xsession.default +@unexec if cmp -s %D/lib/X11/xdm/Xsetup_0.default %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi lib/X11/xdm/Xsetup_0.default +@unexec if cmp -s %D/lib/X11/xdm/Xwilling.default %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi lib/X11/xdm/Xwilling.default lib/X11/xdm/chooser lib/X11/xdm/pixmaps/xorg-bw.xpm lib/X11/xdm/pixmaps/xorg.xpm +@unexec if cmp -s %D/lib/X11/xdm/xdm-config.default %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi lib/X11/xdm/xdm-config.default lib/X11/xedit/lisp/indent.lsp lib/X11/xedit/lisp/lisp.lsp @@ -373,6 +390,7 @@ lib/X11/xedit/lisp/progmodes/xlog.lsp lib/X11/xedit/lisp/progmodes/xrdb.lsp lib/X11/xedit/lisp/syntax.lsp lib/X11/xedit/lisp/xedit.lsp +@unexec if cmp -s %D/lib/X11/xinit/xinitrc.default %D/lib/X11/xinit/xinitrc; then rm -f %D/lib/X11/xinit/xinitrc; fi lib/X11/xinit/xinitrc.default lib/X11/xkb/README lib/X11/xkb/README.config @@ -493,6 +511,7 @@ lib/X11/xkb/rules/sgi.lst lib/X11/xkb/rules/sun lib/X11/xkb/rules/sun.lst lib/X11/xkb/rules/xfree86 +lib/X11/xkb/rules/xfree86.lst lib/X11/xkb/rules/xorg lib/X11/xkb/rules/xorg-it.lst lib/X11/xkb/rules/xorg.lst @@ -733,6 +752,14 @@ lib/X11/xkb/types/pc lib/X11/xkb/xkbcomp lib/X11/xman.help lib/X11/xsm/system.xsm +@dirrm lib/X11/icons/redglass/cursors +@dirrm lib/X11/icons/redglass +@dirrm lib/X11/icons/whiteglass/cursors +@dirrm lib/X11/icons/whiteglass +@dirrm lib/X11/icons/handhelds/cursors +@dirrm lib/X11/icons/handhelds +@dirrm lib/X11/icons/default +@dirrm lib/X11/xkb/geometry/ibm @comment xterm workaround bin/resize diff --git a/x11/xorg-clients/scripts/configure b/x11/xorg-clients/scripts/configure index 139d289c805b..aa92ba29b024 100644 --- a/x11/xorg-clients/scripts/configure +++ b/x11/xorg-clients/scripts/configure @@ -5,6 +5,7 @@ LOCALDEF=$WRKDIR/.config rm -f $LOCALDEF echo "#define BuildServer NO" >> $LOCALDEF echo "#define BuildLBX NO" >> $LOCALDEF +echo "#define BuildXterm NO" >> $LOCALDEF echo "#define BuildFontServer NO" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF echo "#define UseInstalledLibraries YES" >> $LOCALDEF diff --git a/x11/xorg-documents/Makefile b/x11/xorg-documents/Makefile index ba5e046c81df..b15c0d59786c 100644 --- a/x11/xorg-documents/Makefile +++ b/x11/xorg-documents/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xorg-documents -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11 -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src6.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src6.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Documentation of X11 protocol and libraries from X.Org diff --git a/x11/xorg-documents/distinfo b/x11/xorg-documents/distinfo index 4b420ce9b34b..f1dbf971ca94 100644 --- a/x11/xorg-documents/distinfo +++ b/x11/xorg-documents/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src6.tar.gz) = f52fe308e14525e3fa1eeb9dcd6d83a6 -SIZE (xorg/X11R6.7.0-src6.tar.gz) = 3181606 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src6.tar.gz) = 13d9a1ebf811261434eb8a771d826c3c +SIZE (xorg/X11R6.8.1-src6.tar.gz) = 3180972 diff --git a/x11/xorg-documents/pkg-plist b/x11/xorg-documents/pkg-plist index 373ba65d9c58..0d875b15c9f7 100644 --- a/x11/xorg-documents/pkg-plist +++ b/x11/xorg-documents/pkg-plist @@ -91,3 +91,7 @@ share/doc/X11/xsmp.txt share/doc/X11/xtest.txt share/doc/X11/xtestlib.txt share/doc/X11/xv-protocol-v2.txt +@unexec rmdir %D/share/doc/X11/PDF 2>/dev/null || true +@unexec rmdir %D/share/doc/X11/PostScript 2>/dev/null || true +@unexec rmdir %D/share/doc/X11/html 2>/dev/null || true +@unexec rmdir %D/share/doc/X11 2>/dev/null || true diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index 99467852413a..70a214ea89a2 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -5,21 +5,13 @@ # $FreeBSD$ # -PORTNAME= libraries -PORTVERSION= 6.7.0 -PORTREVISION= 3 +PORTNAME= xorg-libraries +PORTVERSION= 6.8.1 CATEGORIES= x11 -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/:xorg \ - ${MASTER_SITE_XORG:S/$/:xorg/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= R6.7/tars/:xorg \ - anholt/:local -PKGNAMEPREFIX= xorg- -DISTFILES= X11R6.7.0-src1.tar.gz:xorg \ - X11R6.7.0-src3.tar.gz:xorg \ - Wraphelp2.gz:local -EXTRACT_ONLY= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X11 libraries and headers from X.Org @@ -44,9 +36,6 @@ XINSTALL_DIRS= include lib nls programs/Xserver/include \ INSTALLS_SHLIB= yes -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > ${WRKSRC}/lib/Xdmcp/Wraphelp.c - post-patch: ${CP} ${FILESDIR}/nls-Compose-microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251 @@ -69,11 +58,4 @@ PLIST_SUB+= OSMESA:="@comment " PLIST_SUB+= OSMESA:="" .endif -# sparc64 doesn't have a working libc_r yet, and -current doesn't need libXThrStub. -.if ${ARCH} == "sparc64" || ${OSVERSION} >= 500043 -PLIST_SUB+= XTHRSTUB:="@comment " -.else -PLIST_SUB+= XTHRSTUB:="" -.endif - .include <bsd.port.post.mk> diff --git a/x11/xorg-libraries/distinfo b/x11/xorg-libraries/distinfo index a07dba660207..62c1647dc07b 100644 --- a/x11/xorg-libraries/distinfo +++ b/x11/xorg-libraries/distinfo @@ -1,6 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 -MD5 (xorg/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xorg/Wraphelp2.gz) = 3376 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11/xorg-libraries/files/patch-UIThrStubs.c b/x11/xorg-libraries/files/patch-UIThrStubs.c new file mode 100644 index 000000000000..a2c94e643ad8 --- /dev/null +++ b/x11/xorg-libraries/files/patch-UIThrStubs.c @@ -0,0 +1,17 @@ +Index: lib/X11/UIThrStubs.c +=================================================================== +RCS file: /cvs/xorg/xc/lib/X11/UIThrStubs.c,v +retrieving revision 1.3 +retrieving revision 1.4 +diff -u -u -r1.3 -r1.4 +--- lib/X11/UIThrStubs.c 28 May 2004 23:26:44 -0000 1.3 ++++ lib/X11/UIThrStubs.c 13 Oct 2004 07:38:00 -0000 1.4 +@@ -99,7 +99,7 @@ + #else + #include <pthread.h> + typedef pthread_t xthread_t; +-#if __GNUC__ >= 3 ++#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) + xthread_t pthread_self() __attribute__ ((weak, alias ("_Xthr_self_stub_"))); + int pthread_mutex_init() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); + int pthread_mutex_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); diff --git a/x11/xorg-libraries/files/patch-Xcomposite-Imakefile b/x11/xorg-libraries/files/patch-Xcomposite-Imakefile new file mode 100644 index 000000000000..5aab74346231 --- /dev/null +++ b/x11/xorg-libraries/files/patch-Xcomposite-Imakefile @@ -0,0 +1,11 @@ +--- lib/Xcomposite/Imakefile.orig Fri Oct 1 17:42:38 2004 ++++ lib/Xcomposite/Imakefile Fri Oct 1 17:43:22 2004 +@@ -61,7 +61,7 @@ + RemoveFile($@) + sh ../Xcursor/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@ + +-InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig) ++InstallNonExecFile(xcomposite.pc,$(PROJECTROOT)/libdata/pkgconfig) + + clean:: + RemoveFile(xcomposite.pc) diff --git a/x11/xorg-libraries/files/patch-Xdamage-Imakefile b/x11/xorg-libraries/files/patch-Xdamage-Imakefile new file mode 100644 index 000000000000..316b3ba332fe --- /dev/null +++ b/x11/xorg-libraries/files/patch-Xdamage-Imakefile @@ -0,0 +1,11 @@ +--- lib/Xdamage/Imakefile.orig Fri Oct 1 17:42:44 2004 ++++ lib/Xdamage/Imakefile Fri Oct 1 17:44:54 2004 +@@ -61,7 +61,7 @@ + RemoveFile($@) + sh ../Xcursor/config-subst $(SUBSTVARS) < xdamage.pc.in > $@ + +-InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig) ++InstallNonExecFile(xdamage.pc,$(PROJECTROOT)/libdata/pkgconfig) + + clean:: + RemoveFile(xdamage.pc) diff --git a/x11/xorg-libraries/files/patch-Xevie-Imakefile b/x11/xorg-libraries/files/patch-Xevie-Imakefile new file mode 100644 index 000000000000..5c5dcc066606 --- /dev/null +++ b/x11/xorg-libraries/files/patch-Xevie-Imakefile @@ -0,0 +1,11 @@ +--- lib/Xevie/Imakefile.orig Fri Oct 1 17:42:49 2004 ++++ lib/Xevie/Imakefile Fri Oct 1 17:44:51 2004 +@@ -66,7 +66,7 @@ + RemoveFile($@) + sh ../Xcursor/config-subst $(SUBSTVARS) < xevie.pc.in > $@ + +-InstallNonExecFile(xevie.pc,$(USRLIBDIR)/pkgconfig) ++InstallNonExecFile(xevie.pc,$(PROJECTROOT)/libdata/pkgconfig) + + clean:: + RemoveFile(xevie.pc) diff --git a/x11/xorg-libraries/files/patch-Xfixes-Imakefile b/x11/xorg-libraries/files/patch-Xfixes-Imakefile new file mode 100644 index 000000000000..eba3ba644ed9 --- /dev/null +++ b/x11/xorg-libraries/files/patch-Xfixes-Imakefile @@ -0,0 +1,11 @@ +--- lib/Xfixes/Imakefile.orig Fri Oct 1 17:42:54 2004 ++++ lib/Xfixes/Imakefile Fri Oct 1 17:44:58 2004 +@@ -68,7 +68,7 @@ + RemoveFile($@) + sh ../Xcursor/config-subst $(SUBSTVARS) < xfixes.pc.in > $@ + +-InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig) ++InstallNonExecFile(xfixes.pc,$(PROJECTROOT)/libdata/pkgconfig) + + clean:: + RemoveFile(xfixes.pc) diff --git a/x11/xorg-libraries/files/patch-Xrender-Imakefile b/x11/xorg-libraries/files/patch-Xrender-Imakefile index 6df9d6bb0658..804b06c709ea 100644 --- a/x11/xorg-libraries/files/patch-Xrender-Imakefile +++ b/x11/xorg-libraries/files/patch-Xrender-Imakefile @@ -1,39 +1,11 @@ -Index: lib/Xrender/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/lib/Xrender/Imakefile,v -retrieving revision 1.2 -diff -u -r1.2 Imakefile ---- lib/Xrender/Imakefile 23 Apr 2004 18:43:50 -0000 1.2 -+++ lib/Xrender/Imakefile 7 Jul 2004 19:01:02 -0000 -@@ -133,6 +133,16 @@ +--- lib/Xrender/Imakefile.orig Sat Oct 16 15:41:02 2004 ++++ lib/Xrender/Imakefile Sat Oct 16 15:42:35 2004 +@@ -161,7 +161,7 @@ + RemoveFile($@) + sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@ - HEADERS = Xrender.h $(NONSTANDARD_HEADERS) - -+SUBSTVARS=prefix="$(PROJECTROOT)" \ -+ exec_prefix="$(BINDIR)" \ -+ libdir="$(USRLIBDIR)" \ -+ includedir="$(INCROOT)" \ -+ VERSION="0.8.4" \ -+ X_REQUIRES="" \ -+ RENDER_CFLAGS="" \ -+ X_NON_PKG_CFLAGS="" \ -+ X_NON_PKG_LIBS="-lX11 -lXext" -+ - #include <Library.tmpl> - - DependTarget() -@@ -142,3 +152,14 @@ - distclean:: clean - RemoveFile(Makefile) - #endif -+ -+all:: xrender.pc -+ -+xrender.pc: xrender.pc.in -+ RemoveFile($@) -+ sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@ -+ +-InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig) +InstallNonExecFile(xrender.pc,$(PROJECTROOT)/libdata/pkgconfig) -+ -+clean:: -+ RemoveFile(xrender.pc) + + clean:: + RemoveFile(xrender.pc) diff --git a/x11/xorg-libraries/files/patch-dps-Imakefile b/x11/xorg-libraries/files/patch-dps-Imakefile index ee16b18b7874..f85503bf79c0 100644 --- a/x11/xorg-libraries/files/patch-dps-Imakefile +++ b/x11/xorg-libraries/files/patch-dps-Imakefile @@ -1,37 +1,29 @@ ---- lib/dps/Imakefile.orig Thu Mar 4 09:47:01 2004 -+++ lib/dps/Imakefile Thu May 27 18:13:27 2004 -@@ -29,7 +29,6 @@ - SED = sed - AWK = awk - SORT = sort -- PSWRAP = PsWrap - - COMMONOBJECTFILES = \ - dpsclient.o\ -@@ -201,7 +200,7 @@ +--- lib/dps/Imakefile.orig Mon May 24 12:06:58 2004 ++++ lib/dps/Imakefile Fri Sep 10 22:12:26 2004 +@@ -201,8 +201,6 @@ includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS) -$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP)) -+$(DPSOPSCFILES) $(PSOPSCFILES): PsWrapDependency - +- SRCS = \ ${COMMONSOURCEFILES} \ -@@ -224,16 +223,11 @@ + ${XSOURCEFILES} \ +@@ -224,16 +222,11 @@ .SUFFIXES: .psw .h -.psw.c : HostProgramTargetName($(PSWRAP)) -+.psw.c : PsWrapDependency ++.psw.c : RunProgram(PSWRAP,-a -o $*.c -h $*.h $<) -.psw.h : HostProgramTargetName($(PSWRAP)) -+.psw.h : PsWrapDependency ++.psw.h : RunProgram(PSWRAP,-a -h $*.h $< > /dev/null) - -HostProgramTargetName($(PSWRAP)): - @echo "checking $@ over in $(PSWRAPSRC) first..."; \ -- cd $(PSWRAPSRC) && $(MAKE) pswraponly; \ +- test -d $(PSWRAPSRC) && cd $(PSWRAPSRC) && $(MAKE) pswraponly; \ - echo "okay, continuing in $(CURRENT_DIR)" includes :: $(HEADERS) diff --git a/x11/xorg-libraries/files/patch-xpm-sec b/x11/xorg-libraries/files/patch-xpm-sec index 347ab0563d6e..fcb22f47be46 100644 --- a/x11/xorg-libraries/files/patch-xpm-sec +++ b/x11/xorg-libraries/files/patch-xpm-sec @@ -1,161 +1,82 @@ +? extras/Xpm/lib/xorg681-xpm-secadd.patch Index: extras/Xpm/lib/Attrib.c =================================================================== RCS file: /cvs/xorg/xc/extras/Xpm/lib/Attrib.c,v -retrieving revision 1.1 -diff -u -r1.1 Attrib.c ---- extras/Xpm/lib/Attrib.c 14 Nov 2003 16:48:24 -0000 1.1 -+++ extras/Xpm/lib/Attrib.c 31 Oct 2004 20:12:38 -0000 -@@ -35,7 +35,7 @@ - #include "XpmI.h" - - /* 3.2 backward compatibility code */ --LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, -+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, - XpmColor ***oldct)); - - LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); -@@ -46,12 +46,15 @@ - static int - CreateOldColorTable(ct, ncolors, oldct) - XpmColor *ct; -- int ncolors; -+ unsigned int ncolors; - XpmColor ***oldct; - { +retrieving revision 1.1.1.1.6.1 +diff -u -r1.1.1.1.6.1 Attrib.c +--- extras/Xpm/lib/Attrib.c 15 Sep 2004 15:47:39 -0000 1.1.1.1.6.1 ++++ extras/Xpm/lib/Attrib.c 5 Nov 2004 03:21:02 -0000 +@@ -52,7 +52,7 @@ XpmColor **colorTable, **color; int a; +- if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) + if (ncolors >= UINT_MAX / sizeof(XpmColor *)) -+ return XpmNoMemory; -+ + return XpmNoMemory; + colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); - if (!colorTable) { - *oldct = NULL; Index: extras/Xpm/lib/CrDatFrI.c =================================================================== RCS file: /cvs/xorg/xc/extras/Xpm/lib/CrDatFrI.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 CrDatFrI.c ---- extras/Xpm/lib/CrDatFrI.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/CrDatFrI.c 31 Oct 2004 20:12:38 -0000 -@@ -124,6 +124,8 @@ +retrieving revision 1.2.4.1 +diff -u -r1.2.4.1 CrDatFrI.c +--- extras/Xpm/lib/CrDatFrI.c 15 Sep 2004 15:47:39 -0000 1.2.4.1 ++++ extras/Xpm/lib/CrDatFrI.c 5 Nov 2004 03:21:02 -0000 +@@ -124,7 +124,7 @@ */ header_nlines = 1 + image->ncolors; header_size = sizeof(char *) * header_nlines; +- if (header_size >= SIZE_MAX / sizeof(char *)) + if (header_size >= UINT_MAX / sizeof(char *)) -+ return (XpmNoMemory); + return (XpmNoMemory); header = (char **) XpmCalloc(header_size, sizeof(char *)); if (!header) - return (XpmNoMemory); -Index: extras/Xpm/lib/WrFFrI.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/WrFFrI.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 WrFFrI.c ---- extras/Xpm/lib/WrFFrI.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/WrFFrI.c 31 Oct 2004 20:12:26 -0000 -@@ -248,6 +248,8 @@ - unsigned int x, y, h; - - h = height - 1; -+ if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) -+ return XpmNoMemory; - p = buf = (char *) XpmMalloc(width * cpp + 3); - if (!buf) - return (XpmNoMemory); -Index: extras/Xpm/lib/XpmI.h -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/XpmI.h,v -retrieving revision 1.1.4.1.6.1 -diff -u -r1.1.4.1.6.1 XpmI.h ---- extras/Xpm/lib/XpmI.h 4 Mar 2004 17:46:10 -0000 1.1.4.1.6.1 -+++ extras/Xpm/lib/XpmI.h 31 Oct 2004 20:12:26 -0000 -@@ -86,6 +86,18 @@ - boundCheckingCalloc((long)(nelem),(long) (elsize)) - #endif - -+#if defined(SCO) || defined(__USLC__) -+#include <stdint.h> /* For SIZE_MAX */ -+#endif -+#include <limits.h> -+#ifndef SIZE_MAX -+# ifdef ULONG_MAX -+# define SIZE_MAX ULONG_MAX -+# else -+# define SIZE_MAX UINT_MAX -+# endif -+#endif -+ - #define XPMMAXCMTLEN BUFSIZ - typedef struct { - unsigned int type; -@@ -187,9 +199,9 @@ - } *xpmHashAtom; - - typedef struct { -- int size; -- int limit; -- int used; -+ unsigned int size; -+ unsigned int limit; -+ unsigned int used; - xpmHashAtom *atomTable; - } xpmHashTable; - Index: extras/Xpm/lib/create.c =================================================================== RCS file: /cvs/xorg/xc/extras/Xpm/lib/create.c,v -retrieving revision 1.1.4.1.6.1 -diff -u -r1.1.4.1.6.1 create.c ---- extras/Xpm/lib/create.c 4 Mar 2004 17:46:10 -0000 1.1.4.1.6.1 -+++ extras/Xpm/lib/create.c 31 Oct 2004 20:12:38 -0000 -@@ -1,3 +1,4 @@ +retrieving revision 1.2.4.1 +diff -u -r1.2.4.1 create.c +--- extras/Xpm/lib/create.c 15 Sep 2004 15:47:39 -0000 1.2.4.1 ++++ extras/Xpm/lib/create.c 5 Nov 2004 03:21:03 -0000 +@@ -1,4 +1,4 @@ +-/* $XdotOrg: xc/extras/Xpm/lib/create.c,v 1.2.4.1 2004/09/15 15:47:39 daniel Exp $ */ +/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ /* * Copyright (C) 1989-95 GROUPE BULL * -@@ -816,6 +817,9 @@ +@@ -817,7 +817,7 @@ ErrorStatus = XpmSuccess; +- if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) + if (image->ncolors >= UINT_MAX / sizeof(Pixel)) -+ return (XpmNoMemory); -+ + return (XpmNoMemory); + /* malloc pixels index tables */ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); - if (!image_pixels) -@@ -988,6 +992,10 @@ +@@ -992,8 +992,10 @@ return (XpmNoMemory); #if !defined(FOR_MSW) && !defined(AMIGA) +- if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) + if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) { + XDestroyImage(*image_return); -+ return XpmNoMemory; + return XpmNoMemory; + } /* now that bytes_per_line must have been set properly alloc data */ (*image_return)->data = (char *) XpmMalloc((*image_return)->bytes_per_line * height); -@@ -2055,6 +2063,9 @@ +@@ -2061,8 +2063,8 @@ xpmGetCmt(data, &colors_cmt); /* malloc pixels index tables */ +- if (ncolors >= SIZE_MAX / sizeof(Pixel)) +- return XpmNoMemory; + if (ncolors >= UINT_MAX / sizeof(Pixel)) + RETURN(XpmNoMemory); -+ + image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); if (!image_pixels) - RETURN(XpmNoMemory); -@@ -2309,7 +2320,8 @@ - } - obm = SelectObject(*dc, image->bitmap); - #endif -- -+ if (ncolors > 256) -+ return (XpmFileInvalid); - - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) -@@ -2356,7 +2368,7 @@ +@@ -2366,7 +2368,7 @@ /* array of pointers malloced by need */ unsigned short *cidx[256]; @@ -164,45 +85,15 @@ diff -u -r1.1.4.1.6.1 create.c bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ for (a = 0; a < ncolors; a++) { -@@ -2415,6 +2427,9 @@ - char *s; - char buf[BUFSIZ]; - -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); -+ - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; -Index: extras/Xpm/lib/data.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/data.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 data.c ---- extras/Xpm/lib/data.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/data.c 31 Oct 2004 20:12:26 -0000 -@@ -375,7 +375,7 @@ - { - if (!data->type) - *cmt = NULL; -- else if (data->CommentLength) { -+ else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) { - *cmt = (char *) XpmMalloc(data->CommentLength + 1); - strncpy(*cmt, data->Comment, data->CommentLength); - (*cmt)[data->CommentLength] = '\0'; Index: extras/Xpm/lib/hashtab.c =================================================================== RCS file: /cvs/xorg/xc/extras/Xpm/lib/hashtab.c,v -retrieving revision 1.1 -diff -u -r1.1 hashtab.c ---- extras/Xpm/lib/hashtab.c 14 Nov 2003 16:48:24 -0000 1.1 -+++ extras/Xpm/lib/hashtab.c 31 Oct 2004 20:12:38 -0000 -@@ -135,15 +135,17 @@ - xpmHashTable *table; - { - xpmHashAtom *atomTable = table->atomTable; -- int size = table->size; -+ unsigned int size = table->size; +retrieving revision 1.1.1.1.6.1 +diff -u -r1.1.1.1.6.1 hashtab.c +--- extras/Xpm/lib/hashtab.c 15 Sep 2004 15:47:39 -0000 1.1.1.1.6.1 ++++ extras/Xpm/lib/hashtab.c 5 Nov 2004 03:21:03 -0000 +@@ -138,13 +138,13 @@ + unsigned int size = table->size; xpmHashAtom *t, *p; int i; - int oldSize = size; @@ -212,198 +103,70 @@ diff -u -r1.1 hashtab.c HASH_TABLE_GROWS table->size = size; table->limit = size / 3; +- if (size >= SIZE_MAX / sizeof(*atomTable)) + if (size >= UINT_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); + return (XpmNoMemory); atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); if (!atomTable) - return (XpmNoMemory); -@@ -204,6 +206,8 @@ +@@ -206,7 +206,7 @@ table->size = INITIAL_HASH_SIZE; table->limit = table->size / 3; table->used = 0; +- if (table->size >= SIZE_MAX / sizeof(*atomTable)) + if (table->size >= UINT_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); + return (XpmNoMemory); atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); if (!atomTable) - return (XpmNoMemory); Index: extras/Xpm/lib/parse.c =================================================================== RCS file: /cvs/xorg/xc/extras/Xpm/lib/parse.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 parse.c ---- extras/Xpm/lib/parse.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/parse.c 31 Oct 2004 20:12:38 -0000 -@@ -1,3 +1,4 @@ +retrieving revision 1.2.4.1 +diff -u -r1.2.4.1 parse.c +--- extras/Xpm/lib/parse.c 15 Sep 2004 15:47:39 -0000 1.2.4.1 ++++ extras/Xpm/lib/parse.c 5 Nov 2004 03:21:03 -0000 +@@ -1,4 +1,4 @@ +-/* $XdotOrg: xc/extras/Xpm/lib/parse.c,v 1.2.4.1 2004/09/15 15:47:39 daniel Exp $ */ +/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ /* * Copyright (C) 1989-95 GROUPE BULL * -@@ -44,6 +45,24 @@ - #include <ctype.h> - #include <string.h> - -+#ifdef HAS_STRLCAT -+# define STRLCAT(dst, src, dstsize) { \ -+ if (strlcat(dst, src, dstsize) >= (dstsize)) \ -+ return (XpmFileInvalid); } -+# define STRLCPY(dst, src, dstsize) { \ -+ if (strlcpy(dst, src, dstsize) >= (dstsize)) \ -+ return (XpmFileInvalid); } -+#else -+# define STRLCAT(dst, src, dstsize) { \ -+ if ((strlen(dst) + strlen(src)) < (dstsize)) \ -+ strcat(dst, src); \ -+ else return (XpmFileInvalid); } -+# define STRLCPY(dst, src, dstsize) { \ -+ if (strlen(src) < (dstsize)) \ -+ strcpy(dst, src); \ -+ else return (XpmFileInvalid); } -+#endif -+ - LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, - unsigned int height, unsigned int ncolors, - unsigned int cpp, XpmColor *colorTable, -@@ -66,7 +85,7 @@ - unsigned int *extensions; - { - unsigned int l; -- char buf[BUFSIZ]; -+ char buf[BUFSIZ + 1]; - - if (!data->format) { /* XPM 2 or 3 */ - -@@ -175,10 +194,10 @@ - XpmColor **colorTablePtr; - xpmHashTable *hashtable; - { -- unsigned int key = 0, l, a, b; -+ unsigned int key = 0, l, a, b, len; - unsigned int curkey; /* current color key */ - unsigned int lastwaskey; /* key read */ -- char buf[BUFSIZ]; -+ char buf[BUFSIZ+1]; - char curbuf[BUFSIZ]; /* current buffer */ - char **sptr, *s; - XpmColor *color; -@@ -186,6 +205,8 @@ +@@ -205,7 +205,7 @@ char **defaults; int ErrorStatus; +- if (ncolors >= SIZE_MAX / sizeof(XpmColor)) + if (ncolors >= UINT_MAX / sizeof(XpmColor)) -+ return (XpmNoMemory); + return (XpmNoMemory); colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); if (!colorTable) - return (XpmNoMemory); -@@ -197,6 +218,10 @@ +@@ -218,7 +218,7 @@ /* * read pixel value */ +- if (cpp >= SIZE_MAX - 1) { + if (cpp >= UINT_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -234,13 +259,14 @@ - } - if (!lastwaskey && key < NKEYS) { /* open new key */ - if (curkey) { /* flush string */ -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } - defaults[curkey] = s; -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - curkey = key + 1; /* set new key */ - *curbuf = '\0'; /* reset curbuf */ -@@ -251,9 +277,9 @@ - return (XpmFileInvalid); - } - if (!lastwaskey) -- strcat(curbuf, " "); /* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf);/* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ - lastwaskey = 0; - } - } -@@ -261,12 +287,13 @@ - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -- s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = defaults[curkey] = (char *) XpmMalloc(len); - if (!s) { xpmFreeColorTable(colorTable, ncolors); return (XpmNoMemory); } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - } else { /* XPM 1 */ - /* get to the beginning of the first string */ -@@ -279,6 +306,10 @@ +@@ -306,7 +306,7 @@ /* * read pixel value */ +- if (cpp >= SIZE_MAX - 1) { + if (cpp >= UINT_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -307,16 +338,17 @@ - *curbuf = '\0'; /* init curbuf */ - while ((l = xpmNextWord(data, buf, BUFSIZ))) { - if (*curbuf != '\0') -- strcat(curbuf, " ");/* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf); /* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ - } -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { xpmFreeColorTable(colorTable, ncolors); return (XpmNoMemory); } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - color->c_color = s; - *curbuf = '\0'; /* reset curbuf */ - if (a < ncolors - 1) -@@ -341,6 +373,9 @@ - unsigned int *iptr, *iptr2; +@@ -374,7 +374,7 @@ unsigned int a, x, y; -+ if ((height > 0 && width >= SIZE_MAX / height) || + if ((height > 0 && width >= SIZE_MAX / height) || +- width * height >= SIZE_MAX / sizeof(unsigned int)) + width * height >= UINT_MAX / sizeof(unsigned int)) -+ return XpmNoMemory; + return XpmNoMemory; #ifndef FOR_MSW iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); - #else -@@ -364,6 +399,9 @@ - { - unsigned short colidx[256]; - -+ if (ncolors > 256) -+ return (XpmFileInvalid); -+ - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) - colidx[(unsigned char)colorTable[a].string[0]] = a + 1; -@@ -394,7 +432,7 @@ +@@ -432,7 +432,7 @@ /* array of pointers malloced by need */ unsigned short *cidx[256]; @@ -412,110 +175,54 @@ diff -u -r1.1.10.1 parse.c bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ for (a = 0; a < ncolors; a++) { -@@ -442,6 +480,9 @@ - char *s; - char buf[BUFSIZ]; - -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); -+ - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; Index: extras/Xpm/lib/scan.c =================================================================== RCS file: /cvs/xorg/xc/extras/Xpm/lib/scan.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 scan.c ---- extras/Xpm/lib/scan.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/scan.c 31 Oct 2004 20:12:38 -0000 -@@ -107,7 +107,8 @@ - LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, - XpmAttributes *attributes)); - --LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, -+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, -+ unsigned int ncolors, - Pixel *pixels, unsigned int mask, - unsigned int cpp, XpmAttributes *attributes)); - -@@ -232,11 +233,17 @@ - else +retrieving revision 1.2.4.1 +diff -u -r1.2.4.1 scan.c +--- extras/Xpm/lib/scan.c 15 Sep 2004 15:47:39 -0000 1.2.4.1 ++++ extras/Xpm/lib/scan.c 5 Nov 2004 03:21:03 -0000 +@@ -234,14 +234,14 @@ cpp = 0; -+ if ((height > 0 && width >= SIZE_MAX / height) || + if ((height > 0 && width >= SIZE_MAX / height) || +- width * height >= SIZE_MAX / sizeof(unsigned int)) + width * height >= UINT_MAX / sizeof(unsigned int)) -+ RETURN(XpmNoMemory); + RETURN(XpmNoMemory); pmap.pixelindex = (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); if (!pmap.pixelindex) RETURN(XpmNoMemory); +- if (pmap.size >= SIZE_MAX / sizeof(Pixel)) + if (pmap.size >= UINT_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); -+ - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); - if (!pmap.pixels) RETURN(XpmNoMemory); -@@ -301,7 +308,8 @@ + + pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); +@@ -308,7 +308,7 @@ * get rgb values and a string of char, and possibly a name for each * color */ -- +- if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) + if (pmap.ncolors >= UINT_MAX / sizeof(XpmColor)) -+ RETURN(XpmNoMemory); + RETURN(XpmNoMemory); colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); if (!colorTable) - RETURN(XpmNoMemory); -@@ -360,6 +368,8 @@ +@@ -368,7 +368,7 @@ /* first get a character string */ a = 0; +- if (cpp >= SIZE_MAX - 1) + if (cpp >= UINT_MAX - 1) -+ return (XpmNoMemory); + return (XpmNoMemory); if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) return (XpmNoMemory); - *s++ = printable[c = a % MAXPRINTABLE]; -@@ -407,7 +417,7 @@ - ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) - Display *display; - XpmColor *colors; -- int ncolors; -+ unsigned int ncolors; - Pixel *pixels; - unsigned int mask; - unsigned int cpp; -@@ -451,6 +461,8 @@ +@@ -461,7 +461,7 @@ } /* first get character strings and rgb values */ +- if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) + if (ncolors >= UINT_MAX / sizeof(XColor) || cpp >= UINT_MAX - 1) -+ return (XpmNoMemory); + return (XpmNoMemory); xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); if (!xcolors) - return (XpmNoMemory); -Index: lib/Xpm/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/lib/Xpm/Imakefile,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 Imakefile ---- lib/Xpm/Imakefile 4 Mar 2004 17:46:58 -0000 1.1.10.1 -+++ lib/Xpm/Imakefile 31 Oct 2004 20:12:26 -0000 -@@ -42,11 +42,16 @@ - SPRINTFDEF = -DVOID_SPRINTF - #endif - -+#if HasStrlcat -+STRLCATDEF = -DHAS_STRLCAT -+#endif -+ - #if defined(Win32Architecture) - ZPIPEDEF = -DNO_ZPIPE - #endif - --DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(ZPIPEDEF) $(ZFILEDEF) -+DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(STRLCATDEF) \ -+ $(ZPIPEDEF) $(ZFILEDEF) - - HEADERS = xpm.h - diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist index 6f7115e3d8db..22b530f0ce65 100644 --- a/x11/xorg-libraries/pkg-plist +++ b/x11/xorg-libraries/pkg-plist @@ -111,6 +111,8 @@ include/X11/Xaw/Panner.h include/X11/Xaw/PannerP.h include/X11/Xaw/Porthole.h include/X11/Xaw/PortholeP.h +include/X11/Xaw/Print.h +include/X11/Xaw/PrintSP.h include/X11/Xaw/Repeater.h include/X11/Xaw/RepeaterP.h include/X11/Xaw/Reports.h @@ -184,6 +186,8 @@ include/X11/Xos.h include/X11/Xos_r.h include/X11/Xosdefs.h include/X11/Xpoll.h +include/X11/XprintAppUtil/xpapputil.h +include/X11/XprintUtil/xprintutil.h include/X11/Xproto.h include/X11/Xprotostr.h include/X11/Xresource.h @@ -288,11 +292,16 @@ include/X11/extensions/XTest.h include/X11/extensions/Xag.h include/X11/extensions/Xagsrv.h include/X11/extensions/Xagstr.h +include/X11/extensions/Xcomposite.h include/X11/extensions/Xcup.h include/X11/extensions/Xcupstr.h +include/X11/extensions/Xdamage.h include/X11/extensions/Xdbe.h include/X11/extensions/Xdbeproto.h +include/X11/extensions/Xevie.h +include/X11/extensions/Xeviestr.h include/X11/extensions/Xext.h +include/X11/extensions/Xfixes.h include/X11/extensions/Xinerama.h include/X11/extensions/Xrandr.h include/X11/extensions/Xrender.h @@ -303,12 +312,14 @@ include/X11/extensions/XvMCproto.h include/X11/extensions/Xvlib.h include/X11/extensions/Xvproto.h include/X11/extensions/bigreqstr.h +include/X11/extensions/composite.h +include/X11/extensions/compositeproto.h +include/X11/extensions/damage.h +include/X11/extensions/damageproto.h +include/X11/extensions/damagewire.h include/X11/extensions/dpms.h include/X11/extensions/dpmsstr.h include/X11/extensions/extutil.h -include/X11/extensions/fontcache.h -include/X11/extensions/fontcacheP.h -include/X11/extensions/fontcachstr.h include/X11/extensions/lbxbuf.h include/X11/extensions/lbxbufstr.h include/X11/extensions/lbxdeltastr.h @@ -338,6 +349,7 @@ include/X11/extensions/shmstr.h include/X11/extensions/sync.h include/X11/extensions/syncstr.h include/X11/extensions/xcmiscstr.h +include/X11/extensions/xevieplaceholder.h include/X11/extensions/xf86bigfont.h include/X11/extensions/xf86bigfstr.h include/X11/extensions/xf86dga.h @@ -348,6 +360,8 @@ include/X11/extensions/xf86misc.h include/X11/extensions/xf86mscstr.h include/X11/extensions/xf86vmode.h include/X11/extensions/xf86vmstr.h +include/X11/extensions/xfixesproto.h +include/X11/extensions/xfixeswire.h include/X11/extensions/xtestext1.h include/X11/extensions/xteststr.h include/X11/extensions/xtrapbits.h @@ -360,12 +374,6 @@ include/X11/extensions/xtrapproto.h include/X11/fonts/FS.h include/X11/fonts/FSlib.h include/X11/fonts/FSproto.h -include/X11/fonts/codeconv/cconvversion.h -include/X11/fonts/codeconv/xttcap.h -include/X11/fonts/codeconv/xttcconv.h -include/X11/fonts/codeconv/xttcconvP.h -include/X11/fonts/codeconv/xttcommon.h -include/X11/fonts/codeconv/xttversion.h include/X11/fonts/fontenc.h include/X11/fonts/fsmasks.h include/X11/keysym.h @@ -548,8 +556,6 @@ lib/libX11.so.6 lib/libXRes.a lib/libXRes.so lib/libXRes.so.1 -%%XTHRSTUB:%%lib/libXThrStub.so -%%XTHRSTUB:%%lib/libXThrStub.so.6 lib/libXTrap.a lib/libXTrap.so lib/libXTrap.so.6 @@ -560,21 +566,31 @@ lib/libXaw.a lib/libXaw.so lib/libXaw.so.6 lib/libXaw.so.7 +lib/libXaw.so.8 +lib/libXcomposite.a +lib/libXcomposite.so +lib/libXcomposite.so.1 lib/libXcursor.a lib/libXcursor.so lib/libXcursor.so.1 +lib/libXdamage.a +lib/libXdamage.so +lib/libXdamage.so.1 lib/libXdmcp.a lib/libXdmcp.so lib/libXdmcp.so.0 +lib/libXevie.a +lib/libXevie.so +lib/libXevie.so.1 lib/libXext.a lib/libXext.so lib/libXext.so.6 +lib/libXfixes.a +lib/libXfixes.so +lib/libXfixes.so.3 lib/libXfont.a lib/libXfont.so lib/libXfont.so.1 -lib/libXfontcache.a -lib/libXfontcache.so -lib/libXfontcache.so.1 lib/libXi.a lib/libXi.so lib/libXi.so.6 @@ -593,6 +609,8 @@ lib/libXp.so.6 lib/libXpm.a lib/libXpm.so lib/libXpm.so.4 +lib/libXprintAppUtil.a +lib/libXprintUtil.a lib/libXrandr.a lib/libXrandr.so lib/libXrandr.so.2 @@ -646,5 +664,12 @@ lib/libxkbfile.so.1 lib/libxkbui.a lib/libxkbui.so lib/libxkbui.so.1 +libdata/pkgconfig/xcomposite.pc libdata/pkgconfig/xcursor.pc +libdata/pkgconfig/xdamage.pc +libdata/pkgconfig/xevie.pc +libdata/pkgconfig/xfixes.pc libdata/pkgconfig/xrender.pc +@dirrm include/X11/XprintAppUtil +@dirrm include/X11/XprintUtil +@dirrm lib/X11/locale/zh_CN.UTF-8 diff --git a/x11/xorg-manpages/Makefile b/x11/xorg-manpages/Makefile index 6a54b97cc46b..7900a6d2be85 100644 --- a/x11/xorg-manpages/Makefile +++ b/x11/xorg-manpages/Makefile @@ -5,16 +5,14 @@ # $FreeBSD$ # -PORTNAME= manpages -PORTVERSION= 6.7.0 +PORTNAME= xorg-manpages +PORTVERSION= 6.8.1 CATEGORIES= x11 -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -PKGNAMEPREFIX= xorg- -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz -EXTRACT_ONLY= X11R6.7.0-src1.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz +EXTRACT_ONLY= X11R${PORTVERSION}-src1.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X.Org library manual pages @@ -28,7 +26,7 @@ XINCLUDE_DIRS= ${XMAN_DIRS} post-extract: (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/X11R6.7.0-src3.tar.gz | \ + ${DISTDIR}/${DIST_SUBDIR}/X11R6.8.1-src3.tar.gz | \ ${TAR} -xf - xc/programs/Xserver); .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" diff --git a/x11/xorg-manpages/distinfo b/x11/xorg-manpages/distinfo index 6fd5e5d75a0d..62c1647dc07b 100644 --- a/x11/xorg-manpages/distinfo +++ b/x11/xorg-manpages/distinfo @@ -1,6 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 -MD5 (xorg/X11R6.7.0-src4.tar.gz) = 4f2ed6fe4378fe60b58b8b4c8487cab0 -SIZE (xorg/X11R6.7.0-src4.tar.gz) = 13044107 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11/xorg-manpages/files/manpages b/x11/xorg-manpages/files/manpages index 2cdddab3e21f..c2016c272820 100644 --- a/x11/xorg-manpages/files/manpages +++ b/x11/xorg-manpages/files/manpages @@ -645,6 +645,39 @@ MAN3= AllPlanes.3 \ XmbufGetVersion.3 \ XmbufGetWindowAttributes.3 \ XmbufQueryExtension.3 \ + XpCancelDoc.3 \ + XpCancelJob.3 \ + XpCancelPage.3 \ + XpCreateContext.3 \ + XpDestroyContext.3 \ + XpEndDoc.3 \ + XpEndJob.3 \ + XpEndPage.3 \ + XpFreePrinterList.3 \ + XpGetAttributes.3 \ + XpGetContext.3 \ + XpGetDocumentData.3 \ + XpGetImageResolution.3 \ + XpGetLocaleHinter.3 \ + XpGetOneAttribute.3 \ + XpGetPageDimensions.3 \ + XpGetPdmStartParams.3 \ + XpGetPrinterList.3 \ + XpGetScreenOfContext.3 \ + XpInputSelected.3 \ + XpPutDocumentData.3 \ + XpQueryExtension.3 \ + XpQueryScreens.3 \ + XpQueryVersion.3 \ + XpRehashPrinterList.3 \ + XpSelectInput.3 \ + XpSetAttributes.3 \ + XpSetContext.3 \ + XpSetImageResolution.3 \ + XpSetLocaleHinter.3 \ + XpStartDoc.3 \ + XpStartJob.3 \ + XpStartPage.3 \ Xrandr.3 \ XrmCombineDatabase.3 \ XrmCombineFileDatabase.3 \ @@ -1503,7 +1536,9 @@ MAN3= AllPlanes.3 \ gluTessNormal.3 \ gluTessProperty.3 \ gluTessVertex.3 \ - gluUnProject.3 + gluUnProject.3 \ + libXp.3 + MAN7= X.7 \ X.Org.7 \ XConsortium.7 \ diff --git a/x11/xorg-manpages/files/patch-man-Imakefile b/x11/xorg-manpages/files/patch-man-Imakefile new file mode 100644 index 000000000000..ece1a93fc226 --- /dev/null +++ b/x11/xorg-manpages/files/patch-man-Imakefile @@ -0,0 +1,11 @@ +--- doc/man/Imakefile.orig Thu Nov 11 17:13:20 2004 ++++ doc/man/Imakefile Thu Nov 11 17:13:56 2004 +@@ -33,7 +33,7 @@ + LIBMANDIRS = X11 Xt Xext Xi Xau $(XVDIR) $(GLXDIRS) $(GLUDIRS) $(DMXDIR) $(XPRINTLIBDIRS) + #endif + +-SUBDIRS = general $(LIBMANDIRS) $(MISCDIR) ++SUBDIRS = general $(LIBMANDIRS) + + all:: + diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index dd9a14158ca1..d6d61aa95422 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg -PORTVERSION= 6.7.0 -PORTREVISION= 1 +PORTVERSION= 6.8.1 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none |