Add PKG_DESTDIR_SUPPORT.

Use PREFIX rather than LOCALBASE.

4 files changed, 20 insertions, 18 deletions

diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 192f61e709a..10c10e4ac9f 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2008/03/17 12:18:47 obache Exp $
+# $NetBSD: Makefile,v 1.76 2009/05/03 22:58:31 abs Exp $
 
 DISTNAME=	xv-3.10a
 PKGREVISION=	13
@@ -35,10 +35,13 @@ BUILD_TARGET=	depend all
 
 SUBST_CLASSES+=		gspath
 SUBST_FILES.gspath=	config.h
-SUBST_SED.gspath=	-e 's|@LOCALBASE@|${LOCALBASE}|g'
+SUBST_SED.gspath=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_STAGE.gspath=	post-configure
 SUBST_MESSAGE.gspath=	Fixing path to ghostscript interpreter.
 
+INSTALLATION_DIRS+= share/doc/xv
+PKG_DESTDIR_SUPPORT=  user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -56,9 +59,8 @@ CPPFLAGS+=	-DNEED_ALLOCA_H
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xv
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
-	${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xv
+	${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${DESTDIR}${PREFIX}/share/doc/xv
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index 86a0f92e70e..0d4df8bd519 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/07/27 23:42:17 joerg Exp $
+$NetBSD: distinfo,v 1.16 2009/05/03 22:58:31 abs Exp $
 
 SHA1 (xv-3.10a-jumbo-patches-20070520.tar.gz) = d00308c1687d9d803d26ef40c73d19a0f593c626
 RMD160 (xv-3.10a-jumbo-patches-20070520.tar.gz) = 23bc07030416ebaca5ce4d223921e33094c37b93
@@ -8,6 +8,6 @@ RMD160 (xv-3.10a.tar.gz) = 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d
 Size (xv-3.10a.tar.gz) = 2259124 bytes
 SHA1 (patch-aa) = bd6ef51bf962e1994e2e47ba5197c9729ec5221a
 SHA1 (patch-ab) = 5bfc8ae09b029e4661b27d94bba46540c7f320fb
-SHA1 (patch-ac) = 39933efe8411df805abfac5a1e43f1e5bee2ea8f
-SHA1 (patch-ad) = b0d0d4f4243ceb091e0734c0024c997bdf7e86c7
+SHA1 (patch-ac) = a17b0095e6586b595190a07126ac58752d8a2562
+SHA1 (patch-ad) = d1fa6ae4c432528148ebe37b7a8bef8bd2059997
 SHA1 (patch-af) = c6ede0291556f7739274e8352d6fb626480927e8
diff --git a/graphics/xv/patches/patch-ac b/graphics/xv/patches/patch-ac
index 1eaf12969e9..24b0a43e75e 100644
--- a/graphics/xv/patches/patch-ac
+++ b/graphics/xv/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.9 2007/07/08 10:50:25 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2009/05/03 22:58:31 abs Exp $
 
 --- config.h.orig	2007-06-08 07:29:49.000000000 +0000
 +++ config.h
@@ -9,8 +9,8 @@ $NetBSD: patch-ac,v 1.9 2007/07/08 10:50:25 wiz Exp $
 -#define GS_PATH "gs"
 -/* #define GS_LIB  "."                 */
 -/* #define GS_DEV  "ppmraw"            */
-+#define GS_PATH "@LOCALBASE@/bin/gs"
-+#define GS_LIB "@LOCALBASE@/share/ghostscript"
++#define GS_PATH "@PREFIX@/bin/gs"
++#define GS_LIB "@PREFIX@/share/ghostscript"
 +#define GS_DEV "ppmraw"
  
  
diff --git a/graphics/xv/patches/patch-ad b/graphics/xv/patches/patch-ad
index 4bbe23c05a1..ae3a744410b 100644
--- a/graphics/xv/patches/patch-ad
+++ b/graphics/xv/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.10 2007/07/08 10:50:26 wiz Exp $
+$NetBSD: patch-ad,v 1.11 2009/05/03 22:58:31 abs Exp $
 
 diff -u Imakefile Imakefile
 --- Imakefile.orig
@@ -41,8 +41,8 @@ diff -u Imakefile Imakefile
  
 +#ifdef UseInstalledJpeg
 +JPEG = -DDOJPEG
-+LIBJPEG = $(LDFLAGS) -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ljpeg
-+JPEGINCLUDE = -I$(LOCALBASE)/include
++LIBJPEG = $(LDFLAGS) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -ljpeg
++JPEGINCLUDE = -I$(PREFIX)/include
 +#endif
 +
  #ifdef HaveTiff
@@ -55,8 +55,8 @@ diff -u Imakefile Imakefile
  
 +#ifdef UseInstalledTiff
 +TIFF = -DDOTIFF
-+LIBTIFF = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ltiff -ljpeg -lz
-+TIFFINCLUDE = -I$(LOCALBASE)/include
++LIBTIFF = -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -ltiff -ljpeg -lz
++TIFFINCLUDE = -I$(PREFIX)/include
 +#endif
 +
  #ifdef HavePDS
@@ -71,7 +71,7 @@ diff -u Imakefile Imakefile
 +*/
 +#ifdef UseInstalledPng
 +PNG    = -DDOPNG
-+PNGDIR = ${LOCALBASE}
++PNGDIR = ${PREFIX}
 +PNGINC = -I$(PNGDIR)/include
 +PNGLIB = -L$(PNGDIR)/lib -lpng -lz
 +LIBPNG = ${PNGLIB}
@@ -85,7 +85,7 @@ diff -u Imakefile Imakefile
 +###
 +*/
 +#ifdef UseInstalledZlib
-+ZLIBDIR = $(LOCALBASE)
++ZLIBDIR = $(PREFIX)
 +ZLIBINC = -I$(ZLIBDIR)/include
 +ZLIBLIB = -L$(ZLIBDIR)/lib -lz
 +LIBZLIB = ${ZLIB}