DESTDIR support

5 files changed, 17 insertions, 9 deletions

diff --git a/databases/rdb/Makefile b/databases/rdb/Makefile
index acebde688ae..e0898bd3fc1 100644
--- a/databases/rdb/Makefile
+++ b/databases/rdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/29 17:30:09 joerg Exp $
 
 DISTNAME=	RDB-2.6d
 PKGNAME=	rdb-2.6.4
@@ -10,6 +10,8 @@ MAINTAINER=	njohnston@globaltetrahedron.com
 HOMEPAGE=	ftp://ftp.sunet.se/pub/unix/databases/flat-file/RDB/
 COMMENT=	Relational database system that uses standard filters via pipes
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/rdb
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
@@ -18,4 +20,6 @@ REPLACE_PERL+=	column compute dataent etbl headchg jointbl lst2tbl mergetbl
 REPLACE_PERL+=	mktbl ptbl rdb rdbt repair reporttbl row search sorttbl
 REPLACE_PERL+=	subtotal summ tbl2lst uniqtbl valid
 
+INSTALLATION_DIRS+=	bin
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/rdb/distinfo b/databases/rdb/distinfo
index 4fa9edea3f2..a0943320e18 100644
--- a/databases/rdb/distinfo
+++ b/databases/rdb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 16:33:09 agc Exp $
+$NetBSD: distinfo,v 1.3 2010/01/29 17:30:09 joerg Exp $
 
 SHA1 (RDB-2.6d.tar.gz) = d7c01391eb8035236630357d77c580fcdd2ed3dd
 RMD160 (RDB-2.6d.tar.gz) = fd28dc86934ff35bb6e18bee196dafdf1248ae15
 Size (RDB-2.6d.tar.gz) = 214540 bytes
-SHA1 (patch-aa) = 94b60d15ceb2eceb084a7d1d6d29f7379f3dac01
+SHA1 (patch-aa) = bd4eb68ea7a0c0a3b040f25500a09ca159c204ce
diff --git a/databases/rdb/patches/patch-aa b/databases/rdb/patches/patch-aa
index b6e20be8499..a099ab62860 100644
--- a/databases/rdb/patches/patch-aa
+++ b/databases/rdb/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/12/20 17:22:16 agc Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/29 17:30:09 joerg Exp $
 
 Generalise to use ${PREFIX}
 
@@ -8,7 +8,7 @@ Generalise to use ${PREFIX}
  # RBD Makefile - installation only
  
 -INSTALL_DIR = /usr/local/bin
-+INSTALL_DIR = ${PREFIX}/bin
++INSTALL_DIR = ${DESTDIR}${PREFIX}/bin
  
  PERL_SCRIPTS = \
  	column compute dataent etbl headchg jointbl lst2tbl \
diff --git a/databases/ruby-vapor/Makefile b/databases/ruby-vapor/Makefile
index b1d49abbd82..afd0f45ae28 100644
--- a/databases/ruby-vapor/Makefile
+++ b/databases/ruby-vapor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/10/19 15:32:14 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2010/01/29 17:34:23 joerg Exp $
 
 DISTNAME=	vapor-0.81
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://vapor.rubyforge.org/
 COMMENT=	Ruby transparent persistence to postgresql
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	${RUBY_PKGPREFIX}-dbd-pg>=0.0.20:../../databases/ruby-dbd-pg
 
 USE_TOOLS=	pax
@@ -25,7 +27,7 @@ CONFIGURE_ARGS+=	--site-ruby-common=${PREFIX}/${RUBY_VENDORLIB_BASE} \
 			--so-dir==${PREFIX}/${RUBY_VENDORARCHLIB}
 
 
-INSTALLATION_DIRS=	${RUBY_DOC}/vapor
+INSTALLATION_DIRS=	${RUBY_DOC}/vapor ${RUBY_EG}
 
 post-install:
 	cd ${WRKSRC}/doc; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_DOC}/vapor
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index 106dc281a4f..697bca0cb14 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/10/06 09:54:42 adam Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/29 17:32:31 joerg Exp $
 
 DISTNAME=	slony1-1.2.15
 CATEGORIES=	databases
@@ -9,6 +9,8 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://main.slony.info/
 COMMENT=	Replication system for PostgreSQL
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server
 
 USE_TOOLS+=		gmake
@@ -26,7 +28,7 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/share/slon.conf-sample \
-		${PGSQL_PREFIX}/share/postgresql
+	    ${DESTDIR}${PGSQL_PREFIX}/share/postgresql
 
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"