DESTDIR support.

16 files changed, 55 insertions, 30 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 692d0f192b2..f9244aa3b4d 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/09/29 13:43:41 drochner Exp $
+# $NetBSD: Makefile,v 1.49 2006/11/05 17:23:44 joerg Exp $
 
 DISTNAME=	cairo-1.2.4
 PKGREVISION=	3
@@ -9,6 +9,8 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://cairographics.org/
 COMMENT=	Vector graphics library with cross-device output support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 4f9a8a65395..2a5f0c3e63d 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/09/06 19:56:40 adam Exp $
+# $NetBSD: Makefile,v 1.2 2006/11/05 17:23:44 joerg Exp $
 
 DISTNAME=	cairomm-1.2.2
 CATEGORIES=	graphics
@@ -8,6 +8,8 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://cairographics.org/cairomm/
 COMMENT=	C++ API for cairo
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index f75fc262a87..658d1254603 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/08/03 18:22:17 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2006/11/05 17:23:44 joerg Exp $
 
 DISTNAME=	glitz-0.5.6
 PKGREVISION=	2
@@ -9,6 +9,8 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://freedesktop.org/Software/glitz
 COMMENT=	OpenGL 2D graphics library and a backend for gl output in cairo
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 0e96b514002..797f035de41 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/09/15 15:09:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2006/11/05 17:23:44 joerg Exp $
 #
 
 DISTNAME=		gnome-icon-theme-2.16.0.1
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Theme consisting of a set of icons for GNOME
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
diff --git a/graphics/hicolor-icon-theme/Makefile b/graphics/hicolor-icon-theme/Makefile
index cd1288efbb3..8d931cdc881 100644
--- a/graphics/hicolor-icon-theme/Makefile
+++ b/graphics/hicolor-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/07/22 04:46:16 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/11/05 17:23:44 joerg Exp $
 #
 
 DISTNAME=	hicolor-icon-theme-0.9
@@ -11,6 +11,7 @@ HOMEPAGE=	http://icon-theme.freedesktop.org/wiki/HicolorTheme
 COMMENT=	Standard icon theme called hicolor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 NO_BUILD=	YES
diff --git a/graphics/icon-naming-utils/Makefile b/graphics/icon-naming-utils/Makefile
index 755e9f80f10..0dbd001f0c1 100644
--- a/graphics/icon-naming-utils/Makefile
+++ b/graphics/icon-naming-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/09/17 14:48:18 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/11/05 17:23:44 joerg Exp $
 #
 
 DISTNAME=	icon-naming-utils-0.8.1
@@ -10,6 +10,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://tango.freedesktop.org/
 COMMENT=	Adapts GNOME and KDE icon names to the Icon Naming Specification
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-XML-Simple>=2.14:../../textproc/p5-XML-Simple
 
 GNU_CONFIGURE=	yes
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index e16e0d5af9c..d3c4c1724a1 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/10/06 20:29:11 adam Exp $
+# $NetBSD: Makefile,v 1.29 2006/11/05 17:23:44 joerg Exp $
 
 DISTNAME=	inkscape-0.44.1
 CATEGORIES=	graphics
@@ -8,6 +8,8 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.inkscape.org/
 COMMENT=	Scalable Vector Graphics (SVG) editor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .if !exists (/usr/bin/iconv)
 BUILD_DEPENDS+=		libiconv-[0-9]*:../../converters/libiconv
 .endif
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index f7811e9c3d5..885147e3966 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/21 14:00:42 gdt Exp $
+# $NetBSD: Makefile,v 1.22 2006/11/05 17:23:44 joerg Exp $
 
 DISTNAME=	lcms-1.15
 PKGREVISION=	2
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.littlecms.com/
 COMMENT=	Light Color Management System -- a color management library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
@@ -29,7 +30,7 @@ INSTALLATION_DIRS+=	share/doc/lcms
 
 post-install:
 .for _f_ in LCMSAPI.TXT TUTORIAL.TXT
-	${INSTALL_DATA} ${WRKSRC}/doc/${_f_} ${PREFIX}/share/doc/lcms/${_f_}
+	${INSTALL_DATA} ${WRKSRC}/doc/${_f_} ${DESTDIR}${PREFIX}/share/doc/lcms/${_f_}
 .endfor
 
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/libart2/Makefile b/graphics/libart2/Makefile
index 3e3d27d5f1e..a0929a182b0 100644
--- a/graphics/libart2/Makefile
+++ b/graphics/libart2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/27 17:40:50 reed Exp $
+# $NetBSD: Makefile,v 1.21 2006/11/05 17:23:45 joerg Exp $
 
 DISTNAME=		libart_lgpl-2.3.17
 PKGNAME=		${DISTNAME:S/_lgpl/2/}
@@ -12,6 +12,7 @@ HOMEPAGE=		http://www.levien.com/libart/
 COMMENT=		High-performance 2D graphics library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 5f9e387d4f8..d4fb3935255 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/11/05 17:23:45 joerg Exp $
 
 DISTNAME=	libexif-0.6.13
 PKGREVISION=	1
