ports/70375: [ patch ] x11-fonts/urwfonts-ttf: correct install path, pkg-message

Thu Aug 12 18:10:26 UTC 2004

>Number:         70375
>Category:       ports
>Synopsis:       [ patch ] x11-fonts/urwfonts-ttf: correct install path, pkg-message
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 12 18:10:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #14: Tue Aug 10 16:04:36 MSD 2004 root at lame.novel.ru:/usr/obj/usr/src/sys/NOV i386

>Description:
	- Use more correct path for fonts, to be exact, use X prefix and 
	install fonts to ${PREFIX}/lib/X11/fonts/urwfonts-ttf.

	- Add pkg-message with some description how to get X server know 
	about installed fonts. 
>How-To-Repeat:
	
>Fix:

diff -ruN urwfonts-ttf.orig/Makefile urwfonts-ttf/Makefile

--- urwfonts-ttf.orig/Makefile	Thu Aug 12 21:39:58 2004
+++ urwfonts-ttf/Makefile	Thu Aug 12 21:55:11 2004
@@ -19,10 +19,14 @@
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
+USE_X_PREFIX=	yes
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${WRKSRC}/fonts.* ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README ${DATADIR}
+	${MKDIR} ${PREFIX}/lib/X11/fonts/urwfonts-ttf
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${WRKSRC}/fonts.* ${PREFIX}/lib/X11/fonts/urwfonts-ttf
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README ${PREFIX}/lib/X11/fonts/urwfonts-ttf
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+		
 .include <bsd.port.mk>
