From fef68c5bbdfe4fb06687b259b4ecca22bc34c5ff Mon Sep 17 00:00:00 2001 From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Fri, 30 Oct 2020 16:10:15 +0000 Subject: [PATCH] Switch x11-fonts/xorg-fonts-* to USES=metaport Also, remove bugus CONFLICTS. I believe that the FONTDIR could be renamed to _FONTDIR and the RUN_DEPENDS sorted, but let's do it another time to keep the diff small. Also, prefixing non-standard variables with "_" is not officially documented yet in the Porter's Handbook (it's only the convention suggested by portclippy, which itself is not mentioned there yet). Reviewed by: zeising (earlier version) Approved by: portmgr blanket Differential Revision: https://reviews.freebsd.org/D26989 --- x11-fonts/xorg-fonts-100dpi/Makefile | 8 +------- x11-fonts/xorg-fonts-75dpi/Makefile | 8 +------- x11-fonts/xorg-fonts-cyrillic/Makefile | 8 +------- x11-fonts/xorg-fonts-miscbitmaps/Makefile | 7 +------ x11-fonts/xorg-fonts-truetype/Makefile | 8 ++------ x11-fonts/xorg-fonts-type1/Makefile | 8 +------- 6 files changed, 7 insertions(+), 40 deletions(-) diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 4b356dfbbffc..a79433c4ffd1 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -4,9 +4,6 @@ PORTNAME= xorg-fonts-100dpi PORTVERSION= 7.7 CATEGORIES= x11-fonts -MASTER_SITES= # none -DISTFILES= # none -EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.Org 100dpi bitmap fonts @@ -18,11 +15,8 @@ RUN_DEPENDS= ${FONTDIR}/100dpi/courB08.pcf.gz:x11-fonts/font-adobe-100dpi \ ${FONTDIR}/100dpi/charB08.pcf.gz:x11-fonts/font-bitstream-100dpi \ ${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings -CONFLICTS= XFree86-font100dpi-* +USES= metaport -NO_BUILD= # none -NO_MTREE= yes -NO_INSTALL= yes FONTDIR= ${LOCALBASE}/share/fonts .include diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index 8dacd1d386a0..626643eb3fd6 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -4,9 +4,6 @@ PORTNAME= xorg-fonts-75dpi PORTVERSION= 7.7 CATEGORIES= x11-fonts -MASTER_SITES= # none -DISTFILES= # none -EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.Org 75dpi bitmap fonts @@ -18,11 +15,8 @@ RUN_DEPENDS= ${FONTDIR}/75dpi/courB08.pcf.gz:x11-fonts/font-adobe-75dpi \ ${FONTDIR}/75dpi/charB08.pcf.gz:x11-fonts/font-bitstream-75dpi \ ${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings -CONFLICTS= XFree86-font75dpi-* +USES= metaport -NO_BUILD= # none -NO_MTREE= yes -NO_INSTALL= yes FONTDIR= ${LOCALBASE}/share/fonts .include diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index a8061d262a6d..4f6f67cf5c06 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -4,9 +4,6 @@ PORTNAME= xorg-fonts-cyrillic PORTVERSION= 7.7 CATEGORIES= x11-fonts -MASTER_SITES= # none -DISTFILES= # none -EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Cyrillic bitmap fonts @@ -17,11 +14,8 @@ RUN_DEPENDS= ${FONTDIR}/cyrillic/crox1c.pcf.gz:x11-fonts/font-cronyx-cyrillic \ ${FONTDIR}/cyrillic/proof9x16.pcf.gz:x11-fonts/font-winitzki-cyrillic \ ${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings -CONFLICTS= XFree86-fontCyrillic-* +USES= metaport -NO_BUILD= # none -NO_MTREE= yes -NO_INSTALL= yes FONTDIR= ${LOCALBASE}/share/fonts .include diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index bd070dcfd50f..be68f7ecd7e2 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -4,8 +4,6 @@ PORTNAME= xorg-fonts-miscbitmaps PORTVERSION= 7.7 CATEGORIES= x11-fonts -MASTER_SITES= # none -DISTFILES= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous bitmap fonts @@ -24,11 +22,8 @@ RUN_DEPENDS= ${FONTDIR}/misc/arabic24.pcf.gz:x11-fonts/font-arabic-misc \ ${FONTDIR}/misc/olcursor.pcf.gz:x11-fonts/font-sun-misc \ ${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings -CONFLICTS= XFree86-fontDefaultBitmaps-* +USES= metaport -NO_BUILD= # none -NO_INSTALL= yes -NO_MTREE= yes FONTDIR= ${LOCALBASE}/share/fonts .include diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index 01aa743ef219..705df18e5853 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -5,9 +5,6 @@ PORTNAME= xorg-fonts-truetype PORTVERSION= 7.7 PORTREVISION= 1 CATEGORIES= x11-fonts -MASTER_SITES= # none -DISTFILES= # none -EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.Org TrueType fonts @@ -18,9 +15,8 @@ RUN_DEPENDS= ${FONTDIR}/TTF/luximb.ttf:x11-fonts/font-bh-ttf \ ${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings \ ${FONTDIR}/dejavu/DejaVuSans.ttf:x11-fonts/dejavu -NO_BUILD= # none -NO_INSTALL= yes -NO_MTREE= yes +USES= metaport + FONTDIR= ${LOCALBASE}/share/fonts .include diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index d4782ec41b68..5a7e6552102f 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -4,9 +4,6 @@ PORTNAME= xorg-fonts-type1 PORTVERSION= 7.7 CATEGORIES= x11-fonts -MASTER_SITES= # none -DISTFILES= # none -EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Type1 fonts @@ -18,11 +15,8 @@ RUN_DEPENDS= ${FONTDIR}/Type1/UTBI____.afm:x11-fonts/font-adobe-utopia-type1 \ ${FONTDIR}/Type1/cursor.pfa:x11-fonts/font-xfree86-type1 \ ${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings -CONFLICTS= XFree86-fontScalable-* +USES= metaport -NO_BUILD= yes -NO_INSTALL= yes -NO_MTREE= yes FONTDIR= ${LOCALBASE}/share/fonts .include