@@ -11,6 +11,7 @@ HOMEPAGE=	http://libexif.sourceforge.net/
 COMMENT=	EXIF file library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index a8a8a5a4ba0..32b0659f731 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/04/17 13:46:09 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2006/11/05 17:23:45 joerg Exp $
 #
 
 DISTNAME=		libgnomecanvas-2.14.0
@@ -11,6 +11,8 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME Canvas library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake msgfmt pkg-config
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index f936783261b..3d6a21de17b 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/10/23 02:30:19 dan Exp $
+# $NetBSD: Makefile,v 1.55 2006/11/05 17:23:45 joerg Exp $
 
 DISTNAME=	librsvg-2.16.0
 PKGNAME=	${DISTNAME:S/-/2-/}
@@ -11,6 +11,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://librsvg.sourceforge.net/
 COMMENT=	SVG library for GNOME2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	librsvg2-gtk-[0-9]*
 MAKE_JOBS_SAFE=	NO
 
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 671a8b41d27..90f1048fb45 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/05/01 21:44:04 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2006/11/05 17:23:45 joerg Exp $
 
 DISTNAME=	libungif-4.1.4
 PKGREVISION=	1
@@ -13,6 +13,7 @@ COMMENT=	Tools and library routines for working with GIF images
 CONFLICTS=	giflib-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
@@ -29,7 +30,7 @@ post-patch:
 	@${RM} ${WRKSRC}/doc/gif2x11.html
 
 post-install:
-	cd ${PREFIX}/lib && 						\
+	cd ${DESTDIR}${PREFIX}/lib && 					\
 	for SOURCE in libungif.*; do					\
 	  TARGET=`echo $$SOURCE | ${SED} -e s/libungif/libgif/`;	\
 	  ${RM} -f $$TARGET; 						\
@@ -40,9 +41,9 @@ post-install:
 	    ${LN} -s $$SOURCE $$TARGET;					\
 	  fi;								\
 	done
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} COPYING UNCOMPRESSED_GIF ${DOCDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt *.png ${HTMLDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} COPYING UNCOMPRESSED_GIF ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt *.png ${DESTDIR}${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 32c50512027..86b54f208b3 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/08/20 21:38:45 salo Exp $
+# $NetBSD: Makefile,v 1.61 2006/11/05 17:23:45 joerg Exp $
 
 DISTNAME=	libwmf-0.2.8.4
 PKGREVISION=	4
@@ -10,6 +10,7 @@ HOMEPAGE=	http://wvware.sourceforge.net/libwmf.html
 COMMENT=	Library for reading and converting WMF (Windows Meta Files)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
@@ -18,7 +19,7 @@ CONFIGURE_ARGS+=	--disable-gd
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/libwmf
 
 post-install:
-	${RMDIR} ${PREFIX}/include/libwmf/gd
+	${RMDIR} ${DESTDIR}${PREFIX}/include/libwmf/gd
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -26,5 +27,6 @@ post-install:
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index e0ee964faf2..8e19f4c61b2 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/11/05 17:23:45 joerg Exp $
 
 DISTNAME=	lm1009
 PKGNAME=	mng-1.0.9
@@ -14,6 +14,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.libmng.com/
 COMMENT=	Multiple-image Network Graphics (MNG) reference library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # Waiting for automake to be pkgviews-enabled
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -31,7 +33,7 @@ CPPFLAGS+=		${BUILDLINK_CPPFLAGS.lcms}
 
 DOCDIR=			${PREFIX}/share/doc/mng
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man3 ${PKGMANDIR}/man5
+INSTALLATION_DIRS=	${PKGMANDIR}/man3 ${PKGMANDIR}/man5 ${DOCDIR}
 
 pre-configure:
 	cd ${WRKSRC};							\
@@ -43,13 +45,12 @@ pre-configure:
 	autoconf
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC}/doc && \
-		${INSTALL_DATA} Plan1.png Plan2.png libmng.txt ${DOCDIR}
+		${INSTALL_DATA} Plan1.png Plan2.png libmng.txt ${DESTDIR}${DOCDIR}
 	cd ${WRKSRC}/doc/man && \
-		${INSTALL_MAN} libmng.3 ${PREFIX}/${PKGMANDIR}/man3
+		${INSTALL_MAN} libmng.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
 	cd ${WRKSRC}/doc/man && \
-		${INSTALL_MAN} jng.5 mng.5 ${PREFIX}/${PKGMANDIR}/man5
+		${INSTALL_MAN} jng.5 mng.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index db7fcd2e2af..5a77af7508a 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/11/05 17:23:45 joerg Exp $
 
 DISTNAME=	scrot-0.8
 PKGREVISION=	8
@@ -9,9 +9,10 @@ MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://linuxbrit.co.uk/scrot/
 COMMENT=	Commandline screen capture util like "import", but using imlib2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 
 .include "../../devel/giblib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"