diff options
Diffstat (limited to 'meta-pkgs/xorg')
| -rw-r--r-- | meta-pkgs/xorg/Makefile | 4 | ||||
| -rw-r--r-- | meta-pkgs/xorg/Makefile.common | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/meta-pkgs/xorg/Makefile b/meta-pkgs/xorg/Makefile index 5f7265e64f8..fd3cfa89ae0 100644 --- a/meta-pkgs/xorg/Makefile +++ b/meta-pkgs/xorg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/07/29 07:27:43 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/09/21 17:38:53 xtraeme Exp $ DISTNAME= # empty PKGNAME= xorg-${XORG_VER} @@ -21,7 +21,7 @@ DEPENDS+= xorg-fontsMisc>=${XORG_VER}:../../fonts/xorg-fontsMisc DEPENDS+= xorg-fontsCyrillic>=${XORG_VER}:../../fonts/xorg-fontsCyrillic DEPENDS+= xorg-fontsTruetype>=${XORG_VER}:../../fonts/xorg-fontsTruetype DEPENDS+= xorg-fontsType1>=${XORG_VER}:../../fonts/xorg-fontsType1 -DEPENDS+= xorg-docs>=${XORG_VER}:../../misc/xorg-docs +#DEPENDS+= xorg-docs>=${XORG_VER}:../../misc/xorg-docs NO_BUILD= # defined NO_BUILDLINK= # defined diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index e479d2ac682..72aee32e973 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2004/08/27 06:29:08 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2004/09/21 17:38:53 xtraeme Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -54,9 +54,9 @@ FILEMAN_DIR= ${MANSOURCEPATH}5 MISCMAN_DIR= ${MANSOURCEPATH}7 MAN_SUFFIX= 1x LIBMAN_SUFFIX= 3x -KERNMAN_SUFFIX= 4 +KERNMAN_SUFFIX= 4x FILEMAN_SUFFIX= 5x -MISCMAN_SUFFIX= 7 +MISCMAN_SUFFIX= 7x .elif ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" @@ -118,7 +118,7 @@ MESSAGE_SUBST+= X11ROOT=${X11ROOT} ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* OpenBSD-*-* SunOS-*-* MASTER_SITE_XORG+= \ - http://freedesktop.org/~xorg/X11R6.7.0/src/ \ + http://freedesktop.org/~xorg/X11R${XORG_VER}/src/multiple/ \ ftp://ftp.x.org/pub/ \ ftp://ftp.gwdg.de/pub/x11/x.org/pub/ \ ftp://ftp.cica.es/pub/X/pub/ \ @@ -126,7 +126,7 @@ MASTER_SITE_XORG+= \ ftp://sunsite.sut.ac.jp/pub/archives/X11/ \ ftp://ftp.unicamp.br/pub/X11/releases/ -XORG_VER= 6.7.0 +XORG_VER= 6.8.1 IMAKE= ${X11ROOT}/bin/imake @@ -170,9 +170,6 @@ 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 -. if exists(${FILESDIR}/Wraphelp.c) - @${CP} ${FILESDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp -. endif . for F in ${SYSTEMS} @${MV} ${WRKSRC}/config/cf/${F}.cf \ |