kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xorg packages now will be installed into ${PREFIX}/xorg by default,

Browse source 
so we don't have to conflict between XFree86 and xorg.

Suggested by grant@.
This commit is contained in:
xtraeme 2004-07-29 06:36:32 +00:00
parent fb9e5350b4
commit 69c871c448
26 changed files with 27 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fonts/XFree86-fonts100dpi/Makefile
View file

@ -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"

4
fonts/XFree86-fonts75dpi/Makefile
View file

@ -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"

4
fonts/XFree86-fontsCyrillic/Makefile
View file

@ -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"

4
fonts/XFree86-fontsEncodings/Makefile
View file

@ -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

4
fonts/XFree86-fontsMisc/Makefile
View file

@ -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

5
fonts/XFree86-fontsScalable/Makefile
View file

@ -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

4
fonts/XFree86-fontserver/Makefile
View file

@ -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

5
fonts/xorg-fonts100dpi/Makefile
View file

@ -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

5
fonts/xorg-fonts75dpi/Makefile
View file

@ -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

5
fonts/xorg-fontsCyrillic/Makefile
View file

@ -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

5
fonts/xorg-fontsEncodings/Makefile
View file

@ -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

5
fonts/xorg-fontsMisc/Makefile
View file

@ -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

4
fonts/xorg-fontsTruetype/Makefile
View file

@ -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

5
fonts/xorg-fontsType1/Makefile
View file

@ -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

4
fonts/xorg-fontserver/Makefile
View file

@ -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

5
meta-pkgs/xorg/Makefile.common
View file

@ -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 @@ PKG_FAIL_REASON+= "X11_TYPE=xorg is mandatory."
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}

4
misc/XFree86-docs/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/07/29 05:48:38 xtraeme Exp $
# $NetBSD: Makefile,v 1.6 2004/07/29 06:36:32 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-docs-${XF_VER}
@ -12,8 +12,6 @@ COMMENT= XFree86 Documentation
DEPENDS= imake>=4.4.0:../../x11/imake
CONFLICTS= xorg-docs-[0-9]*
USE_LANGUAGES= # empty
NO_BUILDLINK= # defined
NO_XFREE86_TARGETS= # defined

4
misc/xorg-docs/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 05:03:15 xtraeme Exp $
# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:32 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-docs-${XORG_VER}
@ -12,8 +12,6 @@ COMMENT= X.org Documentation
BUILD_DEPENDS= xorg-imake>=${XORG_VER}:../../x11/xorg-imake
CONFLICTS= XFree86-docs-[0-9]*
USE_LANGUAGES= # empty
NO_BUILDLINK= # defined
NO_XFREE86_TARGETS= # defined

4
x11/XFree86-clients/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2004/07/29 05:41:12 xtraeme Exp $
# $NetBSD: Makefile,v 1.11 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-clients-${XF_VER}
@ -11,8 +11,6 @@ MAINTAINER= xfree86@blef.org
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 client programs and related files
CONFLICTS= xorg-clients-[0-9]*
USE_X11= yes
USE_BUILDLINK3= yes
CHECK_X11_TYPE= # defined

3
x11/XFree86-libs/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2004/07/29 05:39:19 xtraeme Exp $
# $NetBSD: Makefile,v 1.14 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-libs-${XF_VER}
@ -15,7 +15,6 @@ COMMENT= XFree86 Libraries
CONFLICTS+= xextensions-[0-9]*
CONFLICTS+= libX11-[0-9]*
CONFLICTS+= libXau-[0-9]*
CONFLICTS+= xorg-libs-[0-9]*
BUILD_DEPENDS= imake>=4.4.0:../../x11/imake

4
x11/XFree86-server/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2004/07/29 05:44:48 xtraeme Exp $
# $NetBSD: Makefile,v 1.10 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-server-${XF_VER}
@ -11,8 +11,6 @@ MAINTAINER= xfree86@blef.org
HOMEPAGE= http://www.xfree86.org/
COMMENT= XFree86 X server and related programs
CONFLICTS= xorg-server-[0-9]*
USE_X11= yes
USE_BUILDLINK3= yes
CHECK_X11_TYPE= # defined

4
x11/imake/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2004/07/29 05:37:36 xtraeme Exp $
# $NetBSD: Makefile,v 1.13 2004/07/29 06:36:33 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= imake-${XF_VER}
@ -12,8 +12,6 @@ COMMENT= Imake and other utilities from XFree86
PKG_INSTALLATION_TYPES= overwrite pkgviews
CONFLICTS= xorg-imake-[0-9]*
USE_BUILDLINK3= yes
USE_DIRS+= XFree86-1.0
INSTALL_TARGET= install install.man

4
x11/xorg-clients/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:52:04 xtraeme Exp $
# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-clients-${XORG_VER}
@ -11,8 +11,6 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org client programs and related files
CONFLICTS+= XFree86-clients-[0-9]*
USE_X11= yes
USE_BUILDLINK3= yes
CHECK_X11_TYPE= # defined

4
x11/xorg-imake/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $
# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
@ -12,8 +12,6 @@ COMMENT= Imake and other utilities from X.org
PKG_INSTALLATION_TYPES= overwrite pkgviews
CONFLICTS+= imake-[0-9]*
USE_BUILDLINK3= yes
INSTALL_TARGET= install install.man
NO_XORG_TARGETS= # defined

3
x11/xorg-libs/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-libs-${XORG_VER}
@ -14,7 +14,6 @@ COMMENT= X.org Libraries
CONFLICTS+= xextensions-[0-9]*
CONFLICTS+= libX11-[0-9]*
CONFLICTS+= libXau-[0-9]*
CONFLICTS+= XFree86-libs-[0-9]*
BUILD_DEPENDS= xorg-imake>=6.7.0:../../x11/xorg-imake

4
x11/xorg-server/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2004/07/29 05:19:45 xtraeme Exp $
# $NetBSD: Makefile,v 1.3 2004/07/29 06:36:34 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-server-${XORG_VER}
@ -10,8 +10,6 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.x.org/
COMMENT= X.org X server and related programs
CONFLICTS+= XFree86-server-[0-9]*
USE_X11= yes
USE_BUILDLINK3= yes
CHECK_X11_TYPE= # defined