pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc xorg packages now will be installed into ${PREFIX}/xor...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f6f77eeab49f
branches: trunk
changeset: 478750:f6f77eeab49f
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Thu Jul 29 06:36:32 2004 +0000
description:
xorg packages now will be installed into ${PREFIX}/xorg by default,
so we don't have to conflict between XFree86 and xorg.
Suggested by grant@.
diffstat:
fonts/XFree86-fonts100dpi/Makefile | 4 +---
fonts/XFree86-fonts75dpi/Makefile | 4 +---
fonts/XFree86-fontsCyrillic/Makefile | 4 +---
fonts/XFree86-fontsEncodings/Makefile | 4 +---
fonts/XFree86-fontsMisc/Makefile | 4 +---
fonts/XFree86-fontsScalable/Makefile | 5 +----
fonts/XFree86-fontserver/Makefile | 4 +---
fonts/xorg-fonts100dpi/Makefile | 5 +----
fonts/xorg-fonts75dpi/Makefile | 5 +----
fonts/xorg-fontsCyrillic/Makefile | 5 +----
fonts/xorg-fontsEncodings/Makefile | 5 +----
fonts/xorg-fontsMisc/Makefile | 5 +----
fonts/xorg-fontsTruetype/Makefile | 4 +---
fonts/xorg-fontsType1/Makefile | 5 +----
fonts/xorg-fontserver/Makefile | 4 +---
meta-pkgs/xorg/Makefile.common | 5 ++---
misc/XFree86-docs/Makefile | 4 +---
misc/xorg-docs/Makefile | 4 +---
x11/XFree86-clients/Makefile | 4 +---
x11/XFree86-libs/Makefile | 3 +--
x11/XFree86-server/Makefile | 4 +---
x11/imake/Makefile | 4 +---
x11/xorg-clients/Makefile | 4 +---
x11/xorg-imake/Makefile | 4 +---
x11/xorg-libs/Makefile | 3 +--
x11/xorg-server/Makefile | 4 +---
26 files changed, 27 insertions(+), 83 deletions(-)
diffs (truncated from 477 to 300 lines):
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/XFree86-fonts100dpi/Makefile
--- a/fonts/XFree86-fonts100dpi/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/XFree86-fonts100dpi/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:32 xtraeme Exp $
DISTNAME= XFree86-4.4.0-src-4
PKGNAME= XFree86-fonts100dpi-${XF_VER}
@@ -13,8 +13,6 @@
NO_XFREE86_TARGETS= # defined
WRKSRC= ${WRKDIR}/xc/fonts/bdf/100dpi
-CONFLICTS= xorg-fonts100dpi-[0-9]*
-
.include "../../fonts/XFree86-fontsEncodings/Makefile.common"
.include "../../meta-pkgs/XFree86/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/XFree86-fonts75dpi/Makefile
--- a/fonts/XFree86-fonts75dpi/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/XFree86-fonts75dpi/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= XFree86-4.4.0-src-4
PKGNAME= XFree86-fonts75dpi-${XF_VER}
@@ -13,8 +13,6 @@
NO_XFREE86_TARGETS= # defined
WRKSRC= ${WRKDIR}/xc/fonts/bdf/75dpi
-CONFLICTS= xorg-fonts75dpi-[0-9]*
-
.include "../../fonts/XFree86-fontsEncodings/Makefile.common"
.include "../../meta-pkgs/XFree86/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/XFree86-fontsCyrillic/Makefile
--- a/fonts/XFree86-fontsCyrillic/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/XFree86-fontsCyrillic/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= XFree86-4.4.0-src-4
PKGNAME= XFree86-fontsCyrillic-${XF_VER}
@@ -13,8 +13,6 @@
NO_XFREE86_TARGETS= # defined
WRKSRC= ${WRKDIR}/xc/fonts/bdf/cyrillic
-CONFLICTS= xorg-fontsCyrillic-[0-9]*
-
.include "../../fonts/XFree86-fontsEncodings/Makefile.common"
.include "../../meta-pkgs/XFree86/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/XFree86-fontsEncodings/Makefile
--- a/fonts/XFree86-fontsEncodings/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/XFree86-fontsEncodings/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= XFree86-4.4.0-src-4
PKGNAME= XFree86-fontsEncodings-${XF_VER}
@@ -12,8 +12,6 @@
DEPENDS= XFree86-clients>=4.4.0:../../x11/XFree86-clients
-CONFLICTS= xorg-fontsEncodings-[0-9]*
-
NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
WRKSRC= ${WRKDIR}/xc/fonts/encodings
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/XFree86-fontsMisc/Makefile
--- a/fonts/XFree86-fontsMisc/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/XFree86-fontsMisc/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-fontsMisc-${XF_VER}
@@ -10,8 +10,6 @@
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 default bitmap fonts
-CONFLICTS= xorg-fontsMisc-[0-9]*
-
NO_XFREE86_TARGETS= # defined
FONTS_MISC= # defined
WRKSRC= ${WRKDIR}/xc/fonts/bdf/misc
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/XFree86-fontsScalable/Makefile
--- a/fonts/XFree86-fontsScalable/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/XFree86-fontsScalable/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-fontsScalable-${XF_VER}
@@ -12,9 +12,6 @@
DEPENDS+= XFree86-fontsEncodings>=4.4.0:../XFree86-fontsEncodings
-CONFLICTS= xorg-fontsTruetype-[0-9]*
-CONFLICTS+= xorg-fontsType1-[0-9]*
-
NO_BUILD= yes
NO_BUILDLINK= # defined
USE_LANGUAGES= # empty
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/XFree86-fontserver/Makefile
--- a/fonts/XFree86-fontserver/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/XFree86-fontserver/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/07/29 05:54:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-fontserver-${XF_VER}
@@ -11,8 +11,6 @@
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 font server
-CONFLICTS= xorg-fontserver-[0-9]*
-
USE_X11= yes
USE_BUILDLINK3= yes
DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/xorg-fonts100dpi/Makefile
--- a/fonts/xorg-fonts100dpi/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/xorg-fonts100dpi/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:55:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fonts100dpi-${XORG_VER}
@@ -12,9 +12,6 @@
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
-CONFLICTS= XFree86-fonts100dpi-[0-9]*
-
-NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings fonts/bdf/100dpi
XINSTALL_DIRS= fonts/bdf/100dpi
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/xorg-fonts75dpi/Makefile
--- a/fonts/xorg-fonts75dpi/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/xorg-fonts75dpi/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:56:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fonts75dpi-${XORG_VER}
@@ -12,9 +12,6 @@
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
-CONFLICTS= XFree86-fonts75dpi-[0-9]*
-
-NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings fonts/bdf/75dpi
XINSTALL_DIRS= fonts/bdf/75dpi
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/xorg-fontsCyrillic/Makefile
--- a/fonts/xorg-fontsCyrillic/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/xorg-fontsCyrillic/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:57:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsCyrillic-${XORG_VER}
@@ -12,9 +12,6 @@
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
-CONFLICTS= XFree86-fontsCyrillic-[0-9]*
-
-NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings fonts/bdf/cyrillic
XINSTALL_DIRS= fonts/bdf/cyrillic
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/xorg-fontsEncodings/Makefile
--- a/fonts/xorg-fontsEncodings/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/xorg-fontsEncodings/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:57:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsEncodings-${XORG_VER}
@@ -11,9 +11,6 @@
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
-CONFLICTS= XFree86-fontsEncodings-[0-9]*
-
-NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/xorg-fontsMisc/Makefile
--- a/fonts/xorg-fontsMisc/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/xorg-fontsMisc/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:58:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsMisc-${XORG_VER}
@@ -12,9 +12,6 @@
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
-CONFLICTS= XFree86-fontsMisc-[0-9]*
-
-NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings fonts/bdf/misc
XINSTALL_DIRS= fonts/bdf/misc
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/xorg-fontsTruetype/Makefile
--- a/fonts/xorg-fontsTruetype/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/xorg-fontsTruetype/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:59:30 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsTruetype-${XORG_VER}
@@ -14,9 +14,7 @@
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
CONFLICTS= vera-ttf-[0-9]*
-CONFLICTS+= XFree86-fontsScalable-[0-9]*
-NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings fonts/scaled/TTF
XINSTALL_DIRS= fonts/scaled/TTF
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/xorg-fontsType1/Makefile
--- a/fonts/xorg-fontsType1/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/xorg-fontsType1/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 05:00:09 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsType1-${XORG_VER}
@@ -12,9 +12,6 @@
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../x11/xorgs-fontsEncodings
-CONFLICTS= XFree86-fontsScalable-[0-9]*
-
-NO_XFREE86_TARGETS= # defined
CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings fonts/scaled/Type1
XINSTALL_DIRS= fonts/scaled/Type1
diff -r b81a7bb97e93 -r f6f77eeab49f fonts/xorg-fontserver/Makefile
--- a/fonts/xorg-fontserver/Makefile Thu Jul 29 05:54:11 2004 +0000
+++ b/fonts/xorg-fontserver/Makefile Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 05:00:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-fontserver-${XORG_VER}
@@ -11,8 +11,6 @@
HOMEPAGE= http://www.x.org/
COMMENT= X.org font server
-CONFLICTS= XFree86-fontserver-[0-9]*
-
USE_X11= yes
USE_BUILDLINK3= yes
DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo
diff -r b81a7bb97e93 -r f6f77eeab49f meta-pkgs/xorg/Makefile.common
--- a/meta-pkgs/xorg/Makefile.common Thu Jul 29 05:54:11 2004 +0000
+++ b/meta-pkgs/xorg/Makefile.common Thu Jul 29 06:36:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/07/29 04:48:32 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -103,10 +103,9 @@
NO_MTREE= # defined
-X11ROOT_PREFIX?= X11R6
+X11ROOT_PREFIX?= xorg
WRKSRC?= ${WRKDIR}/xc
X11ROOT?= ${PREFIX}/${X11ROOT_PREFIX}
-X11BASE= ${X11ROOT}
PREPEND_PATH= ${X11ROOT}/bin # Make sure we have this in PATH :)
PLIST_SUBST+= X11ROOT_PREFIX=${X11ROOT_PREFIX}
diff -r b81a7bb97e93 -r f6f77eeab49f misc/XFree86-docs/Makefile
Home |
Main Index |
Thread Index |
Old Index