diff -ruN urwfonts-ttf.orig/pkg-message urwfonts-ttf/pkg-message
--- urwfonts-ttf.orig/pkg-message	Thu Jan  1 03:00:00 1970
+++ urwfonts-ttf/pkg-message	Thu Aug 12 21:47:44 2004
@@ -0,0 +1,10 @@
+============================================================
+You'll have to add /usr/X11R6/lib/X11/fonts/urwfonts-ttf
+to your X font path by either:
+
+$ xset fp+ /usr/X11R6/lib/X11/fonts/urwfonts-ttf
+$ xset fp rehash
+
+or by adding it to your X-server configuration file (usually
+/etc/X11/XF86Config) and restarting the X-server.
+============================================================
diff -ruN urwfonts-ttf.orig/pkg-plist urwfonts-ttf/pkg-plist
--- urwfonts-ttf.orig/pkg-plist	Thu Aug 12 21:39:58 2004
+++ urwfonts-ttf/pkg-plist	Thu Aug 12 21:43:01 2004
@@ -1,40 +1,40 @@
-share/urwfonts-ttf/COPYING
-share/urwfonts-ttf/README
-share/urwfonts-ttf/a010013l.ttf
-share/urwfonts-ttf/a010015l.ttf
-share/urwfonts-ttf/a010033l.ttf
-share/urwfonts-ttf/a010035l.ttf
-share/urwfonts-ttf/b018012l.ttf
-share/urwfonts-ttf/b018015l.ttf
-share/urwfonts-ttf/b018032l.ttf
-share/urwfonts-ttf/b018035l.ttf
-share/urwfonts-ttf/c059013l.ttf
-share/urwfonts-ttf/c059016l.ttf
-share/urwfonts-ttf/c059033l.ttf
-share/urwfonts-ttf/c059036l.ttf
-share/urwfonts-ttf/d050000l.ttf
-share/urwfonts-ttf/fonts.dir
-share/urwfonts-ttf/fonts.scale
-share/urwfonts-ttf/n019003l.ttf
-share/urwfonts-ttf/n019004l.ttf
-share/urwfonts-ttf/n019023l.ttf
-share/urwfonts-ttf/n019024l.ttf
-share/urwfonts-ttf/n019043l.ttf
-share/urwfonts-ttf/n019044l.ttf
-share/urwfonts-ttf/n019063l.ttf
-share/urwfonts-ttf/n019064l.ttf
-share/urwfonts-ttf/n021003l.ttf
-share/urwfonts-ttf/n021004l.ttf
-share/urwfonts-ttf/n021023l.ttf
-share/urwfonts-ttf/n021024l.ttf
-share/urwfonts-ttf/n022003l.ttf
-share/urwfonts-ttf/n022004l.ttf
-share/urwfonts-ttf/n022023l.ttf
-share/urwfonts-ttf/n022024l.ttf
-share/urwfonts-ttf/p052003l.ttf
-share/urwfonts-ttf/p052004l.ttf
-share/urwfonts-ttf/p052023l.ttf
-share/urwfonts-ttf/p052024l.ttf
-share/urwfonts-ttf/s050000l.ttf
-share/urwfonts-ttf/z003034l.ttf
- at dirrm share/urwfonts-ttf
+lib/X11/fonts/urwfonts-ttf/COPYING
+lib/X11/fonts/urwfonts-ttf/README
+lib/X11/fonts/urwfonts-ttf/a010013l.ttf
+lib/X11/fonts/urwfonts-ttf/a010015l.ttf
+lib/X11/fonts/urwfonts-ttf/a010033l.ttf
+lib/X11/fonts/urwfonts-ttf/a010035l.ttf
+lib/X11/fonts/urwfonts-ttf/b018012l.ttf
+lib/X11/fonts/urwfonts-ttf/b018015l.ttf
+lib/X11/fonts/urwfonts-ttf/b018032l.ttf
+lib/X11/fonts/urwfonts-ttf/b018035l.ttf
+lib/X11/fonts/urwfonts-ttf/c059013l.ttf
+lib/X11/fonts/urwfonts-ttf/c059016l.ttf
+lib/X11/fonts/urwfonts-ttf/c059033l.ttf
+lib/X11/fonts/urwfonts-ttf/c059036l.ttf
+lib/X11/fonts/urwfonts-ttf/d050000l.ttf
+lib/X11/fonts/urwfonts-ttf/fonts.dir
+lib/X11/fonts/urwfonts-ttf/fonts.scale
+lib/X11/fonts/urwfonts-ttf/n019003l.ttf
+lib/X11/fonts/urwfonts-ttf/n019004l.ttf
+lib/X11/fonts/urwfonts-ttf/n019023l.ttf
+lib/X11/fonts/urwfonts-ttf/n019024l.ttf
+lib/X11/fonts/urwfonts-ttf/n019043l.ttf
+lib/X11/fonts/urwfonts-ttf/n019044l.ttf
+lib/X11/fonts/urwfonts-ttf/n019063l.ttf
+lib/X11/fonts/urwfonts-ttf/n019064l.ttf
+lib/X11/fonts/urwfonts-ttf/n021003l.ttf
+lib/X11/fonts/urwfonts-ttf/n021004l.ttf
+lib/X11/fonts/urwfonts-ttf/n021023l.ttf
+lib/X11/fonts/urwfonts-ttf/n021024l.ttf
+lib/X11/fonts/urwfonts-ttf/n022003l.ttf
+lib/X11/fonts/urwfonts-ttf/n022004l.ttf
+lib/X11/fonts/urwfonts-ttf/n022023l.ttf
+lib/X11/fonts/urwfonts-ttf/n022024l.ttf
+lib/X11/fonts/urwfonts-ttf/p052003l.ttf
+lib/X11/fonts/urwfonts-ttf/p052004l.ttf
+lib/X11/fonts/urwfonts-ttf/p052023l.ttf
+lib/X11/fonts/urwfonts-ttf/p052024l.ttf
+lib/X11/fonts/urwfonts-ttf/s050000l.ttf
+lib/X11/fonts/urwfonts-ttf/z003034l.ttf
+ at dirrm lib/X11/fonts/urwfonts-ttf
>Release-Note:
>Audit-Trail:
>Unformatted:

