diff options
-rw-r--r-- | fonts/XFree86-fontsEncodings/Makefile | 3 | ||||
-rw-r--r-- | fonts/XFree86-fontsEncodings/Makefile.common | 3 | ||||
-rw-r--r-- | fonts/XFree86-fontsScalable/Makefile | 3 | ||||
-rw-r--r-- | meta-pkgs/XFree86/Makefile.common | 8 | ||||
-rw-r--r-- | x11/XFree86-clients/Makefile | 3 | ||||
-rw-r--r-- | x11/XFree86-server/Makefile | 3 |
6 files changed, 17 insertions, 6 deletions
diff --git a/fonts/XFree86-fontsEncodings/Makefile b/fonts/XFree86-fontsEncodings/Makefile index 920ed9667f9..fb5e9f3925d 100644 --- a/fonts/XFree86-fontsEncodings/Makefile +++ b/fonts/XFree86-fontsEncodings/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/29 00:30:16 xtraeme Exp $ DISTNAME= XFree86-4.4.0-src-4 PKGNAME= XFree86-fontsEncodings-${XF_VER} @@ -13,6 +13,7 @@ COMMENT= XFree86 Encoding fonts DEPENDS= XFree86-clients>=4.4.0:../../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 6c6a9ff867e..c87e855dc1d 100644 --- a/fonts/XFree86-fontsEncodings/Makefile.common +++ b/fonts/XFree86-fontsEncodings/Makefile.common @@ -1,9 +1,10 @@ -# $NetBSD: Makefile.common,v 1.1 2004/03/28 22:11:32 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.2 2004/03/29 00:30:16 xtraeme Exp $ # # Makefile fragment used by XFree86-fonts* packages. NO_BUILDLINK= # defined USE_LANGUAGES= # empty +CHECK_X11_TYPE= # defined DEPENDS+= XFree86-fontsEncodings>=4.4.0:../../fonts/XFree86-fontsEncodings FILESDIR= ${.CURDIR}/../../fonts/XFree86-fontsEncodings/files diff --git a/fonts/XFree86-fontsScalable/Makefile b/fonts/XFree86-fontsScalable/Makefile index 12444a3d388..2dd43017873 100644 --- a/fonts/XFree86-fontsScalable/Makefile +++ b/fonts/XFree86-fontsScalable/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/03/28 22:06:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/29 00:30:16 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-fontsScalable-${XF_VER} @@ -16,6 +16,7 @@ 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/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common index 562e61dbcf9..13e69363ec6 100644 --- a/meta-pkgs/XFree86/Makefile.common +++ b/meta-pkgs/XFree86/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2004/03/28 22:06:16 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.6 2004/03/29 00:30:17 xtraeme Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -114,6 +114,12 @@ PLIST_SUBST+= FILEMAN_SUFFIX=${FILEMAN_SUFFIX} PLIST_SUBST+= MISCMAN_DIR=${MISCMAN_DIR} PLIST_SUBST+= MISCMAN_SUFFIX=${MISCMAN_SUFFIX} +.if defined(CHECK_X11_TYPE) +. if !defined(X11_TYPE) || empty(X11_TYPE:MXFree86) +PKG_FAIL_REASON+= "X11_TYPE=XFree86 is mandatory." +. endif +.endif + NO_MTREE= # defined X11ROOT_PREFIX?= X11R6 diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile index 1d2b7e6641f..41176fb4bbb 100644 --- a/x11/XFree86-clients/Makefile +++ b/x11/XFree86-clients/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/03/28 22:06:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/29 00:30:16 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-clients-${XF_VER} @@ -13,6 +13,7 @@ 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 090309a30d0..011a531f3fb 100644 --- a/x11/XFree86-server/Makefile +++ b/x11/XFree86-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/03/28 22:06:16 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2004/03/29 00:30:17 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-server-${XF_VER} @@ -13,6 +13,7 @@ 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 |