DESTDIR support

5 files changed, 35 insertions, 12 deletions

diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 2c9237c33d9..923758a9fb8 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/02/03 23:21:08 joerg Exp $
 
 DISTNAME=		g2-0.50
 PKGREVISION=		3
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://g2.sourceforge.net/
 COMMENT=		Powerful, easy to use 2D graphics library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -25,9 +27,9 @@ post-configure: perl5-configure
 
 post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} doc/g2_ref.txt COPYING README	\
-		${PREFIX}/share/doc/g2
+		${DESTDIR}${PREFIX}/share/doc/g2
 	cd ${WRKSRC}/demo && ${INSTALL_DATA} *.c *.f *.inc  \
-		${PREFIX}/share/examples/g2
+		${DESTDIR}${PREFIX}/share/examples/g2
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/graphics/g2/distinfo b/graphics/g2/distinfo
index ef1cfa85318..e7bf6859e03 100644
--- a/graphics/g2/distinfo
+++ b/graphics/g2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/10/04 22:22:37 rillig Exp $
+$NetBSD: distinfo,v 1.7 2010/02/03 23:21:08 joerg Exp $
 
 SHA1 (g2-0.50.tar.gz) = 41153f697e3b3e270319b8c99f575f2fccff39cc
 RMD160 (g2-0.50.tar.gz) = c9a379b845da7da3d108c4f60446476d60d67091
 Size (g2-0.50.tar.gz) = 132308 bytes
 SHA1 (patch-aa) = 4691247328cb448c3478e189aba679091c77dca9
-SHA1 (patch-ab) = 627f3ec9b3cd81c431328c6b368f39588c6e8b7c
+SHA1 (patch-ab) = 9f7358c01232123f9f9101d2719382ac93d17abf
 SHA1 (patch-ad) = 766b1063f690db1ea0c3587b4dd2319f678d54bf
diff --git a/graphics/g2/patches/patch-ab b/graphics/g2/patches/patch-ab
index 54144a40f7e..9ee9939fe02 100644
--- a/graphics/g2/patches/patch-ab
+++ b/graphics/g2/patches/patch-ab
@@ -1,7 +1,18 @@
-$NetBSD: patch-ab,v 1.3 2006/10/04 22:22:37 rillig Exp $
+$NetBSD: patch-ab,v 1.4 2010/02/03 23:21:08 joerg Exp $
 
---- Makefile.in.orig	2004-03-01 00:47:46.000000000 +0100
-+++ Makefile.in	2006-10-05 00:19:32.000000000 +0200
+--- Makefile.in.orig	2004-02-29 23:47:46.000000000 +0000
++++ Makefile.in
+@@ -9,8 +9,8 @@ G2_VERSION = 0.50
+ #
+ # g2 installation directories
+ #
+-LIBDIR = @prefix@/lib
+-INCDIR = @prefix@/include
++LIBDIR = ${DESTDIR}@prefix@/lib
++INCDIR = ${DESTDIR}@prefix@/include
+ 
+ #LIBDIR = $(HOME)/local/lib
+ #INCDIR = $(HOME)/local/include
 @@ -66,30 +66,22 @@ OBJ = $(SRC:.c=.o)
  INS =  $(BASE_INS) $(PS_INS) $(X11_INS) $(WIN32_INS) $(GD_INS)
  
diff --git a/graphics/gimp1-wideangle/Makefile b/graphics/gimp1-wideangle/Makefile
index 41a9f3dde6d..bbda73bbf37 100644
--- a/graphics/gimp1-wideangle/Makefile
+++ b/graphics/gimp1-wideangle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/03 23:11:15 joerg Exp $
 #
 
 DISTNAME=	wideangleFeb03
@@ -12,10 +12,16 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://members.ozemail.com.au/~hodsond/
 COMMENT=	GIMP plugin for wideangle lens distortions
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/wideangle
 USE_TOOLS+=	gmake pkg-config
 
-BUILD_TARGET=	wideangle
+BUILD_TARGET=		wideangle
+INSTALLATION_DIRS+=	lib/gimp/1.2/plug-ins
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wideangle ${DESTDIR}${PREFIX}/lib/gimp/1.2/plug-ins
 
 .include "../../graphics/gimp1-base/buildlink3.mk"
 
diff --git a/graphics/gimp2-wideangle/Makefile b/graphics/gimp2-wideangle/Makefile
index cd7e598cde2..f574019385b 100644
--- a/graphics/gimp2-wideangle/Makefile
+++ b/graphics/gimp2-wideangle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/02/03 23:19:10 joerg Exp $
 #
 
 DISTNAME=	wideangle
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://members.ozemail.com.au/~hodsond/wideangle.html
 COMMENT=	GIMP plugin for wideangle lens distortions
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	pkg-config
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
@@ -23,7 +25,9 @@ do-build:
 	(cd ${WRKSRC} && LIBS=${LINK_PTHREAD:Q} gimptool-2.0 --build wideangle.c)
 
 do-install:
-	(cd ${WRKSRC} && gimptool-2.0 --install-admin-bin wideangle)
+	plugindir=`gimptool-2.0 --gimpplugindir` && \
+	${INSTALL_DATA_DIR} ${DESTDIR}$${plugindir}/plug-ins && \
+	${INSTALL_PROGRAM} ${WRKSRC}/wideangle ${DESTDIR}$${plugindir}/plug-ins
 
 .include "../../graphics/gimp/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"