--- dvi2ps-3.2j/Makefile-original	Mon Sep 11 18:16:11 2000
+++ dvi2ps-3.2j/Makefile	Tue Aug 27 08:19:22 2002
@@ -3,6 +3,7 @@
 #
 # BINAREA and DVI2LIB are relative to PREFIX
 PREFIX=${DESTDIR}/usr/local
+PREFIX_PKG=${DESTDIR}/usr/pkg
 # where dvi2ps is installed
 BINAREA=${PREFIX}/bin
 #
@@ -45,14 +46,14 @@
 FONTF = -DFREETYPE -DVFLIB
 # FREETYPE -- FTLIB, FTINC
 # VFLIB    -- FTLIB, FTINC, VFLIB, VFLIBINC
-FTLIB = -L${PREFIX}/lib -lttf
-FTINC = -I${PREFIX}/include/freetype
-VFLIB = -L${PREFIX}/lib -lVFlib2
-VFLIBINC = -I${PREFIX}/include
+FTLIB = -L${PREFIX_PKG}/lib -lttf
+FTINC = -I${PREFIX_PKG}/include/freetype
+VFLIB = -L${PREFIX_PKG}/lib -lVFlib2
+VFLIBINC = -I${PREFIX_PKG}/include
 
 # kpathsea
-KPSELIB = -L${PREFIX}/lib -lkpathsea
-KPSEINC = -I${PREFIX}/include -DKPATHSEA
+KPSELIB = -L${PREFIX_PKG}/lib -lkpathsea
+KPSEINC = -I${PREFIX_PKG}/include -DKPATHSEA
 
 #
 CC=gcc
@@ -75,6 +76,7 @@
 #
 FONTLIB = ${VFLIB} ${FTLIB}
 CFLAGS = ${CCFLAGS} ${FONTF} ${KPSEINC}
+LDFLAGS= -Xlinker --rpath-link -Xlinker /usr/pkg/lib
 CNFCFLAGS = ${CFLAGS} -DDVI2PATH=\"${DVI2PATH}\" \
 	    -DDVI2LIB=\"${DVI2LIB}\" -DFONTDESC=\"//${FONTDESC}\" \
 	    -DRESOLUTION=${RESOLUTION} -DMFMODE=\"${MFMODE}\" \
@@ -126,7 +128,7 @@
 all: dvi2ps ${PSHEADERS}
 
 dvi2ps: ${DVI2OBJS} ${PSOBJS}
-	${CC} -o $@ ${DVI2OBJS} ${PSOBJS} ${FONTLIB} ${KPSELIB} -lm
+	${CC} -o $@ ${LDFLAGS} ${DVI2OBJS} ${PSOBJS} ${FONTLIB} ${KPSELIB} -lm
 dvi2.o: Makefile
 	${CC} ${CNFCFLAGS} -c dvi2.c
 ps.o: Makefile