[pkgsrc/trunk]: pkgsrc user-destdir support

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3346e4407c6
branches:  trunk
changeset: 395288:e3346e4407c6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 20:04:17 2009 +0000

description:
user-destdir support

diffstat:

 time/saytime/Makefile         |   9 ++++++---
 time/saytime/distinfo         |   4 ++--
 time/saytime/patches/patch-aa |  17 ++++++++++++++++-
 wm/flwm/Makefile              |   6 +++++-
 wm/flwm/distinfo              |   3 ++-
 wm/flwm/patches/patch-ab      |  15 +++++++++++++++
 6 files changed, 46 insertions(+), 8 deletions(-)

diffs (127 lines):

diff -r 313563711376 -r e3346e4407c6 time/saytime/Makefile
--- a/time/saytime/Makefile     Tue Jul 07 20:03:12 2009 +0000
+++ b/time/saytime/Makefile     Tue Jul 07 20:04:17 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/07 20:04:53 joerg Exp $
 #
 
 DISTNAME=              saytime_11nov1995
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://www.acme.com/software/saytime/
 COMMENT=               Talking clock
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=    pax
 
 ONLY_FOR_PLATFORM=     NetBSD-*-* OpenBSD-*-* SunOS-*-*
@@ -23,8 +25,9 @@
        ${SED} -e 's|@LOCALBASE@|${LOCALBASE}|' \
                ${WRKSRC}/Makefile.template > ${WRKSRC}/Makefile
 
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/saytime
+
 post-install:
-       ${INSTALL_DATA_DIR} ${LOCALBASE}/share/saytime
-       cd ${WRKSRC}/times && pax -rw * ${LOCALBASE}/share/saytime/
+       cd ${WRKSRC}/times && pax -rw * ${DESTDIR}${PREFIX}/share/saytime/
 
 .include "../../mk/bsd.pkg.mk"
diff -r 313563711376 -r e3346e4407c6 time/saytime/distinfo
--- a/time/saytime/distinfo     Tue Jul 07 20:03:12 2009 +0000
+++ b/time/saytime/distinfo     Tue Jul 07 20:04:17 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/07/07 21:23:21 is Exp $
+$NetBSD: distinfo,v 1.2 2009/07/07 20:04:53 joerg Exp $
 
 SHA1 (saytime_11nov1995.tar.gz) = 0deae40ee1c4f128a75d93bc0d9d7cf61c6c757b
 RMD160 (saytime_11nov1995.tar.gz) = c5b4193f4ccabcf75da59e0019e2a73673576d06
 Size (saytime_11nov1995.tar.gz) = 104245 bytes
-SHA1 (patch-aa) = 6d644e2a8de98357d33987a2f3f375c862da81b4
+SHA1 (patch-aa) = dbcc77435c7844d676e152949c3121aa9bcb569c
 SHA1 (patch-ab) = 764f5d214742d450e18b6e83555ba806979fefa5
diff -r 313563711376 -r e3346e4407c6 time/saytime/patches/patch-aa
--- a/time/saytime/patches/patch-aa     Tue Jul 07 20:03:12 2009 +0000
+++ b/time/saytime/patches/patch-aa     Tue Jul 07 20:04:17 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/07/07 21:23:21 is Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/07 20:04:53 joerg Exp $
 
 --- Makefile.orig      1995-11-11 20:39:27.000000000 +0100
 +++ Makefile
@@ -34,3 +34,18 @@
  
  all:          saytime
  
+@@ -30,10 +26,10 @@ saytime:   saytime.o
+       $(CC) $(CFLAGS) -c $<
+ 
+ install:        all
+-      rm -f $(BINDIR)/saytime
+-      cp saytime $(BINDIR)
+-      rm -f $(MANDIR)/saytime.1
+-      cp saytime.1 $(MANDIR)
++      rm -f ${DESTDIR}$(BINDIR)/saytime
++      cp saytime ${DESTDIR}$(BINDIR)
++      rm -f ${DESTDIR}$(MANDIR)/saytime.1
++      cp saytime.1 ${DESTDIR}$(MANDIR)
+ 
+ clean:
+       rm -f saytime *.o a.out core
diff -r 313563711376 -r e3346e4407c6 wm/flwm/Makefile
--- a/wm/flwm/Makefile  Tue Jul 07 20:03:12 2009 +0000
+++ b/wm/flwm/Makefile  Tue Jul 07 20:04:17 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/01/05 16:59:57 abs Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/07 20:04:17 joerg Exp $
 #
 
 DISTNAME=      flwm-1.02
@@ -10,11 +10,15 @@
 HOMEPAGE=      http://flwm.sourceforge.net/
 COMMENT=       The Fast, Light Window Manager
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES= c c++
 GNU_CONFIGURE= yes
 CONFIGURE_ENV+=        X_LIBS="-lGL"
 MAKE_ENV+=     CXXFLAGS=${CXXFLAGS:M*:Q}
 CXXFLAGS+=     -DFLTK_1_0_COMPAT
 
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+
 .include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 313563711376 -r e3346e4407c6 wm/flwm/distinfo
--- a/wm/flwm/distinfo  Tue Jul 07 20:03:12 2009 +0000
+++ b/wm/flwm/distinfo  Tue Jul 07 20:04:17 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/01/05 16:59:57 abs Exp $
+$NetBSD: distinfo,v 1.6 2009/07/07 20:04:17 joerg Exp $
 
 SHA1 (flwm-1.02.tgz) = bd348fa8a1c65b2318bf59e15cba0dcd511b3134
 RMD160 (flwm-1.02.tgz) = 634af3b1882f1753fd82d54e09f2484c9aadad68
 Size (flwm-1.02.tgz) = 64142 bytes
 SHA1 (patch-aa) = f71ebceef3d4f39963113fbf32d3efddcf489c8f
+SHA1 (patch-ab) = 22cf873b56d36675c86fac3059490ed717ebed12
diff -r 313563711376 -r e3346e4407c6 wm/flwm/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/flwm/patches/patch-ab  Tue Jul 07 20:04:17 2009 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2009/07/07 20:04:17 joerg Exp $
+
+--- Makefile.orig      2009-07-07 22:01:57.000000000 +0200
++++ Makefile
+@@ -44,8 +44,8 @@ makedepend:
+ include makedepend
+ 
+ install: $(PROGRAM)
+-      $(INSTALL) -s $(PROGRAM) $(bindir)/$(PROGRAM)
+-      $(INSTALL) $(PROGRAM).$(MANPAGE) $(mandir)/man$(MANPAGE)/$(PROGRAM).$(MANPAGE)
++      $(INSTALL) -s $(PROGRAM) ${DESTDIR}$(bindir)/$(PROGRAM)
++      $(INSTALL) $(PROGRAM).$(MANPAGE) ${DESTDIR}$(mandir)/man$(MANPAGE)/$(PROGRAM).$(MANPAGE)
+ 
+ uninstall:
+       -@ rm -f $(bindir)/$(PROGRAM)