ports/93063: [Maintainer Update] x11-fonts/farsifonts - minor fixes

[Babak Farrokhi]

>Number:         93063
>Category:       ports
>Synopsis:       [Maintainer Update] x11-fonts/farsifonts - minor fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 08 21:10:06 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Babak Farrokhi
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:


System: FreeBSD 6.0-STABLE #6: Sun Jan 22 14:40:17 IRST 2006
    root at home.farrokhi.net:/usr/obj/usr/src/sys/HOME



>Description:


- update MASTER_SITES
- fix PKG-PLIST


>How-To-Repeat:





>Fix:


--- farsifonts.patch begins here ---
diff -ruN farsifonts.orig/Makefile farsifonts/Makefile
--- farsifonts.orig/Makefile	Wed Feb  8 23:34:28 2006
+++ farsifonts/Makefile	Wed Feb  8 23:41:49 2006
@@ -8,7 +8,8 @@
 PORTNAME=	farsifonts
 PORTVERSION=	0.4
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://www.farsiweb.info/font/
+MASTER_SITES=	http://www.farsiweb.info/font/ \
+		http://www.unixified.net/distfiles/
 
 MAINTAINER=	babak at farrokhi.net
 COMMENT=	Standard set of Unicode Persian fonts
@@ -17,6 +18,8 @@
 
 USE_X_PREFIX=	yes
 USE_ZIP=	yes
+PLIST_SUB=      FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
+FONTSDIR?=      ${PREFIX}/lib/X11/fonts/${PORTNAME}
 
 do-build:
 	@ttmkfdir -c -d ${WRKSRC} > ${WRKSRC}/fonts.dir
@@ -24,6 +27,6 @@
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/farsifonts
 	@${INSTALL_DATA} ${WRKSRC}/*.ttf ${PREFIX}/lib/X11/fonts/farsifonts
-	@${INSTALL_DATA} ${WRKSRC}/*.dir ${PREFIX}/lib/X11/fonts/farsifonts
+	@${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/lib/X11/fonts/farsifonts
 
 .include <bsd.port.mk>
diff -ruN farsifonts.orig/pkg-plist farsifonts/pkg-plist
--- farsifonts.orig/pkg-plist	Wed Feb  8 23:34:28 2006
+++ farsifonts/pkg-plist	Wed Feb  8 23:41:24 2006
@@ -1,12 +1,12 @@
-lib/X11/fonts/farsifonts/elham.ttf
-lib/X11/fonts/farsifonts/fonts.dir
-lib/X11/fonts/farsifonts/homa.ttf
-lib/X11/fonts/farsifonts/koodak.ttf
-lib/X11/fonts/farsifonts/nazli.ttf
-lib/X11/fonts/farsifonts/nazlib.ttf
-lib/X11/fonts/farsifonts/roya.ttf
-lib/X11/fonts/farsifonts/royab.ttf
-lib/X11/fonts/farsifonts/terafik.ttf
-lib/X11/fonts/farsifonts/terafikb.ttf
-lib/X11/fonts/farsifonts/titr.ttf
- at dirrm lib/X11/fonts/farsifonts
+%%FONTSDIR%%/elham.ttf
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/homa.ttf
+%%FONTSDIR%%/koodak.ttf
+%%FONTSDIR%%/nazli.ttf
+%%FONTSDIR%%/nazlib.ttf
+%%FONTSDIR%%/roya.ttf
+%%FONTSDIR%%/royab.ttf
+%%FONTSDIR%%/terafik.ttf
+%%FONTSDIR%%/terafikb.ttf
+%%FONTSDIR%%/titr.ttf
+ at dirrm %%FONTSDIR%%
--- farsifonts.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: