summaryrefslogtreecommitdiff
path: root/x11/modular-xorg-server
diff options
context:
space:
mode:
authorbjs <bjs>2008-10-29 22:20:28 +0000
committerbjs <bjs>2008-10-29 22:20:28 +0000
commitc50df204e27f3fa83eb56212fab0a1fe375b8bb8 (patch)
tree15f28e82edea30af223dc151406d5237b908717d /x11/modular-xorg-server
parent978e6f098ced70b477dfc827b876a8cf5e092112 (diff)
downloadpkgsrc-c50df204e27f3fa83eb56212fab0a1fe375b8bb8.tar.gz
Refactor declaration of PATCHFILES/PATCH_SITES again, allowing
the X server to define its own. PATCHFILES for modular-xorg-server are now located in ${MASTER_SITE_LOCAL:=xorg-server-patchfiles/}.
Diffstat (limited to 'x11/modular-xorg-server')
-rw-r--r--x11/modular-xorg-server/Makefile7
-rw-r--r--x11/modular-xorg-server/distinfo11
-rw-r--r--x11/modular-xorg-server/options.mk3
3 files changed, 10 insertions, 11 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index c6b399f89e2..350400c6810 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/10/29 00:55:53 bjs Exp $
+# $NetBSD: Makefile,v 1.36 2008/10/29 22:20:28 bjs Exp $
#
DISTNAME= xorg-server-1.4.2
@@ -8,8 +8,9 @@ CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
-PATCHFILES+= xorg-server-1.4.2-20080917.patch.gz
-PATCH_SITES+= ${MASTER_SITE_LOCAL}
+PATCHFILES= xorg-server-1.4.2-20080917.patch.gz
+PATCHFILES+= ${XSERVER_DRI_PATCHFILES}
+PATCH_SITES= ${MASTER_SITE_LOCAL:=xorg-server-patchfiles/}
MAINTAINER= bjs@NetBSD.org
HOMEPAGE= http://xorg.freedesktop.org/
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 74582375431..58f65acbf9a 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.27 2008/10/29 00:53:38 bjs Exp $
+$NetBSD: distinfo,v 1.28 2008/10/29 22:20:28 bjs Exp $
-SHA1 (Mesa-7.0.4-001) = a49b9094272abb2484447fb35c9adf3fe391a4bb
-RMD160 (Mesa-7.0.4-001) = 1992bb054742924f1f39a19ab35e621f53e6fbf2
-Size (Mesa-7.0.4-001) = 38003 bytes
-SHA1 (Mesa-7.0.4-002) = 1f7fe7b19a9ec6cc036021df8c9016fc1f1cb234
-RMD160 (Mesa-7.0.4-002) = 5e11808b59ea3e8c4459c671c9236b18a95d8fba
-Size (Mesa-7.0.4-002) = 4379 bytes
+SHA1 (Mesa-7.0.4-xorg-server_GL) = 6aed65e64c7a684a5d707334a4b4fe7711966380
+RMD160 (Mesa-7.0.4-xorg-server_GL) = 2028532d79f5bba1d09ae787a1799fc4b206a5d7
+Size (Mesa-7.0.4-xorg-server_GL) = 34729 bytes
SHA1 (MesaLib-7.0.4.tar.bz2) = 7e2ecbe89d245510d2681d04e959aee6adc205c5
RMD160 (MesaLib-7.0.4.tar.bz2) = 0394bb9e00ea13f2399bc5895d4264221bbc03ac
Size (MesaLib-7.0.4.tar.bz2) = 3414357 bytes
diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk
index 86251a2a698..915c05d7943 100644
--- a/x11/modular-xorg-server/options.mk
+++ b/x11/modular-xorg-server/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2008/09/18 20:56:01 bjs Exp $
+# $NetBSD: options.mk,v 1.5 2008/10/29 22:20:28 bjs Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
PKG_SUPPORTED_OPTIONS= dri inet6
@@ -17,6 +17,7 @@ MESA_DISTFILE= ${MESA_DISTNAME}${EXTRACT_SUFX} # .tar.bz2
DISTFILES+= ${MESA_DISTFILE}
SITES.${MESA_DISTFILE}= ${MESA_SITES}
MESA_SRC= ${WRKDIR}/Mesa-${MESA_VERSION}
+XSERVER_DRI_PATCHFILES= Mesa-7.0.4-xorg-server_GL
###
### XXX Is there a better way to do this? For now, when updating these
### patches (don't forget about Mesa updates!), please ensure that