Index: Mk/bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.497 diff -u -r1.497 bsd.port.mk --- Mk/bsd.port.mk 3 Aug 2004 19:03:58 -0000 1.497 +++ Mk/bsd.port.mk 3 Oct 2004 23:00:13 -0000 @@ -1477,9 +1477,6 @@ .else -.if defined(USE_IMAKE) -RUN_DEPENDS+= mkhtmlindex:${X_IMAKE_PORT} -.endif .if defined(USE_XPM) || defined(USE_GL) USE_XLIB= yes .endif @@ -1663,7 +1660,6 @@ # Miscellaneous overridable commands: GMAKE?= gmake XMKMF?= xmkmf -a -MKHTMLINDEX?= ${X11BASE}/bin/mkhtmlindex .if exists(/sbin/md5) MD5?= /sbin/md5 .elif exists(/bin/md5) @@ -2532,16 +2528,6 @@ 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} @@ -3178,9 +3164,6 @@ @(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) @@ -3189,9 +3172,6 @@ @(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 @@ -4586,21 +4566,6 @@ @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}; \ Index: Mk/bsd.sites.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.sites.mk,v retrieving revision 1.259 diff -u -r1.259 bsd.sites.mk --- Mk/bsd.sites.mk 1 Sep 2004 23:35:15 -0000 1.259 +++ Mk/bsd.sites.mk 3 Oct 2004 23:00:13 -0000 @@ -883,6 +883,7 @@ ftp://ftp.chg.ru/pub/XFree86/%SUBDIR%/source/ MASTER_SITE_XORG+= \ + http://freedesktop.org/~xorg/%SUBDIR%/ \ ftp://ftp.x.org/pub/%SUBDIR%/ \ ftp://ftp.gwdg.de/pub/x11/x.org/pub/%SUBDIR%/ \ ftp://ftp.cica.es/pub/X/pub/%SUBDIR%/ \ Index: devel/imake-6/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/imake-6/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- devel/imake-6/Makefile 23 Jul 2004 23:45:10 -0000 1.5 +++ devel/imake-6/Makefile 3 Oct 2004 23:08:27 -0000 @@ -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 @@ 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 Index: devel/imake-6/distinfo =================================================================== RCS file: /home/ncvs/ports/devel/imake-6/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- devel/imake-6/distinfo 19 Jun 2004 05:36:37 -0000 1.1 +++ devel/imake-6/distinfo 3 Oct 2004 23:00:13 -0000 @@ -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 Index: devel/imake-6/pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/imake-6/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- devel/imake-6/pkg-plist 19 Jun 2004 05:36:37 -0000 1.1 +++ devel/imake-6/pkg-plist 3 Oct 2004 23:00:13 -0000 @@ -121,19 +121,3 @@ 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 Index: devel/imake-6/files/patch-FreeBSD.cf =================================================================== RCS file: /home/ncvs/ports/devel/imake-6/files/patch-FreeBSD.cf,v retrieving revision 1.1 diff -u -r1.1 patch-FreeBSD.cf --- devel/imake-6/files/patch-FreeBSD.cf 19 Jun 2004 05:36:38 -0000 1.1 +++ devel/imake-6/files/patch-FreeBSD.cf 3 Oct 2004 23:00:13 -0000 @@ -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) Index: devel/imake-6/files/patch-Imake.tmpl =================================================================== RCS file: /home/ncvs/ports/devel/imake-6/files/patch-Imake.tmpl,v retrieving revision 1.2 diff -u -r1.2 patch-Imake.tmpl --- devel/imake-6/files/patch-Imake.tmpl 23 Jul 2004 06:27:24 -0000 1.2 +++ devel/imake-6/files/patch-Imake.tmpl 3 Oct 2004 23:00:13 -0000 @@ -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) Index: devel/imake-6/files/patch-cf-Imakefile =================================================================== RCS file: /home/ncvs/ports/devel/imake-6/files/patch-cf-Imakefile,v retrieving revision 1.1 diff -u -r1.1 patch-cf-Imakefile --- devel/imake-6/files/patch-cf-Imakefile 19 Jun 2004 05:36:38 -0000 1.1 +++ devel/imake-6/files/patch-cf-Imakefile 3 Oct 2004 23:00:13 -0000 @@ -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 \ Index: devel/imake-6/files/patch-imake.c =================================================================== RCS file: /home/ncvs/ports/devel/imake-6/files/patch-imake.c,v retrieving revision 1.1 diff -u -r1.1 patch-imake.c --- devel/imake-6/files/patch-imake.c 19 Jun 2004 05:36:38 -0000 1.1 +++ devel/imake-6/files/patch-imake.c 3 Oct 2004 23:00:13 -0000 @@ -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 Index: x11/xorg/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- x11/xorg/Makefile 25 Jul 2004 20:41:21 -0000 1.7 +++ x11/xorg/Makefile 17 Oct 2004 21:14:25 -0000 @@ -6,8 +6,7 @@ # PORTNAME= xorg -PORTVERSION= 6.7.0 -PORTREVISION= 1 +PORTVERSION= 6.8.1 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none Index: x11/xorg-clients/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-clients/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- x11/xorg-clients/Makefile 2 Sep 2004 03:15:01 -0000 1.12 +++ x11/xorg-clients/Makefile 17 Oct 2004 21:14:04 -0000 @@ -6,15 +6,13 @@ # PORTNAME= xorg-clients -PORTVERSION= 6.7.0 -PORTREVISION= 4 +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 Index: x11/xorg-clients/distinfo =================================================================== RCS file: /home/ncvs/ports/x11/xorg-clients/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11/xorg-clients/distinfo 31 May 2004 05:28:38 -0000 1.1 +++ x11/xorg-clients/distinfo 17 Oct 2004 11:18:47 -0000 @@ -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 Index: x11/xorg-clients/files/patch-dpsinfo-Imakefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-clients/files/patch-dpsinfo-Imakefile,v retrieving revision 1.1 diff -u -r1.1 patch-dpsinfo-Imakefile --- x11/xorg-clients/files/patch-dpsinfo-Imakefile 31 May 2004 05:28:38 -0000 1.1 +++ x11/xorg-clients/files/patch-dpsinfo-Imakefile 20 Oct 2004 03:05:25 -0000 @@ -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) Index: x11/xorg-clients/files/patch-programs_Imakefile =================================================================== RCS file: x11/xorg-clients/files/patch-programs_Imakefile diff -N x11/xorg-clients/files/patch-programs_Imakefile --- x11/xorg-clients/files/patch-programs_Imakefile 26 Jul 2004 20:12:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ - -$FreeBSD: ports/x11/xorg-clients/files/patch-programs_Imakefile,v 1.1 2004/07/26 20:12:44 krion Exp $ - ---- 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) Index: x11/xorg-clients/files/patch-texteroids =================================================================== RCS file: /home/ncvs/ports/x11/xorg-clients/files/patch-texteroids,v retrieving revision 1.1 diff -u -r1.1 patch-texteroids --- x11/xorg-clients/files/patch-texteroids 31 May 2004 05:28:38 -0000 1.1 +++ x11/xorg-clients/files/patch-texteroids 20 Oct 2004 03:08:00 -0000 @@ -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) Index: x11/xorg-clients/files/patch-xdm-socket.c =================================================================== RCS file: x11/xorg-clients/files/patch-xdm-socket.c diff -N x11/xorg-clients/files/patch-xdm-socket.c --- x11/xorg-clients/files/patch-xdm-socket.c 6 Jul 2004 00:53:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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) Index: x11/xorg-clients/scripts/configure =================================================================== RCS file: /home/ncvs/ports/x11/xorg-clients/scripts/configure,v retrieving revision 1.1 diff -u -r1.1 configure --- x11/xorg-clients/scripts/configure 31 May 2004 05:28:39 -0000 1.1 +++ x11/xorg-clients/scripts/configure 17 Oct 2004 11:22:46 -0000 @@ -5,6 +5,7 @@ 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 Index: x11/xorg-documents/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-documents/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- x11/xorg-documents/Makefile 2 Sep 2004 01:57:52 -0000 1.3 +++ x11/xorg-documents/Makefile 17 Oct 2004 21:12:24 -0000 @@ -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 Index: x11/xorg-documents/distinfo =================================================================== RCS file: /home/ncvs/ports/x11/xorg-documents/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11/xorg-documents/distinfo 24 Jul 2004 01:11:50 -0000 1.1 +++ x11/xorg-documents/distinfo 17 Oct 2004 20:33:04 -0000 @@ -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 Index: x11/xorg-libraries/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-libraries/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- x11/xorg-libraries/Makefile 16 Sep 2004 02:14:08 -0000 1.9 +++ x11/xorg-libraries/Makefile 17 Oct 2004 21:12:41 -0000 @@ -5,21 +5,13 @@ # $FreeBSD: ports/x11/xorg-libraries/Makefile,v 1.9 2004/09/16 02:14:08 anholt Exp $ # -PORTNAME= libraries -PORTVERSION= 6.7.0 -PORTREVISION= 2 +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 @@ 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:="" .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 Index: x11/xorg-libraries/distinfo =================================================================== RCS file: /home/ncvs/ports/x11/xorg-libraries/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11/xorg-libraries/distinfo 29 May 2004 21:03:48 -0000 1.1 +++ x11/xorg-libraries/distinfo 3 Oct 2004 23:00:13 -0000 @@ -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 Index: x11/xorg-libraries/pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11/xorg-libraries/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- x11/xorg-libraries/pkg-plist 7 Jul 2004 19:49:55 -0000 1.2 +++ x11/xorg-libraries/pkg-plist 3 Oct 2004 23:00:13 -0000 @@ -111,6 +111,8 @@ 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_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/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/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/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/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/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/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.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/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,9 @@ 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 Index: x11/xorg-libraries/files/patch-UIThrStubs.c =================================================================== RCS file: x11/xorg-libraries/files/patch-UIThrStubs.c diff -N x11/xorg-libraries/files/patch-UIThrStubs.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/xorg-libraries/files/patch-UIThrStubs.c 20 Oct 2004 03:34:19 -0000 @@ -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 + 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_"))); Index: x11/xorg-libraries/files/patch-Xcomposite-Imakefile =================================================================== RCS file: x11/xorg-libraries/files/patch-Xcomposite-Imakefile diff -N x11/xorg-libraries/files/patch-Xcomposite-Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/xorg-libraries/files/patch-Xcomposite-Imakefile 3 Oct 2004 23:00:13 -0000 @@ -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) Index: x11/xorg-libraries/files/patch-Xdamage-Imakefile =================================================================== RCS file: x11/xorg-libraries/files/patch-Xdamage-Imakefile diff -N x11/xorg-libraries/files/patch-Xdamage-Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/xorg-libraries/files/patch-Xdamage-Imakefile 3 Oct 2004 23:00:13 -0000 @@ -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) Index: x11/xorg-libraries/files/patch-Xevie-Imakefile =================================================================== RCS file: x11/xorg-libraries/files/patch-Xevie-Imakefile diff -N x11/xorg-libraries/files/patch-Xevie-Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/xorg-libraries/files/patch-Xevie-Imakefile 3 Oct 2004 23:00:13 -0000 @@ -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) Index: x11/xorg-libraries/files/patch-Xfixes-Imakefile =================================================================== RCS file: x11/xorg-libraries/files/patch-Xfixes-Imakefile diff -N x11/xorg-libraries/files/patch-Xfixes-Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/xorg-libraries/files/patch-Xfixes-Imakefile 3 Oct 2004 23:00:13 -0000 @@ -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) Index: x11/xorg-libraries/files/patch-Xrender-Imakefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-libraries/files/patch-Xrender-Imakefile,v retrieving revision 1.1 diff -u -r1.1 patch-Xrender-Imakefile --- x11/xorg-libraries/files/patch-Xrender-Imakefile 7 Jul 2004 19:49:55 -0000 1.1 +++ x11/xorg-libraries/files/patch-Xrender-Imakefile 16 Oct 2004 22:43:02 -0000 @@ -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 - - 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) Index: x11/xorg-libraries/files/patch-dps-Imakefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-libraries/files/patch-dps-Imakefile,v retrieving revision 1.1 diff -u -r1.1 patch-dps-Imakefile --- x11/xorg-libraries/files/patch-dps-Imakefile 29 May 2004 21:03:48 -0000 1.1 +++ x11/xorg-libraries/files/patch-dps-Imakefile 3 Oct 2004 23:00:13 -0000 @@ -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) Index: x11/xorg-libraries/files/patch-xpm-sec.patch4 =================================================================== RCS file: x11/xorg-libraries/files/patch-xpm-sec.patch4 diff -N x11/xorg-libraries/files/patch-xpm-sec.patch4 --- x11/xorg-libraries/files/patch-xpm-sec.patch4 16 Sep 2004 02:14:09 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,498 +0,0 @@ -Index: xc/extras/Xpm/lib/Attrib.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/Attrib.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 Attrib.c ---- extras/Xpm/lib/Attrib.c 15 Feb 2001 07:59:10 -0000 1.1.1.1 -+++ extras/Xpm/lib/Attrib.c 31 Aug 2004 23:28:59 -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,11 +46,14 @@ - static int - CreateOldColorTable(ct, ncolors, oldct) - XpmColor *ct; -- int ncolors; -+ unsigned int ncolors; - XpmColor ***oldct; - { - XpmColor **colorTable, **color; - int a; -+ -+ if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) -+ return XpmNoMemory; - - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); - if (!colorTable) { -Index: xc/extras/Xpm/lib/CrDatFrI.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/CrDatFrI.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 CrDatFrI.c ---- extras/Xpm/lib/CrDatFrI.c 19 Jan 2002 11:08:43 -0000 1.1.1.2 -+++ extras/Xpm/lib/CrDatFrI.c 31 Aug 2004 23:28:59 -0000 -@@ -124,6 +124,8 @@ - */ - header_nlines = 1 + image->ncolors; - header_size = sizeof(char *) * header_nlines; -+ if (header_size >= SIZE_MAX / sizeof(char *)) -+ return (XpmNoMemory); - header = (char **) XpmCalloc(header_size, sizeof(char *)); - if (!header) - return (XpmNoMemory); -Index: xc/extras/Xpm/lib/WrFFrI.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/WrFFrI.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 WrFFrI.c ---- extras/Xpm/lib/WrFFrI.c 19 Jan 2002 11:08:43 -0000 1.1.1.2 -+++ extras/Xpm/lib/WrFFrI.c 31 Aug 2004 23:28:59 -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: xc/extras/Xpm/lib/XpmI.h -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/XpmI.h,v -retrieving revision 1.6 -diff -u -r1.6 XpmI.h ---- extras/Xpm/lib/XpmI.h 13 Feb 2004 22:40:56 -0000 1.6 -+++ extras/Xpm/lib/XpmI.h 31 Aug 2004 23:28:59 -0000 -@@ -86,6 +86,18 @@ - boundCheckingCalloc((long)(nelem),(long) (elsize)) - #endif - -+#if defined(SCO) || defined(__USLC__) -+#include /* For SIZE_MAX */ -+#endif -+#include -+#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: xc/extras/Xpm/lib/create.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/create.c,v -retrieving revision 1.3 -diff -u -r1.3 create.c ---- extras/Xpm/lib/create.c 13 Feb 2004 22:40:56 -0000 1.3 -+++ extras/Xpm/lib/create.c 31 Aug 2004 23:28:59 -0000 -@@ -1,3 +1,4 @@ -+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ - /* - * Copyright (C) 1989-95 GROUPE BULL - * -@@ -816,6 +817,9 @@ - - ErrorStatus = XpmSuccess; - -+ if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) -+ return (XpmNoMemory); -+ - /* malloc pixels index tables */ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); - if (!image_pixels) -@@ -988,6 +992,8 @@ - return (XpmNoMemory); - - #if !defined(FOR_MSW) && !defined(AMIGA) -+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) -+ 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 +2061,9 @@ - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -+ if (ncolors >= SIZE_MAX / sizeof(Pixel)) -+ return XpmNoMemory; -+ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) - RETURN(XpmNoMemory); -@@ -2309,7 +2318,8 @@ - } - obm = SelectObject(*dc, image->bitmap); - #endif -- -+ if (ncolors > 256) -+ return (XpmFileInvalid); - - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) -@@ -2414,6 +2424,9 @@ - { - char *s; - char buf[BUFSIZ]; -+ -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); - - buf[cpp] = '\0'; - if (USE_HASHTABLE) { -Index: xc/extras/Xpm/lib/data.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/data.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 data.c ---- extras/Xpm/lib/data.c 19 Jan 2002 11:08:44 -0000 1.1.1.2 -+++ extras/Xpm/lib/data.c 31 Aug 2004 23:28:59 -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: xc/extras/Xpm/lib/hashtab.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/hashtab.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 hashtab.c ---- extras/Xpm/lib/hashtab.c 15 Feb 2001 07:59:10 -0000 1.1.1.1 -+++ extras/Xpm/lib/hashtab.c 31 Aug 2004 23:28:59 -0000 -@@ -135,7 +135,7 @@ - xpmHashTable *table; - { - xpmHashAtom *atomTable = table->atomTable; -- int size = table->size; -+ unsigned int size = table->size; - xpmHashAtom *t, *p; - int i; - int oldSize = size; -@@ -144,6 +144,8 @@ - HASH_TABLE_GROWS - table->size = size; - table->limit = size / 3; -+ if (size >= SIZE_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); -@@ -204,6 +206,8 @@ - table->size = INITIAL_HASH_SIZE; - table->limit = table->size / 3; - table->used = 0; -+ if (table->size >= SIZE_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); -Index: xc/extras/Xpm/lib/parse.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/parse.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 parse.c ---- extras/Xpm/lib/parse.c 19 Jan 2002 11:08:44 -0000 1.1.1.2 -+++ extras/Xpm/lib/parse.c 31 Aug 2004 23:28:59 -0000 -@@ -1,3 +1,4 @@ -+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ - /* - * Copyright (C) 1989-95 GROUPE BULL - * -@@ -44,6 +45,24 @@ - #include - #include - -+#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 @@ - char **defaults; - int ErrorStatus; - -+ if (ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) - return (XpmNoMemory); -@@ -197,6 +218,10 @@ - /* - * read pixel value - */ -+ if (cpp >= SIZE_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 @@ - /* - * read pixel value - */ -+ if (cpp >= SIZE_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; - unsigned int a, x, y; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= SIZE_MAX / sizeof(unsigned int)) -+ 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; -@@ -441,6 +479,9 @@ - { - char *s; - char buf[BUFSIZ]; -+ -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); - - buf[cpp] = '\0'; - if (USE_HASHTABLE) { -Index: xc/extras/Xpm/lib/scan.c -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/extras/Xpm/lib/scan.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 scan.c ---- extras/Xpm/lib/scan.c 19 Jan 2002 11:08:44 -0000 1.1.1.2 -+++ extras/Xpm/lib/scan.c 31 Aug 2004 23:28:59 -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 - cpp = 0; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= SIZE_MAX / sizeof(unsigned int)) -+ RETURN(XpmNoMemory); - pmap.pixelindex = - (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); - if (!pmap.pixelindex) - RETURN(XpmNoMemory); - -+ if (pmap.size >= SIZE_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); -+ - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); - if (!pmap.pixels) - RETURN(XpmNoMemory); -@@ -301,7 +308,8 @@ - * get rgb values and a string of char, and possibly a name for each - * color - */ -- -+ if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ RETURN(XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); - if (!colorTable) - RETURN(XpmNoMemory); -@@ -360,6 +368,8 @@ - - /* first get a character string */ - a = 0; -+ if (cpp >= SIZE_MAX - 1) -+ 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 @@ - } - - /* first get character strings and rgb values */ -+ if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) -+ return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) - return (XpmNoMemory); -Index: xc/lib/Xpm/Imakefile -=================================================================== -RCS file: /cvs/OpenBSD/XF4/xc/lib/Xpm/Imakefile,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 Imakefile ---- lib/Xpm/Imakefile 15 Feb 2001 07:56:01 -0000 1.1.1.1 -+++ lib/Xpm/Imakefile 31 Aug 2004 23:28:59 -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 - Index: x11/xorg-manpages/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xorg-manpages/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11/xorg-manpages/Makefile 2 Sep 2004 01:57:52 -0000 1.4 +++ x11/xorg-manpages/Makefile 17 Oct 2004 21:13:57 -0000 @@ -5,16 +5,14 @@ # $FreeBSD: ports/x11/xorg-manpages/Makefile,v 1.4 2004/09/02 01:57:52 lesi Exp $ # -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 Index: x11/xorg-manpages/distinfo =================================================================== RCS file: /home/ncvs/ports/x11/xorg-manpages/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11/xorg-manpages/distinfo 29 May 2004 21:10:21 -0000 1.1 +++ x11/xorg-manpages/distinfo 17 Oct 2004 11:27:17 -0000 @@ -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 Index: x11/xorg-manpages/files/manpages =================================================================== RCS file: /home/ncvs/ports/x11/xorg-manpages/files/manpages,v retrieving revision 1.1 diff -u -r1.1 manpages --- x11/xorg-manpages/files/manpages 29 May 2004 21:10:21 -0000 1.1 +++ x11/xorg-manpages/files/manpages 17 Oct 2004 20:31:24 -0000 @@ -1,4 +1,5 @@ -MAN1= Xserver.1 +MAN1= Xserver.1 \ + dumpkeymap.1 MAN3= AllPlanes.3 \ BitmapBitOrder.3 \ @@ -645,6 +646,39 @@ 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 +1537,9 @@ gluTessNormal.3 \ gluTessProperty.3 \ gluTessVertex.3 \ - gluUnProject.3 + gluUnProject.3 \ + libXp.3 + MAN7= X.7 \ X.Org.7 \ XConsortium.7 \ Index: x11-fonts/xorg-fonts-100dpi/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-100dpi/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/xorg-fonts-100dpi/Makefile 2 Sep 2004 01:57:52 -0000 1.4 +++ x11-fonts/xorg-fonts-100dpi/Makefile 17 Oct 2004 00:32:36 -0000 @@ -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 Index: x11-fonts/xorg-fonts-100dpi/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-100dpi/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/xorg-fonts-100dpi/distinfo 31 May 2004 03:18:51 -0000 1.1 +++ x11-fonts/xorg-fonts-100dpi/distinfo 17 Oct 2004 00:32:43 -0000 @@ -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 Index: x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 =================================================================== RCS file: x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 diff -N x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11-fonts/xorg-fonts-100dpi/files/patch-bug-1560 20 Oct 2004 03:26:22 -0000 @@ -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 Index: x11-fonts/xorg-fonts-75dpi/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-75dpi/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/xorg-fonts-75dpi/Makefile 2 Sep 2004 01:57:52 -0000 1.4 +++ x11-fonts/xorg-fonts-75dpi/Makefile 17 Oct 2004 00:32:30 -0000 @@ -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 Index: x11-fonts/xorg-fonts-75dpi/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-75dpi/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/xorg-fonts-75dpi/distinfo 31 May 2004 03:19:42 -0000 1.1 +++ x11-fonts/xorg-fonts-75dpi/distinfo 16 Oct 2004 22:44:03 -0000 @@ -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 Index: x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 =================================================================== RCS file: x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 diff -N x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11-fonts/xorg-fonts-75dpi/files/patch-bug-1560 20 Oct 2004 03:26:22 -0000 @@ -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 Index: x11-fonts/xorg-fonts-cyrillic/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-cyrillic/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/xorg-fonts-cyrillic/Makefile 2 Sep 2004 01:57:52 -0000 1.4 +++ x11-fonts/xorg-fonts-cyrillic/Makefile 17 Oct 2004 00:33:16 -0000 @@ -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 Index: x11-fonts/xorg-fonts-cyrillic/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-cyrillic/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/xorg-fonts-cyrillic/distinfo 31 May 2004 03:20:52 -0000 1.1 +++ x11-fonts/xorg-fonts-cyrillic/distinfo 17 Oct 2004 00:35:39 -0000 @@ -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 Index: x11-fonts/xorg-fonts-encodings/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-encodings/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/xorg-fonts-encodings/Makefile 2 Sep 2004 01:57:52 -0000 1.4 +++ x11-fonts/xorg-fonts-encodings/Makefile 17 Oct 2004 00:33:30 -0000 @@ -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 Index: x11-fonts/xorg-fonts-encodings/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-encodings/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/xorg-fonts-encodings/distinfo 31 May 2004 03:17:29 -0000 1.1 +++ x11-fonts/xorg-fonts-encodings/distinfo 17 Oct 2004 00:35:35 -0000 @@ -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 Index: x11-fonts/xorg-fonts-encodings/pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-encodings/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- x11-fonts/xorg-fonts-encodings/pkg-plist 31 May 2004 03:17:29 -0000 1.1 +++ x11-fonts/xorg-fonts-encodings/pkg-plist 17 Oct 2004 00:43:42 -0000 @@ -16,6 +16,9 @@ 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-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 Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-miscbitmaps/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/xorg-fonts-miscbitmaps/Makefile 2 Sep 2004 01:57:52 -0000 1.4 +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile 17 Oct 2004 00:32:57 -0000 @@ -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 Index: x11-fonts/xorg-fonts-miscbitmaps/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-miscbitmaps/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/xorg-fonts-miscbitmaps/distinfo 31 May 2004 03:21:30 -0000 1.1 +++ x11-fonts/xorg-fonts-miscbitmaps/distinfo 17 Oct 2004 00:35:30 -0000 @@ -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 Index: x11-fonts/xorg-fonts-truetype/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-truetype/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/xorg-fonts-truetype/Makefile 2 Sep 2004 01:57:53 -0000 1.4 +++ x11-fonts/xorg-fonts-truetype/Makefile 17 Oct 2004 00:33:47 -0000 @@ -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 Index: x11-fonts/xorg-fonts-truetype/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-truetype/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/xorg-fonts-truetype/distinfo 31 May 2004 03:22:09 -0000 1.1 +++ x11-fonts/xorg-fonts-truetype/distinfo 17 Oct 2004 00:35:25 -0000 @@ -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 Index: x11-fonts/xorg-fonts-type1/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-type1/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-fonts/xorg-fonts-type1/Makefile 2 Sep 2004 01:57:53 -0000 1.4 +++ x11-fonts/xorg-fonts-type1/Makefile 17 Oct 2004 00:35:00 -0000 @@ -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 Index: x11-fonts/xorg-fonts-type1/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts-type1/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-fonts/xorg-fonts-type1/distinfo 31 May 2004 03:11:07 -0000 1.1 +++ x11-fonts/xorg-fonts-type1/distinfo 17 Oct 2004 00:35:19 -0000 @@ -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 Index: x11-servers/xorg-fontserver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-fontserver/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-servers/xorg-fontserver/Makefile 2 Sep 2004 01:57:53 -0000 1.4 +++ x11-servers/xorg-fontserver/Makefile 17 Oct 2004 01:09:31 -0000 @@ -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 Index: x11-servers/xorg-fontserver/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-fontserver/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-servers/xorg-fontserver/distinfo 11 Jun 2004 05:36:11 -0000 1.1 +++ x11-servers/xorg-fontserver/distinfo 17 Oct 2004 01:11:11 -0000 @@ -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 Index: x11-servers/xorg-nestserver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-nestserver/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- x11-servers/xorg-nestserver/Makefile 23 Jul 2004 23:46:01 -0000 1.2 +++ x11-servers/xorg-nestserver/Makefile 17 Oct 2004 01:15:22 -0000 @@ -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 Index: x11-servers/xorg-nestserver/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-nestserver/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-servers/xorg-nestserver/distinfo 23 Jul 2004 18:37:31 -0000 1.1 +++ x11-servers/xorg-nestserver/distinfo 17 Oct 2004 01:15:25 -0000 @@ -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 Index: x11-servers/xorg-printserver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-printserver/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-servers/xorg-printserver/Makefile 2 Sep 2004 01:57:53 -0000 1.4 +++ x11-servers/xorg-printserver/Makefile 17 Oct 2004 01:43:17 -0000 @@ -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 @@ XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver +MAN7= Xprint.7 + .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include .if ${X_WINDOW_SYSTEM:L} != xorg Index: x11-servers/xorg-printserver/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-printserver/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-servers/xorg-printserver/distinfo 19 Jun 2004 01:54:48 -0000 1.1 +++ x11-servers/xorg-printserver/distinfo 17 Oct 2004 01:31:00 -0000 @@ -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 Index: x11-servers/xorg-printserver/pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-printserver/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- x11-servers/xorg-printserver/pkg-plist 19 Jun 2004 01:54:48 -0000 1.1 +++ x11-servers/xorg-printserver/pkg-plist 17 Oct 2004 01:42:08 -0000 @@ -1 +1,868 @@ 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 Index: x11-servers/xorg-server/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- x11-servers/xorg-server/Makefile 26 Sep 2004 14:18:42 -0000 1.17 +++ x11-servers/xorg-server/Makefile 20 Oct 2004 03:00:50 -0000 @@ -5,16 +5,13 @@ # $FreeBSD: ports/x11-servers/xorg-server/Makefile,v 1.17 2004/09/26 14:18:42 lesi Exp $ # -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 Index: x11-servers/xorg-server/Makefile.inc =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/Makefile.inc,v retrieving revision 1.8 diff -u -r1.8 Makefile.inc --- x11-servers/xorg-server/Makefile.inc 12 Sep 2004 20:35:08 -0000 1.8 +++ x11-servers/xorg-server/Makefile.inc 3 Oct 2004 23:00:13 -0000 @@ -41,17 +41,10 @@ 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 .if !target(do-configure) @@ -90,6 +83,5 @@ @for dir in ${XMAN_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ done - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html .endif Index: x11-servers/xorg-server/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-servers/xorg-server/distinfo 10 May 2004 05:04:59 -0000 1.1 +++ x11-servers/xorg-server/distinfo 3 Oct 2004 23:00:13 -0000 @@ -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 Index: x11-servers/xorg-server/pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- x11-servers/xorg-server/pkg-plist 31 Aug 2004 00:18:26 -0000 1.4 +++ x11-servers/xorg-server/pkg-plist 17 Oct 2004 11:17:48 -0000 @@ -36,18 +36,23 @@ 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/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/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/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/tek4957_drv.o lib/modules/input/void_drv.o lib/modules/input/wacom_drv.o -%%I386%%lib/modules/libafb.a +%%AMD64_I386%%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 Index: x11-servers/xorg-server/files/patch-FreeBSD.cf =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/files/patch-FreeBSD.cf,v retrieving revision 1.2 diff -u -r1.2 patch-FreeBSD.cf --- x11-servers/xorg-server/files/patch-FreeBSD.cf 18 May 2004 05:29:03 -0000 1.2 +++ x11-servers/xorg-server/files/patch-FreeBSD.cf 3 Oct 2004 23:00:13 -0000 @@ -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 Index: x11-servers/xorg-server/files/patch-Library.tmpl =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/files/patch-Library.tmpl,v retrieving revision 1.1 diff -u -r1.1 patch-Library.tmpl --- x11-servers/xorg-server/files/patch-Library.tmpl 29 May 2004 01:04:23 -0000 1.1 +++ x11-servers/xorg-server/files/patch-Library.tmpl 3 Oct 2004 23:00:13 -0000 @@ -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 Index: x11-servers/xorg-server/files/patch-X11.tmpl =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/files/patch-X11.tmpl,v retrieving revision 1.2 diff -u -r1.2 patch-X11.tmpl --- x11-servers/xorg-server/files/patch-X11.tmpl 31 May 2004 02:56:22 -0000 1.2 +++ x11-servers/xorg-server/files/patch-X11.tmpl 3 Oct 2004 23:00:13 -0000 @@ -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 Index: x11-servers/xorg-server/files/patch-bus-Imakefile =================================================================== RCS file: x11-servers/xorg-server/files/patch-bus-Imakefile diff -N x11-servers/xorg-server/files/patch-bus-Imakefile --- x11-servers/xorg-server/files/patch-bus-Imakefile 11 May 2004 08:12:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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) - Index: x11-servers/xorg-server/files/patch-fb-renderfixes.diff =================================================================== RCS file: x11-servers/xorg-server/files/patch-fb-renderfixes.diff diff -N x11-servers/xorg-server/files/patch-fb-renderfixes.diff --- x11-servers/xorg-server/files/patch-fb-renderfixes.diff 18 May 2004 05:29:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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, Index: x11-servers/xorg-server/files/patch-kernel-Imakefile =================================================================== RCS file: x11-servers/xorg-server/files/patch-kernel-Imakefile diff -N x11-servers/xorg-server/files/patch-kernel-Imakefile --- x11-servers/xorg-server/files/patch-kernel-Imakefile 10 May 2004 05:04:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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) Index: x11-servers/xorg-server/files/patch-linux.cf =================================================================== RCS file: x11-servers/xorg-server/files/patch-linux.cf diff -N x11-servers/xorg-server/files/patch-linux.cf --- x11-servers/xorg-server/files/patch-linux.cf 10 May 2004 05:04:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 Index: x11-servers/xorg-server/files/patch-loadmod.c =================================================================== RCS file: x11-servers/xorg-server/files/patch-loadmod.c diff -N x11-servers/xorg-server/files/patch-loadmod.c --- x11-servers/xorg-server/files/patch-loadmod.c 10 May 2004 05:05:00 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 - #include Index: x11-servers/xorg-server/files/patch-xf86cfg-Imakefile =================================================================== RCS file: x11-servers/xorg-server/files/patch-xf86cfg-Imakefile diff -N x11-servers/xorg-server/files/patch-xf86cfg-Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11-servers/xorg-server/files/patch-xf86cfg-Imakefile 3 Oct 2004 23:00:13 -0000 @@ -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\ Index: x11-servers/xorg-server/files/patch-xf86drmCompat.c =================================================================== RCS file: x11-servers/xorg-server/files/patch-xf86drmCompat.c diff -N x11-servers/xorg-server/files/patch-xf86drmCompat.c --- x11-servers/xorg-server/files/patch-xf86drmCompat.c 31 Aug 2004 00:18:27 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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) Index: x11-servers/xorg-server/files/patch-xf86fbman.c =================================================================== RCS file: x11-servers/xorg-server/files/patch-xf86fbman.c diff -N x11-servers/xorg-server/files/patch-xf86fbman.c --- x11-servers/xorg-server/files/patch-xf86fbman.c 2 Sep 2004 21:46:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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) Index: x11-servers/xorg-server/files/patch-xorg.cf =================================================================== RCS file: x11-servers/xorg-server/files/patch-xorg.cf diff -N x11-servers/xorg-server/files/patch-xorg.cf --- x11-servers/xorg-server/files/patch-xorg.cf 31 Aug 2004 00:18:27 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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 Index: x11-servers/xorg-server/scripts/configure =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server/scripts/configure,v retrieving revision 1.3 diff -u -r1.3 configure --- x11-servers/xorg-server/scripts/configure 19 Jun 2004 05:51:45 -0000 1.3 +++ x11-servers/xorg-server/scripts/configure 17 Oct 2004 02:03:53 -0000 @@ -14,6 +14,8 @@ 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 Index: x11-servers/xorg-vfbserver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-vfbserver/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- x11-servers/xorg-vfbserver/Makefile 2 Sep 2004 01:57:53 -0000 1.4 +++ x11-servers/xorg-vfbserver/Makefile 17 Oct 2004 01:15:47 -0000 @@ -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 Index: x11-servers/xorg-vfbserver/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-vfbserver/distinfo,v retrieving revision 1.1 diff -u -r1.1 distinfo --- x11-servers/xorg-vfbserver/distinfo 19 Jun 2004 02:02:13 -0000 1.1 +++ x11-servers/xorg-vfbserver/distinfo 17 Oct 2004 01:18:27 -0000 @@ -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