user-destdir support

6 files changed, 33 insertions, 17 deletions

diff --git a/time/dclock/Makefile b/time/dclock/Makefile
index d5f4f0864a6..24f58f42377 100644
--- a/time/dclock/Makefile
+++ b/time/dclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/01 23:37:53 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/07/07 20:27:10 joerg Exp $
 #
 
 DISTNAME=	dclock
@@ -11,10 +11,14 @@ EXTRACT_SUFX=	.shar.Z
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Digital clock for X
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	ivtools-*
 
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/dclock/distinfo b/time/dclock/distinfo
index cb734d3b343..5da725d693c 100644
--- a/time/dclock/distinfo
+++ b/time/dclock/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2007/04/19 18:27:59 drochner Exp $
+$NetBSD: distinfo,v 1.8 2009/07/07 20:27:10 joerg Exp $
 
 SHA1 (dclock.shar.Z) = 1e9dac79e11f7075fd216e90d45218f499c9b035
 RMD160 (dclock.shar.Z) = 772bded334477537f39f2a492d0bea69afff71a8
 Size (dclock.shar.Z) = 23855 bytes
-SHA1 (patch-aa) = bde3e7be8f4a253398958b8c310d11303f0558e5
+SHA1 (patch-aa) = 4631e0b7777edcc0f6d5c998207d02d8fa712367
 SHA1 (patch-ab) = 0dea1f8d07d70521706ea88f0daf0772d3de5120
 SHA1 (patch-ac) = 71ea6994b2466ca69a2e5a0b23bd944f94f182be
diff --git a/time/dclock/patches/patch-aa b/time/dclock/patches/patch-aa
index 9696fdd4714..a4cb934c9c4 100644
--- a/time/dclock/patches/patch-aa
+++ b/time/dclock/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2005/01/25 04:13:57 tv Exp $
+$NetBSD: patch-aa,v 1.4 2009/07/07 20:27:10 joerg Exp $
 
 --- Makefile.orig	2005-01-24 22:41:08.000000000 -0500
 +++ Makefile
@@ -28,8 +28,8 @@ $NetBSD: patch-aa,v 1.3 2005/01/25 04:13:57 tv Exp $
 +	${LINK.c} -o dclock ${OBJS} ${LIBS}
 +
 +install: dclock
-+	${BSD_INSTALL_PROGRAM} dclock $(PREFIX)/bin
-+	${BSD_INSTALL_MAN} dclock.man $(PREFIX)/man/man1/dclock.1
++	${BSD_INSTALL_PROGRAM} dclock ${DESTDIR}$(PREFIX)/bin
++	${BSD_INSTALL_MAN} dclock.man ${DESTDIR}$(PREFIX)/man/man1/dclock.1
  
  clean: ; rm -f ${OBJS} core dclock
  
diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index 12ddd57efa2..ac6392f1d4f 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/05/30 00:24:00 zafer Exp $
+# $NetBSD: Makefile,v 1.22 2009/07/07 20:25:27 joerg Exp $
 #
 
 DISTNAME=	emiclock-2.0.2
@@ -10,6 +10,8 @@ MAINTAINER=	minoura@NetBSD.org
 COMMENT=	Analog clock with image in the middle
 LICENSE=	emiclock-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=	Do not distribute
 NO_SRC_ON_FTP=${RESTRICTED}
 NO_BIN_ON_FTP=${RESTRICTED}
@@ -28,10 +30,11 @@ post-patch:
 	${ECHO} "#undef USE_XAW3D" > ${WRKSRC}/xawconfig.h
 .endif
 
+INSTALLATION_DIRS=	lib/X11/ja_JP.eucJP/app-defaults
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults
 	${INSTALL_DATA} ${WRKSRC}/resources/R6/EUC/EmiClock.ad \
-		${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock
+		${DESTDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock
 
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
diff --git a/time/emiclock/distinfo b/time/emiclock/distinfo
index ce3a1977e48..ffb76b96afb 100644
--- a/time/emiclock/distinfo
+++ b/time/emiclock/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/01/05 16:58:41 hira Exp $
+$NetBSD: distinfo,v 1.7 2009/07/07 20:25:27 joerg Exp $
 
 SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1
 RMD160 (emiclock-2.0.2.tar.gz) = 25a753aaefbd9b8b57c16fbfe13678a002ab8179
@@ -6,5 +6,5 @@ Size (emiclock-2.0.2.tar.gz) = 308682 bytes
 SHA1 (patch-aa) = 082873291d05709ecc392a3e6295078065aa1d30
 SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b
 SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690
-SHA1 (patch-ad) = 079da0fad45d8c4ab14416aa427cf2451c024b8f
+SHA1 (patch-ad) = 47a12bfb61ed37f5ad9625f161e5e2a6c1d3e47f
 SHA1 (patch-ae) = 75250a553700eeacd5fcc6f71ed4477541cab6c0
diff --git a/time/emiclock/patches/patch-ad b/time/emiclock/patches/patch-ad
index 22c02408c03..6dace7b5759 100644
--- a/time/emiclock/patches/patch-ad
+++ b/time/emiclock/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2006/01/05 16:58:41 hira Exp $
+$NetBSD: patch-ad,v 1.5 2009/07/07 20:25:27 joerg Exp $
 
---- Imakefile.orig	2006-01-06 01:38:37.000000000 +0900
-+++ Imakefile	2006-01-06 01:39:37.000000000 +0900
-@@ -106,6 +106,11 @@
+--- Imakefile.orig	1999-09-02 16:33:47.000000000 +0200
++++ Imakefile
+@@ -106,6 +106,11 @@ XCOMM
  #define	StartupSound	myu.au
  #endif	/* i386BsdArchitecture && (i386FreeBsd || FreeBSDArchitecture) */
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ad,v 1.4 2006/01/05 16:58:41 hira Exp $
  #else	/* USE_NETAUDIO */
  
  /* netaudio (NCDaudio) */
-@@ -143,7 +148,7 @@
+@@ -143,7 +148,7 @@ XCOMM
  LOCAL_LIBRARIES = XawClientLibs
  # ifdef	USE_XAW3D
        DEPXAWLIB = $(USRLIBDIR)/libXaw3d.a
@@ -23,7 +23,7 @@ $NetBSD: patch-ad,v 1.4 2006/01/05 16:58:41 hira Exp $
  # endif	/* USE_XAW3D */
  
    SYS_LIBRARIES = SoundLibrary -lm
-@@ -219,6 +224,8 @@
+@@ -219,6 +224,8 @@ XCOMM
  #define	ResourceDir	resources/Xaw3d
  #endif	/* !USE_XAW3D */
  
@@ -32,3 +32,12 @@ $NetBSD: patch-ad,v 1.4 2006/01/05 16:58:41 hira Exp $
  EmiClock.ad:: ResourceDir/EmiClock.ad
  	$(CP) ResourceDir/EmiClock.ad .
  
+@@ -234,6 +241,6 @@ XCOMM
+ 
+ #ifdef	USE_SOUND
+ install:: sounds/StartupSound
+-	MakeDir(EmiClockLib)
+-	$(INSTALL) -c $(INSTAPPFLAGS) sounds/StartupSound EmiClockLib/StartupSound
++	MakeDir(${DESTDIR}EmiClockLib)
++	$(INSTALL) -c $(INSTAPPFLAGS) sounds/StartupSound ${DESTDIR}EmiClockLib/StartupSound
+ #endif	/* USE_SOUND */