DESTDIR support

7 files changed, 41 insertions, 16 deletions

diff --git a/converters/rss2html/Makefile b/converters/rss2html/Makefile
index 39f22516dfe..8d1b82599ca 100644
--- a/converters/rss2html/Makefile
+++ b/converters/rss2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/01/17 12:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/01/29 16:51:42 joerg Exp $
 #
 
 DISTNAME=		rss2html-0.8.2
@@ -11,13 +11,23 @@ HOMEPAGE=		http://www.nopcode.org/blog/rss2html.html
 COMMENT=		RSS to HTML converter
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 USE_TOOLS+=		gmake
 
-INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/doc/rss2html
 
 LIBS.SunOS+=		-lnsl -lsocket
 MAKE_ENV+=		LIBS=${LIBS:M*:Q}
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/rss2html ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/doc/rss2html.links ${DESTDIR}${PREFIX}/share/doc/rss2html/
+	${INSTALL_DATA} ${WRKSRC}/doc/usage.example ${DESTDIR}${PREFIX}/share/doc/rss2html/
+	${INSTALL_DATA} ${WRKSRC}/doc/rss2html.template ${DESTDIR}${PREFIX}/share/doc/rss2html/
+	${INSTALL_DATA} ${WRKSRC}/README	${DESTDIR}${PREFIX}/share/doc/rss2html/
+	${INSTALL_MAN} ${WRKSRC}/doc/rss2html.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/ru-d1489/Makefile b/converters/ru-d1489/Makefile
index 85aa3c7b172..19529decb5e 100644
--- a/converters/ru-d1489/Makefile
+++ b/converters/ru-d1489/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/07/15 15:33:45 mishka Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/29 16:51:38 joerg Exp $
 
 DISTNAME=	d1489-1.4
 PKGNAME=	ru-d1489-1.4
@@ -10,4 +10,7 @@ MAINTAINER=	mishka@NetBSD.org
 #HOMEPAGE=
 COMMENT=	CP866<->KOI8-R, CP1251<->KOI8-R and font converters acc. to RFC1489
 
+INSTALLATION_DIRS+=	bin
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/ru-d1489/distinfo b/converters/ru-d1489/distinfo
index 36bcb2edbdd..bef35c6ee69 100644
--- a/converters/ru-d1489/distinfo
+++ b/converters/ru-d1489/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 16:12:35 agc Exp $
+$NetBSD: distinfo,v 1.3 2010/01/29 16:51:38 joerg Exp $
 
 SHA1 (d1489-1.4.tgz) = 648dc8f7af860237d09d55784bb869bd80584910
 RMD160 (d1489-1.4.tgz) = 1d66b92a4cb03e4256230f2597784e520185e6be
 Size (d1489-1.4.tgz) = 9588 bytes
 SHA1 (patch-aa) = 554cd0e768142e45e702828cd02f4cd01cb1b1e6
-SHA1 (patch-ab) = db98895b1aa87b6c3844df57a6c48951011fecd8
+SHA1 (patch-ab) = 836a527343fc5c02e66d4fa82ca75a171b879784
diff --git a/converters/ru-d1489/patches/patch-ab b/converters/ru-d1489/patches/patch-ab
index df2ac6a2867..55482b62acc 100644
--- a/converters/ru-d1489/patches/patch-ab
+++ b/converters/ru-d1489/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/12 21:01:17 agc Exp $
+$NetBSD: patch-ab,v 1.2 2010/01/29 16:51:38 joerg Exp $
 
 --- Makefile.orig	Wed Nov  5 01:25:46 1997
 +++ Makefile	Fri Jul 12 21:48:50 2002
@@ -14,14 +14,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/07/12 21:01:17 agc Exp $
 -	ln /usr/local/bin/todos /usr/local/bin/fromwin
 -	ln /usr/local/bin/todos /usr/local/bin/towin
 -	cp a2kfcnv /usr/local/bin
-+	cp todos $(PREFIX)/bin
++	${BSD_INSTALL_PROGRAM} todos ${DESTDIR}$(PREFIX)/bin
 +	-rm -f $(PREFIX)/bin/fromdos
 +	-rm -f $(PREFIX)/bin/fromwin
 +	-rm -f $(PREFIX)/bin/towin
-+	ln $(PREFIX)/bin/todos $(PREFIX)/bin/fromdos
-+	ln $(PREFIX)/bin/todos $(PREFIX)/bin/fromwin
-+	ln $(PREFIX)/bin/todos $(PREFIX)/bin/towin
-+	cp a2kfcnv $(PREFIX)/bin
++	ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/fromdos
++	ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/fromwin
++	ln ${DESTDIR}$(PREFIX)/bin/todos ${DESTDIR}$(PREFIX)/bin/towin
++	${BSD_INSTALL_PROGRAM} a2kfcnv ${DESTDIR}$(PREFIX)/bin
  
  clean:
  	-rm -f todos a2kfcnv
diff --git a/converters/txt2man/Makefile b/converters/txt2man/Makefile
index 7e3bc668f84..6f865863be1 100644
--- a/converters/txt2man/Makefile
+++ b/converters/txt2man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/05/23 09:39:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2010/01/29 16:53:09 joerg Exp $
 #
 
 DISTNAME=	txt2man-1.5.5
@@ -9,9 +9,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mvertes.free.fr/
 COMMENT=	Convert flat ASCII text to man page format
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=	YES
 USE_TOOLS+=	gawk
 
-MAKE_FLAGS+=	prefix=${PREFIX:Q}
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index 2e1c70fc8b6..fb3f8295fc0 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/06/01 21:49:56 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2010/01/29 16:54:40 joerg Exp $
 #
 
 DISTNAME=	uudeview-0.5.20
@@ -10,9 +10,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fpx.de/fp/Software/UUDeview/
 COMMENT=	Program for uu/xx/Base64/BinHex de-/encoding
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-inews=inews --disable-tcl
 LDFLAGS+=		${_STRIPFLAG_CC}
 
+INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 .include "../../converters/uulib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 08e9cdcab53..01c98d0ff79 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2007/01/07 09:13:50 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2010/01/29 16:55:45 joerg Exp $
 
 DISTNAME=	uudeview-0.5.20
 PKGNAME=	xdeview-0.5.20
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.fpx.de/fp/Software/UUDeview/
 COMMENT=	X11 program for uu/xx/Base64/BinHex de-/encoding
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-tcl=${LOCALBASE:Q}
 CONFIGURE_ARGS+=	--enable-tk=${LOCALBASE:Q}
@@ -18,8 +20,11 @@ LDFLAGS+=	-s -lX11
 BUILD_TARGET=	xdeview
 INSTALL_TARGET=	install-tcl
 
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin
+
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man/xdeview.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../converters/uulib/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"