summaryrefslogtreecommitdiff
path: root/meta-pkgs/xorg/Makefile.common
diff options
context:
space:
mode:
Diffstat (limited to 'meta-pkgs/xorg/Makefile.common')
-rw-r--r--meta-pkgs/xorg/Makefile.common33
1 files changed, 16 insertions, 17 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 545cc70b49f..59eb8719eb5 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2005/12/08 09:18:24 rillig Exp $
+# $NetBSD: Makefile.common,v 1.38 2006/01/18 23:53:06 xtraeme Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -130,16 +130,16 @@ PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB}
PLIST_SUBST+= XF86RUSH=${XF86RUSH}
PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS}
PLIST_SUBST+= LIBDRI=${LIBDRI}
-PLIST_SUBST+= MAN_DIR=${MAN_DIR:Q}
-PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR:Q}
-PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX:Q}
-PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX:Q}
-PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR:Q}
-PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX:Q}
-PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR:Q}
-PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX:Q}
-PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR:Q}
-PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX:Q}
+PLIST_SUBST+= MAN_DIR=${MAN_DIR}
+PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR}
+PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX}
+PLIST_SUBST+= LIBMAN_SUFFIX=${LIBMAN_SUFFIX}
+PLIST_SUBST+= KERNMAN_DIR=${KERNMAN_DIR}
+PLIST_SUBST+= KERNMAN_SUFFIX=${KERNMAN_SUFFIX}
+PLIST_SUBST+= FILEMAN_DIR=${FILEMAN_DIR}
+PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX}
+PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR}
+PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX}
CHECK_X11_TYPE?= yes
@@ -156,7 +156,7 @@ X11ROOT?= ${LOCALBASE}/${X11ROOT_PREFIX}
PREPEND_PATH+= ${X11ROOT}/bin # Make sure we have this in PATH :)
EGDIR?= ${LOCALBASE}/share/examples/xorg
-PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX:Q}
+PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX}
MESSAGE_SUBST+= X11ROOT=${X11ROOT}
.if ${OPSYS} != "Darwin"
@@ -182,9 +182,7 @@ ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* \
OpenBSD-*-* SunOS-*-* DragonFly-*-*
MASTER_SITE_XORG+= \
- http://ftp.skynet.be/pub/ftp.x.org/pub/X11R${XORG_VER}/src/ \
- http://www.mirrormonster.com/ftp.x.org/pub/X11R${XORG_VER}/src/ \
- http://xorg.freedesktop.org/X11R${XORG_VER}/src/ \
+ http://xorg.freedesktop.org/releases/X11R${XORG_VER}/src/ \
ftp://ftp.opengroup.org/pub/x.org/pub/X11R${XORG_VER}/src/ \
ftp://x.mirrors.skynet.be/pub/ftp.x.org/pub/X11R${XORG_VER}/src/ \
http://x.mirrors.skynet.be/pub/ftp.x.org/pub/X11R${XORG_VER}/src/ \
@@ -196,7 +194,7 @@ MASTER_SITE_XORG+= \
# When updating the version be sure to regenerate checksums
# for each xorg package with distinfo files.
-XORG_VER= 6.8.2
+XORG_VER= 6.9.0
IMAKE= ${X11ROOT}/bin/imake
@@ -264,11 +262,11 @@ post-extract:
@${LN} -sf ${X11ROOT}/bin/pswrap ${WRKSRC}/config/pswrap
@${LN} -sf ${X11ROOT}/lib/X11/config/version.def ${WRKSRC}/config/cf
@${LN} -sf ${X11ROOT}/lib/X11/config/date.def ${WRKSRC}/config/cf
- @${CP} ${PKGSRCDIR}/x11/xorg-libs/files/DragonFly.cf ${WRKSRC}/config/cf
. for F in ${SYSTEMS}
@${MV} ${WRKSRC}/config/cf/${F}.cf ${WRKSRC}/config/cf/${F}.cf.in
. endfor
+. undef F
. endif
. if !target(pre-configure)
@@ -284,6 +282,7 @@ pre-configure:
${WRKSRC}/config/cf/${F}.cf.in > \
${WRKSRC}/config/cf/${F}.cf
. endfor
+. undef F
. endif
. if !target(do-configure)