2 files changed, 28 insertions, 10 deletions

diff --git a/print/xdvi/Makefile b/print/xdvi/Makefile
index 591464e02974..402286eff5d8 100644
--- a/print/xdvi/Makefile
+++ b/print/xdvi/Makefile
@@ -3,7 +3,7 @@
 # Date created:         1 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.10 1995/04/15 22:06:55 jmz Exp $
+# $Id: Makefile,v 1.11 1995/04/17 20:31:43 asami Exp $
 #
 
 DISTNAME=	xdvi
@@ -30,6 +30,7 @@ install: build
 	@(cd ${WRKSRC}; ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} xdvi.man)
 	@(cd ${WRKSRC}; ${GMAKE} -f Makefile install BINDIR=${PREFIX}/bin)
 	@(cd ${WRKSRC}; install -c -m 755 -o bin MakeTeXPK ${PREFIX}/bin)
+	@if -f ${SCRIPTDIR}/install.tmp; then sh ${SCRIPTDIR}/install.tmp; fi
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/xdvi/scripts/configure b/print/xdvi/scripts/configure
index 9cfff05f76b2..5012040149ec 100644
--- a/print/xdvi/scripts/configure
+++ b/print/xdvi/scripts/configure
@@ -2,8 +2,17 @@
 
 # paper size, default is not A4
 A4=n
-#default font cache directory: must be world writable
-CACHE=/tmp
+
+prefix=$PREFIX;
+if `echo $PREFIX |grep -q X11` ; then
+  prefix=/usr/local
+fi
+CACHE=$prefix/lib/texmf/fonts
+
+if [ -f $prefix/bin/MakeTeXPK ]; then
+  echo "**WARNING** MakeTeXPK already exists in $PREFIX/bin"
+  echo "This file will be replaced during install."
+fi
 
 if [ ! -f ${WRKSRC}/MakeTeXPK.orig ]; then
   mv ${WRKSRC}/MakeTeXPK ${WRKSRC}/MakeTeXPK.orig || exit 1
@@ -25,12 +34,20 @@ for i in $RES; do
   fi
   shift
 done
-
-echo "Choose a font cache directory for automatic font generation"
-echo -n "(this directory must be world writable) [$CACHE]: "
-read answ; if [ "$answ" != "" ]; then CACHE=$answ; fi
+rm -f $SCRIPTDIR/install.tmp
+echo "Choose a font directory for automatic font generation."
+echo "The default directory is $CACHE. If you"
+echo "don't want to make this directory world writable, then you"
+echo "can choose eg. /tmp. Then you will have to periodically move "
+echo "the files to $CACHE/pk."
+echo -n "font directory [$CACHE]: "
+read answ; if [ "$answ" != "" ]; then 
+  CACHE=$answ; 
+else
+  echo "mkdir -p $CACHE/pk; chmod 1777 $CACHE/pk" > $SCRIPTDIR/install.tmp
+fi
   
-sed -e s:/usr/lib/tex:$PREFIX/lib/texmf: \
+sed -e s:/usr/lib/tex:$prefix/lib/texmf: \
     -e s:/LocalLibrary/Fonts/TeXFonts:$CACHE: \
      $SUBST <${WRKSRC}/MakeTeXPK.orig >${WRKSRC}/MakeTeXPK
 
@@ -39,6 +56,6 @@ sed -e s:/usr/lib/tex:$PREFIX/lib/texmf: \
 chmod +w  ${WRKSRC}/Imakefile 
 echo "OSDEFS=" >> ${WRKSRC}/Imakefile || exit 1;
 echo "OPTIONDEFS=-DUSE_PK -DGREY -DPS_GS -DMAKEPK -DBUTTONS" >> ${WRKSRC}/Imakefile
-echo "DEFAULT_FONT_PATH=$PREFIX/lib/texmf/fonts/pk:$CACHE/pk"  >> ${WRKSRC}/Imakefile
-echo "DEFAULT_VF_PATH=$PREFIX/lib/texmf/fonts/vf" >> ${WRKSRC}/Imakefile
+echo "DEFAULT_FONT_PATH=$prefix/lib/texmf/fonts/pk:$CACHE/pk:/tmp/pk"  >> ${WRKSRC}/Imakefile
+echo "DEFAULT_VF_PATH=$prefix/lib/texmf/fonts/vf" >> ${WRKSRC}/Imakefile
 exit 0;