DESTDIR support

6 files changed, 20 insertions, 12 deletions

diff --git a/time/wmfishtime/Makefile b/time/wmfishtime/Makefile
index b8fa343b278..8178545384a 100644
--- a/time/wmfishtime/Makefile
+++ b/time/wmfishtime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/12 00:28:02 joerg Exp $
 #
 
 DISTNAME=	wmfishtime-1.24
@@ -10,8 +10,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ne.jp/asahi/linux/timecop/
 COMMENT=	Dockable clock application with clock, date and fish
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_X11BASE=	yes
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmfishtime/distinfo b/time/wmfishtime/distinfo
index 6074417550b..2c1d41536fb 100644
--- a/time/wmfishtime/distinfo
+++ b/time/wmfishtime/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 19:14:56 wiz Exp $
+$NetBSD: distinfo,v 1.7 2010/02/12 00:28:02 joerg Exp $
 
 SHA1 (wmfishtime-1.24.tar.gz) = f5c730102787bac48b19bb5418a70333cbe22c31
 RMD160 (wmfishtime-1.24.tar.gz) = 9c705351ecbc28e15fd8e3b73712940fdb73baf1
 Size (wmfishtime-1.24.tar.gz) = 21895 bytes
-SHA1 (patch-aa) = 8122c7a1213914145b3fd43956e6982dca1c1214
+SHA1 (patch-aa) = b4529e948b3534b7ee7c62571eeed63c073ec6e2
 SHA1 (patch-ba) = cd739472544fe79dcc12b22fa0b1dbc0281ac7bd
 SHA1 (patch-bb) = d35e6a640d89db0ea2ae60101cffb1957e836f58
diff --git a/time/wmfishtime/patches/patch-aa b/time/wmfishtime/patches/patch-aa
index 66ae9d675a1..0037e02a9bf 100644
--- a/time/wmfishtime/patches/patch-aa
+++ b/time/wmfishtime/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2003/01/19 10:27:57 salo Exp $
+$NetBSD: patch-aa,v 1.5 2010/02/12 00:28:02 joerg Exp $
 --- Makefile.orig	Sat May 26 22:49:41 2001
 +++ Makefile	Sat Jan 19 05:48:48 2002
 @@ -2,22 +2,22 @@
@@ -35,5 +35,5 @@ $NetBSD: patch-aa,v 1.4 2003/01/19 10:27:57 salo Exp $
  install:
 -	install $(INSTALL) wmfishtime $(PREFIX)/bin
 -	install $(INSTALL) wmfishtime.1 $(PREFIX)/man/man1
-+	$(BSD_INSTALL_PROGRAM) wmfishtime $(PREFIX)/bin
-+	$(BSD_INSTALL_MAN) wmfishtime.1 $(PREFIX)/man/man1
++	$(BSD_INSTALL_PROGRAM) wmfishtime ${DESTDIR}$(PREFIX)/bin
++	$(BSD_INSTALL_MAN) wmfishtime.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 0485e1fa1be..0e4e201b847 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/09/19 06:46:52 tron Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/12 00:28:36 joerg Exp $
 
 DISTNAME=	wmMoonClock-1.27
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 # HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 COMMENT=	Shows lunar ephemeris to fairly high accuracy
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 USE_TOOLS+=	gmake
 USE_X11BASE=	YES
@@ -21,6 +23,8 @@ MAKE_FLAGS+=	EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
 EXTRA_LOCAL_LIBS=	-lsocket
 .endif
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/time/wmmoonclock/distinfo b/time/wmmoonclock/distinfo
index 05225ebafc9..8c1a2e7368b 100644
--- a/time/wmmoonclock/distinfo
+++ b/time/wmmoonclock/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 19:14:56 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/02/12 00:28:36 joerg Exp $
 
 SHA1 (wmMoonClock-1.27.tar.gz) = bbc27a11ff99505fe4b872019f214f305cee6c5b
 RMD160 (wmMoonClock-1.27.tar.gz) = adf74a0fff42a5e3d7823c7fabf71c95f47057e4
 Size (wmMoonClock-1.27.tar.gz) = 155197 bytes
-SHA1 (patch-aa) = 6b9d2459c7b92bee200c06f543a85ce429b8cd7b
+SHA1 (patch-aa) = e6e38e186b6525c96e81c141d5ea75ce242b9e7a
diff --git a/time/wmmoonclock/patches/patch-aa b/time/wmmoonclock/patches/patch-aa
index ac43a5c47eb..061c21412b2 100644
--- a/time/wmmoonclock/patches/patch-aa
+++ b/time/wmmoonclock/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/10/27 13:40:30 bouyer Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/12 00:28:36 joerg Exp $
 
 --- Makefile.orig	Tue Mar 23 03:20:32 1999
 +++ Makefile	Thu Oct 17 00:31:50 2002
@@ -25,5 +25,5 @@ $NetBSD: patch-aa,v 1.3 2002/10/27 13:40:30 bouyer Exp $
 -	install -s -m 0755 wmMoonClock $(DESTDIR)/bin
 -	install    -m 0644 wmMoonClock.1 $(DESTDIR)/man/man1 
 -
-+	$(BSD_INSTALL_PROGRAM) wmMoonClock $(DESTDIR)/bin
-+	$(BSD_INSTALL_DATA) wmMoonClock.1 $(DESTDIR)/man/man1 
++	$(BSD_INSTALL_PROGRAM) wmMoonClock $(DESTDIR)${PREFIX}/bin
++	$(BSD_INSTALL_DATA) wmMoonClock.1 $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1