user-destdir support

15 files changed, 93 insertions, 68 deletions

diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 85c75195a5f..7941beb1cf0 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2009/07/07 20:34:11 joerg Exp $
 
 DISTNAME=		unroff-1.0
 PKGNAME=		unroff-1.0.2
@@ -13,6 +13,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www-rn.informatik.uni-bremen.de/software/unroff/
 COMMENT=		Programmable troff translator with backend for HTML
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=		unroff
 
 USE_TOOLS+=	pax
@@ -26,18 +28,14 @@ post-patch:
 
 LIBDIR=		${PREFIX}/share/unroff
 
+INSTALLATION_DIRS=	bin ${LIBDIR}/doc ${LIBDIR}/misc ${PKGMANDIR}/man1
+
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${LIBDIR}
-	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} src/unroff ${PREFIX}/bin/unroff
-	cd ${WRKSRC} && pax -wr scm ${LIBDIR}
-	${INSTALL_DATA_DIR} ${LIBDIR}/doc
-	cd ${WRKSRC} && ${INSTALL_DATA} doc/manual.ms ${LIBDIR}/doc
-	${INSTALL_DATA_DIR} ${LIBDIR}/misc
-	cd ${WRKSRC} && ${INSTALL_DATA} doc/tmac.hyper misc/sample.unroff ${LIBDIR}/misc
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${LIBDIR}
-	cd ${WRKSRC} && ${INSTALL_MAN} doc/*.1 ${PREFIX}/${PKGMANDIR}/man1
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} src/unroff ${DESTDIR}${PREFIX}/bin/unroff
+	cd ${WRKSRC} && pax -wr scm ${DESTDIR}${LIBDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} doc/manual.ms ${DESTDIR}${LIBDIR}/doc
+	cd ${WRKSRC} && ${INSTALL_DATA} doc/tmac.hyper misc/sample.unroff ${DESTDIR}${LIBDIR}/misc
+	cd ${WRKSRC} && ${INSTALL_MAN} doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../lang/elk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/untex/Makefile b/textproc/untex/Makefile
index 1aa0d8b08c0..eb63b80a780 100644
--- a/textproc/untex/Makefile
+++ b/textproc/untex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:14 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2009/07/07 20:31:58 joerg Exp $
 #
 
 DISTNAME=	untex-1.3
@@ -8,12 +8,14 @@ MASTER_SITES=	ftp://hal6000.uni-duisburg.de/pub/source/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Remove LaTeX commands
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/untex ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/untex.man ${PREFIX}/${PKGMANDIR}/man1/untex.1
+	${INSTALL_PROGRAM} ${WRKDIR}/untex ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKDIR}/untex.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/untex.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/writer2latex/Makefile b/textproc/writer2latex/Makefile
index 9d9bed671cc..6a24ed989a0 100644
--- a/textproc/writer2latex/Makefile
+++ b/textproc/writer2latex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:52 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2009/07/07 20:31:33 joerg Exp $
 #
 
 DISTNAME=	${W2L}beta2
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.hj-gym.dk/~hj/writer2latex/
 COMMENT=	Convert OpenOffice.org/StarOffice documents to LaTeX and other formats
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${W2L}
 USE_JAVA2=	yes
 USE_JAVA=	run
@@ -19,7 +21,7 @@ USE_JAVA=	run
 W2L=		writer2latex04
 W2LPATH=	${PREFIX}/share/${W2L}
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${W2LPATH}
 
 do-configure:
 .for scr in w2l
@@ -34,9 +36,8 @@ do-build:
 	${RM} -rf ${WRKSRC}/source
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/w2l ${PREFIX}/bin/w2l
-	${INSTALL_DATA_DIR} ${W2LPATH}
-	${CP} -R ${WRKSRC}/* ${W2LPATH}
+	${INSTALL_SCRIPT} ${WRKSRC}/w2l ${DESTDIR}${PREFIX}/bin/w2l
+	${CP} -R ${WRKSRC}/* ${DESTDIR}${W2LPATH}
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 7cf46f87cb4..5cb25b4dbda 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2009/07/07 20:30:31 joerg Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xalan-J,
 # because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -21,13 +21,13 @@ USE_TOOLS+=	pax
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS=	lib/java share/doc/java/xalan share/examples/java/xalan
+
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/bsf.jar ${PREFIX}/lib/java
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xalan
-	cd ${WRKSRC}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/xalan
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xalan
-	cd ${WRKSRC}/samples && pax -rw -pp . ${PREFIX}/share/examples/java/xalan
+	${INSTALL_DATA} ${WRKSRC}/xalan.jar ${DESTDIR}${PREFIX}/lib/java
+	${INSTALL_DATA} ${WRKSRC}/bsf.jar ${DESTDIR}${PREFIX}/lib/java
+	cd ${WRKSRC}/docs && pax -rw -pp . ${DESTDIR}${PREFIX}/share/doc/java/xalan
+	cd ${WRKSRC}/samples && pax -rw -pp . ${DESTDIR}${PREFIX}/share/examples/java/xalan
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index 6dbaf96b030..6fd78552c80 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:24 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/07/07 20:29:41 joerg Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xerces-J,
 # because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -14,6 +14,8 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://xerces.apache.org/xerces-j/
 COMMENT=	The Apache Project's validating XML parser with DOM and SAX support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/xerces-1_2_0
 USE_JAVA=	run
 USE_TOOLS+=	pax
@@ -23,14 +25,13 @@ NO_BUILD=	yes
 post-extract:
 	chmod -R u+w,go-w ${WRKSRC}
 
+INSTALLATION_DIRS=	lib/java share/doc/java/xerces share/examples/java/xerces
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
-	${INSTALL_DATA} ${WRKSRC}/xerces.jar ${PREFIX}/lib/java
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xerces
-	cd ${WRKSRC}/docs && pax -rw -pp . ${PREFIX}/share/doc/java/xerces
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xerces
-	${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${PREFIX}/share/examples/java/xerces
-	cd ${WRKSRC}/data && pax -rw -pp . ${PREFIX}/share/examples/java/xerces
+	${INSTALL_DATA} ${WRKSRC}/xerces.jar ${DESTDIR}${PREFIX}/lib/java
+	cd ${WRKSRC}/docs && pax -rw -pp . ${DESTDIR}${PREFIX}/share/doc/java/xerces
+	${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${DESTDIR}${PREFIX}/share/examples/java/xerces
+	cd ${WRKSRC}/data && pax -rw -pp . ${DESTDIR}${PREFIX}/share/examples/java/xerces
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile
index 0cee4b654bb..8aaeaac337d 100644
--- a/textproc/xhtml/Makefile
+++ b/textproc/xhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/08 22:43:26 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 20:28:29 joerg Exp $
 #
 
 DISTNAME=	xhtml1
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.w3.org/MarkUp/
 COMMENT=	DTDs for the Extensible Hypertext Markup Language
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	yes
 USE_LANGUAGES=	# empty
 USE_TOOLS+=	pax
@@ -20,11 +22,12 @@ WRKSRC=		${WRKDIR}/xhtml1-20020801
 SGML_CATALOGS=	${PREFIX}/share/xml/xhtml/1.0/xhtml.soc
 XML_CATALOGS=	${PREFIX}/share/xml/xhtml/1.0/catalog
 
+INSTALLATION_DIRS=	share/xml/xhtml/1.0
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xml/xhtml/1.0
-	cd ${WRKSRC}/DTD && pax -rwpppm . ${PREFIX}/share/xml/xhtml/1.0
+	cd ${WRKSRC}/DTD && pax -rwpppm . ${DESTDIR}${PREFIX}/share/xml/xhtml/1.0
 	${INSTALL_DATA} ${FILESDIR}/catalog10 \
-	    ${PREFIX}/share/xml/xhtml/1.0/catalog
+	    ${DESTDIR}${PREFIX}/share/xml/xhtml/1.0/catalog
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlindent/Makefile b/textproc/xmlindent/Makefile
index 781c4b13949..a883dcdbb48 100644
--- a/textproc/xmlindent/Makefile
+++ b/textproc/xmlindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:14 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/07 20:27:05 joerg Exp $
 #
 
 DISTNAME=	xmlindent-0.2.16
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.cs.helsinki.fi/u/penberg/xmlindent/src/
 COMMENT=	XML stream reformatter written in ANSI C
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	lex
 
@@ -18,7 +19,7 @@ GCC_REQD+=	3.0
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xmlindent ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xmlindent.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/xmlindent ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xmlindent.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile
index 58d7a6b84f4..f86accfaf37 100644
--- a/textproc/xmlstarlet/Makefile
+++ b/textproc/xmlstarlet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:52 reed Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 20:27:24 joerg Exp $
 #
 
 DISTNAME=		xmlstarlet-1.0.1
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xmlstar.sourceforge.net/
 COMMENT=		Command line utilities for XML manipulation
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
@@ -24,8 +26,8 @@ TEST_TARGET=	check
 INSTALLATION_DIRS+=	share/doc/xmlstarlet
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/xmlstarlet-ug.pdf ${PREFIX}/share/doc/xmlstarlet
-	${INSTALL_DATA} ${WRKSRC}/doc/xmlstarlet.txt ${PREFIX}/share/doc/xmlstarlet
+	${INSTALL_DATA} ${WRKSRC}/doc/xmlstarlet-ug.pdf ${DESTDIR}${PREFIX}/share/doc/xmlstarlet
+	${INSTALL_DATA} ${WRKSRC}/doc/xmlstarlet.txt ${DESTDIR}${PREFIX}/share/doc/xmlstarlet
 
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/xslide/Makefile b/textproc/xslide/Makefile
index eaa5c4b12fb..8e38831429c 100644
--- a/textproc/xslide/Makefile
+++ b/textproc/xslide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/10/11 09:31:58 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/07 20:26:10 joerg Exp $
 #
 
 DISTNAME=		xslide-0.2.2
@@ -11,6 +11,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xslide.sourceforge.net/
 COMMENT=		XSL major mode for emacs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../editors/emacs/modules.mk"
 
@@ -33,10 +34,10 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/${PKGBASE}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${EMACS_LISPPREFIX}/${PKGBASE}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xslide
-	${INSTALL_DATA} ${WRKSRC}/README.TXT ${PREFIX}/share/doc/xslide
-	${INSTALL_DATA} ${WRKSRC}/dot_emacs ${PREFIX}/share/doc/xslide
+	${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} ${DESTDIR}${EMACS_LISPPREFIX}/${PKGBASE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xslide
+	${INSTALL_DATA} ${WRKSRC}/README.TXT ${DESTDIR}${PREFIX}/share/doc/xslide
+	${INSTALL_DATA} ${WRKSRC}/dot_emacs ${DESTDIR}${PREFIX}/share/doc/xslide
 
 .include "../../mk/bsd.pkg.mk"
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 */