Date: Fri, 30 Oct 2020 16:10:15 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553700 - in head/x11-fonts: xorg-fonts-100dpi xorg-fonts-75dpi xorg-fonts-cyrillic xorg-fonts-miscbitmaps xorg-fonts-truetype xorg-fonts-type1 Message-ID: <202010301610.09UGAFhS035068@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: 0mp Date: Fri Oct 30 16:10:15 2020 New Revision: 553700 URL: https://svnweb.freebsd.org/changeset/ports/553700 Log: 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 Modified: head/x11-fonts/xorg-fonts-100dpi/Makefile head/x11-fonts/xorg-fonts-75dpi/Makefile head/x11-fonts/xorg-fonts-cyrillic/Makefile head/x11-fonts/xorg-fonts-miscbitmaps/Makefile head/x11-fonts/xorg-fonts-truetype/Makefile head/x11-fonts/xorg-fonts-type1/Makefile Modified: head/x11-fonts/xorg-fonts-100dpi/Makefile ============================================================================== --- head/x11-fonts/xorg-fonts-100dpi/Makefile Fri Oct 30 15:54:00 2020 (r553699) +++ head/x11-fonts/xorg-fonts-100dpi/Makefile Fri Oct 30 16:10:15 2020 (r553700) @@ -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-font ${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> Modified: head/x11-fonts/xorg-fonts-75dpi/Makefile ============================================================================== --- head/x11-fonts/xorg-fonts-75dpi/Makefile Fri Oct 30 15:54:00 2020 (r553699) +++ head/x11-fonts/xorg-fonts-75dpi/Makefile Fri Oct 30 16:10:15 2020 (r553700) @@ -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 ${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> Modified: head/x11-fonts/xorg-fonts-cyrillic/Makefile ============================================================================== --- head/x11-fonts/xorg-fonts-cyrillic/Makefile Fri Oct 30 15:54:00 2020 (r553699) +++ head/x11-fonts/xorg-fonts-cyrillic/Makefile Fri Oct 30 16:10:15 2020 (r553700) @@ -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-fon ${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> Modified: head/x11-fonts/xorg-fonts-miscbitmaps/Makefile ============================================================================== --- head/x11-fonts/xorg-fonts-miscbitmaps/Makefile Fri Oct 30 15:54:00 2020 (r553699) +++ head/x11-fonts/xorg-fonts-miscbitmaps/Makefile Fri Oct 30 16:10:15 2020 (r553700) @@ -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 ${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> Modified: head/x11-fonts/xorg-fonts-truetype/Makefile ============================================================================== --- head/x11-fonts/xorg-fonts-truetype/Makefile Fri Oct 30 15:54:00 2020 (r553699) +++ head/x11-fonts/xorg-fonts-truetype/Makefile Fri Oct 30 16:10:15 2020 (r553700) @@ -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- ${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> Modified: head/x11-fonts/xorg-fonts-type1/Makefile ============================================================================== --- head/x11-fonts/xorg-fonts-type1/Makefile Fri Oct 30 15:54:00 2020 (r553699) +++ head/x11-fonts/xorg-fonts-type1/Makefile Fri Oct 30 16:10:15 2020 (r553700) @@ -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/f ${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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010301610.09UGAFhS035068>