diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-05-11 08:12:23 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-05-11 08:12:23 +0000 |
| commit | b38e118caad0b8605f66040dd4c464b5d2b7784e (patch) | |
| tree | cbd380d23b7283c868817d9035d3de06c57397bd /x11-servers | |
| parent | - Update to 0.22 (diff) | |
[1] Add missing dependency on freetype2.
[2] Add missing AMD64 patch that was in XFree86-4-Server.
Reported by: [1] bento via kris
Submitted by: [2] Francois Tigeot <ftigeot@wolfpond.org>
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server-snap/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server-snap/files/patch-bus-Imakefile | 18 | ||||
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-bus-Imakefile | 18 |
4 files changed, 40 insertions, 0 deletions
diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index da31c550809d..59de56d38655 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -7,6 +7,7 @@ PORTNAME= server PORTVERSION= 6.7.0 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ PKGNAMEPREFIX= xorg- @@ -18,6 +19,7 @@ COMMENT= X.Org X server and related programs LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \ ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau +LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \ ${LIB_PC_DEPENDS} RUN_DEPENDS= ${LIB_PC_DEPENDS} diff --git a/x11-servers/xorg-server-snap/files/patch-bus-Imakefile b/x11-servers/xorg-server-snap/files/patch-bus-Imakefile new file mode 100644 index 000000000000..eb44640c816e --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-bus-Imakefile @@ -0,0 +1,18 @@ +Index: programs/Xserver/hw/xfree86/os-support/bus/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v +retrieving revision 1.2 +diff -u -r1.2 Imakefile +--- programs/Xserver/hw/xfree86/os-support/bus/Imakefile 23 Apr 2004 19:54:08 -0000 1.2 ++++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile 11 May 2004 07:58:43 -0000 +@@ -80,8 +80,8 @@ + PCIDRVRSRC = ix86Pci.c linuxPci.c + PCIDRVROBJ = ix86Pci.o linuxPci.o + +-#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) +- ++#elif defined(FreeBSDArchitecture) && \ ++ (defined(AlphaArchitecture) || defined(AMD64Architecture)) + + XCOMM generic FreeBSD PCI driver (using /dev/pci) + diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index da31c550809d..59de56d38655 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= server PORTVERSION= 6.7.0 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ PKGNAMEPREFIX= xorg- @@ -18,6 +19,7 @@ COMMENT= X.Org X server and related programs LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \ ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau +LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \ ${LIB_PC_DEPENDS} RUN_DEPENDS= ${LIB_PC_DEPENDS} diff --git a/x11-servers/xorg-server/files/patch-bus-Imakefile b/x11-servers/xorg-server/files/patch-bus-Imakefile new file mode 100644 index 000000000000..eb44640c816e --- /dev/null +++ b/x11-servers/xorg-server/files/patch-bus-Imakefile @@ -0,0 +1,18 @@ +Index: programs/Xserver/hw/xfree86/os-support/bus/Imakefile +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v +retrieving revision 1.2 +diff -u -r1.2 Imakefile +--- programs/Xserver/hw/xfree86/os-support/bus/Imakefile 23 Apr 2004 19:54:08 -0000 1.2 ++++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile 11 May 2004 07:58:43 -0000 +@@ -80,8 +80,8 @@ + PCIDRVRSRC = ix86Pci.c linuxPci.c + PCIDRVROBJ = ix86Pci.o linuxPci.o + +-#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) +- ++#elif defined(FreeBSDArchitecture) && \ ++ (defined(AlphaArchitecture) || defined(AMD64Architecture)) + + XCOMM generic FreeBSD PCI driver (using /dev/pci) + |