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
This commit is contained in:
Mateusz Piotrowski 2020-10-30 16:10:15 +00:00
parent ab2b83bc24
commit fef68c5bbd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=553700
6 changed files with 7 additions and 40 deletions

View File

@ -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 <bsd.port.mk>

View File

@ -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 <bsd.port.mk>

View File

@ -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 <bsd.port.mk>

View File

@ -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 <bsd.port.mk>

View File

@ -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 <bsd.port.mk>

View File

@ -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 <bsd.port.mk>