Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Jan 2010 04:11:11 GMT
From:      Sevan Janiyan <venture37@geeklan.co.uk>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   misc/142403: [patch] arabic/ae_fonts_ttf use $SUB_FILES to dynamically adjust pkg-message
Message-ID:  <201001070411.o074BB3k078204@www.freebsd.org>
Resent-Message-ID: <201001070420.o074K1c7067609@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001070411.o074BB3k078204>