Date: Fri, 17 Feb 2012 22:13:17 +0100 (CET) From: Niclas Zeising <zeising@daemonic.se> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/165254: [PATCH] fixes to x11-fonts/xorg-fonts makefile to handle dependencies better Message-ID: <201202172113.q1HLDHYF014579@vincent.daemonic.se> Resent-Message-ID: <201202172120.q1HLK9hd076403@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 165254
>Category: ports
>Synopsis: [PATCH] fixes to x11-fonts/xorg-fonts makefile to handle dependencies better
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 17 21:20:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Niclas Zeising
>Release: FreeBSD 9.0-BETA2 amd64
>Organization:
>Environment:
System: FreeBSD vincent.daemonic.se 9.0-BETA2 FreeBSD 9.0-BETA2 #0 r225368: Sat Sep 3 22:13:26 CEST 2011 root@vincent.daemonic.se:/usr/obj/usr/src/sys/VINCENT amd64
>Description:
x11-fonts/xorg-fonts is a meta port, which depends on other meta ports. But it does this by looking for a file the other meta ports install, instead of depending on the meta port explicitly. If this file is already there, xorg-fonts believes that this port it depends on is already installed. This has the effect that some fonts may not be installed at all, when installing xorg-fonts as part of the xorg distribution.
>How-To-Repeat:
>Fix:
Attached patch changes xorg-fonts to depend on the other meta-ports themselves, instead of depending on files the ports the other meta ports dependencies install. This makes all fonts install properly.
--- x11-fonts.xorg-fonts.Makefile.diff begins here ---
Index: x11-fonts/xorg-fonts/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/xorg-fonts/Makefile,v
retrieving revision 1.6
diff -u -d -r1.6 Makefile
--- x11-fonts/xorg-fonts/Makefile 25 Feb 2011 16:52:47 -0000 1.6
+++ x11-fonts/xorg-fonts/Makefile 17 Feb 2012 21:07:38 -0000
@@ -18,12 +18,12 @@
USE_XORG= fontutil
FONTSDIR= ${PREFIX}/lib/X11/fonts
-RUN_DEPENDS= ${FONTSDIR}/100dpi/courB08-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
- ${FONTSDIR}/75dpi/courB08-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-75dpi \
- ${FONTSDIR}/cyrillic/koi12x24.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \
- ${FONTSDIR}/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
- ${FONTSDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
- ${FONTSDIR}/Type1/cour.afm:${PORTSDIR}/x11-fonts/xorg-fonts-type1 \
+RUN_DEPENDS= xorg-fonts-100dpi>=0.0:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
+ xorg-fonts-75dpi>=0.0:${PORTSDIR}/x11-fonts/xorg-fonts-75dpi \
+ xorg-fonts-cyrillic>=0.0:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \
+ xorg-fonts-miscbitmaps>=0.0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
+ xorg-fonts-truetype>=0.0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
+ xorg-fonts-type1>=0.0:${PORTSDIR}/x11-fonts/xorg-fonts-type1 \
${FONTSDIR}/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
NO_BUILD= yes
--- x11-fonts.xorg-fonts.Makefile.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202172113.q1HLDHYF014579>