From 69c871c44879613395742f6172695959b5e30dae Mon Sep 17 00:00:00 2001 From: xtraeme Date: Thu, 29 Jul 2004 06:36:32 +0000 Subject: 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@. --- 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 +--- 15 files changed, 15 insertions(+), 52 deletions(-) (limited to 'fonts') diff --git a/fonts/XFree86-fonts100dpi/Makefile b/fonts/XFree86-fonts100dpi/Makefile index dd310c2ef55..2c68a686015 100644 --- a/fonts/XFree86-fonts100dpi/Makefile +++ b/fonts/XFree86-fonts100dpi/Makefile @@ -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 @@ COMMENT= XFree86 bitmap 100dpi fonts 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 --git a/fonts/XFree86-fonts75dpi/Makefile b/fonts/XFree86-fonts75dpi/Makefile index e1813de4922..a5a39d894f5 100644 --- a/fonts/XFree86-fonts75dpi/Makefile +++ b/fonts/XFree86-fonts75dpi/Makefile @@ -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 @@ COMMENT= XFree86 bitmap 75dpi fonts 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 --git a/fonts/XFree86-fontsCyrillic/Makefile b/fonts/XFree86-fontsCyrillic/Makefile index aa57e5da467..ea944ad3030 100644 --- a/fonts/XFree86-fontsCyrillic/Makefile +++ b/fonts/XFree86-fontsCyrillic/Makefile @@ -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 @@ COMMENT= XFree86 Cyrillic fonts 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 --git a/fonts/XFree86-fontsEncodings/Makefile b/fonts/XFree86-fontsEncodings/Makefile index de912fe0b68..75bf75b4d8d 100644 --- a/fonts/XFree86-fontsEncodings/Makefile +++ b/fonts/XFree86-fontsEncodings/Makefile @@ -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 @@ COMMENT= XFree86 Encoding fonts 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 --git a/fonts/XFree86-fontsMisc/Makefile b/fonts/XFree86-fontsMisc/Makefile index ac135179493..5317c3f8d75 100644 --- a/fonts/XFree86-fontsMisc/Makefile +++ b/fonts/XFree86-fontsMisc/Makefile @@ -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 @@ MAINTAINER= xfree86@blef.org 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 --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile index 9c1f686e0e9..f926de2683c 100644 --- a/fonts/XFree86-fontsScalable/Makefile +++ b/fonts/XFree86-fontsScalable/Makefile @@ -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 @@ COMMENT= XFree86 scalable fonts 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 --git a/fonts/XFree86-fontserver/Makefile b/fonts/XFree86-fontserver/Makefile index aabfbca614c..3b731f6f2ff 100644 --- a/fonts/XFree86-fontserver/Makefile +++ b/fonts/XFree86-fontserver/Makefile @@ -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 @@ MAINTAINER= xfree86@blef.org 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 --git a/fonts/xorg-fonts100dpi/Makefile b/fonts/xorg-fonts100dpi/Makefile index c775f6d586c..34c7906f607 100644 --- a/fonts/xorg-fonts100dpi/Makefile +++ b/fonts/xorg-fonts100dpi/Makefile @@ -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 @@ COMMENT= X.org 100dpi bitmap fonts 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 --git a/fonts/xorg-fonts75dpi/Makefile b/fonts/xorg-fonts75dpi/Makefile index 1d814535724..3f1395d0d15 100644 --- a/fonts/xorg-fonts75dpi/Makefile +++ b/fonts/xorg-fonts75dpi/Makefile @@ -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 @@ COMMENT= X.org 75dpi bitmap fonts 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 --git a/fonts/xorg-fontsCyrillic/Makefile b/fonts/xorg-fontsCyrillic/Makefile index 904658de2c9..502aae45d5a 100644 --- a/fonts/xorg-fontsCyrillic/Makefile +++ b/fonts/xorg-fontsCyrillic/Makefile @@ -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 @@ COMMENT= X.org Cyrillic bitmap fonts 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 --git a/fonts/xorg-fontsEncodings/Makefile b/fonts/xorg-fontsEncodings/Makefile index bce4793e798..48a66dbf45c 100644 --- a/fonts/xorg-fontsEncodings/Makefile +++ b/fonts/xorg-fontsEncodings/Makefile @@ -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 @@ COMMENT= X.org Encoding fonts 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 --git a/fonts/xorg-fontsMisc/Makefile b/fonts/xorg-fontsMisc/Makefile index 66172846324..70ffe28098b 100644 --- a/fonts/xorg-fontsMisc/Makefile +++ b/fonts/xorg-fontsMisc/Makefile @@ -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 @@ COMMENT= X.org miscellaneous bitmap fonts 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 --git a/fonts/xorg-fontsTruetype/Makefile b/fonts/xorg-fontsTruetype/Makefile index 1e431fd0be8..8fe3f455be7 100644 --- a/fonts/xorg-fontsTruetype/Makefile +++ b/fonts/xorg-fontsTruetype/Makefile @@ -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 @@ BUILD_DEPENDS+= fontconfig-[0-9]*:../../fonts/fontconfig 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 --git a/fonts/xorg-fontsType1/Makefile b/fonts/xorg-fontsType1/Makefile index ba7f7454915..8cdf613052e 100644 --- a/fonts/xorg-fontsType1/Makefile +++ b/fonts/xorg-fontsType1/Makefile @@ -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 @@ COMMENT= X.org Type1 fonts 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 --git a/fonts/xorg-fontserver/Makefile b/fonts/xorg-fontserver/Makefile index 0bf761efbe0..9b9748e6dfa 100644 --- a/fonts/xorg-fontserver/Makefile +++ b/fonts/xorg-fontserver/Makefile @@ -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 @@ MAINTAINER= xtraeme@NetBSD.org 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 -- cgit v1.2.3