From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 16 01:30:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0A717AD for ; Sun, 16 Feb 2014 01:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 781511B3E for ; Sun, 16 Feb 2014 01:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1G1U0Hs019939 for ; Sun, 16 Feb 2014 01:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1G1U0Ig019938; Sun, 16 Feb 2014 01:30:00 GMT (envelope-from gnats) Resent-Date: Sun, 16 Feb 2014 01:30:00 GMT Resent-Message-Id: <201402160130.s1G1U0Ig019938@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Matthew D.Fuller" Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CC1B76F for ; Sun, 16 Feb 2014 01:23:40 +0000 (UTC) Received: from thyme.infocus-llc.com (server.infocus-llc.com [206.156.254.44]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9B3CB1B2A for ; Sun, 16 Feb 2014 01:23:39 +0000 (UTC) Received: from draco.over-yonder.net (c-75-65-60-66.hsd1.ms.comcast.net [75.65.60.66]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by thyme.infocus-llc.com (Postfix) with ESMTPSA id 8A15437B5AC for ; Sat, 15 Feb 2014 19:23:30 -0600 (CST) Received: by draco.over-yonder.net (Postfix, from userid 100) id 3fRVvj3fKJz1CL; Sat, 15 Feb 2014 19:23:29 -0600 (CST) Message-Id: <3fRVvj3fKJz1CL@draco.over-yonder.net> Date: Sat, 15 Feb 2014 19:23:29 -0600 (CST) From: "Matthew D.Fuller" To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/186805: [x11] Excise some vestigial XFree86 references X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: "Matthew D.Fuller" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Feb 2014 01:30:00 -0000 >Number: 186805 >Category: ports >Synopsis: [x11] Excise some vestigial XFree86 references >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: Sun Feb 16 01:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Matthew D. Fuller >Release: FreeBSD 9.1-STABLE amd64 >Organization: >Environment: System: FreeBSD draco.over-yonder.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r251584: Sun Jun 9 14:23:33 CDT 2013 root@draco.over-yonder.net:/usr/obj/usr/src/sys/DRACO amd64 >Description: Upgrading x11-fonts/dejavu/ brought its pkg-message to my attention, with its careful discussion of the X config file in XFree86 vs. X.Org. It's now been about 6 years since XFree86 support was removed from ports (just after 7.0-RELEASE timeframe), so surely we don't need to yack about it anymore. This cleans up obvious XFree86 bits from x11-fonts/, consisting of: - Various references to differing implementations and config file locations in pkg-message files (should be thoroughly uncontroversial). - Eliminating intlfonts/pkg-req script that did nothing but try to make lib/X11/fonts/local directory, which BSD.local.dist has been making since it was added to ports/Templates in 2007, and talk about upgrading to XFree86 >3.3.3 which hasn't been relevant this millennium (should be pretty uncontroversial). - Removes CONFLICTS settings for XFree86-font* variants, which are ~6 years gone now (I s'pose it's _possible_ somebody still has those installed and this would confuse them, but they probably _should_ be confused in that case...) >How-To-Repeat: >Fix: Index: x11-fonts/artwiz-aleczapka/files/pkg-message.in =================================================================== --- x11-fonts/artwiz-aleczapka/files/pkg-message.in (revision 344497) +++ x11-fonts/artwiz-aleczapka/files/pkg-message.in (working copy) @@ -1,10 +1,8 @@ ------------------------------------------------------------------ - To get XFree86 to recognise your new fonts you will need to - add a line to your XF86Config file. XFree86 4 usually keeps its - XF86Config file in /etc or /etc/X11. + To get X to recognise your new fonts you will need to add a line to your + X server configuration file (usually /etc/X11/xorg.conf). - Add the following line to the "Files" section and restart XFree86. FontPath "%%LOCALBASE%%/lib/X11/fonts/artwiz-aleczapka-en" Index: x11-fonts/artwiz-aleczapka-de/pkg-message =================================================================== --- x11-fonts/artwiz-aleczapka-de/pkg-message (revision 344497) +++ x11-fonts/artwiz-aleczapka-de/pkg-message (working copy) @@ -1,10 +1,9 @@ ------------------------------------------------------------------ - To get XFree86 to recognise your new fonts you will need to - add a line to your XF86Config file. XFree86 4 usually keeps its - XF86Config file in /etc or /etc/X11. + To get X to recognise your new fonts you will need to add a line to your + X server configuration file (usually /etc/X11/xorg.conf). - Add the following line to the "Files" section and restart XFree86. + Add the following line to the "Files" section and restart X. FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de" Index: x11-fonts/artwiz-aleczapka-se/pkg-message =================================================================== --- x11-fonts/artwiz-aleczapka-se/pkg-message (revision 344497) +++ x11-fonts/artwiz-aleczapka-se/pkg-message (working copy) @@ -1,10 +1,9 @@ ------------------------------------------------------------------ - To get XFree86 to recognise your new fonts you will need to - add a line to your XF86Config file. XFree86 4 usually keeps its - XF86Config file in /etc or /etc/X11. + To get X to recognise your new fonts you will need to add a line to your + X server configuration file (usually /etc/X11/xorg.conf). - Add the following line to the "Files" section and restart XFree86. + Add the following line to the "Files" section and restart X. FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se" Index: x11-fonts/artwiz-fonts/files/pkg-message.in =================================================================== --- x11-fonts/artwiz-fonts/files/pkg-message.in (revision 344497) +++ x11-fonts/artwiz-fonts/files/pkg-message.in (working copy) @@ -1,10 +1,9 @@ ------------------------------------------------------------------ - To get XFree86 to recognise your new fonts you will need to - add a line to your XF86Config file. XFree86 4 usually keeps its - XF86Config file in /etc or /etc/X11. + To get X to recognise your new fonts you will need to add a line to your + X server configuration file (usually /etc/X11/xorg.conf). - Add the following line to the "Files" section and restart XFree86. + Add the following line to the "Files" section and restart X. FontPath "%%LOCALBASE%%/lib/X11/fonts/artwiz-fonts" Index: x11-fonts/dejavu/files/pkg-message.in =================================================================== --- x11-fonts/dejavu/files/pkg-message.in (revision 344497) +++ x11-fonts/dejavu/files/pkg-message.in (working copy) @@ -7,5 +7,4 @@ FontPath "%%FONTSDIR%%/" -Note: your X Windows configuration file is typically /etc/X11/XF86Config -if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org. +Note: your X Windows configuration file is typically /etc/X11/xorg.conf. Index: x11-fonts/intlfonts/pkg-req =================================================================== --- x11-fonts/intlfonts/pkg-req (revision 344497) +++ x11-fonts/intlfonts/pkg-req (working copy) @@ -1,22 +0,0 @@ -#!/bin/sh - -if [ "x$1" = "x" ]; then - exit 1; -fi -if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then - exit 1; -fi - -export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local - -if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then - echo '**********************************************************************' - echo "****** ${FONTDIR}/ doesn't exist." - echo "****** Creating ${FONTDIR}/" - echo '****** Please upgrade your XFree86 to 3.3.3 or upper,' - echo "****** or add this directory to your /etc/XF86Config's FontPath entry." - echo '**********************************************************************' - mkdir ${FONTDIR} -fi - -exit 0; Index: x11-fonts/pingwi/files/pkg-message.in =================================================================== --- x11-fonts/pingwi/files/pkg-message.in (revision 344497) +++ x11-fonts/pingwi/files/pkg-message.in (working copy) @@ -7,5 +7,4 @@ FontPath "%%FONTSDIR%%/" -Note: your X Windows configuration file is typically /etc/X11/XF86Config -if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org. +Note: your X Windows configuration file is typically /etc/X11/xorg.conf. Index: x11-fonts/texcm-ttf/files/pkg-message.in =================================================================== --- x11-fonts/texcm-ttf/files/pkg-message.in (revision 344497) +++ x11-fonts/texcm-ttf/files/pkg-message.in (working copy) @@ -9,5 +9,4 @@ FontPath "%%FONTSDIR%%/" -Note: your X Windows configuration file is typically /etc/X11/XF86Config -if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org. +Note: your X Windows configuration file is typically /etc/X11/xorg.conf. Index: x11-fonts/xorg-fonts-100dpi/Makefile =================================================================== --- x11-fonts/xorg-fonts-100dpi/Makefile (revision 344497) +++ x11-fonts/xorg-fonts-100dpi/Makefile (working copy) @@ -18,8 +18,6 @@ ${FONTDIR}/100dpi/charB08.pcf.gz:${PORTSDIR}/x11-fonts/font-bitstream-100dpi \ ${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings -CONFLICTS= XFree86-font100dpi-* - NO_BUILD= # none NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts Index: x11-fonts/xorg-fonts-75dpi/Makefile =================================================================== --- x11-fonts/xorg-fonts-75dpi/Makefile (revision 344497) +++ x11-fonts/xorg-fonts-75dpi/Makefile (working copy) @@ -18,8 +18,6 @@ ${FONTDIR}/75dpi/charB08.pcf.gz:${PORTSDIR}/x11-fonts/font-bitstream-75dpi \ ${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings -CONFLICTS= XFree86-font75dpi-* - NO_BUILD= # none NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts Index: x11-fonts/xorg-fonts-cyrillic/Makefile =================================================================== --- x11-fonts/xorg-fonts-cyrillic/Makefile (revision 344497) +++ x11-fonts/xorg-fonts-cyrillic/Makefile (working copy) @@ -17,8 +17,6 @@ ${FONTDIR}/cyrillic/proof9x16.pcf.gz:${PORTSDIR}/x11-fonts/font-winitzki-cyrillic \ ${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings -CONFLICTS= XFree86-fontCyrillic-* - NO_BUILD= # none NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile =================================================================== --- x11-fonts/xorg-fonts-miscbitmaps/Makefile (revision 344497) +++ x11-fonts/xorg-fonts-miscbitmaps/Makefile (working copy) @@ -24,8 +24,6 @@ ${FONTDIR}/misc/olcursor.pcf.gz:${PORTSDIR}/x11-fonts/font-sun-misc \ ${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings -CONFLICTS= XFree86-fontDefaultBitmaps-* - NO_BUILD= # none NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts Index: x11-fonts/xorg-fonts-type1/Makefile =================================================================== --- x11-fonts/xorg-fonts-type1/Makefile (revision 344497) +++ x11-fonts/xorg-fonts-type1/Makefile (working copy) @@ -18,8 +18,6 @@ ${FONTDIR}/Type1/cursor.pfa:${PORTSDIR}/x11-fonts/font-xfree86-type1 \ ${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings -CONFLICTS= XFree86-fontScalable-* - do-install: # empty NO_BUILD= # none >Release-Note: >Audit-Trail: >Unformatted: