summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-07-30 08:31:22 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-07-30 08:31:22 +0000
commitc5c5617e1fbb151c6a58d27754f7cebe106e3fbd (patch)
tree6a2dd0650e406c94eb4b4a7cb9f6b58d730fd574
parentc1e73d3cf3b7dd92ebcd9e889a8343a41549e677 (diff)
downloadpkgsrc-c5c5617e1fbb151c6a58d27754f7cebe106e3fbd.tar.gz
Remove CHECK_X11_TYPE, now it's already defined in Makefile.common.
-rw-r--r--fonts/XFree86-fontsEncodings/Makefile3
-rw-r--r--fonts/XFree86-fontsEncodings/Makefile.common3
-rw-r--r--fonts/XFree86-fontsScalable/Makefile3
-rw-r--r--fonts/xorg-fonts100dpi/Makefile3
-rw-r--r--fonts/xorg-fonts75dpi/Makefile3
-rw-r--r--fonts/xorg-fontsCyrillic/Makefile3
-rw-r--r--fonts/xorg-fontsEncodings/Makefile3
-rw-r--r--fonts/xorg-fontsMisc/Makefile3
-rw-r--r--fonts/xorg-fontsTruetype/Makefile3
-rw-r--r--fonts/xorg-fontsType1/Makefile3
-rw-r--r--x11/XFree86-clients/Makefile3
-rw-r--r--x11/XFree86-server/Makefile3
-rw-r--r--x11/xorg-clients/Makefile3
-rw-r--r--x11/xorg-imake/Makefile5
-rw-r--r--x11/xorg-server/Makefile3
15 files changed, 17 insertions, 30 deletions
diff --git a/fonts/XFree86-fontsEncodings/Makefile b/fonts/XFree86-fontsEncodings/Makefile
index b2f9c6b85e3..6fa14988d66 100644
--- a/fonts/XFree86-fontsEncodings/Makefile
+++ b/fonts/XFree86-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/07/29 09:06:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/30 08:31:22 xtraeme Exp $
DISTNAME= XFree86-${XF_VER}-src-4
PKGNAME= XFree86-fontsEncodings-${XF_VER}
@@ -13,7 +13,6 @@ COMMENT= XFree86 Encoding fonts
DEPENDS= XFree86-clients>=${XF_VER}:../../x11/XFree86-clients
NO_XFREE86_TARGETS= # defined
-CHECK_X11_TYPE= # defined
WRKSRC= ${WRKDIR}/xc/fonts/encodings
post-extract:
diff --git a/fonts/XFree86-fontsEncodings/Makefile.common b/fonts/XFree86-fontsEncodings/Makefile.common
index 6482a106a9e..e1a729657e7 100644
--- a/fonts/XFree86-fontsEncodings/Makefile.common
+++ b/fonts/XFree86-fontsEncodings/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2004/07/29 09:06:19 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/07/30 08:31:22 xtraeme Exp $
#
# Makefile fragment used by XFree86-fonts* packages.
NO_BUILDLINK= # defined
USE_LANGUAGES= # empty
-CHECK_X11_TYPE= # defined
DEPENDS+= XFree86-fontsEncodings>=${XF_VER}:../../fonts/XFree86-fontsEncodings
FILESDIR= ${.CURDIR}/../../fonts/XFree86-fontsEncodings/files
diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile
index 94bef88cc01..4f8db03f00c 100644
--- a/fonts/XFree86-fontsScalable/Makefile
+++ b/fonts/XFree86-fontsScalable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/07/29 09:06:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/30 08:31:22 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-fontsScalable-${XF_VER}
@@ -16,7 +16,6 @@ NO_BUILD= yes
NO_BUILDLINK= # defined
USE_LANGUAGES= # empty
NO_XFREE86_TARGETS= # defined
-CHECK_X11_TYPE= # defined
FONT_TYPES= Speedo TTF Type1
diff --git a/fonts/xorg-fonts100dpi/Makefile b/fonts/xorg-fonts100dpi/Makefile
index fa5d8a898f9..27d271528f7 100644
--- a/fonts/xorg-fonts100dpi/Makefile
+++ b/fonts/xorg-fonts100dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/29 12:12:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fonts100dpi-${XORG_VER}
@@ -12,7 +12,6 @@ COMMENT= X.org 100dpi bitmap fonts
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
-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 d0ee443427a..93f51af57cf 100644
--- a/fonts/xorg-fonts75dpi/Makefile
+++ b/fonts/xorg-fonts75dpi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/29 12:12:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fonts75dpi-${XORG_VER}
@@ -12,7 +12,6 @@ COMMENT= X.org 75dpi bitmap fonts
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
-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 1334e9ca40f..28bc258bce2 100644
--- a/fonts/xorg-fontsCyrillic/Makefile
+++ b/fonts/xorg-fontsCyrillic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/29 12:12:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsCyrillic-${XORG_VER}
@@ -12,7 +12,6 @@ COMMENT= X.org Cyrillic bitmap fonts
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
-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 48a66dbf45c..e24bf085b1e 100644
--- a/fonts/xorg-fontsEncodings/Makefile
+++ b/fonts/xorg-fontsEncodings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsEncodings-${XORG_VER}
@@ -11,7 +11,6 @@ COMMENT= X.org Encoding fonts
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
-CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings
.include "../../meta-pkgs/xorg/Makefile.common"
diff --git a/fonts/xorg-fontsMisc/Makefile b/fonts/xorg-fontsMisc/Makefile
index c1cd90de13f..c536c4a27a3 100644
--- a/fonts/xorg-fontsMisc/Makefile
+++ b/fonts/xorg-fontsMisc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/29 12:12:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsMisc-${XORG_VER}
@@ -12,7 +12,6 @@ COMMENT= X.org miscellaneous bitmap fonts
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
-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 868956af9ab..87e68b65702 100644
--- a/fonts/xorg-fontsTruetype/Makefile
+++ b/fonts/xorg-fontsTruetype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/29 12:12:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsTruetype-${XORG_VER}
@@ -15,7 +15,6 @@ DEPENDS+= xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
CONFLICTS= vera-ttf-[0-9]*
-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 5f941742547..19cc266f644 100644
--- a/fonts/xorg-fontsType1/Makefile
+++ b/fonts/xorg-fontsType1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/29 12:12:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= X11R6.7.0-src1
PKGNAME= xorg-fontsType1-${XORG_VER}
@@ -12,7 +12,6 @@ COMMENT= X.org Type1 fonts
BUILD_DEPENDS= xorg-clients>=6.7.0:../../x11/xorg-clients
DEPENDS+= xorg-fontsEncodings>=6.7.0:../../fonts/xorg-fontsEncodings
-CHECK_X11_TYPE= # defined
XBUILD_DIRS= fonts/encodings fonts/scaled/Type1
XINSTALL_DIRS= fonts/scaled/Type1
diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile
index deab850722b..30311df8753 100644
--- a/x11/XFree86-clients/Makefile
+++ b/x11/XFree86-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/07/29 09:06:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-clients-${XF_VER}
@@ -13,7 +13,6 @@ COMMENT= XFree86 client programs and related files
USE_X11= yes
USE_BUILDLINK3= yes
-CHECK_X11_TYPE= # defined
DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo
PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index 501c879a895..82cac397c18 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/29 09:06:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-server-${XF_VER}
@@ -13,7 +13,6 @@ COMMENT= XFree86 X server and related programs
USE_X11= yes
USE_BUILDLINK3= yes
-CHECK_X11_TYPE= # defined
DISTINFO_FILE= ${.CURDIR}/../../x11/XFree86-libs/distinfo
PATCHDIR= ${.CURDIR}/../../x11/XFree86-libs/patches
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index ced9e5152a3..afc02c17b67 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-clients-${XORG_VER}
@@ -13,7 +13,6 @@ COMMENT= X.org client programs and related files
USE_X11= yes
USE_BUILDLINK3= yes
-CHECK_X11_TYPE= # defined
DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo
PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 3bab9a4fbdc..fec57ec772a 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 07:22:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-imake-${XORG_VER}
@@ -16,7 +16,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
USE_DIRS+= xorg-1.0
INSTALL_TARGET= install install.man
-NO_XORG_TARGETS= # defined
+NO_XORG_TARGETS= yes
+CHECK_X11_TYPE= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index eec9f174947..a5af81fc513 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/30 04:39:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/30 08:31:23 xtraeme Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-server-${XORG_VER}
@@ -12,7 +12,6 @@ COMMENT= X.org X server and related programs
USE_X11= yes
USE_BUILDLINK3= yes
-CHECK_X11_TYPE= # defined
DISTINFO_FILE= ${.CURDIR}/../../x11/xorg-libs/distinfo
PATCHDIR= ${.CURDIR}/../../x11/xorg-libs/patches