diff options
author | joerg <joerg@pkgsrc.org> | 2006-03-02 23:57:14 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-03-02 23:57:14 +0000 |
commit | 2c0843e02283b4e44be277fd0919666de714d694 (patch) | |
tree | e31ed72a960ef1a9b09a5527104e8468b63a577c | |
parent | a72b6f74f092f687a10c34e7f63d4d6013ccad64 (diff) | |
download | pkgsrc-2c0843e02283b4e44be277fd0919666de714d694.tar.gz |
Fix AGP GART support on DragonFly. Fix PLIST on DragonFly.
Bump xorg-server revision.
-rw-r--r-- | x11/xorg-libs/distinfo | 4 | ||||
-rw-r--r-- | x11/xorg-libs/patches/patch-aw | 29 | ||||
-rw-r--r-- | x11/xorg-server/Makefile | 6 | ||||
-rw-r--r-- | x11/xorg-server/PLIST | 3 |
4 files changed, 36 insertions, 6 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index 3557151a61d..1b64034d567 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2006/02/27 22:58:57 joerg Exp $ +$NetBSD: distinfo,v 1.37 2006/03/02 23:57:14 joerg Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -31,7 +31,7 @@ SHA1 (patch-as) = 492de38023ab7babebe0db8ab700d76e5f2b8a8b SHA1 (patch-at) = de62c6d1eedda14bac4344978b18065d46de3efd SHA1 (patch-au) = 3b76dbc381190ef18957a5af73208a72df687151 SHA1 (patch-av) = bfcdb21557e8e6f8c24399ad0077b75d4a5215c6 -SHA1 (patch-aw) = 4289ec24e811efd6f74acca6c6842ee5f77cc5f7 +SHA1 (patch-aw) = f9bc393bb6867cd5e2ed54ce7e84ddfb4837785b SHA1 (patch-ax) = 582b2b9d8f0f8316b9e2b5528cd14753df1f4bdf SHA1 (patch-ay) = 4403bc18ab13f582e4a36d6f873bbd7aaaceacf5 SHA1 (patch-az) = a236a896e4e58f0d21d5745fb4b452300f2b77c6 diff --git a/x11/xorg-libs/patches/patch-aw b/x11/xorg-libs/patches/patch-aw index b50e63f4e4c..77b008a7fd7 100644 --- a/x11/xorg-libs/patches/patch-aw +++ b/x11/xorg-libs/patches/patch-aw @@ -1,7 +1,16 @@ -$NetBSD: patch-aw,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ +$NetBSD: patch-aw,v 1.3 2006/03/02 23:57:14 joerg Exp $ --- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig 2006-01-06 17:29:53.000000000 +0000 +++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile +@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/programs/Xserver/hw/x + + #include <Server.tmpl> + +-#if defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) ++#if defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(DragonFlyArchitecture) + #if BuildXInputExt + # if JoystickSupport + JOYSTICK_SRC = bsd_jstk.c @@ -47,7 +47,7 @@ SHARED_CFLAGS = PositionIndependentCFlag IOPERM_SRC = ioperm_noop.c IOPERM_OBJ = ioperm_noop.o @@ -11,3 +20,21 @@ $NetBSD: patch-aw,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ # if defined(i386Architecture) || defined(AMD64Architecture) IOPERMDEFINES = -DUSE_DEV_IO # elif defined(AlphaBsdArchitecture) +@@ -128,7 +128,7 @@ AXP_OBJ=bsd_ev56.o xf86Axp.o bsd_axp.o + #endif + + #if (defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || \ +- defined(OpenBSDArchitecture)) && HasAgpGart ++ defined(OpenBSDArchitecture) || defined(DragonFlyArchitecture)) && HasAgpGart + AGP_SRC=lnx_agp.c + AGP_OBJ=lnx_agp.o + #else +@@ -220,7 +220,7 @@ LinkSourceFile(vidmem.c,../shared) + LinkSourceFile(sigio.c,../shared) + LinkSourceFile(kmod_noop.c,../shared) + #if (defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || \ +- defined(OpenBSDArchitecture)) && HasAgpGart ++ defined(OpenBSDArchitecture) || defined(DragonFlyArchitecture)) && HasAgpGart + LinkSourceFile(lnx_agp.c,../linux) + #else + LinkSourceFile(agp_noop.c,../shared) diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index 321fdc9bd9d..5781b5fc839 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2006/02/12 15:29:19 xtraeme Exp $ +# $NetBSD: Makefile,v 1.39 2006/03/02 23:57:14 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz \ @@ -13,6 +13,8 @@ MAINTAINER= joerg@NetBSD.org HOMEPAGE= http://www.x.org/ COMMENT= X.org X server and related programs +BUILD_DEPENDS= xorg-imake-[0-9]*:../../x11/xorg-imake + DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches diff --git a/x11/xorg-server/PLIST b/x11/xorg-server/PLIST index da0c5a6a7cf..db175d605f1 100644 --- a/x11/xorg-server/PLIST +++ b/x11/xorg-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2006/02/11 10:58:41 rillig Exp $ +@comment $NetBSD: PLIST,v 1.10 2006/03/02 23:57:14 joerg Exp $ ${X11ROOT_PREFIX}/bin/X ${X11ROOT_PREFIX}/bin/Xnest ${X11ROOT_PREFIX}/bin/Xprt @@ -1230,6 +1230,7 @@ ${X11ROOT_PREFIX}/bin/kbd_mode ${X11ROOT_PREFIX}/lib/modules/extensions/libdrm.so ${X11ROOT_PREFIX}/lib/modules/extensions/libdri.so ${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX} +${X11ROOT_PREFIX}/${MAN_DIR}/Xdmx.${MAN_SUFFIX} @dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd @dirrm ${X11ROOT_PREFIX}/etc/rc.d @comment end DragonFly |