From owner-freebsd-bugs@FreeBSD.ORG Thu Jan 7 04:20:01 2010 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A5BC1065695 for ; Thu, 7 Jan 2010 04:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 622E78FC1D for ; Thu, 7 Jan 2010 04:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o074K1X3067610 for ; Thu, 7 Jan 2010 04:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o074K1c7067609; Thu, 7 Jan 2010 04:20:01 GMT (envelope-from gnats) Resent-Date: Thu, 7 Jan 2010 04:20:01 GMT Resent-Message-Id: <201001070420.o074K1c7067609@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sevan Janiyan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B54FC106566C for ; Thu, 7 Jan 2010 04:11:11 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id A32AC8FC14 for ; Thu, 7 Jan 2010 04:11:11 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o074BBHS078205 for ; Thu, 7 Jan 2010 04:11:11 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o074BB3k078204; Thu, 7 Jan 2010 04:11:11 GMT (envelope-from nobody) Message-Id: <201001070411.o074BB3k078204@www.freebsd.org> Date: Thu, 7 Jan 2010 04:11:11 GMT From: Sevan Janiyan To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/142403: [patch] arabic/ae_fonts_ttf use $SUB_FILES to dynamically adjust pkg-message X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2010 04:20:01 -0000 >Number: 142403 >Category: misc >Synopsis: [patch] arabic/ae_fonts_ttf use $SUB_FILES to dynamically adjust pkg-message >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Jan 07 04:20:00 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Sevan Janiyan >Release: >Organization: >Environment: >Description: >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/arabic/ae_fonts_ttf/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 22 Aug 2009 00:12:52 -0000 1.13 +++ Makefile 7 Jan 2010 04:02:43 -0000 @@ -7,7 +7,7 @@ PORTNAME= ae_fonts1_ttf PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 2 CATEGORIES= arabic x11-fonts MASTER_SITES= SF/arabeyes/Fonts/ae_fonts DISTNAME= ae_fonts1_ttf_${PORTVERSION} @@ -19,6 +19,7 @@ USE_BZIP2= yes WRKSRC= ${WRKDIR}/ae_fonts1-${PORTVERSION} +SUB_FILES= pkg-message .if !defined(WITHOUT_AAHS) FONTS= AAHS @@ -71,7 +72,6 @@ .endfor post-install: - @${CAT} ${PKGMESSAGE} | ${SED} "s|LOCALBASE|${LOCALBASE}|g" \ - | ${SED} "s|PORTNAME|ae_fonts1|g" + @${CAT} ${PKGMESSAGE} .include Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- pkg-message 19 Apr 2008 17:46:05 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ------------------------------------------------------------------- - To get XFree86 to recognize your new fonts you will need to - add a line to your XF86Config file. Please consult XF86Config(5) - for more information on where to find the configuration file. - - Add the following line to the "Files" section and restart XFree86. - - FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/AAHS" - FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/AGA" - FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/FS" - FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/Kasr" - FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/MCS" - FontPath "LOCALBASE/lib/X11/fonts/PORTNAME/Shmookh" ------------------------------------------------------------------- Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message.in 7 Jan 2010 04:02:43 -0000 @@ -0,0 +1,14 @@ +------------------------------------------------------------------ + To get XFree86 to recognize your new fonts you will need to + add a line to your XF86Config file. Please consult XF86Config(5) + for more information on where to find the configuration file. + + Add the following line to the "Files" section and restart XFree86. + + FontPath "%%PREFIX%%/lib/X11/fonts/ae_fonts1/AAHS" + FontPath "%%PREFIX%%/lib/X11/fonts/ae_fonts1/AGA" + FontPath "%%PREFIX%%/lib/X11/fonts/ae_fonts1/FS" + FontPath "%%PREFIX%%/lib/X11/fonts/ae_fonts1/Kasr" + FontPath "%%PREFIX%%/lib/X11/fonts/ae_fonts1/MCS" + FontPath "%%PREFIX%%/lib/X11/fonts/ae_fonts1/Shmookh" +------------------------------------------------------------------ >Release-Note: >Audit-Trail: >Unformatted: