From 9b6608ce833f76f77be42b9c5115d8b8e3d4c2ff Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Tue, 11 Jul 2000 10:06:40 +0000
Subject: Use X11PREFIX in preference to X11BASE, just in case xpkgwedge is
 installed.

---
 print/papersize/Makefile           | 4 ++--
 print/papersize/files/getpapersize | 4 ++--
 print/papersize/files/setpapersize | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'print/papersize')

diff --git a/print/papersize/Makefile b/print/papersize/Makefile
index 05d94561b41..103a0c53168 100644
--- a/print/papersize/Makefile
+++ b/print/papersize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/09/05 18:38:55 kim Exp $
+# $NetBSD: Makefile,v 1.4 2000/07/11 10:06:40 agc Exp $
 #
 
 DISTNAME=	papersize-1.0.2
@@ -17,7 +17,7 @@ NO_CONFIGURE=	yes
 do-build:
 	for f in setpapersize getpapersize; do			\
 		${SED} -e 's|@localbase@|${LOCALBASE}|g'	\
-		       -e 's|@x11base@|${X11BASE}|g'		\
+		       -e 's|@x11prefix@|${X11PREFIX}|g'	\
 			${FILESDIR}/$$f > ${WRKSRC}/$$f;	\
 	done
 
diff --git a/print/papersize/files/getpapersize b/print/papersize/files/getpapersize
index f578cf14490..3b94eb60b83 100644
--- a/print/papersize/files/getpapersize
+++ b/print/papersize/files/getpapersize
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: getpapersize,v 1.2 1999/09/05 18:38:55 kim Exp $
+# $NetBSD: getpapersize,v 1.3 2000/07/11 10:06:41 agc Exp $
 #
 # Small shell script to show the default papersize for packages
 #
@@ -22,7 +22,7 @@ while [ $# -gt 0 ]; do
 		fi
 		;;
 	ddd)
-		f=@x11base@/lib/X11/app-defaults/Ddd
+		f=@x11prefix@/lib/X11/app-defaults/Ddd
 		if [ -e $f ]; then
 			echo -n "$1 has default papersize: "
 			awk '/^@Ddd\*paperSize: / { gsub(".*:", "", $0); print $0; }' $f
diff --git a/print/papersize/files/setpapersize b/print/papersize/files/setpapersize
index 4480ca83d17..751d16aa26e 100644
--- a/print/papersize/files/setpapersize
+++ b/print/papersize/files/setpapersize
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: setpapersize,v 1.3 1999/09/05 18:38:56 kim Exp $
+# $NetBSD: setpapersize,v 1.4 2000/07/11 10:06:41 agc Exp $
 #
 # Small shell script to set the default papersize for packages
 #
@@ -54,7 +54,7 @@ while [ $# -gt 0 ]; do
 		fi
 		;;
 	ddd)
-		dddfile=@x11base@/lib/X11/app-defaults/Ddd
+		dddfile=@x11prefix@/lib/X11/app-defaults/Ddd
 		if [ -e $dddfile ]; then
 			mv $dddfile $dddfile.old
 			sed -e 's|@Ddd@\*paperSize:.*|@Ddd@*paperSize: '$dimensions'|' $dddfile.old > $dddfile && rm $dddfile.old
-- 
cgit v1.2.3