diff options
| author | lesi <lesi@FreeBSD.org> | 2005-06-15 10:40:03 +0800 |
|---|---|---|
| committer | lesi <lesi@FreeBSD.org> | 2005-06-15 10:40:03 +0800 |
| commit | ecf40d2a6837b577969dd569157afeaf4ab4fa83 (patch) | |
| tree | b68b5534754d7d526398bac500532d65e8823573 | |
| parent | 4e3306ebebda9d068a5b2af721a79204736773b2 (diff) | |
| download | freebsd-ports-gnome-ecf40d2a6837b577969dd569157afeaf4ab4fa83.tar.gz freebsd-ports-gnome-ecf40d2a6837b577969dd569157afeaf4ab4fa83.tar.zst freebsd-ports-gnome-ecf40d2a6837b577969dd569157afeaf4ab4fa83.zip | |
Upgrade to XFree86 4.5.0.
Ports changes:
- Drop dependency on x11/wrapper. X server already contains this code
(programs/Xserver/os/utils.c rev. 3.58).
- Install default SecurityPolicy with XFree86-4-libraries, thus avoiding
plists and who-owns-what complications between different fooServer ports.
Copy default file to real one if that doesn't exist and remove both upon
uninstall if they are the same.
- Revert change to Imake.rules rev. 3.132 in devel/imake-4 port, since
couple of ports break with this change
(devel/imake-4/files/patch-Imake.rules)
- Add grehans patches for PPC [1]
- Several of directories that were previously in /etc/mtree/BSD.x11-4.dist
were moved to respective ports pkg-plists
PR: [1] 78345, 78346, 78348, 78352, 78353, 78354, 78355, 78356
110 files changed, 996 insertions, 2499 deletions
diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile index 130c0a734cae..7fbc27c99eef 100644 --- a/devel/imake-4/Makefile +++ b/devel/imake-4/Makefile @@ -6,13 +6,12 @@ # PORTNAME= imake -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= Imake and other utilities from XFree86 @@ -21,7 +20,7 @@ CONFLICTS= imake-6* PREFIX?= ${X11BASE} MTREE_FILE= /etc/mtree/BSD.x11-4.dist -USE_PERL5= YES +USE_PERL5= yes USE_REINPLACE= yes .ifdef USE_IMAKE @@ -36,7 +35,6 @@ IGNORE= is part of XFree86-4 DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc/config -PATCH_DIST_ARGS= --force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true MAN1= ccmakedep.1 \ cleanlinks.1 \ gccmakedep.1 \ diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo index 0559e773d23a..7cd266868d78 100644 --- a/devel/imake-4/distinfo +++ b/devel/imake-4/distinfo @@ -1,4 +1,4 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/devel/imake-4/files/patch-Imake.rules b/devel/imake-4/files/patch-Imake.rules new file mode 100644 index 000000000000..cce69202137c --- /dev/null +++ b/devel/imake-4/files/patch-Imake.rules @@ -0,0 +1,139 @@ +--- cf/Imake.rules.orig Sun Jun 5 02:56:52 2005 ++++ cf/Imake.rules Sun Jun 5 02:56:37 2005 +@@ -1198,7 +1198,7 @@ + + #ifndef InstallNamedTarget + #define InstallNamedTarget(step,srcname,flags,dest,dstname) @@\ +-step:: @@\ ++step:: srcname @@\ + MakeDir($(DESTDIR)dest) @@\ + InstallNamedInline(srcname,flags,dest,dstname) + #endif /* InstallNamedTarget */ +@@ -1211,7 +1211,7 @@ + */ + #ifndef InstallNamedTargetNoClobber + #define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname) @@\ +-step:: @@\ ++step:: srcname @@\ + MakeDir($(DESTDIR)dest) @@\ + @if [ -f $(DESTDIR)dest/dstname ]; then \ @@\ + echo "Not overwriting existing" $(DESTDIR)dest/dstname; \ @@\ +@@ -1233,7 +1233,7 @@ + */ + #ifndef InstallLibrary + #define InstallLibrary(libname,dest) @@\ +-install:: @@\ ++install:: LibraryTargetName(libname) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\ + RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname)) +@@ -1278,7 +1278,7 @@ + */ + #ifndef MergeIntoInstalledLibrary + #define MergeIntoInstalledLibrary(tolib,fromlib) @@\ +-install:: @@\ ++install:: fromlib @@\ + $(SCRIPTSRC)/mergelib $(DESTDIR)tolib fromlib + #endif /* MergeIntoInstalledLibrary */ + +@@ -1350,7 +1350,7 @@ + @@\ + CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +-install.man:: @@\ ++install.man:: file.$(MANNEWSUFFIX) @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ + $(DESTDIR)destdir/dest.suffix +@@ -1382,7 +1382,7 @@ + @@\ + CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +-install.man:: @@\ ++install.man:: file.$(MANNEWSUFFIX) @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ +@@ -1396,7 +1396,7 @@ + @@\ + CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +-install.man:: @@\ ++install.man:: file.$(MANNEWSUFFIX) @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.suffix* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ +@@ -1406,7 +1406,7 @@ + + #ifndef InstallMultipleMan + #define InstallMultipleMan(list,dest) @@\ +-install.man:: @@\ ++install.man:: list @@\ + MakeDir($(DESTDIR)dest) @@\ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + for i in list; do \ @@\ +@@ -1507,9 +1507,9 @@ + dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\ + RemoveFiles(dest.suffix.html dest.suffix-html) @@\ + RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\ +- > dest.suffix-html) && $(MV) dest.suffix-html $@ @@\ ++ > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html @@\ + @@\ +-install.man:: @@\ ++install.man:: dest.suffix.html @@\ + MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ + @(SUF=`expr suffix \: '\(.\)'`; \ @@\ + set -x; \ @@\ +@@ -1525,7 +1525,7 @@ + #ifndef InstallHtmlManPageAliases + #if BuildHtmlManPages + #define InstallHtmlManPageAliases(file,aliases,suffix) @@\ +-install.man:: @@\ ++install.man:: file.suffix.html @@\ + @SUF=`expr suffix \: '\(.\)'`; \ @@\ + for i in aliases; do (set -x; \ @@\ + RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \ @@\ +@@ -1616,7 +1616,7 @@ + */ + #ifndef InstallNonExec + #define InstallNonExec(file,dest) @@\ +-install:: @@\ ++install:: file @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) file $(DESTDIR)dest + #endif /* InstallNonExec */ + +@@ -1756,7 +1756,7 @@ + MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ + @MakeFlagsToShellFlags(i,set +e); \ @@\ + if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ +- RELPATH=`echo opath/cdir | \ @@\ ++ RELPATH=`cd opath/cdir; pwd | \ @@\ + sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\ + cd Concat($(DESTDIR),opath/cdir); \ @@\ + if [ -d rdir -a ! -h rdir ]; then \ @@\ +@@ -1803,7 +1803,7 @@ + MakeDir(Concat($(DESTDIR),npath)) @@\ + @MakeFlagsToShellFlags(i,set +e); \ @@\ + if [ -d Concat($(DESTDIR),opath) ]; then \ @@\ +- RELPATH=`echo opath | \ @@\ ++ RELPATH=`cd opath; pwd | \ @@\ + sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ + cd Concat($(DESTDIR),opath); \ @@\ + if [ -f lfile -a ! -h lfile ]; then \ @@\ +@@ -3607,14 +3607,14 @@ + */ + #ifndef InstallDynamicModule + #define InstallDynamicModule(module,dest,subdir) @@\ +-install:: @@\ ++install:: module @@\ + MakeDir($(DESTDIR)dest/subdir) @@\ + $(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir + #endif + + #ifndef InstallDynamicNamedModule + #define InstallDynamicNamedModule(module,instname,dest,subdir) @@\ +-install:: @@\ ++install:: module @@\ + MakeDir($(DESTDIR)dest/subdir) @@\ + $(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir/instname + #endif diff --git a/devel/imake-4/files/patch-amd64 b/devel/imake-4/files/patch-amd64 deleted file mode 100644 index 7e786cf3d680..000000000000 --- a/devel/imake-4/files/patch-amd64 +++ /dev/null @@ -1,22 +0,0 @@ ---- imake/imakemdep.h.orig Mon Dec 29 20:53:52 2003 -+++ imake/imakemdep.h Tue Mar 2 11:05:16 2004 -@@ -374,6 +374,9 @@ - # ifdef __AMD64__ - "-D__AMD64__", - # endif -+# ifdef __amd64__ -+ "-D__amd64__", -+# endif - # ifdef __x86_64__ - "-D__AMD64__", - # endif -@@ -1271,6 +1274,9 @@ - # if defined (__AMD64__) || defined (__x86_64__) - {"__AMD64__", "1"}, - {"__x86_64__", "1"}, -+# endif -+# if defined (__amd64__) -+ {"__amd64__", "1"}, - # endif - # ifdef __i386 - {"__i386", "1"}, diff --git a/devel/imake-4/files/patch-cf-Imakefile b/devel/imake-4/files/patch-cf-Imakefile deleted file mode 100644 index a767e900338f..000000000000 --- a/devel/imake-4/files/patch-cf-Imakefile +++ /dev/null @@ -1,12 +0,0 @@ ---- cf/Imakefile.orig Sun Nov 9 01:41:04 2003 -+++ cf/Imakefile Sun Nov 9 01:41:05 2003 -@@ -77,7 +77,8 @@ - sunLib.tmpl \ - sv3Lib.tmpl \ - sv4Lib.tmpl \ --xf86.tmpl -+xf86.tmpl \ -+xttMod.tmpl - - CFFILES = \ - Imake.cf \ diff --git a/devel/imake-4/files/patch-h b/devel/imake-4/files/patch-h deleted file mode 100644 index ec57f029eeb9..000000000000 --- a/devel/imake-4/files/patch-h +++ /dev/null @@ -1,29 +0,0 @@ ---- cf/Imake.rules.orig Tue Dec 18 05:00:37 2001 -+++ cf/Imake.rules Mon Jan 21 02:34:48 2002 -@@ -1399,7 +1399,7 @@ - dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\ - RemoveFiles(dest.suffix.html dest.suffix-html) @@\ - RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\ -- > dest.suffix-html) && $(MV) dest.suffix-html $@ @@\ -+ > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html @@\ - @@\ - install.man:: dest.suffix.html @@\ - MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ -@@ -1644,7 +1644,7 @@ - MakeDir(Concat($(DESTDIR),npath/mdir)) @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\ -- RELPATH=`echo opath/cdir | \ @@\ -+ RELPATH=`cd opath/cdir; pwd | \ @@\ - sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\ - cd Concat($(DESTDIR),opath/cdir); \ @@\ - if [ -d rdir -a ! -h rdir ]; then \ @@\ -@@ -1691,7 +1691,7 @@ - MakeDir(Concat($(DESTDIR),npath)) @@\ - @MakeFlagsToShellFlags(i,set +e); \ @@\ - if [ -d Concat($(DESTDIR),opath) ]; then \ @@\ -- RELPATH=`echo opath | \ @@\ -+ RELPATH=`cd opath; pwd | \ @@\ - sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\ - cd Concat($(DESTDIR),opath); \ @@\ - if [ -f lfile -a ! -h lfile ]; then \ @@\ diff --git a/devel/imake-4/pkg-plist b/devel/imake-4/pkg-plist index 261dbcb08bf0..821776a84b32 100644 --- a/devel/imake-4/pkg-plist +++ b/devel/imake-4/pkg-plist @@ -118,4 +118,4 @@ lib/X11/config/xf86.rules lib/X11/config/xf86.tmpl lib/X11/config/xf86site.def lib/X11/config/xfree86.cf -lib/X11/config/xttMod.tmpl +@dirrm lib/X11/config diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure index d4fd250860b1..8a2337008f75 100644 --- a/devel/imake-4/scripts/configure +++ b/devel/imake-4/scripts/configure @@ -47,6 +47,7 @@ echo "#define HasFontconfig YES" >> $F echo "#define FontconfigDir ${PREFIX}" >> $F echo "#define HasLibpng YES" >> $F echo "#define LibpngDir ${LOCALBASE}" >> $F +echo "#define DocDir ${PREFIX}/share/doc/XFree86" >> $F echo "#define BuildHtmlManPages NO" >> $F # Never install something to outside ${X11BASE} echo "#define NothingOutsideProjectRoot YES" >> $F diff --git a/graphics/xfree86-dri/Makefile b/graphics/xfree86-dri/Makefile index 90fa5d05371a..226ffcab1843 100644 --- a/graphics/xfree86-dri/Makefile +++ b/graphics/xfree86-dri/Makefile @@ -6,13 +6,13 @@ # PORTNAME= xfree86-dri -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} -DISTFILES= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL hardware acceleration drivers for XFree86 @@ -24,7 +24,7 @@ EXTRA_PATCHES+= ${FILESDIR}/patch-GL-Imakefile ONLY_FOR_ARCHS= i386 alpha amd64 XBUILD_DIRS= lib/GL -XINSTALL_DIRS= lib/GL/mesa/src/drv +XINSTALL_DIRS= lib/GL/mesa/drivers/dri .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> diff --git a/graphics/xfree86-dri/distinfo b/graphics/xfree86-dri/distinfo index ba2d5d81e5e3..5cb3430994ae 100644 --- a/graphics/xfree86-dri/distinfo +++ b/graphics/xfree86-dri/distinfo @@ -1,6 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/graphics/xfree86-dri/pkg-plist b/graphics/xfree86-dri/pkg-plist index fc64212b98f0..6f11f4ea69f2 100644 --- a/graphics/xfree86-dri/pkg-plist +++ b/graphics/xfree86-dri/pkg-plist @@ -1,9 +1,11 @@ lib/modules/dri/gamma_dri.so %%ALPHA_NA%%lib/modules/dri/i810_dri.so -%%I386%%lib/modules/dri/i830_dri.so +%%I386%%lib/modules/dri/i915_dri.so lib/modules/dri/mga_dri.so lib/modules/dri/r128_dri.so lib/modules/dri/r200_dri.so lib/modules/dri/radeon_dri.so %%I386%%lib/modules/dri/sis_dri.so %%AMD64_NA%%lib/modules/dri/tdfx_dri.so +@dirrm lib/modules/dri +@unexec rmdir %D/lib/modules 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile index cc18c68c45c1..5cf745b83d2f 100644 --- a/x11-fonts/XFree86-4-font100dpi/Makefile +++ b/x11-fonts/XFree86-4-font100dpi/Makefile @@ -6,12 +6,12 @@ # PORTNAME= font100dpi -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 bitmap 100 dpi fonts diff --git a/x11-fonts/XFree86-4-font100dpi/distinfo b/x11-fonts/XFree86-4-font100dpi/distinfo index 68a120863349..06ebae3b0e40 100644 --- a/x11-fonts/XFree86-4-font100dpi/distinfo +++ b/x11-fonts/XFree86-4-font100dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-font100dpi/pkg-plist b/x11-fonts/XFree86-4-font100dpi/pkg-plist index e490a38b7b26..ce6bdbade4c1 100644 --- a/x11-fonts/XFree86-4-font100dpi/pkg-plist +++ b/x11-fonts/XFree86-4-font100dpi/pkg-plist @@ -1896,3 +1896,4 @@ lib/X11/fonts/100dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/100dpi/timR24.pcf.gz +@unexec rmdir %D/lib/X11/fonts/100dpi 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile index f90c0f3bbc5c..0571cce61ea8 100644 --- a/x11-fonts/XFree86-4-font75dpi/Makefile +++ b/x11-fonts/XFree86-4-font75dpi/Makefile @@ -6,12 +6,12 @@ # PORTNAME= font75dpi -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 bitmap 75 dpi fonts diff --git a/x11-fonts/XFree86-4-font75dpi/distinfo b/x11-fonts/XFree86-4-font75dpi/distinfo index 68a120863349..06ebae3b0e40 100644 --- a/x11-fonts/XFree86-4-font75dpi/distinfo +++ b/x11-fonts/XFree86-4-font75dpi/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-font75dpi/pkg-plist b/x11-fonts/XFree86-4-font75dpi/pkg-plist index a6fe936f64e8..e1d7affdc256 100644 --- a/x11-fonts/XFree86-4-font75dpi/pkg-plist +++ b/x11-fonts/XFree86-4-font75dpi/pkg-plist @@ -1896,3 +1896,4 @@ lib/X11/fonts/75dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/75dpi/timR24.pcf.gz +@unexec rmdir %D/lib/X11/fonts/75dpi 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile index f8f9cb348f39..3decc2f484e1 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/Makefile +++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile @@ -6,12 +6,12 @@ # PORTNAME= fontCyrillic -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 Cyrillic fonts diff --git a/x11-fonts/XFree86-4-fontCyrillic/distinfo b/x11-fonts/XFree86-4-fontCyrillic/distinfo index 68a120863349..06ebae3b0e40 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/distinfo +++ b/x11-fonts/XFree86-4-fontCyrillic/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist index e8570a82ca7a..fc2472baa0e6 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist +++ b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist @@ -84,3 +84,4 @@ lib/X11/fonts/cyrillic/koinil2.pcf.gz lib/X11/fonts/cyrillic/proof9x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16b.pcf.gz +@unexec rmdir %D/lib/X11/fonts/cyrillic 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile index daa771be138b..28f340abd17f 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile @@ -6,14 +6,14 @@ # PORTNAME= fontDefaultBitmaps -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-4.tgz -EXTRACT_ONLY= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-4.tgz +EXTRACT_ONLY= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 default bitmap fonts @@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/xc/fonts/bdf/misc post-extract: (cd ${WRKDIR} && \ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/XFree86-4.4.0-src-1.tgz \ + ${DISTDIR}/${DIST_SUBDIR}/XFree86-${PORTVERSION}-src-1.tgz \ | ${TAR} -xf - xc/extras/fonts) do-configure: diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo index 77c31aba8b09..f9188477d037 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo @@ -1,4 +1,4 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist index fc31cc8768d2..e058c34eb29f 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist @@ -411,3 +411,4 @@ lib/X11/fonts/misc/olgl10.pcf.gz lib/X11/fonts/misc/olgl12.pcf.gz lib/X11/fonts/misc/olgl14.pcf.gz lib/X11/fonts/misc/olgl19.pcf.gz +@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile index da8cf15f656c..f92ec6821769 100644 --- a/x11-fonts/XFree86-4-fontEncodings/Makefile +++ b/x11-fonts/XFree86-4-fontEncodings/Makefile @@ -6,12 +6,12 @@ # PORTNAME= fontEncodings -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 font encoding files diff --git a/x11-fonts/XFree86-4-fontEncodings/distinfo b/x11-fonts/XFree86-4-fontEncodings/distinfo index 68a120863349..06ebae3b0e40 100644 --- a/x11-fonts/XFree86-4-fontEncodings/distinfo +++ b/x11-fonts/XFree86-4-fontEncodings/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11-fonts/XFree86-4-fontEncodings/pkg-plist b/x11-fonts/XFree86-4-fontEncodings/pkg-plist index 60a995f12bc5..41210b00ce0e 100644 --- a/x11-fonts/XFree86-4-fontEncodings/pkg-plist +++ b/x11-fonts/XFree86-4-fontEncodings/pkg-plist @@ -16,6 +16,7 @@ lib/X11/fonts/encodings/iso8859-6.16.enc lib/X11/fonts/encodings/iso8859-6.8x.enc lib/X11/fonts/encodings/large/big5.eten-0.enc.gz lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz +lib/X11/fonts/encodings/large/cns11643-1.enc.gz lib/X11/fonts/encodings/large/encodings.dir lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz @@ -41,6 +42,9 @@ lib/X11/fonts/encodings/mulearabic-0.enc lib/X11/fonts/encodings/mulearabic-1.enc lib/X11/fonts/encodings/mulearabic-2.enc lib/X11/fonts/encodings/mulelao-1.enc +lib/X11/fonts/encodings/sun_eu_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 +@dirrm lib/X11/fonts/encodings/large +@dirrm lib/X11/fonts/encodings diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile index 9b9a9a9c9af2..4e115e51df82 100644 --- a/x11-fonts/XFree86-4-fontScalable/Makefile +++ b/x11-fonts/XFree86-4-fontScalable/Makefile @@ -6,14 +6,13 @@ # PORTNAME= fontScalable -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-4.tgz \ - XFree86-4.4.0-src-5.tgz +DISTFILES= XFree86-${PORTVERSION}-src-4.tgz \ + XFree86-${PORTVERSION}-src-5.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 scalable fonts diff --git a/x11-fonts/XFree86-4-fontScalable/distinfo b/x11-fonts/XFree86-4-fontScalable/distinfo index 5ad35a9bf4ee..adecc4e876fe 100644 --- a/x11-fonts/XFree86-4-fontScalable/distinfo +++ b/x11-fonts/XFree86-4-fontScalable/distinfo @@ -1,4 +1,4 @@ -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 -MD5 (xc/XFree86-4.4.0-src-5.tgz) = 5c37f028efc6d54a9c725e333f9cc8ae -SIZE (xc/XFree86-4.4.0-src-5.tgz) = 4386587 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 +MD5 (xc/XFree86-4.5.0-src-5.tgz) = 598ce329eb06b8189f92704a5698253c +SIZE (xc/XFree86-4.5.0-src-5.tgz) = 4386592 diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist index 777c36610b26..fd858ea49042 100644 --- a/x11-fonts/XFree86-4-fontScalable/pkg-plist +++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist @@ -87,3 +87,9 @@ %%TYPE1:%%lib/X11/fonts/Type1/l049036t.afm %%TYPE1:%%lib/X11/fonts/Type1/l049036t.pfa @unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi +@unexec rm %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || true +@unexec rm %D/lib/X11/fonts/Type1/fonts.cache-1 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/Speedo 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/Type1 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/CID 2>/dev/null || true +@unexec rmdir %D/lib/X11/fonts/TTF 2>/dev/null || true diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index f22c37422b54..9f7ef72d4ece 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -6,15 +6,14 @@ # PORTNAME= FontServer -PORTVERSION= 4.4.0 -PORTREVISION= 2 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 font server diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo index ba2d5d81e5e3..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-FontServer/distinfo +++ b/x11-servers/XFree86-4-FontServer/distinfo @@ -1,6 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-FontServer/pkg-plist b/x11-servers/XFree86-4-FontServer/pkg-plist index 498ae0096911..fa422c54fa19 100644 --- a/x11-servers/XFree86-4-FontServer/pkg-plist +++ b/x11-servers/XFree86-4-FontServer/pkg-plist @@ -2,3 +2,4 @@ bin/xfs etc/rc.d/xfs.sh lib/X11/fs/config.default +@dirrm lib/X11/fs diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure index 2fe7598d1330..3daedd35e4ea 100644 --- a/x11-servers/XFree86-4-FontServer/scripts/configure +++ b/x11-servers/XFree86-4-FontServer/scripts/configure @@ -36,6 +36,7 @@ for i in BuildFonts \ XnestServer \ XVirtualFramebufferServer \ XprtServer \ + XdmxServer \ LibHeaders \ ForceNormalLib \ XTrueTypeInstallCConvHeaders diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index 729bad199bc6..b03e4a24d354 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -6,41 +6,28 @@ # PORTNAME= NestServer -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 nested X server -CONFLICTS= xorg-nestserver-* +CONFLICTS= xorg-nestserver-[0-9]* MAN1= Xnest.1 -EXTRA_PATCHES+= ${FILESDIR}/patch-programs::Xserver::Xext::Imakefile +PLIST_FILES= bin/Xnest + XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver/hw/xnest -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-NestServer/distinfo +++ b/x11-servers/XFree86-4-NestServer/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile deleted file mode 100644 index 350e13eebafb..000000000000 --- a/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 -+++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 -@@ -160,7 +160,7 @@ - LinkSourceFile(modinit.h,extmod) - - #if BuildXCSecurity && InstallSecurityConfig --InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) -+InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-NestServer,$(SERVERCONFIGDIR)) - #endif - - DependTarget() diff --git a/x11-servers/XFree86-4-NestServer/pkg-plist b/x11-servers/XFree86-4-NestServer/pkg-plist deleted file mode 100644 index d30d2d29dd1e..000000000000 --- a/x11-servers/XFree86-4-NestServer/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/Xnest -lib/X11/xserver/SecurityPolicy.default-NestServer diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure index 63f1ce26feed..a5a5dfc2c9e5 100644 --- a/x11-servers/XFree86-4-NestServer/scripts/configure +++ b/x11-servers/XFree86-4-NestServer/scripts/configure @@ -36,8 +36,10 @@ for i in BuildFonts \ BuildFontServer \ XVirtualFramebufferServer \ XprtServer \ + XdmxServer \ LibHeaders \ ForceNormalLib \ + InstallSecurityConfig \ XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index 5a912a7d39c0..f8dafbf7cf26 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -6,21 +6,14 @@ # PORTNAME= PrintServer -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 print server @@ -32,10 +25,6 @@ XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - do-install: $(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-PrintServer/distinfo +++ b/x11-servers/XFree86-4-PrintServer/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure index 2dafb5a3dc33..4891f552f098 100644 --- a/x11-servers/XFree86-4-PrintServer/scripts/configure +++ b/x11-servers/XFree86-4-PrintServer/scripts/configure @@ -36,6 +36,7 @@ for i in BuildFonts \ BuildFontServer \ XnestServer \ XVirtualFramebufferServer \ + XdmxServer \ LibHeaders \ ForceNormalLib \ XTrueTypeInstallCConvHeaders diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 5afd4211fa10..e9f1b2d4a7ea 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -6,21 +6,14 @@ # PORTNAME= Server -PORTVERSION= 4.4.0 -PORTREVISION= 7 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 X server and related programs @@ -32,13 +25,17 @@ PATCHDIR= ${MASTERDIR}/files .for pf in patch-Imake.rules patch-Imake.tmpl \ patch-X11.tmpl patch-Xcursor-Imakefile \ - patch-amd64 patch-c2 patch-dri-Imakefile \ + patch-c2 \ patch-f patch-imake.c \ patch-texteroids patch-xditview-Imakefile patch-xdm \ patch-xdm_session.c patch-xf86.tmpl \ - patch-xterm-Imakefile patch-z05 patch-z14 \ - patch-z15 patch-z30 patch-z32 patch-z34 patch-z35 \ - patch-z41 patch-z44 patch-z45 + patch-xterm-Imakefile patch-z14 \ + patch-z15 patch-z34 patch-z35 \ + patch-z45 \ + patch-lib_GL_GL_Imakefile \ + patch-lib_GL_mesa_drivers_dri_Imakefile \ + patch-lib_GL_mesa_drivers_osmesa_Imakefile \ + patch-programs_Xserver_GL_dri_Imakefile # patch-startx EXTRA_PATCHES+= ${.CURDIR}/../../x11/XFree86-4-libraries/files/${pf} @@ -149,6 +146,12 @@ PLIST_SUB+= IA64_NA="@comment " PLIST_SUB+= IA64_NA="" .endif +.if ${ARCH} == powerpc +PLIST_SUB+= PPC_NA="@comment " +.else +PLIST_SUB+= PPC_NA="" +.endif + .if ${ARCH} == sparc64 PLIST_SUB+= SPARC64_NA="@comment " PLIST_SUB+= SPARC64="" @@ -158,10 +161,8 @@ PLIST_SUB+= SPARC64="@comment " PLIST_SUB+= SPARC64_NA="" MAN4+= glint.4x \ mga.4x \ - rendition.4x \ s3virge.4x \ savage.4x \ - siliconmotion.4x \ tdfx.4x \ vga.4x .endif @@ -194,17 +195,16 @@ PLIST_SUB+= AMD64_I386="" PLIST_SUB+= AMD64_I386="@comment " .endif -post-extract:: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - @${MKDIR} ${WRKDIR}/drmsource +.if ${ARCH} != powerpc && ${ARCH} != sparc64 +MAN4+= rendition.4x \ + siliconmotion.4x +.endif post-build: @${RM} -f ${PKGMESSAGE} @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} post-install:: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} @if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \ ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-Server/distinfo +++ b/x11-servers/XFree86-4-Server/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf b/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf index bcbd69901253..01fcb12d6134 100644 --- a/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf +++ b/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf @@ -1,6 +1,6 @@ ---- config/cf/FreeBSD.cf.orig Sat Nov 1 20:38:01 2003 -+++ config/cf/FreeBSD.cf Tue Nov 11 20:47:11 2003 -@@ -172,11 +172,11 @@ +--- config/cf/FreeBSD.cf.orig Thu Mar 3 03:32:17 2005 ++++ config/cf/FreeBSD.cf Wed Mar 23 10:41:03 2005 +@@ -234,11 +234,11 @@ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) @@ -16,7 +16,17 @@ #endif #define CppCmd /usr/bin/cpp -@@ -393,18 +393,8 @@ +@@ -470,6 +470,9 @@ + #define AsVISOption -Av9a + #define AsOutputArchSize 64 + #endif ++#ifdef PpcArchitecture ++#define XF86INT10_BUILD X86INT10_STUB ++#endif + + #define StandardDefines -DCSRG_BASED + +@@ -491,18 +494,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-Imake.cf b/x11-servers/XFree86-4-Server/files/patch-Imake.cf new file mode 100644 index 000000000000..cdda9ca19f79 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-Imake.cf @@ -0,0 +1,18 @@ + +--- patch-Imake.cf begins here --- +--- config/cf/Imake.cf.orig Wed Jan 19 20:53:39 2005 ++++ config/cf/Imake.cf Wed Jan 19 20:55:09 2005 +@@ -282,6 +282,10 @@ + # undef __amd64__ + # undef __x86_64__ + # endif ++# ifdef __powerpc__ ++# define PpcArchitecture ++# undef __powerpc__ ++# endif + #endif /* __FreeBSD__ */ + + /* Systems based on kernel of FreeBSD */ +--- patch-Imake.cf ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-Pci.h b/x11-servers/XFree86-4-Server/files/patch-Pci.h new file mode 100644 index 000000000000..ece4cf51dbc4 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-Pci.h @@ -0,0 +1,16 @@ + +--- patch-Pci.h begins here --- +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Thu Jan 20 06:51:21 2005 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Thu Jan 20 06:52:09 2005 +@@ -285,7 +285,7 @@ + # define ARCH_PCI_INIT linuxPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN /* Needs kernel work to remove */ +-# elif defined(__OpenBSD__) ++# elif defined(__FreeBSD__) || defined(__OpenBSD__) + # define ARCH_PCI_INIT freebsdPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN +--- patch-Pci.h ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c b/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c deleted file mode 100644 index ca124eacf985..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c +++ /dev/null @@ -1,43 +0,0 @@ -Index: programs/Xserver/Xext/saver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/Xext/saver.c,v -retrieving revision 3.8 -retrieving revision 3.8.2.1 -diff -u -u -r3.8 -r3.8.2.1 ---- programs/Xserver/Xext/saver.c 17 Nov 2003 22:20:26 -0000 3.8 -+++ programs/Xserver/Xext/saver.c 2 Mar 2004 19:39:48 -0000 3.8.2.1 -@@ -27,7 +27,7 @@ - * Author: Keith Packard, MIT X Consortium - */ - --/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8 2003/11/17 22:20:26 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8.2.1 2004/03/02 19:39:48 dawes Exp $ */ - - #define NEED_REPLIES - #define NEED_EVENTS -@@ -810,7 +810,7 @@ - DepthPtr pDepth; - WindowOptPtr ancwopt; - unsigned long *pVlist; -- unsigned long *values = 0; -+ unsigned long *values = 0, *save = 0; - unsigned long tmask, imask; - unsigned long val; - Pixmap pixID; -@@ -938,6 +938,7 @@ - ret = BadAlloc; - goto bail; - } -+ save = values; - pAttr->screen = pScreen; - pAttr->client = client; - pAttr->x = stuff->x; -@@ -1166,7 +1167,7 @@ - bail: - CheckScreenPrivate (pScreen); - xfree (pAttr); -- xfree (values); -+ xfree (save); - return ret; - } - diff --git a/x11-servers/XFree86-4-Server/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server/files/patch-alpha_video.c deleted file mode 100644 index fdb7cbd95a5b..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-alpha_video.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD: /tmp/pcvs/ports/x11-servers/XFree86-4-Server/files/Attic/patch-alpha_video.c,v 1.3 2004-08-10 01:29:21 marcus Exp $ - ---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Feb 25 11:04:10 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Feb 25 11:04:50 2004 -@@ -483,7 +483,7 @@ - writeSparse32(int Value, pointer Base, register unsigned long Offset); - - #ifdef __FreeBSD__ --extern int sysarch(int, char *); -+extern int sysarch(int, void *); - #endif - - struct parms { diff --git a/x11-servers/XFree86-4-Server/files/patch-atimobility b/x11-servers/XFree86-4-Server/files/patch-atimobility deleted file mode 100644 index b263a250ad5b..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-atimobility +++ /dev/null @@ -1,76 +0,0 @@ -diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c ./programs/Xserver/hw/xfree86/drivers/ati/atimode.c ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c Wed Jan 12 13:01:31 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atimode.c Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20 2004/12/31 16:07:06 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */ - /* - * Copyright 2000 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -646,7 +646,7 @@ - SetBits(pMode->CrtcVDisplay, CRTC_V_DISP); - pATIHW->crtc_v_sync_strt_wid = - SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) | -- SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID); -+ SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA); - if (pMode->Flags & V_NVSYNC) - pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL; - } -diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c ./programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Wed Jan 12 13:01:31 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79 2004/12/31 16:07:06 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */ - /* - * Copyright 1999 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -1900,10 +1900,10 @@ - VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP); - VSyncStart = - GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT); -- VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) | -- GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID); -+ VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) | -+ GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA); - if (VSyncStart > VSyncEnd) -- VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1; -+ VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1; - VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL); - - VBlankStart = (VDisplay & ~0x03FFU) | -@@ -2175,7 +2175,7 @@ - if ((pATIHW->horz_stretching & - (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) != - (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) -- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -+ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, - "Inconsistent panel horizontal dimension:" - " %d and %d.\n", pATI->LCDHorizontal, HDisplay); - HDisplay = pATI->LCDHorizontal; -@@ -2191,7 +2191,7 @@ - { - if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) || - !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO)) -- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -+ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, - "Inconsistent panel vertical dimension: %d and %d.\n", - pATI->LCDVertical, VDisplay); - VDisplay = pATI->LCDVertical; -diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h ./programs/Xserver/hw/xfree86/drivers/ati/atiregs.h ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Wed Jan 12 13:01:32 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26 2004/12/31 16:07:07 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */ - /* - * Copyright 1994 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -551,6 +551,7 @@ - #define CRTC_V_SYNC_STRT 0x000007fful - /* ? 0x0000f800ul */ - #define CRTC_V_SYNC_WID 0x001f0000ul -+#define CRTC_V_SYNC_END_VGA 0x000f0000ul - #define CRTC_V_SYNC_POL 0x00200000ul - /* ? 0xffc00000ul */ - #define CRTC_VLINE_CRNT_VLINE IOPortTag(0x04u, 0x04u) diff --git a/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile b/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile new file mode 100644 index 000000000000..0e80a054d0ef --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile @@ -0,0 +1,21 @@ + +--- patch-bus-Imakefile begins here --- +--- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Thu Jan 20 03:43:03 2005 ++++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Thu Jan 20 03:46:40 2005 +@@ -66,6 +66,13 @@ + PCIDRVRSRC = netbsdPci.c + PCIDRVROBJ = netbsdPci.o + ++#elif defined(FreeBSDArchitecture) && defined(PpcArchitecture) ++ ++XCOMM FreeBSD/PowerPC PCI driver (using /dev/pci) ++ ++PCIDRVRSRC = freebsdPci.c ++PCIDRVROBJ = freebsdPci.o ++ + #elif defined(PpcArchitecture) + + XCOMM PowerPC PCI drivers +--- patch-bus-Imakefile ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-compiler.h b/x11-servers/XFree86-4-Server/files/patch-compiler.h new file mode 100644 index 000000000000..cab042675d88 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-compiler.h @@ -0,0 +1,16 @@ + +--- patch-compiler.h begins here --- +--- programs/Xserver/hw/xfree86/common/compiler.h.orig Fri Jan 21 03:19:16 2005 ++++ programs/Xserver/hw/xfree86/common/compiler.h Fri Jan 21 03:20:03 2005 +@@ -1068,7 +1068,7 @@ + # define write_mem_barrier() /* NOP */ + # endif /* __arm32__ */ + +-# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__powerpc__) ++# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__) + + # ifndef MAP_FAILED + # define MAP_FAILED ((void *)-1) +--- patch-compiler.h ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile b/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile new file mode 100644 index 000000000000..08e8d9ab4756 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile @@ -0,0 +1,15 @@ +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile.orig Thu Feb 24 16:37:48 2005 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile Thu Feb 24 16:38:50 2005 +@@ -125,6 +125,7 @@ + $(LN) $${UP}$(DRMBSDDIR)/$$i/Makefile $(DRM_COPY_DIR)/$$i); \ + done + ++/* + INSTALL_LIST = $(INSTALL_SHARED) $(INSTALL_BSD) + InstallMultiple($(INSTALL_LIST),$(DRMBSDINSTSRCDIR)) + +@@ -138,3 +139,4 @@ + $(DESTDIR)$(DRMBSDINSTSRCDIR)/$$i); \ + done + ++*/ diff --git a/x11-servers/XFree86-4-Server/files/patch-elfloader.c b/x11-servers/XFree86-4-Server/files/patch-elfloader.c new file mode 100644 index 000000000000..7013d0a33b28 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-elfloader.c @@ -0,0 +1,82 @@ +--- programs/Xserver/hw/xfree86/loader/elfloader.c.orig Mon Mar 28 19:12:53 2005 ++++ programs/Xserver/hw/xfree86/loader/elfloader.c Mon Mar 28 19:22:51 2005 +@@ -203,6 +203,7 @@ + #if defined (__alpha__) || \ + defined (__ia64__) || \ + defined (__AMD64__) || \ ++ defined (__amd64__) || \ + (defined (__sparc__) && \ + (defined (__arch64__) || \ + defined (__sparcv9))) +@@ -294,7 +295,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + typedef Elf_Rela Elf_Rel_t; + #else + typedef Elf_Rel Elf_Rel_t; +@@ -488,7 +490,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + ELFDEBUG(", r_addend 0x%lx", rel->r_addend); + # endif + ELFDEBUG("\n"); +@@ -524,6 +527,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -548,6 +552,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -603,6 +608,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -1263,7 +1269,7 @@ + unsigned long *dest64; + unsigned short *dest16; + #endif +-#if defined(__AMD64__) ++#if defined(__AMD64__) || defined(__amd64__) + unsigned long *dest64; + int *dest32s; + #endif +@@ -1281,7 +1287,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + ELFDEBUG("%lx", rel->r_addend); + # endif + ELFDEBUG("\n"); +@@ -1340,7 +1347,7 @@ + + break; + #endif /* i386 */ +-#if defined(__AMD64__) ++#if defined(__AMD64__) || defined(__amd64__) + case R_X86_64_32: + dest32 = (unsigned int *)(secp + rel->r_offset); + # ifdef ELFDEBUG diff --git a/x11-servers/XFree86-4-Server/files/patch-loader.c b/x11-servers/XFree86-4-Server/files/patch-loader.c new file mode 100644 index 000000000000..f68744ce35fc --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-loader.c @@ -0,0 +1,13 @@ +--- programs/Xserver/hw/xfree86/loader/loader.c.orig Tue Feb 22 06:58:18 2005 ++++ programs/Xserver/hw/xfree86/loader/loader.c Tue Feb 22 06:59:09 2005 +@@ -552,8 +552,8 @@ + FatalError("\n_LoaderFileToMem() read() failed: %s\n", + strerror(errno)); + +-# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__)) \ +- && defined(__powerpc__) ++# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) \ ++ || defined(__FreeBSD__)) && defined(__powerpc__) + /* + * Keep the instruction cache in sync with changes in the + * main memory. diff --git a/x11-servers/XFree86-4-Server/files/patch-mouse.c b/x11-servers/XFree86-4-Server/files/patch-mouse.c new file mode 100644 index 000000000000..6aba3f5627b1 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-mouse.c @@ -0,0 +1,18 @@ + +--- patch-mouse.c begins here --- +--- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jan 29 06:57:55 2005 ++++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Sat Jan 29 06:59:03 2005 +@@ -1501,8 +1501,8 @@ + + case PROT_SYSMOUSE: /* sysmouse */ + buttons = (~pBuf[0]) & 0x07; +- dx = (char)(pBuf[1]) + (char)(pBuf[3]); +- dy = - ((char)(pBuf[2]) + (char)(pBuf[4])); ++ dx = (signed char)(pBuf[1]) + (signed char)(pBuf[3]); ++ dy = - ((signed char)(pBuf[2]) + (signed char)(pBuf[4])); + /* FreeBSD sysmouse sends additional data bytes */ + if (pMse->protoPara[4] >= 8) { + /* +--- patch-mouse.c ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile b/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile new file mode 100644 index 000000000000..c418e5cad535 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile @@ -0,0 +1,15 @@ + +--- patch-support-Imakefile begins here --- +--- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Thu Jan 20 03:30:38 2005 ++++ programs/Xserver/hw/xfree86/os-support/Imakefile Thu Jan 20 03:31:37 2005 +@@ -15,6 +15,7 @@ + (defined(SunArchitecture) && defined(SparcArchitecture)) || \ + (defined(KFreeBSDArchitecture) && defined(AlphaArchitecture)) || \ + (defined(KFreeBSDArchitecture) && defined(Sparc64Architecture)) || \ ++ (defined(KFreeBSDArchitecture) && defined(PpcArchitecture)) || \ + (defined(KNetBSDArchitecture) && defined(AlphaArchitecture)) || \ + (defined(KNetBSDArchitecture) && defined(PpcArchitecture)) || \ + (defined(KNetBSDArchitecture) && defined(SparcArchitecture)) || \ +--- patch-support-Imakefile ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile deleted file mode 100644 index d004ae77d6f4..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 -+++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 -@@ -160,7 +160,7 @@ - LinkSourceFile(modinit.h,extmod) - - #if BuildXCSecurity && InstallSecurityConfig --InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) -+InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-Server,$(SERVERCONFIGDIR)) - #endif - - DependTarget() diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::XF98Conf.cpp b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::XF98Conf.cpp deleted file mode 100644 index 3e045c448c60..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::XF98Conf.cpp +++ /dev/null @@ -1,52 +0,0 @@ -Index: programs/Xserver/hw/xfree86/XF98Conf.cpp -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/XF98Conf.cpp,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- programs/Xserver/hw/xfree86/XF98Conf.cpp 13 Feb 2004 23:58:34 -0000 1.4 -+++ programs/Xserver/hw/xfree86/XF98Conf.cpp 8 Jun 2004 01:28:55 -0000 1.5 -@@ -1,4 +1,4 @@ --XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/XF98Conf.cpp,v 1.4 2004/02/13 23:58:34 dawes Exp $ -+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/XF98Conf.cpp,v 1.5 2004/06/08 01:28:55 dawes Exp $ - XCOMM - XCOMM Copyright (c) 1994-1998 by The XFree86 Project, Inc. - XCOMM All rights reserved. -@@ -480,6 +480,20 @@ - - EndSection - -+Section "Monitor" -+ Identifier "Aile TFT LCD" -+ VendorName "NEC" -+ ModelName "La13" -+ HorizSync 33.0-82.0 -+ VertRefresh 55.0-90.0 -+ -+XCOMM fH=46.9,fV=75.0 -+ ModeLine "800x600" 49.50 800 836 920 1056 600 601 604 625 -+ -+XCOMM fH=53.7,fV=85.1 -+ ModeLine "800x600H" 56.30 800 836 920 1048 600 601 604 631 -+EndSection -+ - XCOMM ********************************************************************** - XCOMM Graphics device section - XCOMM ********************************************************************** -@@ -508,6 +522,16 @@ - XCOMM VideoRam 2048 - Endsection - -+Section "Device" -+ Identifier "CLGD7555" -+ VendorName "Cirrus Logic" -+ BoardName "CLGD 7555" -+ Driver "cirrus" -+XCOMM Option "sw cursor" "on" -+XCOMM BusID "PCI:0:3:0" -+XCOMM VideoRam 2048 -+EndSection -+ - XCOMM ********************************************************************** - XCOMM Screen sections. - XCOMM ********************************************************************** diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86Events.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86Events.c deleted file mode 100644 index 83fba24a3a2d..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86Events.c +++ /dev/null @@ -1,73 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig Tue Sep 21 19:22:14 2004 -+++ programs/Xserver/hw/xfree86/common/xf86Events.c Tue Sep 21 19:23:55 2004 -@@ -467,7 +467,7 @@ - #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT) - static Bool first_time = TRUE; - #endif --#if defined(__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - static int kbdSun = -1; - #endif - /* Disable any keyboard processing while in suspend */ -@@ -483,7 +483,7 @@ - } - #endif - --#if defined (__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - if (kbdSun == -1) { - if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun")) - || (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun"))) -@@ -493,7 +493,7 @@ - } - if (kbdSun) - goto special; --#endif /* __sparc__ && __linux__ */ -+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */ - - #ifdef __linux__ - if (xf86Info.kbdCustomKeycodes) { -@@ -543,7 +543,7 @@ - } - } else - #endif /* i386 && SVR4 */ -- { -+ if (!xf86IsPc98()) { - switch (scanCode) { - case 0x59: scanCode = KEY_0x59; break; - case 0x5a: scanCode = KEY_0x5A; break; -@@ -655,10 +655,12 @@ - * they need to get the same key code as the base key on the same - * physical keyboard key. - */ -- if (scanCode == KEY_SysReqest) -- scanCode = KEY_Print; -- else if (scanCode == KEY_Break) -- scanCode = KEY_Pause; -+ if (!xf86IsPc98()) { -+ if (scanCode == KEY_SysReqest) -+ scanCode = KEY_Print; -+ else if (scanCode == KEY_Break) -+ scanCode = KEY_Pause; -+ } - #endif - - /* -@@ -695,7 +697,7 @@ - } - } - #endif --#if defined (__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - special: - if (kbdSun) { - switch (scanCode) { -@@ -729,7 +731,7 @@ - */ - scanCode--; - } --#endif /* defined (__sparc__) && defined(__linux__) */ -+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */ - - #ifdef XKB - if ((xf86Info.ddxSpecialKeys == SKWhenNeeded && diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86PciInfo.h b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86PciInfo.h deleted file mode 100644 index a04a88012204..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86PciInfo.h +++ /dev/null @@ -1,22 +0,0 @@ -Index: programs/Xserver/hw/xfree86/common/xf86PciInfo.h -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v -retrieving revision 1.159 -retrieving revision 1.160 -diff -u -r1.159 -r1.160 ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h 22 Mar 2004 17:01:14 -0000 1.159 -+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 8 Jun 2004 01:28:56 -0000 1.160 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.159 2004/03/22 17:01:14 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.160 2004/06/08 01:28:56 dawes Exp $ */ - - /* - * Copyright (c) 1995-2003 by The XFree86 Project, Inc. -@@ -317,6 +317,7 @@ - /* Cirrus Logic */ - #define PCI_CHIP_GD7548 0x0038 - #define PCI_CHIP_GD7555 0x0040 -+#define PCI_CHIP_GD7556 0x004C - #define PCI_CHIP_GD5430 0x00A0 - #define PCI_CHIP_GD5434_4 0x00A4 - #define PCI_CHIP_GD5434_8 0x00A8 diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c deleted file mode 100644 index 54a57504a4bc..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c +++ /dev/null @@ -1,17 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig Sat Aug 28 13:14:32 2004 -+++ programs/Xserver/hw/xfree86/common/xf86fbman.c Sat Aug 28 13:16:03 2004 -@@ -1115,12 +1115,10 @@ - - *size = 0; - -- if (!offman->LinearAreas) return FALSE; -- - pLink = offman->LinearAreas; -- pLinkRet = pLink; - -- if (!pLink->area) { -+ if (pLink && !pLink->area) { -+ pLinkRet = pLink; - while (pLink) { - if (pLink->free) { - if (pLink->linear.size > pLinkRet->linear.size) diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::Japanese::README98 b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::Japanese::README98 deleted file mode 100644 index 0501d529b0fe..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::Japanese::README98 +++ /dev/null @@ -1,62 +0,0 @@ -Index: programs/Xserver/hw/xfree86/doc/Japanese/README98 -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/Japanese/README98,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- programs/Xserver/hw/xfree86/doc/Japanese/README98 20 Jun 2000 20:07:58 -0000 1.4 -+++ programs/Xserver/hw/xfree86/doc/Japanese/README98 8 Jun 2004 01:28:56 -0000 1.5 -@@ -1,6 +1,6 @@ - XFree86 PC98 Dependent Information - The XFree86 Project Inc. and X98 CORE TEAM Ãø -- 2000 ǯ 6 ·î 20 Æü -+ 2004 ǯ 6 ·î 6 Æü - - ¤³¤Î¥É¥¥å¥á¥ó¥È¤Ç¤Ï¡¢PC98 ¸Çͤλö¹à¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡£PC/AT ¸ß´¹µ¡ - ¤È¶¦Ä̤λö¹à¤Ë¤Ä¤¤¤Æ¤Ï¡¢¶¦Ä̤Υɥ¥å¥á¥ó¥È¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£ -@@ -11,7 +11,7 @@ - ¥¤¥ë̾: XFree86) ¤µ¤ì¤Æ¤ª¤ê¡¢½¾Íè¤Î¥Ü¡¼¥É / ¥Á¥Ã¥×¥»¥Ã¥ÈËè¤Î¥µ¡¼¥Ð¤â¤Ê - ¤¯¤Ê¤ê¤Þ¤·¤¿¡£¤Þ¤¿¡¢³Æ¥É¥é¥¤¥Ð¤Ï¤¹¤Ù¤Æ SVGA ¥Ù¡¼¥¹¤Ç¡¢XF86_S3 ¥Ù¡¼¥¹¤Î - ¥É¥é¥¤¥Ð¤Ï¤¢¤ê¤Þ¤»¤ó¡£¸½ºß¤Î¤È¤³¤í¡¢PC98 ¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤Î¤Ï¡¢mga¡¢ -- apm¡¢glint¡¢trident ¥É¥é¥¤¥Ð¤Î¤ß¤Ç¤¹¡£Millennium¡¢Mystique¡¢ -+ apm¡¢glint¡¢trident¡¢cirrus ¥É¥é¥¤¥Ð¤Î¤ß¤Ç¤¹¡£Millennium¡¢Mystique¡¢ - VoodooRUSH¡¢Permedia2¡¢TGUI968x(¤¤¤º¤ì¤â PCI) ¤Î¥Ü¡¼¥É¤ò¤ª»ý¤Á¤ÎÊý°Ê³° - ¤Ï¡¢3.3 ¥Ù¡¼¥¹ (ex. 3.3.6) ¤Î´Ä¶¤ò¸æÍøÍѲ¼¤µ¤¤¡£¸½¾õ 4.0 ¤Ç¤Ï EGC ¤ä - PEGC ¤¹¤éÍøÍѤǤ¤Þ¤»¤ó¡£³«È¯¥á¥ó¥Ð¤¬Èó¾ï¤Ë¾¯¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¢³«È¯ -@@ -43,6 +43,7 @@ - ------------- ----------------------------------------------- ------- - NEC MGA Millennium/Mystique XFree86 - NEC Trident TGUI968x(X-Mate,ValueStar Åù) XFree86 -+ NEC Cirrus Logic CLGD755x (Aile Åù) XFree86 - - 3. ¶¦ÄÌ»ö¹à - -@@ -274,6 +275,28 @@ - README.trident ¤Ï¸½»þÅÀ (4.0) ¤Ç¤Ï 3.3.6 ÍѤÎÆâÍƤǤ¢¤ê¡¢¤³¤ì¤ËµºÜ¤µ - ¤ì¤Æ¤¤¤ë Option ¤Î¿¤¯¤Ï»ÈÍѤǤ¤Ê¤¤¤Î¤ÇÃí°Õ¤·¤Æ²¼¤µ¤¤¡£ - -+ 4.5. cirrus ¥É¥é¥¤¥Ð -+ -+ NEC ¤ÎÆ⢥¢¥¯¥»¥é¥ì¡¼¥¿ (Cirrus Logic CLGD755x) ¤ÇÆ°ºî¤¹¤ë¥É¥é¥¤¥Ð¤Ç¤¹¡£ -+ -+ 4.5.1. XF86Config ¤ÎÀßÄê -+ -+ XF86Config.98 Æâ¤Ëµ¤µ¤ì¤¿¥ª¥×¥·¥ç¥ó¤ò»ØÄê¤Ç¤¤Þ¤¹¡£ -+ Ä̾ï¤ÏÆä˲¿¤â»ØÄꤹ¤ëɬÍ×̵¤¤È¦¤Ç¤¹¡£ -+ -+ 4.5.2. Êó¹ð¤µ¤ì¤Æ¤¤¤ëÌäÂê -+ -+ o ¥í¥°¤Ë MMIO ¤ª¤è¤Ó I2C ¤Ë´ØÏ¢¤·¤¿¥¨¥é¡¼ ("(EE)" ¤Ç¼¨¤µ¤ì¤ë) ¤¬ -+ ½Ð¤Þ¤¹¤¬¡¢¤³¤ì¤Ï¼ÂºÝ¤Ë¤Ï·Ù¹ð¥ì¥Ù¥ë¤ÇÆ°ºî¤Ë¤Ï´Ø·¸¤Ê¤¤¤è¤¦¤Ç¤¹¡£ -+ -+ 4.5.3. ¤½¤Î¾ -+ -+ o ¤Þ¤À½½Ê¬¤Ê¥Æ¥¹¥È¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤¤Î¤ÇÆ°ºî¥ì¥Ý¡¼¥È¤ò¤ª´ê¤¤¤·¤Þ¤¹¡£ -+ -+ 4.5.4. ´ØÏ¢ -+ -+ XFree86 man page, cirrus man page -+ - 5. ³Æ OS Ëè¤ÎÃí°Õ»ö¹à - - 5.1. FreeBSD(98) ¤Ç¤ÎÃí°Õ»ö¹à diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::VideoBoard98 b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::VideoBoard98 deleted file mode 100644 index 56a6c5ea6e96..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::VideoBoard98 +++ /dev/null @@ -1,45 +0,0 @@ -Index: programs/Xserver/hw/xfree86/doc/VideoBoard98 -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/VideoBoard98,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -r1.5 -r1.6 ---- programs/Xserver/hw/xfree86/doc/VideoBoard98 20 Jun 2000 20:07:58 -0000 1.5 -+++ programs/Xserver/hw/xfree86/doc/VideoBoard98 8 Jun 2004 01:28:56 -0000 1.6 -@@ -156,9 +156,9 @@ - |PC9821Nb7/C,D |CLGD7543 | B/I | B/I |1| X | | - |PC9821Nb10 |CLGD7548 | B/I | B/I |1| X | | - |PC9821Nx/3,C7 |Cyber9320 | B/I | B/I |1| X | | --|PC9821Nr12 |CLGD7555 | B/I | B/I |2| X | | --|PC9821Nr13/D10 |CLGD7555 | B/I | B/I |2| X | | --|PC9821Nr13/D14,S14 |CLGD7556 | B/I | B/I |2| X | | -+|PC9821Nr12 |CLGD7555 | B/I | B/I |2| o? |O| -+|PC9821Nr13/D10 |CLGD7555 | B/I | B/I |2| o? |O| -+|PC9821Nr13/D14,S14 |CLGD7556 | B/I | B/I |2| o? |O| - |PC9821Nr15 |Cyber9385 | B/I | B/I |2| X | | - |PC9821Nr150 |Cyber9385 | B/I | B/I |2| X | | - |PC9821Nr150/S20 |Cyber9385-1 | B/I | B/I |2| X | | -@@ -169,12 +169,12 @@ - |PC9821Lt2 |Cyber9320 | B/I | B/I |1| X | | - |PC9821La7 |Cyber9320 | B/I | B/I |1| X | | - |PC9821La10 |Cyber9320 | B/I | B/I |1| X | | --|PC9821La13 |CLGD7555 | B/I | B/I |2| X | | -+|PC9821La13 |CLGD7555 | B/I | B/I |2| o |O| - +------------------------+---------------+-------+--------+-+-------+-+ --|PC9821Ls12 |CLGD7555 | B/I | B/I |2| X | | --|PC9821Ls13 |CLGD7555 | B/I | B/I |2| X | | --|PC9821Ls13 |CLGD7556 | B/I | B/I |2| X | | --|PC9821Ls150 |CLGD7555 | B/I | B/I |2| X | | -+|PC9821Ls12 |CLGD7555 | B/I | B/I |2| o? |O| -+|PC9821Ls13 |CLGD7555 | B/I | B/I |2| o? |O| -+|PC9821Ls13 |CLGD7556 | B/I | B/I |2| o? |O| -+|PC9821Ls150 |CLGD7555 | B/I | B/I |2| o? |O| - +------------------------+---------------+-------+--------+-+-------+-+ - - -@@ -384,4 +384,4 @@ - |WinFrame928 |S3-928 | | |2| X | | - +------------------------+---------------+-------+--------+-+-------+-+ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/doc/VideoBoard98,v 1.5 2000/06/20 20:07:58 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/doc/VideoBoard98,v 1.6 2004/06/08 01:28:56 dawes Exp $ */ diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::alp_driver.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::alp_driver.c deleted file mode 100644 index a73295241a0a..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::alp_driver.c +++ /dev/null @@ -1,170 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v -retrieving revision 1.36 -retrieving revision 1.37 -diff -u -r1.36 -r1.37 ---- programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c 7 Nov 2003 22:49:58 -0000 1.36 -+++ programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c 8 Jun 2004 01:28:56 -0000 1.37 -@@ -11,7 +11,7 @@ - * Guy DESBIEF - */ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.36 2003/11/07 22:49:58 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.37 2004/06/08 01:28:56 dawes Exp $ */ - - /* All drivers should typically include these */ - #include "xf86.h" -@@ -109,6 +109,9 @@ - static void AlpDisplayPowerManagementSet(ScrnInfoPtr pScrn, - int PowerManagementMode, int flags); - -+static void PC98CIRRUS755xEnable(ScrnInfoPtr pScrn); -+static void PC98CIRRUS755xDisable(ScrnInfoPtr pScrn); -+ - /* - * This is intentionally screen-independent. It indicates the binding - * choice made in the first PreInit. -@@ -143,6 +146,8 @@ - static int gd5446_MaxClocks[] = { 135100, 135100, 85500, 85500, 0 }; - static int gd5480_MaxClocks[] = { 135100, 200000, 200000, 135100, 135100 }; - static int gd7548_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; -+static int gd7555_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; -+static int gd7556_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; - - /* - * List of symbols from other modules that this module references. This -@@ -453,6 +458,11 @@ - break; - } - break; -+ -+ case PCI_CHIP_GD7555: -+ case PCI_CHIP_GD7556: -+ videoram = 2048; /* for PC-9821 La13 etc. */ -+ break; - } - - /* UNMap the Alp memory and MMIO areas */ -@@ -567,7 +577,7 @@ - pCir->PciInfo->device, - pCir->PciInfo->func); - -- if (xf86LoadSubModule(pScrn, "int10")) { -+ if (!xf86IsPc98() && xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols,NULL); - xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n"); - pInt = xf86InitInt10(pCir->pEnt->index); -@@ -653,6 +663,16 @@ - - from = X_DEFAULT; - pCir->HWCursor = FALSE; -+ -+ switch (pCir->Chipset) { -+ case PCI_CHIP_GD7555: -+ case PCI_CHIP_GD7556: -+ pCir->HWCursor = TRUE; -+ break; -+ default: -+ break; -+ } -+ - if (xf86GetOptValBool(pCir->Options, OPTION_HW_CURSOR, &pCir->HWCursor)) - from = X_CONFIG; - -@@ -939,6 +959,12 @@ - case PCI_CHIP_GD7548: - p = gd7548_MaxClocks; - break; -+ case PCI_CHIP_GD7555: -+ p = gd7555_MaxClocks; -+ break; -+ case PCI_CHIP_GD7556: -+ p = gd7556_MaxClocks; -+ break; - } - if (!p) - return FALSE; -@@ -1425,6 +1451,9 @@ - - vgaHWProtect(pScrn, FALSE); - -+ if (xf86IsPc98()) -+ PC98CIRRUS755xEnable(pScrn); -+ - return TRUE; - } - -@@ -1843,6 +1872,9 @@ - - AlpRestore(pScrn); - vgaHWLock(hwp); -+ -+ if (xf86IsPc98()) -+ PC98CIRRUS755xDisable(pScrn); - } - - -@@ -1880,6 +1912,9 @@ - - pScrn->vtSema = FALSE; - -+ if (xf86IsPc98()) -+ PC98CIRRUS755xDisable(pScrn); -+ - pScreen->CloseScreen = pCir->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); - } -@@ -2142,3 +2177,52 @@ - box.y2 - pScrn->virtualY); - } - } -+ -+static void -+PC98CIRRUS755xEnable(ScrnInfoPtr pScrn) /* enter_aile() */ -+{ -+ unsigned int index,data; -+ vgaHWPtr hwp = VGAHWPTR(pScrn); -+ -+ outb(0xfac, 0x02); -+ -+ outb(0x68, 0x0e); -+ outb(0x6a, 0x07); -+ outb(0x6a, 0x8f); -+ outb(0x6a, 0x06); -+ -+ outw(VGA_SEQ_INDEX, 0x1206); /* unlock cirrus special */ -+ -+ index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET; -+ data = hwp->IOBase + VGA_CRTC_DATA_OFFSET; -+ outb(index, 0x3c); -+ outb(data, inb(data) & 0xef); -+ outb(index, 0x1a); -+ outb(data, inb(data) & 0xf3); -+} -+ -+static void -+PC98CIRRUS755xDisable(ScrnInfoPtr pScrn) /* leave_aile() */ -+{ -+ unsigned int index,data; -+ vgaHWPtr hwp = VGAHWPTR(pScrn); -+ -+ outw(VGA_SEQ_INDEX, 0x1206); /* unlock cirrus special */ -+ -+ index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET; -+ data = hwp->IOBase + VGA_CRTC_DATA_OFFSET; -+ outb(index, 0x3c); -+ outb(data, 0x71); -+ outb(index, 0x1a); -+ outb(data, inb(data) | 0x0c); -+ -+ outb(0xfac,0x00); -+ -+ outb(0x68, 0x0f); -+ outb(0x6a, 0x07); -+ outb(0x6a, 0x8e); -+ outb(0x6a, 0x21); -+ outb(0x6a, 0x69); -+ outb(0x6a, 0x06); -+} -+ diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::cir_driver.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::cir_driver.c deleted file mode 100644 index a8cb1622a194..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::cir_driver.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v -retrieving revision 1.69 -retrieving revision 1.70 -diff -u -r1.69 -r1.70 ---- programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c 18 Jun 2003 16:17:38 -0000 1.69 -+++ programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c 8 Jun 2004 01:28:56 -0000 1.70 -@@ -11,7 +11,7 @@ - * Guy DESBIEF - */ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.69 2003/06/18 16:17:38 eich Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.70 2004/06/08 01:28:56 dawes Exp $ */ - - /* All drivers should typically include these */ - #include "xf86.h" -@@ -86,6 +86,8 @@ - { PCI_CHIP_GD5464BD, "CL-GD5464BD" }, - { PCI_CHIP_GD5465, "CL-GD5465" }, - { PCI_CHIP_GD7548, "CL-GD7548" }, -+ { PCI_CHIP_GD7555, "CL-GD7555" }, -+ { PCI_CHIP_GD7556, "CL-GD7556" }, - {-1, NULL } - }; - -@@ -103,6 +105,8 @@ - { PCI_CHIP_GD5464BD,PCI_CHIP_GD5464BD, RES_SHARED_VGA }, - { PCI_CHIP_GD5465, PCI_CHIP_GD5465, RES_SHARED_VGA }, - { PCI_CHIP_GD7548, PCI_CHIP_GD7548, RES_SHARED_VGA }, -+ { PCI_CHIP_GD7555, PCI_CHIP_GD7555, RES_SHARED_VGA }, -+ { PCI_CHIP_GD7556, PCI_CHIP_GD7556, RES_SHARED_VGA }, - { -1, -1, RES_UNDEFINED} - }; - diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::os-support::linux::drm::xf86drmCompat.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::os-support::linux::drm::xf86drmCompat.c deleted file mode 100644 index ec83bfd67322..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::os-support::linux::drm::xf86drmCompat.c +++ /dev/null @@ -1,28 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig Tue Aug 24 17:38:16 2004 -+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c Tue Aug 24 17:39:32 2004 -@@ -77,8 +77,8 @@ - #include "mga_drm.h" - #include "r128_drm.h" - #include "radeon_drm.h" --#ifndef __FreeBSD__ - #include "sis_drm.h" -+#ifndef __FreeBSD__ - #include "i810_drm.h" - #include "i830_drm.h" - #endif -@@ -1012,7 +1012,6 @@ - } - } - --#ifndef __FreeBSD__ - /* SiS */ - - Bool drmSiSAgpInit(int driSubFD, int offset, int size) -@@ -1026,6 +1025,7 @@ - return 1; /* TRUE */ - } - -+#ifndef __FreeBSD__ - /* I830 */ - - Bool drmI830CleanupDma(int driSubFD) diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::xf86config::xf86config.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::xf86config::xf86config.c deleted file mode 100644 index 2181a8372bea..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::xf86config::xf86config.c +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig Fri Nov 14 02:40:24 2003 -+++ programs/Xserver/hw/xfree86/xf86config/xf86config.c Thu Nov 4 00:15:33 2004 -@@ -838,8 +838,7 @@ - "which is the rate at which scanlines are displayed.\n" - "\n" - "The valid range for horizontal sync and vertical sync should be documented\n" --"in the manual of your monitor. If in doubt, check the monitor database\n" --TREEROOTLX "/doc/Monitors to see if your monitor is there.\n" -+"in the manual of your monitor.\n" - "\n"; - - static char *hsyncintro_text = diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c b/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c deleted file mode 100644 index 70d910dd4cba..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c +++ /dev/null @@ -1,186 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v -retrieving revision 1.118 -retrieving revision 1.119 -diff -u -u -r1.118 -r1.119 ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 26 Feb 2004 04:25:29 -0000 1.118 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 3 Mar 2004 18:11:43 -0000 1.119 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.118 2004/02/26 04:25:29 martin Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.119 2004/03/03 18:11:43 dawes Exp $ */ - /* - * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and - * VA Linux Systems Inc., Fremont, California. -@@ -7031,12 +7031,79 @@ - RADEONFreeRec(pScrn); - } - -+/* -+ * Powering done DAC, needed for DPMS problem with ViewSonic P817 (or its variant). -+ * -+ * Note for current DAC mapping when calling this function: -+ * For most of cards: -+ * single CRT: Driver doesn't change the existing CRTC->DAC mapping, -+ * CRTC1 could be driving either DAC or both DACs. -+ * CRT+CRT: CRTC1->TV DAC, CRTC2->Primary DAC -+ * DFP/LCD+CRT: CRTC2->TV DAC, CRTC2->Primary DAC. -+ * Some boards have two DACs reversed or don't even have a primary DAC, -+ * this is reflected in pRADEONEnt->ReversedDAC. And radeon 7200 doesn't -+ * have a second DAC. -+ * It's kind of messy, we'll need to redo DAC mapping part some day. -+ */ -+static void RADEONDacPowerSet(ScrnInfoPtr pScrn, Bool IsOn, Bool IsPrimaryDAC) -+{ -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ unsigned char *RADEONMMIO = info->MMIO; -+ -+ if (IsPrimaryDAC) { -+ CARD32 dac_cntl; -+ CARD32 dac_macro_cntl = 0; -+ dac_cntl = INREG(RADEON_DAC_CNTL); -+ if ((!info->IsMobility) || (info->ChipFamily == CHIP_FAMILY_RV350)) -+ dac_macro_cntl = INREG(RADEON_DAC_MACRO_CNTL); -+ if (IsOn) { -+ dac_cntl &= ~RADEON_DAC_PDWN; -+ dac_macro_cntl &= ~(RADEON_DAC_PDWN_R | -+ RADEON_DAC_PDWN_G | -+ RADEON_DAC_PDWN_B); -+ } else { -+ dac_cntl |= RADEON_DAC_PDWN; -+ dac_macro_cntl |= (RADEON_DAC_PDWN_R | -+ RADEON_DAC_PDWN_G | -+ RADEON_DAC_PDWN_B); -+ } -+ OUTREG(RADEON_DAC_CNTL, dac_cntl); -+ if ((!info->IsMobility) || (info->ChipFamily == CHIP_FAMILY_RV350)) -+ OUTREG(RADEON_DAC_MACRO_CNTL, dac_macro_cntl); -+ } else { -+ if (info->ChipFamily != CHIP_FAMILY_R200) { -+ CARD32 tv_dac_cntl = INREG(RADEON_TV_DAC_CNTL); -+ if (IsOn) { -+ tv_dac_cntl &= ~(RADEON_TV_DAC_RDACPD | -+ RADEON_TV_DAC_GDACPD | -+ RADEON_TV_DAC_BDACPD | -+ RADEON_TV_DAC_BGSLEEP); -+ } else { -+ tv_dac_cntl |= (RADEON_TV_DAC_RDACPD | -+ RADEON_TV_DAC_GDACPD | -+ RADEON_TV_DAC_BDACPD | -+ RADEON_TV_DAC_BGSLEEP); -+ } -+ OUTREG(RADEON_TV_DAC_CNTL, tv_dac_cntl); -+ } else { -+ CARD32 fp2_gen_cntl = INREG(RADEON_FP2_GEN_CNTL); -+ if (IsOn) { -+ fp2_gen_cntl |= RADEON_FP2_DV0_EN; -+ } else { -+ fp2_gen_cntl &= ~RADEON_FP2_DV0_EN; -+ } -+ OUTREG(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); -+ } -+ } -+} -+ - /* Sets VESA Display Power Management Signaling (DPMS) Mode */ - static void RADEONDisplayPowerManagementSet(ScrnInfoPtr pScrn, - int PowerManagementMode, - int flags) - { - RADEONInfoPtr info = RADEONPTR(pScrn); -+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); - unsigned char *RADEONMMIO = info->MMIO; - - #ifdef XF86DRI -@@ -7055,8 +7122,6 @@ - RADEON_CRTC2_VSYNC_DIS | - RADEON_CRTC2_HSYNC_DIS); - -- /* TODO: additional handling for LCD ? */ -- - switch (PowerManagementMode) { - case DPMSModeOn: - /* Screen: On; HSync: On, VSync: On */ -@@ -7123,13 +7188,19 @@ - if (info->ChipFamily >= CHIP_FAMILY_R200) { - OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); - } -+ } else if (info->DisplayType == MT_CRT) { -+ RADEONDacPowerSet(pScrn, TRUE, !pRADEONEnt->ReversedDAC); - } - } else { -- if ((info->Clone) && (info->CloneType == MT_DFP)) { -- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_BLANK_EN); -- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_ON, ~RADEON_FP2_ON); -- if (info->ChipFamily >= CHIP_FAMILY_R200) { -- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); -+ if (info->Clone) { -+ if (info->CloneType == MT_DFP) { -+ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_BLANK_EN); -+ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_ON, ~RADEON_FP2_ON); -+ if (info->ChipFamily >= CHIP_FAMILY_R200) { -+ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); -+ } -+ } else if (info->CloneType == MT_CRT) { -+ RADEONDacPowerSet(pScrn, TRUE, !pRADEONEnt->ReversedDAC); - } - } - if (info->DisplayType == MT_DFP) { -@@ -7140,6 +7211,14 @@ - OUTREGP (RADEON_LVDS_GEN_CNTL, RADEON_LVDS_BLON, ~RADEON_LVDS_BLON); - usleep (info->PanelPwrDly * 1000); - OUTREGP (RADEON_LVDS_GEN_CNTL, RADEON_LVDS_ON, ~RADEON_LVDS_ON); -+ } else if (info->DisplayType == MT_CRT) { -+ if ((pRADEONEnt->HasSecondary) || info->Clone) { -+ RADEONDacPowerSet(pScrn, TRUE, pRADEONEnt->ReversedDAC); -+ } else { -+ RADEONDacPowerSet(pScrn, TRUE, TRUE); -+ if (info->HasCRTC2) -+ RADEONDacPowerSet(pScrn, TRUE, FALSE); -+ } - } - } - } else if ((PowerManagementMode == DPMSModeOff) || -@@ -7152,13 +7231,19 @@ - if (info->ChipFamily >= CHIP_FAMILY_R200) { - OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); - } -+ } else if (info->DisplayType == MT_CRT) { -+ RADEONDacPowerSet(pScrn, FALSE, !pRADEONEnt->ReversedDAC); - } - } else { -- if ((info->Clone) && (info->CloneType == MT_DFP)) { -- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_BLANK_EN, ~RADEON_FP2_BLANK_EN); -- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_ON); -- if (info->ChipFamily >= CHIP_FAMILY_R200) { -- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); -+ if (info->Clone) { -+ if(info->CloneType == MT_DFP) { -+ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_BLANK_EN, ~RADEON_FP2_BLANK_EN); -+ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_ON); -+ if (info->ChipFamily >= CHIP_FAMILY_R200) { -+ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); -+ } -+ } else if (info->CloneType == MT_CRT) { -+ RADEONDacPowerSet(pScrn, FALSE, !pRADEONEnt->ReversedDAC); - } - } - if (info->DisplayType == MT_DFP) { -@@ -7179,6 +7264,17 @@ - if (info->IsMobility || info->IsIGP) { - OUTPLL(RADEON_PIXCLKS_CNTL, tmpPixclksCntl); - } -+ } else if (info->DisplayType == MT_CRT) { -+ if ((pRADEONEnt->HasSecondary) || info->Clone) { -+ RADEONDacPowerSet(pScrn, FALSE, pRADEONEnt->ReversedDAC); -+ } else { -+ /* single CRT, turning both DACs off, we don't really know -+ * which DAC is actually connected. -+ */ -+ RADEONDacPowerSet(pScrn, FALSE, TRUE); -+ if (info->HasCRTC2) /* don't apply this to old radeon (singel CRTC) card */ -+ RADEONDacPowerSet(pScrn, FALSE, FALSE); -+ } - } - } - } diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h b/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h deleted file mode 100644 index c8a912487b43..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h +++ /dev/null @@ -1,31 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v -retrieving revision 1.32 -retrieving revision 1.33 -diff -u -u -r1.32 -r1.33 ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 19 Feb 2004 22:38:12 -0000 1.32 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 3 Mar 2004 18:11:45 -0000 1.33 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.32 2004/02/19 22:38:12 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.33 2004/03/03 18:11:45 dawes Exp $ */ - /* - * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and - * VA Linux Systems Inc., Fremont, California. -@@ -401,11 +401,16 @@ - # define RADEON_DAC_FORCE_DATA_SEL_MASK (3 << 6) - # define RADEON_DAC_FORCE_DATA_MASK 0x0003ff00 - # define RADEON_DAC_FORCE_DATA_SHIFT 8 -+#define RADEON_DAC_MACRO_CNTL 0x0d04 -+# define RADEON_DAC_PDWN_R (1 << 16) -+# define RADEON_DAC_PDWN_G (1 << 17) -+# define RADEON_DAC_PDWN_B (1 << 18) - #define RADEON_TV_DAC_CNTL 0x088c - # define RADEON_TV_DAC_STD_MASK 0x0300 - # define RADEON_TV_DAC_RDACPD (1 << 24) - # define RADEON_TV_DAC_GDACPD (1 << 25) - # define RADEON_TV_DAC_BDACPD (1 << 26) -+# define RADEON_TV_DAC_BGSLEEP (1 << 26) - #define RADEON_DISP_HW_DEBUG 0x0d14 - # define RADEON_CRT2_DISP1_SEL (1 << 5) - #define RADEON_DISP_OUTPUT_CNTL 0x0d64 diff --git a/x11-servers/XFree86-4-Server/files/patch-trident_driver.c b/x11-servers/XFree86-4-Server/files/patch-trident_driver.c new file mode 100644 index 000000000000..5a062e416351 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-trident_driver.c @@ -0,0 +1,17 @@ +Index: programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c +=================================================================== +RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v +retrieving revision 1.193 +retrieving revision 1.194 +diff -u -r1.193 -r1.194 +--- programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 18 Feb 2005 02:55:10 -0000 1.193 ++++ programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 30 Apr 2005 17:04:00 -0000 1.194 +@@ -2606,7 +2606,7 @@ + TRIDENTPtr pTrident = TRIDENTPTR(pScrn); + TRIDENTRegPtr tridentReg; + +- WAITFORVSYNC; ++ if (!xf86IsPc98()) WAITFORVSYNC; + + TridentFindClock(pScrn,mode->Clock); + diff --git a/x11-servers/XFree86-4-Server/files/patch-trident_video.c b/x11-servers/XFree86-4-Server/files/patch-trident_video.c new file mode 100644 index 000000000000..776d1ded68b5 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-trident_video.c @@ -0,0 +1,19 @@ +Index: programs/Xserver/hw/xfree86/drivers/trident/trident_video.c +=================================================================== +RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v +retrieving revision 1.47 +retrieving revision 1.48 +diff -u -r1.47 -r1.48 +--- programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 29 Mar 2004 16:25:22 -0000 1.47 ++++ programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 30 Apr 2005 17:04:00 -0000 1.48 +@@ -1307,6 +1307,8 @@ + * full vblank has passed. + * - Alan. + */ +- WAITFORVSYNC; +- WAITFORVSYNC; ++ if (!xf86IsPc98()) { ++ WAITFORVSYNC; ++ WAITFORVSYNC; ++ } + } diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index f56b79fee502..f519e7233fba 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -3,16 +3,16 @@ bin/XFree86 bin/getconfig bin/getconfig.pl bin/gtf -%%SPARC64_NA%%bin/inb -%%SPARC64_NA%%bin/inl -%%SPARC64_NA%%bin/inw -%%SPARC64_NA%%bin/ioport +%%PPC_NA%%%%SPARC64_NA%%bin/inb +%%PPC_NA%%%%SPARC64_NA%%bin/inl +%%PPC_NA%%%%SPARC64_NA%%bin/inw +%%PPC_NA%%%%SPARC64_NA%%bin/ioport bin/kbd_mode bin/mmapr bin/mmapw -%%SPARC64_NA%%bin/outb -%%SPARC64_NA%%bin/outl -%%SPARC64_NA%%bin/outw +%%PPC_NA%%%%SPARC64_NA%%bin/outb +%%PPC_NA%%%%SPARC64_NA%%bin/outl +%%PPC_NA%%%%SPARC64_NA%%bin/outw bin/pcitweak %%I386%%bin/scanpci bin/xf86cfg @@ -39,85 +39,52 @@ lib/X11/Options lib/X11/XF86Config.98 lib/X11/XF86Config.eg lib/X11/app-defaults/XF86Cfg -lib/X11/doc/BUILD -lib/X11/doc/BugReport -lib/X11/doc/DESIGN -lib/X11/doc/Install -lib/X11/doc/Japanese/README98 -lib/X11/doc/Japanese/README98.1st -lib/X11/doc/LICENSE -lib/X11/doc/README -lib/X11/doc/README.DECtga -lib/X11/doc/README.DRI -lib/X11/doc/README.DRIcomp -lib/X11/doc/README.I128 -lib/X11/doc/README.SiS -lib/X11/doc/README.XKB-Config -lib/X11/doc/README.XKB-Enhancing -lib/X11/doc/README.apm -lib/X11/doc/README.ati -lib/X11/doc/README.chips -lib/X11/doc/README.cyrix -lib/X11/doc/README.dps -lib/X11/doc/README.fonts -lib/X11/doc/README.i740 -lib/X11/doc/README.i810 -lib/X11/doc/README.mouse -lib/X11/doc/README.newport -lib/X11/doc/README.r128 -lib/X11/doc/README.rapidaccess -lib/X11/doc/README.rendition -lib/X11/doc/README.s3virge -lib/X11/doc/RELNOTES -lib/X11/doc/Versions -lib/X11/doc/VideoBoard98 +share/doc/XFree86/BUILD +share/doc/XFree86/BugReport +share/doc/XFree86/DESIGN +share/doc/XFree86/Install +share/doc/XFree86/Japanese/README98 +share/doc/XFree86/Japanese/README98.1st +share/doc/XFree86/LICENSE +share/doc/XFree86/README +share/doc/XFree86/README.DECtga +share/doc/XFree86/README.DRI +share/doc/XFree86/README.DRIcomp +share/doc/XFree86/README.I128 +share/doc/XFree86/README.SiS +share/doc/XFree86/README.XKB-Config +share/doc/XFree86/README.XKB-Enhancing +share/doc/XFree86/README.apm +share/doc/XFree86/README.ati +share/doc/XFree86/README.chips +share/doc/XFree86/README.cyrix +share/doc/XFree86/README.dps +share/doc/XFree86/README.fonts +share/doc/XFree86/README.i740 +share/doc/XFree86/README.i810 +share/doc/XFree86/README.mouse +share/doc/XFree86/README.newport +share/doc/XFree86/README.r128 +share/doc/XFree86/README.rapidaccess +share/doc/XFree86/README.rendition +share/doc/XFree86/README.s3virge +share/doc/XFree86/RELNOTES +share/doc/XFree86/Versions +share/doc/XFree86/VideoBoard98 lib/X11/etc/Xinstall.sh lib/X11/etc/sun.termcap lib/X11/etc/sun.terminfo lib/X11/etc/xmodmap.std lib/X11/getconfig/cfg.sample lib/X11/getconfig/xfree86.cfg -lib/X11/xserver/SecurityPolicy.default-Server -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 lib/modules/drivers/atimisc_drv.o %%AMD64_I386%%lib/modules/drivers/chips_drv.o -%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o -%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o -%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o +%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o +%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o +%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o %%AMD64_I386%%lib/modules/drivers/cyrix_drv.o %%AMD64%%lib/modules/drivers/dummy_drv.o %%AMD64%%lib/modules/drivers/fbdev_drv.o @@ -131,16 +98,16 @@ lib/modules/drivers/atimisc_drv.o lib/modules/drivers/nv_drv.o lib/modules/drivers/r128_drv.o lib/modules/drivers/radeon_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o +%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o lib/modules/drivers/riva128.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o +%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o %%AMD64_I386%%lib/modules/drivers/sis_drv.o %%SPARC64%%lib/modules/drivers/sunffb_drv.o %%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o +%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o %%AMD64_I386%%lib/modules/drivers/trident_drv.o %%AMD64_I386%%lib/modules/drivers/tseng_drv.o %%AMD64_I386%%lib/modules/drivers/vesa_drv.o @@ -200,7 +167,16 @@ lib/modules/libxf4bpp.a lib/modules/libxf8_16bpp.a lib/modules/libxf8_32bpp.a %%SPARC64%%lib/modules/libxf8_32wid.a -%%SPARC64_NA%%lib/modules/v10002d.uc -%%SPARC64_NA%%lib/modules/v20002d.uc +%%PPC_NA%%%%SPARC64_NA%%lib/modules/v10002d.uc +%%PPC_NA%%%%SPARC64_NA%%lib/modules/v20002d.uc +@dirrm lib/X11/etc @dirrm lib/X11/getconfig -@unexec rmdir %D/lib/X11/doc/Japanese 2>/dev/null || true +@dirrm lib/modules/drivers +@dirrm lib/modules/extensions +@dirrm lib/modules/fonts +@dirrm lib/modules/freebsd +@dirrm lib/modules/input +@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@unexec rmdir %D/lib/modules 2>/dev/null || true +@unexec rmdir %D/share/doc/XFree86/Japanese 2>/dev/null || true +@unexec rmdir %D/share/doc/XFree86 2>/dev/null || true diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index cae9a5090e8a..c4c87848d3e9 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -32,7 +32,6 @@ echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \ wacom void citron" >> $LOCALDEF echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF echo "#define BuildXF86DRM NO" >> $LOCALDEF -echo "#define InstSrcDir $WRKDIR/drmsource" >> $LOCALDEF echo "#define HasGlide3 YES" >> $LOCALDEF # Install driver manpages as foo.4x so they can easily be accesed by @@ -55,9 +54,11 @@ for i in \ BuildFontServer \ XVirtualFramebufferServer \ XprtServer \ + BuildDmx \ LibHeaders \ LibInstall \ ForceNormalLib \ + InstallSecurityConfig \ XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index bf8ca6d64c2e..c2029f3b5e93 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -6,45 +6,28 @@ # PORTNAME= VirtualFramebufferServer -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 virtual framebuffer server -CONFLICTS= xorg-vfbserver-* - -RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps - -FONT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz +CONFLICTS= xorg-vfbserver-[0-9]* MAN1= Xvfb.1 -EXTRA_PATCHES+= ${FILESDIR}/patch-programs::Xserver::Xext::Imakefile +PLIST_FILES= bin/Xvfb + XBUILD_DIRS= lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver/hw/vfb -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile deleted file mode 100644 index 557654663de4..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 -+++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 -@@ -160,7 +160,7 @@ - LinkSourceFile(modinit.h,extmod) - - #if BuildXCSecurity && InstallSecurityConfig --InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) -+InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-VFBServer,$(SERVERCONFIGDIR)) - #endif - - DependTarget() diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist deleted file mode 100644 index e81bbc131be4..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/Xvfb -lib/X11/xserver/SecurityPolicy.default-VFBServer diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure index 159baea5aff2..1882084a1b9e 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure @@ -37,8 +37,10 @@ for i in BuildFonts \ BuildFontServer \ XnestServer \ XprtServer \ + XdmxServer \ LibHeaders \ ForceNormalLib \ + InstallSecurityConfig \ XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index e53691604eef..3ed98fdc6884 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -6,16 +6,15 @@ # PORTNAME= clients -PORTVERSION= 4.4.0 -PORTREVISION= 5 +PORTVERSION= 4.5.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz \ - XFree86-4.4.0-src-4.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz \ + XFree86-${PORTVERSION}-src-4.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 client programs and related files @@ -42,12 +41,7 @@ XINSTALL_MAN_DIRS= programs .for pf in patch-bdftruncate.pl patch-ucs2any.pl \ patch-programs::fonttosfnt::read.c \ - patch-programs::Imakefile \ - patch-programs::xdm::Imakefile \ - patch-programs::xdm::session.c \ - patch-programs::xdm::socket.c \ - patch-programs::xkbcomp::symbols::Imakefile \ - patch-programs::xkbcomp::symbols::pc::Imakefile + patch-programs::Imakefile EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor @@ -94,7 +88,7 @@ post-install: .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86-4 +IGNORE= is part of XFree86-4 .endif .include "${FILESDIR}/manpages" diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo index e5d5220d81b6..4096a2f01d04 100644 --- a/x11/XFree86-4-clients/distinfo +++ b/x11/XFree86-4-clients/distinfo @@ -1,8 +1,8 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b -SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 +SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 diff --git a/x11/XFree86-4-clients/files/patch-programs::xdm::Imakefile b/x11/XFree86-4-clients/files/patch-programs::xdm::Imakefile deleted file mode 100644 index df58671f79e5..000000000000 --- a/x11/XFree86-4-clients/files/patch-programs::xdm::Imakefile +++ /dev/null @@ -1,14 +0,0 @@ ---- programs/xdm/Imakefile.old Wed Jun 30 22:11:46 2004 -+++ programs/xdm/Imakefile Wed Jun 30 22:12:12 2004 -@@ -31,7 +31,11 @@ - #endif - - #if HasSecureRPC -+#if defined(FreeBSDArchitecture) && (OSMajorVersion < 5) -+RPC_DEFINES = -DSECURE_RPC -DFREEBSD_OLD_RPC -+#else - RPC_DEFINES = -DSECURE_RPC -+#endif - RPCOBJS = rpcauth.o - RPCSRCS = rpcauth.c - RPCLIB = -lrpcsvc diff --git a/x11/XFree86-4-clients/files/patch-programs::xdm::session.c b/x11/XFree86-4-clients/files/patch-programs::xdm::session.c deleted file mode 100644 index 4a52adccc013..000000000000 --- a/x11/XFree86-4-clients/files/patch-programs::xdm::session.c +++ /dev/null @@ -1,27 +0,0 @@ ---- programs/xdm/session.c.old Wed Jun 30 22:12:02 2004 -+++ programs/xdm/session.c Wed Jun 30 22:12:21 2004 -@@ -54,8 +54,12 @@ - #ifdef SECURE_RPC - # include <rpc/rpc.h> - # include <rpc/key_prot.h> -+#ifdef FREEBSD_OLD_RPC -+extern int key_setnet(struct netstarg *arg); -+#else - extern int key_setnet(struct key_netstarg *arg); - #endif -+#endif - #ifdef K5AUTH - # include <krb5/krb5.h> - #endif -@@ -643,7 +647,11 @@ - char netname[MAXNETNAMELEN+1], secretkey[HEXKEYBYTES+1]; - int nameret, keyret; - int len; -+#ifdef FREEBSD_OLD_RPC -+ struct netstarg netst; -+#else - struct key_netstarg netst; -+#endif - int key_set_ok = 0; - - nameret = getnetname (netname); diff --git a/x11/XFree86-4-clients/files/patch-programs::xdm::socket.c b/x11/XFree86-4-clients/files/patch-programs::xdm::socket.c deleted file mode 100644 index deef390c4192..000000000000 --- a/x11/XFree86-4-clients/files/patch-programs::xdm::socket.c +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/xdm/socket.c.orig Thu Jun 3 05:38:29 2004 -+++ programs/xdm/socket.c Thu Jun 3 05:40:54 2004 -@@ -66,6 +66,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); - #else diff --git a/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::Imakefile b/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::Imakefile deleted file mode 100644 index ce5b56ccaa60..000000000000 --- a/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/xkbcomp/symbols/Imakefile.orig Sun Sep 19 21:29:40 2004 -+++ programs/xkbcomp/symbols/Imakefile Sun Sep 19 21:30:09 2004 -@@ -15,7 +15,7 @@ - czsk cz cz_qwerty \ - de de_CH dev dk dvorak \ - ee el en_US es \ -- fi fr fr_CH \ -+ fi fo fr fr_CH \ - gb ge_la ge_ru group guj gur \ - hr hr_US hu hu_US hu_qwerty \ - ie il il_phonetic iso9995-3 inet ir is it iu \ diff --git a/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::pc::Imakefile b/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::pc::Imakefile deleted file mode 100644 index 672908b004e9..000000000000 --- a/x11/XFree86-4-clients/files/patch-programs::xkbcomp::symbols::pc::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/xkbcomp/symbols/pc/Imakefile.orig Sun Sep 19 21:31:10 2004 -+++ programs/xkbcomp/symbols/pc/Imakefile Sun Sep 19 21:31:20 2004 -@@ -7,7 +7,7 @@ - cz cz_qwerty \ - de dev dk dvorak dz \ - ee el en_US es \ -- fi fr fr-latin9 \ -+ fi fo fr fr-latin9 \ - gb ge_la ge_ru guj gur \ - hr \ - ie il il_phonetic ir is it iu \ diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist index ef91ad9f790c..7d4f4c857cdc 100644 --- a/x11/XFree86-4-clients/pkg-plist +++ b/x11/XFree86-4-clients/pkg-plist @@ -580,7 +580,9 @@ lib/X11/xkb/symbols/iu lib/X11/xkb/symbols/jp lib/X11/xkb/symbols/kan lib/X11/xkb/symbols/keypad +lib/X11/xkb/symbols/ky lib/X11/xkb/symbols/la +lib/X11/xkb/symbols/lat lib/X11/xkb/symbols/level3 lib/X11/xkb/symbols/lo lib/X11/xkb/symbols/lock @@ -640,6 +642,8 @@ lib/X11/xkb/symbols/pc/ge_ru lib/X11/xkb/symbols/pc/guj lib/X11/xkb/symbols/pc/gur lib/X11/xkb/symbols/pc/hr +lib/X11/xkb/symbols/pc/hsb +lib/X11/xkb/symbols/pc/hu lib/X11/xkb/symbols/pc/ie lib/X11/xkb/symbols/pc/il lib/X11/xkb/symbols/pc/il_phonetic @@ -648,7 +652,9 @@ lib/X11/xkb/symbols/pc/is lib/X11/xkb/symbols/pc/it lib/X11/xkb/symbols/pc/iu lib/X11/xkb/symbols/pc/kan +lib/X11/xkb/symbols/pc/ky lib/X11/xkb/symbols/pc/la +lib/X11/xkb/symbols/pc/lat lib/X11/xkb/symbols/pc/latin lib/X11/xkb/symbols/pc/lo lib/X11/xkb/symbols/pc/lt @@ -674,6 +680,7 @@ lib/X11/xkb/symbols/pc/se_FI lib/X11/xkb/symbols/pc/se_NO lib/X11/xkb/symbols/pc/se_SE lib/X11/xkb/symbols/pc/si +lib/X11/xkb/symbols/pc/sin lib/X11/xkb/symbols/pc/sk lib/X11/xkb/symbols/pc/sk_qwerty lib/X11/xkb/symbols/pc/sr @@ -687,6 +694,7 @@ lib/X11/xkb/symbols/pc/tj lib/X11/xkb/symbols/pc/tml lib/X11/xkb/symbols/pc/tr lib/X11/xkb/symbols/pc/ua +lib/X11/xkb/symbols/pc/ur_PK lib/X11/xkb/symbols/pc/us lib/X11/xkb/symbols/pc/us_intl lib/X11/xkb/symbols/pc/uz @@ -748,6 +756,7 @@ lib/X11/xkb/types/pc lib/X11/xkb/xkbcomp lib/X11/xman.help lib/X11/xsm/system.xsm +@dirrm lib/X11/fonts/util @dirrm lib/X11/icons/default @dirrm lib/X11/icons/handhelds/cursors @dirrm lib/X11/icons/handhelds @@ -755,5 +764,48 @@ lib/X11/xsm/system.xsm @dirrm lib/X11/icons/redglass @dirrm lib/X11/icons/whiteglass/cursors @dirrm lib/X11/icons/whiteglass +@dirrm lib/X11/icons +@dirrm lib/X11/lbxproxy +@dirrm lib/X11/proxymngr +@dirrm lib/X11/rstart/commands/x11r6 +@dirrm lib/X11/rstart/commands +@dirrm lib/X11/rstart/contexts +@dirrm lib/X11/rstart +@dirrm lib/X11/twm +@dirrm lib/X11/x11perfcomp @dirrm lib/X11/xdm/default +@dirrm lib/X11/xdm/pixmaps +@dirrm lib/X11/xdm +@dirrm lib/X11/xedit/lisp/progmodes +@dirrm lib/X11/xedit/lisp +@dirrm lib/X11/xedit +@dirrm lib/X11/xinit +@dirrm lib/X11/xkb/compat +@dirrm lib/X11/xkb/compiled +@dirrm lib/X11/xkb/geometry/digital @dirrm lib/X11/xkb/geometry/ibm +@dirrm lib/X11/xkb/geometry/sgi +@dirrm lib/X11/xkb/geometry +@dirrm lib/X11/xkb/keycodes/digital +@dirrm lib/X11/xkb/keycodes/sgi +@dirrm lib/X11/xkb/keycodes +@dirrm lib/X11/xkb/keymap/digital +@dirrm lib/X11/xkb/keymap/sgi +@dirrm lib/X11/xkb/keymap/sun +@dirrm lib/X11/xkb/keymap +@dirrm lib/X11/xkb/rules +@dirrm lib/X11/xkb/semantics +@dirrm lib/X11/xkb/symbols/digital +@dirrm lib/X11/xkb/symbols/fujitsu +@dirrm lib/X11/xkb/symbols/hp +@dirrm lib/X11/xkb/symbols/macintosh +@dirrm lib/X11/xkb/symbols/nec +@dirrm lib/X11/xkb/symbols/pc +@dirrm lib/X11/xkb/symbols/sgi +@dirrm lib/X11/xkb/symbols/sony +@dirrm lib/X11/xkb/symbols/sun +@dirrm lib/X11/xkb/symbols/xfree68 +@dirrm lib/X11/xkb/symbols +@dirrm lib/X11/xkb/types +@dirrm lib/X11/xkb +@dirrm lib/X11/xsm diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile index ba76eea28f4d..e7774392d9f8 100644 --- a/x11/XFree86-4-documents/Makefile +++ b/x11/XFree86-4-documents/Makefile @@ -6,13 +6,13 @@ # PORTNAME= documents -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-6.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-6.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 documentation @@ -37,6 +37,6 @@ do-configure: .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86-4 +IGNORE= is part of XFree86-4 .endif .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-documents/distinfo b/x11/XFree86-4-documents/distinfo index 50e799f99281..0c395b4f09fb 100644 --- a/x11/XFree86-4-documents/distinfo +++ b/x11/XFree86-4-documents/distinfo @@ -1,4 +1,4 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-6.tgz) = d1e12c33e9756d5143004a69f2cdac81 -SIZE (xc/XFree86-4.4.0-src-6.tgz) = 3254668 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-6.tgz) = f75cf36c1170c15c5e0de757667151d4 +SIZE (xc/XFree86-4.5.0-src-6.tgz) = 3257406 diff --git a/x11/XFree86-4-documents/files/patch-04 b/x11/XFree86-4-documents/files/patch-Imakefile index 1dd024b87daa..34d44da6741d 100644 --- a/x11/XFree86-4-documents/files/patch-04 +++ b/x11/XFree86-4-documents/files/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig Sun Apr 11 08:26:03 2004 -+++ Imakefile Sun Apr 11 08:26:24 2004 -@@ -13,13 +13,11 @@ +--- Imakefile.orig Wed Feb 2 17:35:34 2005 ++++ Imakefile Wed Feb 2 17:36:07 2005 +@@ -8,7 +8,7 @@ #else SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE PM Render SM X11 XDMCP \ XIM XLFD XProtocol Xaw Xext Xi Xmu Xserver Xt Xv XvMC \ @@ -8,10 +8,11 @@ + i18n rstart xfs xterm xtrans #endif - all:: + AllTarget(specindex.html) +@@ -21,6 +21,4 @@ + #endif - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) + CppRawFileTarget(specindex.html,specindex.cpp,$(SPECINDEXDEFS),NullParameter) - -InstallDoc(specindex,specindex.html) diff --git a/x11/XFree86-4-documents/pkg-plist b/x11/XFree86-4-documents/pkg-plist index cf8199d5b779..5a8207d610df 100644 --- a/x11/XFree86-4-documents/pkg-plist +++ b/x11/XFree86-4-documents/pkg-plist @@ -1,93 +1,96 @@ -lib/X11/doc/DPMS.txt -lib/X11/doc/DPMSLib.txt -lib/X11/doc/ICElib.txt -lib/X11/doc/LocaleDB.txt -lib/X11/doc/PM_spec.txt -lib/X11/doc/PostScript/DPMS.ps -lib/X11/doc/PostScript/DPMSLib.ps -lib/X11/doc/PostScript/ICElib.ps -lib/X11/doc/PostScript/LocaleDB.ps -lib/X11/doc/PostScript/SMlib.ps -lib/X11/doc/PostScript/XIMTransport.ps -lib/X11/doc/PostScript/XiLib.ps -lib/X11/doc/PostScript/XiPorting.ps -lib/X11/doc/PostScript/XiProtocol.ps -lib/X11/doc/PostScript/Xtrans.ps -lib/X11/doc/PostScript/appgroup.ps -lib/X11/doc/PostScript/bdf.ps -lib/X11/doc/PostScript/bigreq.ps -lib/X11/doc/PostScript/buffer.ps -lib/X11/doc/PostScript/ctext.ps -lib/X11/doc/PostScript/ctlseqs.ps -lib/X11/doc/PostScript/ddx.ps -lib/X11/doc/PostScript/evi.ps -lib/X11/doc/PostScript/fontlib.ps -lib/X11/doc/PostScript/fsproto.ps -lib/X11/doc/PostScript/i18nFramework.ps -lib/X11/doc/PostScript/icccm.ps -lib/X11/doc/PostScript/ice.ps -lib/X11/doc/PostScript/intrinsics.ps -lib/X11/doc/PostScript/mit-shm.ps -lib/X11/doc/PostScript/proto.ps -lib/X11/doc/PostScript/record.ps -lib/X11/doc/PostScript/recordlib.ps -lib/X11/doc/PostScript/rstart.ps -lib/X11/doc/PostScript/shape.ps -lib/X11/doc/PostScript/shapelib.ps -lib/X11/doc/PostScript/tog-cup.ps -lib/X11/doc/PostScript/widgets.ps -lib/X11/doc/PostScript/xc-misc.ps -lib/X11/doc/PostScript/xdmcp.ps -lib/X11/doc/PostScript/xfs-design.ps -lib/X11/doc/PostScript/xim.ps -lib/X11/doc/PostScript/xlfd.ps -lib/X11/doc/PostScript/xlib.ps -lib/X11/doc/PostScript/xmu.ps -lib/X11/doc/PostScript/xsmp.ps -lib/X11/doc/PostScript/xtest.ps -lib/X11/doc/PostScript/xtestlib.ps -lib/X11/doc/SMlib.txt -lib/X11/doc/XIMTransport.txt -lib/X11/doc/XiLib.txt -lib/X11/doc/XiPorting.txt -lib/X11/doc/XiProtocol.txt -lib/X11/doc/Xtrans.txt -lib/X11/doc/XvMC_API.txt -lib/X11/doc/appgroup.txt -lib/X11/doc/bdf.txt -lib/X11/doc/bigreq.txt -lib/X11/doc/buffer.txt -lib/X11/doc/ctext.txt -lib/X11/doc/ctlseqs.txt -lib/X11/doc/ddx.txt -lib/X11/doc/evi.txt -lib/X11/doc/fontlib.txt -lib/X11/doc/fsproto.txt -lib/X11/doc/i18nFramework.txt -lib/X11/doc/icccm.txt -lib/X11/doc/ice.txt -lib/X11/doc/intrinsics.txt -lib/X11/doc/libGL.txt -lib/X11/doc/mit-shm.txt -lib/X11/doc/proto.txt -lib/X11/doc/record.txt -lib/X11/doc/recordlib.txt -lib/X11/doc/render-protocol.txt -lib/X11/doc/rstart.txt -lib/X11/doc/rstartd.txt -lib/X11/doc/shape.txt -lib/X11/doc/shapelib.txt -lib/X11/doc/tog-cup.txt -lib/X11/doc/widgets.txt -lib/X11/doc/xc-misc.txt -lib/X11/doc/xdmcp.txt -lib/X11/doc/xfs-design.txt -lib/X11/doc/xim.txt -lib/X11/doc/xlfd.txt -lib/X11/doc/xlib.txt -lib/X11/doc/xmu.txt -lib/X11/doc/xsmp.txt -lib/X11/doc/xtest.txt -lib/X11/doc/xtestlib.txt -lib/X11/doc/xv-protocol-v2.txt -@unexec rmdir %D/lib/X11/doc/PDF 2>/dev/null || true +share/doc/XFree86/DPMS.txt +share/doc/XFree86/DPMSLib.txt +share/doc/XFree86/ICElib.txt +share/doc/XFree86/LocaleDB.txt +share/doc/XFree86/PM_spec.txt +share/doc/XFree86/PostScript/DPMS.ps +share/doc/XFree86/PostScript/DPMSLib.ps +share/doc/XFree86/PostScript/ICElib.ps +share/doc/XFree86/PostScript/LocaleDB.ps +share/doc/XFree86/PostScript/SMlib.ps +share/doc/XFree86/PostScript/XIMTransport.ps +share/doc/XFree86/PostScript/XiLib.ps +share/doc/XFree86/PostScript/XiPorting.ps +share/doc/XFree86/PostScript/XiProtocol.ps +share/doc/XFree86/PostScript/Xtrans.ps +share/doc/XFree86/PostScript/appgroup.ps +share/doc/XFree86/PostScript/bdf.ps +share/doc/XFree86/PostScript/bigreq.ps +share/doc/XFree86/PostScript/buffer.ps +share/doc/XFree86/PostScript/ctext.ps +share/doc/XFree86/PostScript/ctlseqs.ps +share/doc/XFree86/PostScript/ddx.ps +share/doc/XFree86/PostScript/evi.ps +share/doc/XFree86/PostScript/fontlib.ps +share/doc/XFree86/PostScript/fsproto.ps +share/doc/XFree86/PostScript/i18nFramework.ps +share/doc/XFree86/PostScript/icccm.ps +share/doc/XFree86/PostScript/ice.ps +share/doc/XFree86/PostScript/intrinsics.ps +share/doc/XFree86/PostScript/mit-shm.ps +share/doc/XFree86/PostScript/proto.ps +share/doc/XFree86/PostScript/record.ps +share/doc/XFree86/PostScript/recordlib.ps +share/doc/XFree86/PostScript/rstart.ps +share/doc/XFree86/PostScript/shape.ps +share/doc/XFree86/PostScript/shapelib.ps +share/doc/XFree86/PostScript/tog-cup.ps +share/doc/XFree86/PostScript/widgets.ps +share/doc/XFree86/PostScript/xc-misc.ps +share/doc/XFree86/PostScript/xdmcp.ps +share/doc/XFree86/PostScript/xfs-design.ps +share/doc/XFree86/PostScript/xim.ps +share/doc/XFree86/PostScript/xlfd.ps +share/doc/XFree86/PostScript/xlib.ps +share/doc/XFree86/PostScript/xmu.ps +share/doc/XFree86/PostScript/xsmp.ps +share/doc/XFree86/PostScript/xtest.ps +share/doc/XFree86/PostScript/xtestlib.ps +share/doc/XFree86/SMlib.txt +share/doc/XFree86/XIMTransport.txt +share/doc/XFree86/XiLib.txt +share/doc/XFree86/XiPorting.txt +share/doc/XFree86/XiProtocol.txt +share/doc/XFree86/Xtrans.txt +share/doc/XFree86/XvMC_API.txt +share/doc/XFree86/appgroup.txt +share/doc/XFree86/bdf.txt +share/doc/XFree86/bigreq.txt +share/doc/XFree86/buffer.txt +share/doc/XFree86/ctext.txt +share/doc/XFree86/ctlseqs.txt +share/doc/XFree86/ddx.txt +share/doc/XFree86/evi.txt +share/doc/XFree86/fontlib.txt +share/doc/XFree86/fsproto.txt +share/doc/XFree86/i18nFramework.txt +share/doc/XFree86/icccm.txt +share/doc/XFree86/ice.txt +share/doc/XFree86/intrinsics.txt +share/doc/XFree86/libGL.txt +share/doc/XFree86/mit-shm.txt +share/doc/XFree86/proto.txt +share/doc/XFree86/record.txt +share/doc/XFree86/recordlib.txt +share/doc/XFree86/render-protocol.txt +share/doc/XFree86/rstart.txt +share/doc/XFree86/rstartd.txt +share/doc/XFree86/shape.txt +share/doc/XFree86/shapelib.txt +share/doc/XFree86/tog-cup.txt +share/doc/XFree86/widgets.txt +share/doc/XFree86/xc-misc.txt +share/doc/XFree86/xdmcp.txt +share/doc/XFree86/xfs-design.txt +share/doc/XFree86/xim.txt +share/doc/XFree86/xlfd.txt +share/doc/XFree86/xlib.txt +share/doc/XFree86/xmu.txt +share/doc/XFree86/xsmp.txt +share/doc/XFree86/xtest.txt +share/doc/XFree86/xtestlib.txt +share/doc/XFree86/xv-protocol-v2.txt +@unexec rmdir %D/share/doc/XFree86/PDF 2>/dev/null || true +@unexec rmdir %D/share/doc/XFree86/PostScript 2>/dev/null || true +@unexec rmdir %D/share/doc/XFree86/html 2>/dev/null || true +@unexec rmdir %D/share/doc/XFree86 2>/dev/null || true diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 5af3dc5b1890..9b4b897d27d5 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -6,21 +6,14 @@ # PORTNAME= libraries -PORTVERSION= 4.4.0 -PORTREVISION= 3 +PORTVERSION= 4.5.0 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 libraries and headers @@ -28,12 +21,16 @@ COMMENT= XFree86-4 libraries and headers LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig -CONFLICTS= Mesa-* libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* \ - libXaw-* libXcursor-* libXdmcp-* libXext-* libXfont-* libXi-* \ - libXinerama-* libXmu-* libXp-* libXpm-* libXrandr-* \ - libXrender-* libXres-* libXt-* libXv-* libXxf86-* libxkbfile-* \ - panoramixext-* printext-* randrext-* renderext-* resourceext-* \ - xextensions-* xf86ext-* xlibs-* xorg-libraries-* xpm-* xproto-* +CONFLICTS= Mesa-[0-9]* libX11-[0-9]* libGL-[0-9]* libGLU-[0-9]* \ + libICE-[0-9]* libSM-[0-9]* libXau-[0-9]* libXaw-[0-9]* \ + libXcursor-[0-9]* libXdmcp-[0-9]* libXext-[0-9]* \ + libXfont-[0-9]* libXi-[0-9]* libXinerama-[0-9]* libXmu-[0-9]* \ + libXp-[0-9]* libXpm-[0-9]* libXrandr-[0-9]* libXrender-[0-9]* \ + libXres-[0-9]* libXt-[0-9]* libXv-[0-9]* libXxf86-[0-9]* \ + libxkbfile-[0-9]* panoramixext-[0-9]* printext-[0-9]* \ + randrext-[0-9]* renderext-[0-9]* resourceext-[0-9]* \ + xextensions-[0-9]* xf86ext-[0-9]* xlibs-[0-9]* \ + xorg-libraries-[0-9]* xpm-[0-9]* xproto-[0-9]* USE_X_PREFIX= no PREFIX?= ${X11BASE} @@ -96,7 +93,8 @@ XINSTALL_DIRS= include lib nls programs/Xserver/include \ XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} # XFree86 User Config: -# DebuggableLibraries NO build with debug libs (require FreeBSD-4 or later) +# DebuggableLibraries NO build with debug libs +# (requires FreeBSD 4.X or later) # ---------------------------------------------------------------------------- DebuggableLibraries?= NO # End of XFree86 User Config @@ -108,7 +106,7 @@ DebuggableLibraries?= NO .include "Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86-4 +IGNORE= is part of XFree86-4 .endif # BuildXF86DRI is false for FreeBSD < 4.1 @@ -118,27 +116,29 @@ PLIST_SUB+= OSMESA:="@comment " PLIST_SUB+= OSMESA:="" .endif -# sparc64 doesn't have a working libc_r yet, and -current doesn't need libXThrStub. -.if ${MACHINE_ARCH} == "sparc64" || ${OSVERSION} >= 500043 -PLIST_SUB+= XTHRSTUB:="@comment " -.else -PLIST_SUB+= XTHRSTUB:="" -.endif - -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c +# 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 post-patch: - ${CP} ${FILESDIR}/nls::Compose::microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251 + ${CP} ${FILESDIR}/nls::Compose::microsoft-cp1251 \ + ${WRKSRC}/nls/Compose/microsoft-cp1251 post-install: + ${MKDIR} ${PREFIX}/include/X11/PM ${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PM.h \ - ${PREFIX}/include/X11/PM + ${PREFIX}/include/X11/PM ${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PMproto.h \ - ${PREFIX}/include/X11/PM + ${PREFIX}/include/X11/PM ${MKDIR} ${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/lib/Xcursor/xcursor.pc \ - ${PREFIX}/libdata/pkgconfig + ${PREFIX}/libdata/pkgconfig + ${MKDIR} ${PREFIX}/lib/X11/xserver + ${INSTALL_DATA} ${WRKSRC}/programs/Xserver/Xext/SecurityPolicy \ + ${PREFIX}/lib/X11/xserver/SecurityPolicy.default .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11/XFree86-4-libraries/files/patch-amd64 b/x11/XFree86-4-libraries/files/patch-amd64 deleted file mode 100644 index bf1674147090..000000000000 --- a/x11/XFree86-4-libraries/files/patch-amd64 +++ /dev/null @@ -1,300 +0,0 @@ ---- config/imake/imakemdep.h.orig Mon Dec 29 20:53:52 2003 -+++ config/imake/imakemdep.h Tue Mar 2 11:05:16 2004 -@@ -374,6 +374,9 @@ - # ifdef __AMD64__ - "-D__AMD64__", - # endif -+# ifdef __amd64__ -+ "-D__amd64__", -+# endif - # ifdef __x86_64__ - "-D__AMD64__", - # endif -@@ -1271,6 +1274,9 @@ - # if defined (__AMD64__) || defined (__x86_64__) - {"__AMD64__", "1"}, - {"__x86_64__", "1"}, -+# endif -+# if defined (__amd64__) -+ {"__amd64__", "1"}, - # endif - # ifdef __i386 - {"__i386", "1"}, ---- extras/Mesa/src/mmath.h.orig Wed Oct 22 11:44:41 2003 -+++ extras/Mesa/src/mmath.h Thu Mar 4 14:25:57 2004 -@@ -205,7 +205,7 @@ - - - #if defined(__i386__) || defined(__sparc__) || defined(__s390x__) || \ -- defined(__powerpc__) || defined(__AMD64__) || \ -+ defined(__powerpc__) || defined(__AMD64__) || defined(__amd64__) || \ - ( defined(__alpha__) && ( defined(__IEEE_FLOAT) || !defined(VMS) ) ) - #define USE_IEEE - #endif ---- extras/x86emu/include/x86emu/types.h.orig Mon Jul 7 11:34:21 2003 -+++ extras/x86emu/include/x86emu/types.h Thu Mar 4 14:29:56 2004 -@@ -76,7 +76,7 @@ - defined(__sparc64__) || \ - defined(__s390x__) || \ - (defined(__hppa__) && defined(__LP64)) || \ -- defined(__AMD64__) || defined(AMD64) || \ -+ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \ - (defined(__sgi) && (_MIPS_SZLONG == 64)) - #define NUM32 int - #else ---- include/DPS/dpsconfig.h.orig Thu Mar 4 14:33:19 2004 -+++ include/DPS/dpsconfig.h Thu Mar 4 14:33:14 2004 -@@ -89,7 +89,7 @@ - #if defined(__alpha) || defined(__alpha__) || \ - defined(__ia64__) || defined(ia64) || \ - defined(__s390x__) || \ -- defined(__AMD64__) || defined(AMD64) -+ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) - #define IEEEFLOAT 1 - #endif - ---- include/Xmd.h.orig Thu Oct 23 11:19:01 2003 -+++ include/Xmd.h Wed Mar 3 19:29:07 2004 -@@ -64,7 +64,7 @@ - defined(__sparc64__) || \ - defined(__s390x__) || \ - (defined(__hppa__) && defined(__LP64__)) || \ -- defined(__AMD64__) || defined(AMD64) || \ -+ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) - #define LONG64 /* 32/64-bit architecture */ - #endif ---- lib/Xt/Xtos.h.orig Fri Oct 24 11:47:35 2003 -+++ lib/Xt/Xtos.h Thu Mar 4 14:37:00 2004 -@@ -67,7 +67,7 @@ - defined(__sparc64__) || \ - defined(__s390x__) || \ - (defined(__hppa__) && defined(__LP64__)) || \ -- defined(__AMD64__) || defined(AMD64) || \ -+ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) - #define LONG64 - #endif ---- lib/font/util/fontxlfd.c.orig Fri Oct 24 12:11:52 2003 -+++ lib/font/util/fontxlfd.c Thu Mar 4 14:39:56 2004 -@@ -197,7 +197,7 @@ - defined(ia64) || defined(__ia64__) || \ - defined(__alpha__) || defined(__alpha) || \ - defined(__hppa__) || \ -- defined(__AMD64__) || defined(__AMD64) || \ -+ defined(__AMD64__) || defined(__AMD64) || defined(__amd64__) || \ - defined(sgi) - #if !defined(__UNIXOS2__) - #include <float.h> ---- programs/Xserver/fb/fb.h.orig Mon Nov 3 00:11:00 2003 -+++ programs/Xserver/fb/fb.h Wed Mar 3 19:14:52 2004 -@@ -105,7 +105,7 @@ - defined(ia64) || defined(__ia64__) || \ - defined(__sparc64__) || \ - defined(__s390x__) || \ -- defined(AMD64) || defined (__AMD64__) || \ -+ defined(AMD64) || defined (__AMD64__) || defined (__amd64__) \ - (defined(sgi) && (_MIPS_SZLONG == 64)) - typedef unsigned long FbBits; - # else ---- programs/Xserver/hw/xfree86/loader/elfloader.c.orig Thu Nov 6 13:38:13 2003 -+++ programs/Xserver/hw/xfree86/loader/elfloader.c Thu Mar 4 14:46:17 2004 -@@ -137,7 +137,7 @@ - # if !defined(linux) - # error No MAP_ANON? - # endif --# if !defined (__AMD64__) || !defined(__linux__) -+# if !(defined (__AMD64__) || defined (__amd64__)) || !defined(__linux__) - # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON) - # else - # define MMAP_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_32BIT) -@@ -156,6 +156,7 @@ - #if defined (__alpha__) || \ - defined (__ia64__) || \ - defined (__AMD64__) || \ -+ defined (__amd64__) || \ - (defined (__sparc__) && \ - (defined (__arch64__) || \ - defined (__sparcv9))) -@@ -247,7 +248,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - typedef Elf_Rela Elf_Rel_t; - #else - typedef Elf_Rel Elf_Rel_t; -@@ -441,7 +443,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - ELFDEBUG(", r_addend 0x%lx", rel->r_addend); - # endif - ELFDEBUG("\n"); -@@ -477,6 +480,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -501,6 +505,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -556,6 +561,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -1216,7 +1222,7 @@ - unsigned long *dest64; - unsigned short *dest16; - #endif --#if defined(__AMD64__) -+#if defined(__AMD64__) || defined(__amd64__) - unsigned long *dest64; - int *dest32s; - #endif -@@ -1234,7 +1240,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - ELFDEBUG("%lx", rel->r_addend); - # endif - ELFDEBUG("\n"); -@@ -1293,7 +1300,7 @@ - - break; - #endif /* i386 */ --#if defined(__AMD64__) -+#if defined(__AMD64__) || defined(__amd64__) - case R_X86_64_32: - dest32 = (unsigned int *)(secp + rel->r_offset); - # ifdef ELFDEBUG ---- programs/Xserver/hw/xfree86/loader/loader.c.orig Fri Feb 13 18:58:45 2004 -+++ programs/Xserver/hw/xfree86/loader/loader.c Thu Mar 4 14:50:15 2004 -@@ -507,7 +507,7 @@ - if ((new_off_bias + size) > new_size) - new_size += pagesize; - ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE --# ifdef __AMD64__ -+# if defined(__AMD64__) || defined(__amd64__) - | MAP_32BIT - # endif - , fd, new_off); -@@ -516,7 +516,7 @@ - return (void *)(ret + new_off_bias); - # else - ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE --# ifdef __AMD64__ -+# if defined(__AMD64__) || defined(__amd64__) - | MAP_32BIT - # endif - , fd, offset + offsetbias); ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Thu Oct 2 09:30:06 2003 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Thu Mar 4 01:46:09 2004 -@@ -80,7 +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) ---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Fri Feb 13 18:58:47 2004 -+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Wed Mar 3 19:39:52 2004 -@@ -347,7 +347,7 @@ - # if !defined(__FreeBSD__) - # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge - # endif --#elif defined(__AMD64__) -+#elif defined(__AMD64__) || defined(__amd64__) - # if defined(__FreeBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # else ---- programs/Xserver/hw/xfree86/os-support/xf86drm.h.orig Wed Oct 29 05:57:47 2003 -+++ programs/Xserver/hw/xfree86/os-support/xf86drm.h Wed Mar 3 20:13:22 2004 -@@ -289,7 +289,7 @@ - #define DRM_LOCK_CONT 0x40000000 /**< Hardware lock is contended */ - - #if defined(__GNUC__) && (__GNUC__ >= 2) --# if defined(__i386) || defined(__AMD64__) -+# if defined(__i386) || defined(__AMD64__) || defined(__amd64__) - /* Reflect changes here to drmP.h */ - #define DRM_CAS(lock,old,new,__ret) \ - do { \ ---- programs/Xserver/hw/xfree86/xf86cfg/loadmod.c.orig Thu Jun 12 10:12:38 2003 -+++ programs/Xserver/hw/xfree86/xf86cfg/loadmod.c Thu Mar 4 14:54:57 2004 -@@ -182,7 +182,7 @@ - SYMFUNC(xf86memchr) - SYMFUNC(xf86memcmp) - SYMFUNC(xf86memcpy) --#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__) -+#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__) || defined (__amd64__) - /* - * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle - * structure copies. This causes a problem both here and in shared ---- programs/Xserver/include/servermd.h.orig Mon Nov 3 00:11:59 2003 -+++ programs/Xserver/include/servermd.h Tue Mar 2 10:55:03 2004 -@@ -389,7 +389,8 @@ - - #endif /* ia64 */ - --#if defined(__AMD64__) || defined(AMD64) -+#if defined(__AMD64__) || defined(AMD64) || \ -+ defined(__amd64__) - # define IMAGE_BYTE_ORDER LSBFirst - - # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) ---- programs/Xserver/mi/micoord.h.orig Fri Feb 13 18:58:52 2004 -+++ programs/Xserver/mi/micoord.h Thu Mar 4 14:57:05 2004 -@@ -70,7 +70,7 @@ - defined(__i386__) || defined(i386) || \ - defined(__ia64__) || defined(ia64) || \ - defined(__s390x__) || defined(__s390__) || \ -- defined(__AMD64__) || defined(AMD64) -+ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) - #define GetHighWord(x) (((int) (x)) >> 16) - #else - #define GetHighWord(x) (((int) (x)) / 65536) ---- programs/Xserver/os/xalloc.c.orig Mon Nov 3 00:12:00 2003 -+++ programs/Xserver/os/xalloc.c Thu Mar 4 15:00:10 2004 -@@ -184,7 +184,7 @@ - defined(__ia64__) || defined(ia64) || \ - defined(__sparc64__) || \ - defined(__s390x__) || \ -- defined(__AMD64__) || defined(AMD64) || \ -+ defined(__AMD64__) || defined(AMD64) || defined(__amd64__) || \ - (defined(sgi) && _MIPS_SZLONG == 64)) - #define MAGIC 0x1404196414071968 - #define MAGIC_FREE 0x1506196615061966 ---- programs/Xserver/render/picture.h.orig Mon Nov 3 00:12:01 2003 -+++ programs/Xserver/render/picture.h Thu Mar 4 15:08:31 2004 -@@ -170,7 +170,7 @@ - defined(ia64) || defined(__ia64__) || \ - defined(__sparc64__) || \ - defined(__s390x__) || \ -- defined(AMD64) || defined (__AMD64__) || \ -+ defined(AMD64) || defined (__AMD64__) || defined (__amd64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) - typedef long xFixed_32_32; - # else diff --git a/x11/XFree86-4-libraries/files/patch-dri-Imakefile b/x11/XFree86-4-libraries/files/patch-dri-Imakefile deleted file mode 100644 index 3e6ea5970d3c..000000000000 --- a/x11/XFree86-4-libraries/files/patch-dri-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/GL/dri/Imakefile.orig Mon Mar 3 20:21:30 2003 -+++ programs/Xserver/GL/dri/Imakefile Mon Mar 3 20:21:31 2003 -@@ -13,7 +13,7 @@ - - INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ -- -I$(XF86OSSRC) -I$(XF86COMSRC) \ -+ -I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \ - -I../include -I../glx -I$(LIBSRC)/GL/include \ - -I$(SERVERSRC)/mi -I$(FONTINCSRC) - DEFINES = $(GLX_DEFINES) diff --git a/x11/XFree86-4-libraries/files/patch-glheader b/x11/XFree86-4-libraries/files/patch-glheader deleted file mode 100644 index f10ac02f2f17..000000000000 --- a/x11/XFree86-4-libraries/files/patch-glheader +++ /dev/null @@ -1,16 +0,0 @@ ---- extras/Mesa/src/glheader.h Wed Nov 6 12:19:39 2002 -+++ extras/Mesa/src/glheader.h Sun Nov 2 12:22:42 2003 -@@ -222,5 +222,5 @@ - */ - #ifndef _ASMAPI --#if !defined( __GNUC__ ) && !defined( VMS ) -+#if !defined( __GNUC__ ) && !defined( VMS ) && !defined(__INTEL_COMPILER) - #define _ASMAPI __cdecl - #else -@@ -252,4 +252,6 @@ - #elif defined(__ICL) - # define INLINE __inline -+#elif defined(__INTEL_COMPILER) -+# define INLINE inline - #else - # define INLINE diff --git a/x11/XFree86-4-libraries/files/patch-z44 b/x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile index 9b6f755f2e6c..eb52f912cad7 100644 --- a/x11/XFree86-4-libraries/files/patch-z44 +++ b/x11/XFree86-4-libraries/files/patch-lib_GL_GL_Imakefile @@ -1,10 +1,7 @@ ---- lib/GL/GL/Imakefile.orig Tue Apr 3 11:29:31 2001 -+++ lib/GL/GL/Imakefile Sat Oct 20 10:14:30 2001 -@@ -214,14 +214,17 @@ - #undef _LinkBuildLibrary - #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib) +--- lib/GL/GL/Imakefile.orig Sun Jan 9 03:58:13 2005 ++++ lib/GL/GL/Imakefile Sun Jan 9 04:01:26 2005 +@@ -294,11 +294,15 @@ -- #if NormalLibGlx NormalLibraryTarget($(LIBNAME),$(UOBJS)) +#if !defined(LibInstall) || LibInstall @@ -19,7 +16,7 @@ #if LinkGLToUsrLib && AlternateUsrLibDir install:: MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR)) -@@ -233,11 +236,14 @@ +@@ -310,8 +314,10 @@ #endif #if DebugLibGlx DebuggedLibraryTarget($(LIBNAME),$(DOBJS)) @@ -27,11 +24,16 @@ InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) #endif +#endif + #if ExtraLibGlx && defined(ExtraLibRules) + all:: + ExtraLibMkdir() +@@ -322,7 +328,9 @@ + #endif #if ProfileLibGlx ProfiledLibraryTarget($(LIBNAME),$(POBJS)) +#if !defined(LibInstall) || LibInstall InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) - #endif -- +#endif + #endif + diff --git a/x11/XFree86-4-libraries/files/patch-z30 b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_dri_Imakefile index 2365d8400d98..156ed4c1189d 100644 --- a/x11/XFree86-4-libraries/files/patch-z30 +++ b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_dri_Imakefile @@ -1,8 +1,8 @@ ---- lib/GL/mesa/src/drv/Imakefile.orig Tue Dec 5 10:17:23 2000 -+++ lib/GL/mesa/src/drv/Imakefile Tue Dec 5 13:29:59 2000 -@@ -70,6 +70,10 @@ +--- lib/GL/mesa/drivers/dri/Imakefile.orig Sun Jan 9 22:27:16 2005 ++++ lib/GL/mesa/drivers/dri/Imakefile Sun Jan 9 22:27:59 2005 +@@ -7,6 +7,10 @@ - #endif /* GlxUseBuiltInDRIDriver */ + SUBDIRS = common DriDrivers +#if (defined(FreeBSDBuildXlib) && FreeBSDBuildXlib) || (defined(ModInstall) && !ModInstall) +SUBDIRS = common diff --git a/x11/XFree86-4-libraries/files/patch-z32 b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_osmesa_Imakefile index 7ac43bf1cd09..71b6bb04bc08 100644 --- a/x11/XFree86-4-libraries/files/patch-z32 +++ b/x11/XFree86-4-libraries/files/patch-lib_GL_mesa_drivers_osmesa_Imakefile @@ -1,15 +1,14 @@ ---- lib/GL/mesa/src/OSmesa/Imakefile.orig Tue Apr 3 11:29:33 2001 -+++ lib/GL/mesa/src/OSmesa/Imakefile Thu Jun 7 02:58:09 2001 -@@ -58,7 +58,7 @@ - LIBNAME = OSMesa - SOREV = 3.3 +--- lib/GL/mesa/drivers/osmesa/Imakefile.orig Sun Jan 9 03:32:47 2005 ++++ lib/GL/mesa/drivers/osmesa/Imakefile Sun Jan 9 03:34:41 2005 +@@ -131,6 +131,7 @@ + #endif + -- +#if !defined(LibInstall) || LibInstall || (!defined(ModInstall) || ModInstall) #if DoNormalLib NormalLibraryTarget($(LIBNAME), $(UOBJS)) InstallLibrary($(LIBNAME),$(USRLIBDIR)) -@@ -77,6 +77,7 @@ +@@ -158,6 +159,7 @@ #if DoProfileLib ProfiledLibraryTarget($(LIBNAME), $(POBJS)) InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) diff --git a/x11/XFree86-4-libraries/files/patch-lib-Imakefile b/x11/XFree86-4-libraries/files/patch-lib_Imakefile index f0ebcfc94004..9e23e6c01608 100644 --- a/x11/XFree86-4-libraries/files/patch-lib-Imakefile +++ b/x11/XFree86-4-libraries/files/patch-lib_Imakefile @@ -1,11 +1,11 @@ ---- lib/Imakefile.orig Thu Apr 8 23:24:13 2004 -+++ lib/Imakefile Thu Apr 8 23:25:07 2004 -@@ -207,7 +207,7 @@ +--- lib/Imakefile.orig Sun Jan 9 22:24:32 2005 ++++ lib/Imakefile Sun Jan 9 22:25:09 2005 +@@ -249,7 +249,7 @@ $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \ - $(LIBXML2BUILDDIR) $(EXPATBUILDDIR) $(FONTCONFIGBUILDDIR) \ + $(LIBXML2BUILDDIR) $(FONTCONFIGBUILDDIR) \ - $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \ + $(XVMCLIBDIR) $(RANDRLIBDIR) \ - $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR) + $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR) $(APPLELIBDIR) \ + $(DMXLIBDIR) - SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \ diff --git a/x11/XFree86-4-libraries/files/patch-z04 b/x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile index 24ac35c46c1b..1cc81756d39a 100644 --- a/x11/XFree86-4-libraries/files/patch-z04 +++ b/x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile @@ -1,15 +1,15 @@ ---- lib/X11/Imakefile.orig Thu Apr 8 23:51:16 2004 -+++ lib/X11/Imakefile Thu Apr 8 23:53:08 2004 +--- lib/X11/Imakefile.orig Sun Jan 9 02:58:04 2005 ++++ lib/X11/Imakefile Sun Jan 9 02:59:57 2005 @@ -10,7 +10,7 @@ HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \ Xcms.h Xlocale.h XKBlib.h --#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients -+#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !FreeBSDBuildXxserv +-#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer ++#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer && !FreeBSDBuildXxserv all:: - BuildIncludes($(HEADERS),IncSubdir,..) -@@ -1041,8 +1041,10 @@ + depend:: +@@ -1043,8 +1043,10 @@ #if InstallXcmsTxt InstallNonExecFile(Xcms.txt,$(LIBDIR)) #endif diff --git a/x11/XFree86-4-libraries/files/patch-luit b/x11/XFree86-4-libraries/files/patch-luit deleted file mode 100644 index a5e858bc67f2..000000000000 --- a/x11/XFree86-4-libraries/files/patch-luit +++ /dev/null @@ -1,79 +0,0 @@ ---- programs/luit/luit.c Fri Mar 5 01:48:51 2004 -+++ /tmp/luit/luit.c Sun Jul 18 09:01:22 2004 -@@ -45,6 +45,8 @@ - #include "charset.h" - #include "iso2022.h" - -+static int p2c_waitpipe[2]; -+static int c2p_waitpipe[2]; - static Iso2022Ptr inputState = NULL, outputState = NULL; - - static char *child_argv0 = NULL; -@@ -462,6 +464,8 @@ - exit(1); - } - -+ pipe(p2c_waitpipe); -+ pipe(c2p_waitpipe); - pid = fork(); - if(pid < 0) { - perror("Couldn't fork"); -@@ -470,8 +474,12 @@ - - if(pid == 0) { - close(pty); -+ close(p2c_waitpipe[1]); -+ close(c2p_waitpipe[0]); - child(line, path, child_argv); - } else { -+ close(p2c_waitpipe[0]); -+ close(c2p_waitpipe[1]); - free(child_argv); - free(path); - free(line); -@@ -486,6 +494,7 @@ - { - int tty; - int pgrp; -+ char tmp[10]; - - close(0); - close(1); -@@ -501,6 +510,7 @@ - kill(getppid(), SIGABRT); - exit(1); - } -+ write(c2p_waitpipe[1],"1",1); - - if(tty != 0) - dup2(tty, 0); -@@ -512,6 +522,9 @@ - if(tty > 2) - close(tty); - -+ read(p2c_waitpipe[0],tmp,1); -+ close(c2p_waitpipe[1]); -+ close(p2c_waitpipe[0]); - execvp(path, argv); - perror("Couldn't exec"); - exit(1); -@@ -535,7 +548,9 @@ - int i; - int val; - int rc; -+ char tmp[10]; - -+ read(c2p_waitpipe[0],tmp,1); - if(verbose) { - reportIso2022(outputState); - } -@@ -564,6 +579,9 @@ - - setWindowSize(0, pty); - -+ write(p2c_waitpipe[1],"1",1); -+ close(c2p_waitpipe[0]); -+ close(p2c_waitpipe[1]); - for(;;) { - rc = waitForInput(0, pty); - diff --git a/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile b/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile new file mode 100644 index 000000000000..fa3f34e36ccc --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile @@ -0,0 +1,11 @@ +--- programs/Xserver/GL/dri/Imakefile.orig Sun Jan 23 01:48:51 2005 ++++ programs/Xserver/GL/dri/Imakefile Sun Jan 23 01:49:41 2005 +@@ -59,7 +59,7 @@ + + INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \ + -I$(EXTINCSRC) -I$(MESASRCDIR)/include \ +- -I$(XF86OSSRC) -I$(XF86COMSRC) \ ++ -I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \ + -I../include -I../glx -I$(LIBSRC)/GL/include \ + -I$(SERVERSRC)/mi -I$(FONTINCSRC) \ + -I$(DRMSRCDIR)/shared diff --git a/x11/XFree86-4-libraries/files/patch-xpm-sec b/x11/XFree86-4-libraries/files/patch-xpm-sec deleted file mode 100644 index 347ab0563d6e..000000000000 --- a/x11/XFree86-4-libraries/files/patch-xpm-sec +++ /dev/null @@ -1,521 +0,0 @@ -Index: extras/Xpm/lib/Attrib.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/Attrib.c,v -retrieving revision 1.1 -diff -u -r1.1 Attrib.c ---- extras/Xpm/lib/Attrib.c 14 Nov 2003 16:48:24 -0000 1.1 -+++ extras/Xpm/lib/Attrib.c 31 Oct 2004 20:12:38 -0000 -@@ -35,7 +35,7 @@ - #include "XpmI.h" - - /* 3.2 backward compatibility code */ --LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, -+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, - XpmColor ***oldct)); - - LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); -@@ -46,12 +46,15 @@ - static int - CreateOldColorTable(ct, ncolors, oldct) - XpmColor *ct; -- int ncolors; -+ unsigned int ncolors; - XpmColor ***oldct; - { - XpmColor **colorTable, **color; - int a; - -+ if (ncolors >= UINT_MAX / sizeof(XpmColor *)) -+ return XpmNoMemory; -+ - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); - if (!colorTable) { - *oldct = NULL; -Index: extras/Xpm/lib/CrDatFrI.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/CrDatFrI.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 CrDatFrI.c ---- extras/Xpm/lib/CrDatFrI.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/CrDatFrI.c 31 Oct 2004 20:12:38 -0000 -@@ -124,6 +124,8 @@ - */ - header_nlines = 1 + image->ncolors; - header_size = sizeof(char *) * header_nlines; -+ if (header_size >= UINT_MAX / sizeof(char *)) -+ return (XpmNoMemory); - header = (char **) XpmCalloc(header_size, sizeof(char *)); - if (!header) - return (XpmNoMemory); -Index: extras/Xpm/lib/WrFFrI.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/WrFFrI.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 WrFFrI.c ---- extras/Xpm/lib/WrFFrI.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/WrFFrI.c 31 Oct 2004 20:12:26 -0000 -@@ -248,6 +248,8 @@ - unsigned int x, y, h; - - h = height - 1; -+ if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) -+ return XpmNoMemory; - p = buf = (char *) XpmMalloc(width * cpp + 3); - if (!buf) - return (XpmNoMemory); -Index: extras/Xpm/lib/XpmI.h -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/XpmI.h,v -retrieving revision 1.1.4.1.6.1 -diff -u -r1.1.4.1.6.1 XpmI.h ---- extras/Xpm/lib/XpmI.h 4 Mar 2004 17:46:10 -0000 1.1.4.1.6.1 -+++ extras/Xpm/lib/XpmI.h 31 Oct 2004 20:12:26 -0000 -@@ -86,6 +86,18 @@ - boundCheckingCalloc((long)(nelem),(long) (elsize)) - #endif - -+#if defined(SCO) || defined(__USLC__) -+#include <stdint.h> /* For SIZE_MAX */ -+#endif -+#include <limits.h> -+#ifndef SIZE_MAX -+# ifdef ULONG_MAX -+# define SIZE_MAX ULONG_MAX -+# else -+# define SIZE_MAX UINT_MAX -+# endif -+#endif -+ - #define XPMMAXCMTLEN BUFSIZ - typedef struct { - unsigned int type; -@@ -187,9 +199,9 @@ - } *xpmHashAtom; - - typedef struct { -- int size; -- int limit; -- int used; -+ unsigned int size; -+ unsigned int limit; -+ unsigned int used; - xpmHashAtom *atomTable; - } xpmHashTable; - -Index: extras/Xpm/lib/create.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/create.c,v -retrieving revision 1.1.4.1.6.1 -diff -u -r1.1.4.1.6.1 create.c ---- extras/Xpm/lib/create.c 4 Mar 2004 17:46:10 -0000 1.1.4.1.6.1 -+++ extras/Xpm/lib/create.c 31 Oct 2004 20:12:38 -0000 -@@ -1,3 +1,4 @@ -+/* $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 >= UINT_MAX / sizeof(Pixel)) -+ return (XpmNoMemory); -+ - /* malloc pixels index tables */ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); - if (!image_pixels) -@@ -988,6 +992,10 @@ - return (XpmNoMemory); - - #if !defined(FOR_MSW) && !defined(AMIGA) -+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) { -+ XDestroyImage(*image_return); -+ return XpmNoMemory; -+ } - /* now that bytes_per_line must have been set properly alloc data */ - (*image_return)->data = - (char *) XpmMalloc((*image_return)->bytes_per_line * height); -@@ -2055,6 +2063,9 @@ - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -+ if (ncolors >= UINT_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); -+ - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) - RETURN(XpmNoMemory); -@@ -2309,7 +2320,8 @@ - } - obm = SelectObject(*dc, image->bitmap); - #endif -- -+ if (ncolors > 256) -+ return (XpmFileInvalid); - - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) -@@ -2356,7 +2368,7 @@ - - /* array of pointers malloced by need */ - unsigned short *cidx[256]; -- int char1; -+ unsigned int char1; - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -@@ -2415,6 +2427,9 @@ - char *s; - char buf[BUFSIZ]; - -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); -+ - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; -Index: extras/Xpm/lib/data.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/data.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 data.c ---- extras/Xpm/lib/data.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/data.c 31 Oct 2004 20:12:26 -0000 -@@ -375,7 +375,7 @@ - { - if (!data->type) - *cmt = NULL; -- else if (data->CommentLength) { -+ else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) { - *cmt = (char *) XpmMalloc(data->CommentLength + 1); - strncpy(*cmt, data->Comment, data->CommentLength); - (*cmt)[data->CommentLength] = '\0'; -Index: extras/Xpm/lib/hashtab.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/hashtab.c,v -retrieving revision 1.1 -diff -u -r1.1 hashtab.c ---- extras/Xpm/lib/hashtab.c 14 Nov 2003 16:48:24 -0000 1.1 -+++ extras/Xpm/lib/hashtab.c 31 Oct 2004 20:12:38 -0000 -@@ -135,15 +135,17 @@ - xpmHashTable *table; - { - xpmHashAtom *atomTable = table->atomTable; -- int size = table->size; -+ unsigned int size = table->size; - xpmHashAtom *t, *p; - int i; -- int oldSize = size; -+ unsigned int oldSize = size; - - t = atomTable; - HASH_TABLE_GROWS - table->size = size; - table->limit = size / 3; -+ if (size >= UINT_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 >= UINT_MAX / sizeof(*atomTable)) -+ return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) - return (XpmNoMemory); -Index: extras/Xpm/lib/parse.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/parse.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 parse.c ---- extras/Xpm/lib/parse.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/parse.c 31 Oct 2004 20:12:38 -0000 -@@ -1,3 +1,4 @@ -+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ - /* - * Copyright (C) 1989-95 GROUPE BULL - * -@@ -44,6 +45,24 @@ - #include <ctype.h> - #include <string.h> - -+#ifdef HAS_STRLCAT -+# define STRLCAT(dst, src, dstsize) { \ -+ if (strlcat(dst, src, dstsize) >= (dstsize)) \ -+ return (XpmFileInvalid); } -+# define STRLCPY(dst, src, dstsize) { \ -+ if (strlcpy(dst, src, dstsize) >= (dstsize)) \ -+ return (XpmFileInvalid); } -+#else -+# define STRLCAT(dst, src, dstsize) { \ -+ if ((strlen(dst) + strlen(src)) < (dstsize)) \ -+ strcat(dst, src); \ -+ else return (XpmFileInvalid); } -+# define STRLCPY(dst, src, dstsize) { \ -+ if (strlen(src) < (dstsize)) \ -+ strcpy(dst, src); \ -+ else return (XpmFileInvalid); } -+#endif -+ - LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, - unsigned int height, unsigned int ncolors, - unsigned int cpp, XpmColor *colorTable, -@@ -66,7 +85,7 @@ - unsigned int *extensions; - { - unsigned int l; -- char buf[BUFSIZ]; -+ char buf[BUFSIZ + 1]; - - if (!data->format) { /* XPM 2 or 3 */ - -@@ -175,10 +194,10 @@ - XpmColor **colorTablePtr; - xpmHashTable *hashtable; - { -- unsigned int key = 0, l, a, b; -+ unsigned int key = 0, l, a, b, len; - unsigned int curkey; /* current color key */ - unsigned int lastwaskey; /* key read */ -- char buf[BUFSIZ]; -+ char buf[BUFSIZ+1]; - char curbuf[BUFSIZ]; /* current buffer */ - char **sptr, *s; - XpmColor *color; -@@ -186,6 +205,8 @@ - char **defaults; - int ErrorStatus; - -+ if (ncolors >= UINT_MAX / sizeof(XpmColor)) -+ return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) - return (XpmNoMemory); -@@ -197,6 +218,10 @@ - /* - * read pixel value - */ -+ if (cpp >= UINT_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -234,13 +259,14 @@ - } - if (!lastwaskey && key < NKEYS) { /* open new key */ - if (curkey) { /* flush string */ -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } - defaults[curkey] = s; -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - curkey = key + 1; /* set new key */ - *curbuf = '\0'; /* reset curbuf */ -@@ -251,9 +277,9 @@ - return (XpmFileInvalid); - } - if (!lastwaskey) -- strcat(curbuf, " "); /* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf);/* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ - lastwaskey = 0; - } - } -@@ -261,12 +287,13 @@ - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -- s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = defaults[curkey] = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - } - } else { /* XPM 1 */ - /* get to the beginning of the first string */ -@@ -279,6 +306,10 @@ - /* - * read pixel value - */ -+ if (cpp >= UINT_MAX - 1) { -+ xpmFreeColorTable(colorTable, ncolors); -+ return (XpmNoMemory); -+ } - color->string = (char *) XpmMalloc(cpp + 1); - if (!color->string) { - xpmFreeColorTable(colorTable, ncolors); -@@ -307,16 +338,17 @@ - *curbuf = '\0'; /* init curbuf */ - while ((l = xpmNextWord(data, buf, BUFSIZ))) { - if (*curbuf != '\0') -- strcat(curbuf, " ");/* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ - buf[l] = '\0'; -- strcat(curbuf, buf); /* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ - } -- s = (char *) XpmMalloc(strlen(curbuf) + 1); -+ len = strlen(curbuf) + 1; -+ s = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -- strcpy(s, curbuf); -+ memcpy(s, curbuf, len); - color->c_color = s; - *curbuf = '\0'; /* reset curbuf */ - if (a < ncolors - 1) -@@ -341,6 +373,9 @@ - unsigned int *iptr, *iptr2; - unsigned int a, x, y; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= UINT_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; -@@ -394,7 +432,7 @@ - - /* array of pointers malloced by need */ - unsigned short *cidx[256]; -- int char1; -+ unsigned int char1; - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -@@ -442,6 +480,9 @@ - char *s; - char buf[BUFSIZ]; - -+ if (cpp >= sizeof(buf)) -+ return (XpmFileInvalid); -+ - buf[cpp] = '\0'; - if (USE_HASHTABLE) { - xpmHashAtom *slot; -Index: extras/Xpm/lib/scan.c -=================================================================== -RCS file: /cvs/xorg/xc/extras/Xpm/lib/scan.c,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 scan.c ---- extras/Xpm/lib/scan.c 4 Mar 2004 17:46:10 -0000 1.1.10.1 -+++ extras/Xpm/lib/scan.c 31 Oct 2004 20:12:38 -0000 -@@ -107,7 +107,8 @@ - LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, - XpmAttributes *attributes)); - --LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, -+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, -+ unsigned int ncolors, - Pixel *pixels, unsigned int mask, - unsigned int cpp, XpmAttributes *attributes)); - -@@ -232,11 +233,17 @@ - else - cpp = 0; - -+ if ((height > 0 && width >= SIZE_MAX / height) || -+ width * height >= UINT_MAX / sizeof(unsigned int)) -+ RETURN(XpmNoMemory); - pmap.pixelindex = - (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); - if (!pmap.pixelindex) - RETURN(XpmNoMemory); - -+ if (pmap.size >= UINT_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); -+ - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); - if (!pmap.pixels) - RETURN(XpmNoMemory); -@@ -301,7 +308,8 @@ - * get rgb values and a string of char, and possibly a name for each - * color - */ -- -+ if (pmap.ncolors >= UINT_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 >= UINT_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 >= UINT_MAX / sizeof(XColor) || cpp >= UINT_MAX - 1) -+ return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) - return (XpmNoMemory); -Index: lib/Xpm/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/lib/Xpm/Imakefile,v -retrieving revision 1.1.10.1 -diff -u -r1.1.10.1 Imakefile ---- lib/Xpm/Imakefile 4 Mar 2004 17:46:58 -0000 1.1.10.1 -+++ lib/Xpm/Imakefile 31 Oct 2004 20:12:26 -0000 -@@ -42,11 +42,16 @@ - SPRINTFDEF = -DVOID_SPRINTF - #endif - -+#if HasStrlcat -+STRLCATDEF = -DHAS_STRLCAT -+#endif -+ - #if defined(Win32Architecture) - ZPIPEDEF = -DNO_ZPIPE - #endif - --DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(ZPIPEDEF) $(ZFILEDEF) -+DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(STRLCATDEF) \ -+ $(ZPIPEDEF) $(ZFILEDEF) - - HEADERS = xpm.h - diff --git a/x11/XFree86-4-libraries/files/patch-z05 b/x11/XFree86-4-libraries/files/patch-z05 deleted file mode 100644 index bbbd80e455cb..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z05 +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/font/X-TrueType/Imakefile.inc~ Fri Feb 18 02:13:25 2000 -+++ lib/font/X-TrueType/Imakefile.inc Tue Apr 18 17:13:40 2000 -@@ -12,7 +12,11 @@ - ARMSCII8 ARABIC MULEENCODING DOSENCODING - #endif - -+#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib - SUBDIRS = $(MODULE_SUBDIRS) $(DEFAULT_CCONV_SUBDIR) $(CCONV_SUBDIRS) -+#else -+SUBDIRS = $(MODULE_SUBDIRS) -+#endif - - #if XTrueTypeDebugXTT - XTT_DEBUG_SRCS = xttdump.c diff --git a/x11/XFree86-4-libraries/files/patch-z41 b/x11/XFree86-4-libraries/files/patch-z41 deleted file mode 100644 index 1c03e9b9709e..000000000000 --- a/x11/XFree86-4-libraries/files/patch-z41 +++ /dev/null @@ -1,18 +0,0 @@ ---- config/cf/xttMod.tmpl~ Tue Dec 5 11:59:36 2000 -+++ config/cf/xttMod.tmpl Wed Dec 20 13:39:42 2000 -@@ -24,11 +24,15 @@ - - ModuleObjectRule() - LibraryModuleTarget($(MODULENAME),$(OBJS)) -+#if (!defined(LibInstall) || LibInstall) || (!defined(ModInstall) || ModInstall) - InstallLibraryModule($(MODULENAME),$(MODULEDIR),codeconv) -+#endif - - DependTarget() - -+#if (!defined(LibInstall) || LibInstall) || (!defined(ModInstall) || ModInstall) - InstallDriverSDKLibraryModule($(MODULENAME),$(DRIVERSDKMODULEDIR),codeconv) -+#endif - - # else - /* dlopen based code converter */ diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist index ba03d4f9a3cf..ade849504555 100644 --- a/x11/XFree86-4-libraries/pkg-plist +++ b/x11/XFree86-4-libraries/pkg-plist @@ -1,3 +1,4 @@ +@unexec if cmp -s %D/lib/X11/xserver/SecurityPolicy %D/lib/X11/xserver/SecurityPolicy.default; then rm %D/lib/X11/xserver/SecurityPolicy; fi bin/xcursor-config include/DPS/ColorSB.h include/DPS/ColorSBP.h @@ -305,6 +306,8 @@ include/X11/extensions/XvMCproto.h include/X11/extensions/Xvlib.h include/X11/extensions/Xvproto.h include/X11/extensions/bigreqstr.h +include/X11/extensions/dmxext.h +include/X11/extensions/dmxproto.h include/X11/extensions/dpms.h include/X11/extensions/dpmsstr.h include/X11/extensions/extutil.h @@ -323,6 +326,7 @@ include/X11/extensions/multibuf.h include/X11/extensions/multibufst.h include/X11/extensions/panoramiXext.h include/X11/extensions/panoramiXproto.h +include/X11/extensions/panoramiXwrap.h include/X11/extensions/randr.h include/X11/extensions/randrproto.h include/X11/extensions/record.h @@ -362,12 +366,6 @@ include/X11/extensions/xtrapproto.h include/X11/fonts/FS.h include/X11/fonts/FSlib.h include/X11/fonts/FSproto.h -include/X11/fonts/codeconv/cconvversion.h -include/X11/fonts/codeconv/xttcap.h -include/X11/fonts/codeconv/xttcconv.h -include/X11/fonts/codeconv/xttcconvP.h -include/X11/fonts/codeconv/xttcommon.h -include/X11/fonts/codeconv/xttversion.h include/X11/fonts/fontenc.h include/X11/fonts/fsmasks.h include/X11/keysym.h @@ -470,11 +468,17 @@ lib/X11/locale/koi8-r/XLC_LOCALE lib/X11/locale/koi8-u/Compose lib/X11/locale/koi8-u/XI18N_OBJS lib/X11/locale/koi8-u/XLC_LOCALE +lib/X11/locale/lib/common/ximcp.so lib/X11/locale/lib/common/ximcp.so.2 +lib/X11/locale/lib/common/xlcDef.so lib/X11/locale/lib/common/xlcDef.so.2 +lib/X11/locale/lib/common/xlcUTF8Load.so lib/X11/locale/lib/common/xlcUTF8Load.so.2 +lib/X11/locale/lib/common/xlibi18n.so lib/X11/locale/lib/common/xlibi18n.so.2 +lib/X11/locale/lib/common/xlocale.so lib/X11/locale/lib/common/xlocale.so.2 +lib/X11/locale/lib/common/xomGeneric.so lib/X11/locale/lib/common/xomGeneric.so.2 lib/X11/locale/locale.alias lib/X11/locale/locale.dir @@ -523,6 +527,7 @@ lib/X11/locale/zh_TW.big5/XLC_LOCALE lib/X11/locale/zh_TW/Compose lib/X11/locale/zh_TW/XI18N_OBJS lib/X11/locale/zh_TW/XLC_LOCALE +lib/X11/xserver/SecurityPolicy.default lib/libFS.a lib/libFS.so lib/libFS.so.6 @@ -550,8 +555,8 @@ lib/libX11.so.6 lib/libXRes.a lib/libXRes.so lib/libXRes.so.1 -%%XTHRSTUB:%%lib/libXThrStub.so -%%XTHRSTUB:%%lib/libXThrStub.so.6 +lib/libXThrStub.so +lib/libXThrStub.so.6 lib/libXTrap.a lib/libXTrap.so lib/libXTrap.so.6 @@ -623,6 +628,9 @@ lib/libXxf86misc.so.1 lib/libXxf86vm.a lib/libXxf86vm.so lib/libXxf86vm.so.1 +lib/libdmx.a +lib/libdmx.so +lib/libdmx.so.1 lib/libdps.a lib/libdps.so lib/libdps.so.1 @@ -647,4 +655,71 @@ lib/libxkbui.a lib/libxkbui.so lib/libxkbui.so.1 libdata/pkgconfig/xcursor.pc +@dirrm include/DPS +@dirrm include/GL +@dirrm include/X11/ICE +@dirrm include/X11/PM +@dirrm include/X11/SM +@dirrm include/X11/Xaw +@dirrm include/X11/Xcursor +@dirrm include/X11/Xmu +@dirrm include/X11/extensions +@dirrm include/X11/fonts +@dirrm lib/X11/locale/C +@dirrm lib/X11/locale/armscii-8 +@dirrm lib/X11/locale/el_GR.UTF-8 +@dirrm lib/X11/locale/en_US.UTF-8 +@dirrm lib/X11/locale/georgian-academy +@dirrm lib/X11/locale/georgian-ps +@dirrm lib/X11/locale/ibm-cp1133 +@dirrm lib/X11/locale/iscii-dev +@dirrm lib/X11/locale/isiri-3342 +@dirrm lib/X11/locale/iso8859-1 +@dirrm lib/X11/locale/iso8859-10 +@dirrm lib/X11/locale/iso8859-11 +@dirrm lib/X11/locale/iso8859-13 +@dirrm lib/X11/locale/iso8859-14 +@dirrm lib/X11/locale/iso8859-15 +@dirrm lib/X11/locale/iso8859-2 +@dirrm lib/X11/locale/iso8859-3 +@dirrm lib/X11/locale/iso8859-4 +@dirrm lib/X11/locale/iso8859-5 +@dirrm lib/X11/locale/iso8859-6 +@dirrm lib/X11/locale/iso8859-7 +@dirrm lib/X11/locale/iso8859-8 +@dirrm lib/X11/locale/iso8859-9 +@dirrm lib/X11/locale/iso8859-9e +@dirrm lib/X11/locale/ja +@dirrm lib/X11/locale/ja.JIS +@dirrm lib/X11/locale/ja.SJIS +@dirrm lib/X11/locale/ja_JP.UTF-8 +@dirrm lib/X11/locale/ko +@dirrm lib/X11/locale/ko_KR.UTF-8 +@dirrm lib/X11/locale/koi8-c +@dirrm lib/X11/locale/koi8-r +@dirrm lib/X11/locale/koi8-u +@dirrm lib/X11/locale/lib/common +@dirrm lib/X11/locale/lib +@dirrm lib/X11/locale/microsoft-cp1251 +@dirrm lib/X11/locale/microsoft-cp1255 +@dirrm lib/X11/locale/microsoft-cp1256 +@dirrm lib/X11/locale/mulelao-1 +@dirrm lib/X11/locale/nokhchi-1 +@dirrm lib/X11/locale/tatar-cyr +@dirrm lib/X11/locale/th_TH +@dirrm lib/X11/locale/th_TH.UTF-8 +@dirrm lib/X11/locale/tscii-0 +@dirrm lib/X11/locale/vi_VN.tcvn +@dirrm lib/X11/locale/vi_VN.viscii +@dirrm lib/X11/locale/zh_CN @dirrm lib/X11/locale/zh_CN.UTF-8 +@dirrm lib/X11/locale/zh_CN.gbk +@dirrm lib/X11/locale/zh_HK.big5 +@dirrm lib/X11/locale/zh_HK.big5hkscs +@dirrm lib/X11/locale/zh_TW +@dirrm lib/X11/locale/zh_TW.UTF-8 +@dirrm lib/X11/locale/zh_TW.big5 +@dirrm lib/X11/locale +@exec if [ ! -f %D/lib/X11/xserver/SecurityPolicy ]; then cp %D/lib/X11/xserver/SecurityPolicy.default %D/lib/X11/xserver/SecurityPolicy; fi +@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true +@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile index 4959e739a31e..ebb149c5f1cd 100644 --- a/x11/XFree86-4-manuals/Makefile +++ b/x11/XFree86-4-manuals/Makefile @@ -6,8 +6,7 @@ # PORTNAME= manuals -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -17,9 +16,9 @@ DISTFILES= XFree86-${PORTVERSION}-src-1.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 man pages -CONFLICTS= xorg-manpages-* +CONFLICTS= xorg-manpages-[0-9]* -USE_IMAKE= YES +USE_IMAKE= yes EXTRACT_TARGET= xc/doc/man \ xc/extras/ogl-sample/main/doc/man EXTRACT_AFTER_ARGS= | ${TAR} -xf - ${EXTRACT_TARGET} @@ -33,6 +32,7 @@ pre-configure: @${MKDIR} ${CFGDIR} @${CP} ${PREFIX}/lib/X11/config/* ${CFGDIR} @${ECHO} "#define BuildHtmlManPages NO" >>${CFGDIR}/xf86site.def + @${ECHO} "#define PreprocessManPages YES" >>${CFGDIR}/xf86site.def do-configure: (cd ${WRKSRC} && \ @@ -45,7 +45,7 @@ do-configure: .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86-4 +IGNORE= is part of XFree86-4 .endif .include "${FILESDIR}/manpages" diff --git a/x11/XFree86-4-manuals/distinfo b/x11/XFree86-4-manuals/distinfo index 95d757b34b21..7f73580f3b79 100644 --- a/x11/XFree86-4-manuals/distinfo +++ b/x11/XFree86-4-manuals/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 diff --git a/x11/XFree86-4-manuals/files/manpages b/x11/XFree86-4-manuals/files/manpages index 2adf970511dc..7b41f1e47574 100644 --- a/x11/XFree86-4-manuals/files/manpages +++ b/x11/XFree86-4-manuals/files/manpages @@ -8,6 +8,25 @@ MAN3= AllPlanes.3 \ ClientWhitePointOfCCC.3 \ ConnectionNumber.3 \ DBE.3 \ + DMX.3 \ + DMXAddBackendInput.3 \ + DMXAddConsoleInput.3 \ + DMXAddInput.3 \ + DMXAddScreen.3 \ + DMXChangeDesktopAttributes.3 \ + DMXChangeScreensAttributes.3 \ + DMXForceWindowCreation.3 \ + DMXGetDesktopAttributes.3 \ + DMXGetInputAttributes.3 \ + DMXGetInputCount.3 \ + DMXGetScreenAttributes.3 \ + DMXGetScreenCount.3 \ + DMXGetWindowAttributes.3 \ + DMXQueryExtension.3 \ + DMXQueryVersion.3 \ + DMXRemoveInput.3 \ + DMXRemoveScreen.3 \ + DMXSync.3 \ DefaultColormap.3 \ DefaultColormapOfScreen.3 \ DefaultDepth.3 \ @@ -1500,8 +1519,5 @@ MAN3= AllPlanes.3 \ gluTessVertex.3 \ gluUnProject.3 MAN7= X.7 \ - X.Org.7 \ - XConsortium.7 \ - XProjectTeam.7 \ XStandards.7 \ Xsecurity.7 diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 262beb58ce6e..2b6e55034c76 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -6,8 +6,7 @@ # PORTNAME= XFree86 -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= # none @@ -19,7 +18,7 @@ COMMENT= X11/XFree86 core distribution (complete, using mini/meta-ports) LIB_DEPENDS= X11.6:${PORTSDIR}/x11/XFree86-4-libraries RUN_DEPENDS= xvinfo:${PORTSDIR}/x11/XFree86-4-clients \ - ${X11BASE}/lib/X11/doc/ddx.txt:${PORTSDIR}/x11/XFree86-4-documents \ + ${X11BASE}/share/doc/XFree86/ddx.txt:${PORTSDIR}/x11/XFree86-4-documents \ ${X11BASE}/man/man7/X.7.gz:${PORTSDIR}/x11/XFree86-4-manuals \ ${FONT100DPI}:${PORTSDIR}/x11-fonts/XFree86-4-font100dpi \ ${FONT75DPI}:${PORTSDIR}/x11-fonts/XFree86-4-font75dpi \ @@ -30,8 +29,7 @@ RUN_DEPENDS= xvinfo:${PORTSDIR}/x11/XFree86-4-clients \ ${X11BASE}/bin/xf86cfg:${PORTSDIR}/x11-servers/XFree86-4-Server \ ${X11BASE}/bin/Xnest:${PORTSDIR}/x11-servers/XFree86-4-NestServer \ ${X11BASE}/bin/Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer \ - ${X11BASE}/bin/Xprt:${PORTSDIR}/x11-servers/XFree86-4-PrintServer \ - ${X11BASE}/bin/Xwrapper-4:${PORTSDIR}/x11/wrapper + ${X11BASE}/bin/Xprt:${PORTSDIR}/x11-servers/XFree86-4-PrintServer NO_BUILD= yes LATEST_LINK= XFree86 |