Convert "/usr/pkg" -> "${PREFIX}".

1 files changed, 23 insertions, 25 deletions

diff --git a/databases/rrdtool/patches/patch-ah b/databases/rrdtool/patches/patch-ah
index f4d72afc182..0dce8b7a866 100644
--- a/databases/rrdtool/patches/patch-ah
+++ b/databases/rrdtool/patches/patch-ah
@@ -1,7 +1,5 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
-
---- src/Makefile.in.orig	Sat Aug 28 04:50:25 1999
-+++ src/Makefile.in	Sun Nov  7 22:03:59 1999
+--- src/Makefile.in.orig	Fri Aug 27 13:20:25 1999
++++ src/Makefile.in	Fri Feb 18 14:21:20 2000
 @@ -76,12 +76,7 @@
  PERL = @PERL@
  RANLIB = @RANLIB@
@@ -69,8 +67,8 @@ $NetBSD: patch-ah,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
  	done
 -gdpng.lo gdpng.o : gdpng.c ../libpng-1.0.3/png.h ../zlib-1.1.3/zlib.h \
 -	../zlib-1.1.3/zconf.h ../libpng-1.0.3/pngconf.h ../gd1.3/gd.h
-+gdpng.lo gdpng.o : gdpng.c /usr/pkg/include/png.h /usr/include/zlib.h \
-+	/usr/include/zconf.h /usr/pkg/include/pngconf.h /usr/pkg/include/gd.h
++gdpng.lo gdpng.o : gdpng.c ${PREFIX}/include/png.h /usr/include/zlib.h \
++	/usr/include/zconf.h ${PREFIX}/include/pngconf.h ${PREFIX}/include/gd.h
  getopt.lo getopt.o : getopt.c ../config/config.h
  getopt1.lo getopt1.o : getopt1.c ../config/config.h getopt.h
  gifsize.lo gifsize.o : gifsize.c
@@ -79,58 +77,58 @@ $NetBSD: patch-ah,v 1.1.1.1 1999/11/17 17:34:39 wennmach Exp $
 -pngsize.lo pngsize.o : pngsize.c ../libpng-1.0.3/png.h \
 -	../zlib-1.1.3/zlib.h ../zlib-1.1.3/zconf.h \
 -	../libpng-1.0.3/pngconf.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
-+pngsize.lo pngsize.o : pngsize.c /usr/pkg/include/png.h \
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
++pngsize.lo pngsize.o : pngsize.c ${PREFIX}/include/png.h \
 +	/usr/include/zlib.h /usr/include/zconf.h \
-+	/usr/pkg/include/pngconf.h
++	${PREFIX}/include/pngconf.h
  rrd_cgi.o: rrd_cgi.c rrd_tool.h ../config/config.h parsetime.h getopt.h \
 -	rrd_format.h ../gd1.3/gd.h ../cgilib-0.4/cgi.h
-+	rrd_format.h /usr/pkg/include/gd.h /usr/pkg/include/cgi.h
++	rrd_format.h ${PREFIX}/include/gd.h ${PREFIX}/include/cgi.h
  rrd_create.lo rrd_create.o : rrd_create.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_diff.lo rrd_diff.o : rrd_diff.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_dump.lo rrd_dump.o : rrd_dump.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_error.lo rrd_error.o : rrd_error.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_fetch.lo rrd_fetch.o : rrd_fetch.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_format.lo rrd_format.o : rrd_format.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_graph.lo rrd_graph.o : rrd_graph.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h \
 -	../gd1.3/gdlucidan10.h ../gd1.3/gdlucidab12.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h \
-+	/usr/pkg/include/gdfontt.h /usr/pkg/include/gdfonts.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h \
++	${PREFIX}/include/gdfontt.h ${PREFIX}/include/gdfonts.h
  rrd_last.lo rrd_last.o : rrd_last.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_open.lo rrd_open.o : rrd_open.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_resize.lo rrd_resize.o : rrd_resize.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_restore.lo rrd_restore.o : rrd_restore.c rrd_tool.h \
  	../config/config.h parsetime.h getopt.h rrd_format.h \
 -	../gd1.3/gd.h
-+	/usr/pkg/include/gd.h
++	${PREFIX}/include/gd.h
  rrd_tool.o: rrd_tool.c rrd_tool.h ../config/config.h parsetime.h \
 -	getopt.h rrd_format.h ../gd1.3/gd.h
-+	getopt.h rrd_format.h /usr/pkg/include/gd.h
++	getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_tune.lo rrd_tune.o : rrd_tune.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  rrd_update.lo rrd_update.o : rrd_update.c rrd_tool.h ../config/config.h \
 -	parsetime.h getopt.h rrd_format.h ../gd1.3/gd.h
-+	parsetime.h getopt.h rrd_format.h /usr/pkg/include/gd.h
++	parsetime.h getopt.h rrd_format.h ${PREFIX}/include/gd.h
  
  info-am:
  info: info-am