3 files changed, 57 insertions, 43 deletions

diff --git a/x11-fonts/urwfonts-ttf/Makefile b/x11-fonts/urwfonts-ttf/Makefile
index c9886e05a7b1..c0d9e31c5d24 100644
--- a/x11-fonts/urwfonts-ttf/Makefile
+++ b/x11-fonts/urwfonts-ttf/Makefile
@@ -19,10 +19,14 @@ NO_WRKSUBDIR=	yes
 
 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 --git a/x11-fonts/urwfonts-ttf/pkg-message b/x11-fonts/urwfonts-ttf/pkg-message
new file mode 100644
index 000000000000..e432e90a5784
--- /dev/null
+++ b/x11-fonts/urwfonts-ttf/pkg-message
@@ -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 --git a/x11-fonts/urwfonts-ttf/pkg-plist b/x11-fonts/urwfonts-ttf/pkg-plist
index c3be2a6c4327..e077130ff353 100644
--- a/x11-fonts/urwfonts-ttf/pkg-plist
+++ b/x11-fonts/urwfonts-ttf/pkg-plist
@@ -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
-@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
+@dirrm lib/X11/fonts/urwfonts-ttf