[pkgsrc/trunk]: pkgsrc/x11 user-destdir support

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/06b1533eadad
branches:  trunk
changeset: 561046:06b1533eadad
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 18:04:13 2009 +0000

description:
user-destdir support

diffstat:

 x11/qt3-mysql/Makefile      |  8 +++++---
 x11/qt3-pgsql/Makefile      |  8 +++++---
 x11/qt4-mysql/Makefile      |  8 +++++---
 x11/ratmen/Makefile         |  4 +++-
 x11/ratmen/distinfo         |  4 ++--
 x11/ratmen/patches/patch-ab |  6 +++---
 6 files changed, 23 insertions(+), 15 deletions(-)

diffs (123 lines):

diff -r 5e785b67b8c8 -r 06b1533eadad x11/qt3-mysql/Makefile
--- a/x11/qt3-mysql/Makefile    Tue Jul 07 18:04:10 2009 +0000
+++ b/x11/qt3-mysql/Makefile    Tue Jul 07 18:04:13 2009 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2008/01/18 05:10:06 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/07 18:07:03 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt3-libs/Makefile.common"
 
@@ -18,11 +20,11 @@
                ${SETENV} ${MAKE_ENV} ${GMAKE})
 
 SQLDRVDIR=     ${QTPREFIX}/plugins/sqldrivers
+INSTALLATION_DIRS      ${SQLDRVDIR}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${SQLDRVDIR}
        ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \
-               ${SQLDRVDIR}
+               ${DESTDIR}${SQLDRVDIR}
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"
diff -r 5e785b67b8c8 -r 06b1533eadad x11/qt3-pgsql/Makefile
--- a/x11/qt3-pgsql/Makefile    Tue Jul 07 18:04:10 2009 +0000
+++ b/x11/qt3-pgsql/Makefile    Tue Jul 07 18:04:13 2009 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2008/03/13 17:38:49 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/07/07 18:06:31 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt3-libs/Makefile.common"
 
@@ -17,11 +19,11 @@
                ${SETENV} ${MAKE_ENV} ${GMAKE})
 
 SQLDRVDIR=     ${QTPREFIX}/plugins/sqldrivers
+INSTALLATION_DIRS=     ${SQLDRVDIR}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${SQLDRVDIR}
        ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
-               ${SQLDRVDIR}
+               ${DESTDIR}${SQLDRVDIR}
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
diff -r 5e785b67b8c8 -r 06b1533eadad x11/qt4-mysql/Makefile
--- a/x11/qt4-mysql/Makefile    Tue Jul 07 18:04:10 2009 +0000
+++ b/x11/qt4-mysql/Makefile    Tue Jul 07 18:04:13 2009 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2009/06/13 11:55:51 hasso Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/07 18:04:13 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
@@ -16,11 +18,11 @@
        cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE}
 
 SQLDRVDIR=     ${QTPREFIX}/plugins/sqldrivers
+INSTALLATION_DIRS=     ${SQLDRVDIR}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${SQLDRVDIR}
        ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \
-               ${SQLDRVDIR}
+               ${DESTDIR}${SQLDRVDIR}
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
diff -r 5e785b67b8c8 -r 06b1533eadad x11/ratmen/Makefile
--- a/x11/ratmen/Makefile       Tue Jul 07 18:04:10 2009 +0000
+++ b/x11/ratmen/Makefile       Tue Jul 07 18:04:13 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/01/20 13:14:12 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/07 18:07:11 joerg Exp $
 
 DISTNAME=      ratmen-2.2.2
 CATEGORIES=    x11 wm
@@ -8,6 +8,8 @@
 HOMEPAGE=      http://www.update.uu.se/~zrajm/programs/
 COMMENT=       Allows you to create X menus from the shell
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_TARGET=  ratmen
 LDFLAGS+=      ${X11_LDFLAGS}
 
diff -r 5e785b67b8c8 -r 06b1533eadad x11/ratmen/distinfo
--- a/x11/ratmen/distinfo       Tue Jul 07 18:04:10 2009 +0000
+++ b/x11/ratmen/distinfo       Tue Jul 07 18:04:13 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/12 17:14:35 minskim Exp $
+$NetBSD: distinfo,v 1.2 2009/07/07 18:07:11 joerg Exp $
 
 SHA1 (ratmen-2.2.2.tar.gz) = 789e2ce43a74f22b81021427d748e49c1637491c
 RMD160 (ratmen-2.2.2.tar.gz) = ee356aa2bdfb7948810c7b243d600b79845107a3
 Size (ratmen-2.2.2.tar.gz) = 22906 bytes
 SHA1 (patch-aa) = c8d7cbc65272a3f852c4950c3c647b5fe063137e
-SHA1 (patch-ab) = 681e4382850b23de29aa9440726b05d73dab27ee
+SHA1 (patch-ab) = dc55759b6fb08b4bb523625d06da82c45d840498
diff -r 5e785b67b8c8 -r 06b1533eadad x11/ratmen/patches/patch-ab
--- a/x11/ratmen/patches/patch-ab       Tue Jul 07 18:04:10 2009 +0000
+++ b/x11/ratmen/patches/patch-ab       Tue Jul 07 18:04:13 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/04/12 17:14:35 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2009/07/07 18:07:11 joerg Exp $
 
 --- Makefile.orig      2003-02-25 22:21:15.000000000 +0100
 +++ Makefile
@@ -31,5 +31,5 @@
  install: $(PROG)
 -      install -D -p -m 755 -s $(PROG) $(PREFIX)/bin/$(PROG)
 -      install -D -p -m 755 $(PROG).1 $(MANDIR)/man1/$(PROG).1
-+      $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
-+      $(BSD_INSTALL_PROGRAM) $(PROG) $(PREFIX)/bin
++      $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(PREFIX)/bin
++      $(BSD_INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(PREFIX)/bin