DESTDIR support

6 files changed, 45 insertions, 29 deletions

diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index 08e2190e035..583eb792c89 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2009/08/10 08:46:30 tron Exp $
+# $NetBSD: Makefile,v 1.76 2010/02/04 02:20:24 joerg Exp $
 
 DISTNAME=	fetchmail-6.3.11
 PKGNAME=	${DISTNAME:S/fetchmail/fetchmailconf/}
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://fetchmail.berlios.de/
 COMMENT=	Configuration tool for fetchmail
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	${DISTNAME}{,nb*}:../../mail/fetchmail
 
 NO_BUILD=	YES
@@ -31,8 +33,8 @@ PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
 PYTHON_PATCH_SCRIPTS=	fetchmailconf.py
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${PREFIX}/bin/fetchmailconf
-	${LN} -s fetchmail.1 ${PREFIX}/${PKGMANDIR}/man1/fetchmailconf.1
+	${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf.py ${DESTDIR}${PREFIX}/bin/fetchmailconf
+	${LN} -s fetchmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/fetchmailconf.1
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-Tk/buildlink3.mk"
diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
index 53a7b82cedc..615da45e7ac 100644
--- a/mail/hypermail/Makefile
+++ b/mail/hypermail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/20 22:14:46 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2010/02/04 02:24:07 joerg Exp $
 #
 
 DISTNAME=	hypermail-2.1.8
@@ -9,11 +9,16 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://www.hypermail.org/
 COMMENT=	Creates indexed, threaded HTML archives of email
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		yacc
 
 CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}
-CONFIGURE_ARGS+=	--with-htmldir=${PREFIX}/share/doc/html/hypermail
+CONFIGURE_ARGS+=	--with-htmldir=${DESTDIR}${PREFIX}/share/doc/html/hypermail
+
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile
index 4d5caf9b2c5..8ccc3ad7fc8 100644
--- a/mail/ifile/Makefile
+++ b/mail/ifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/03/17 11:25:15 obache Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/04 02:25:43 joerg Exp $
 #
 
 DISTNAME=	ifile-1.3.4
@@ -12,7 +12,15 @@ MAINTAINER=	salo@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/ifile/
 COMMENT=	Intelligent mail filtering system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ifile ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/ifile.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index c7c1b216fde..20c58b9dd76 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/01/17 12:02:24 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/02/04 02:28:33 joerg Exp $
 
 DISTNAME=		imapfilter-2.0.6
 PKGREVISION=		3
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://imapfilter.hellug.gr/
 COMMENT=		Mail filtering utility for the IMAP
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
 INSTALLATION_DIRS=	share/examples/imapfilter
@@ -17,7 +19,7 @@ INSTALLATION_DIRS=	share/examples/imapfilter
 post-install:
 .for f in sample.config.lua sample.extend.lua
 	${INSTALL_DATA} ${WRKSRC}/${f} \
-		${PREFIX}/share/examples/imapfilter
+		${DESTDIR}${PREFIX}/share/examples/imapfilter
 .endfor
 
 .include "../../lang/lua/buildlink3.mk"
diff --git a/mail/imapfilter/distinfo b/mail/imapfilter/distinfo
index f53aa0db07b..38c8f354446 100644
--- a/mail/imapfilter/distinfo
+++ b/mail/imapfilter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2007/10/28 16:42:48 seb Exp $
+$NetBSD: distinfo,v 1.19 2010/02/04 02:28:33 joerg Exp $
 
 SHA1 (imapfilter-2.0.6.tar.bz2) = 93ce31079f0a350b5b4bbf824fdf9c1d00653ec7
 RMD160 (imapfilter-2.0.6.tar.bz2) = 1ae1e9ac16119d85f64594669b9aa1e918cba16b
 Size (imapfilter-2.0.6.tar.bz2) = 38536 bytes
-SHA1 (patch-aa) = b7ede32938ae3a25041d23176043ce3061ee867e
+SHA1 (patch-aa) = 7a8ba5f66a3e97a533b4d4b09d2021d638ccf28f
diff --git a/mail/imapfilter/patches/patch-aa b/mail/imapfilter/patches/patch-aa
index 233eb0b395d..aab4c4f3c6d 100644
--- a/mail/imapfilter/patches/patch-aa
+++ b/mail/imapfilter/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.10 2007/10/28 16:42:48 seb Exp $
+$NetBSD: patch-aa,v 1.11 2010/02/04 02:28:33 joerg Exp $
 
 --- Makefile.orig	2007-10-07 11:07:19.000000000 +0000
 +++ Makefile
-@@ -1,7 +1,7 @@
+@@ -1,7 +1,6 @@
 -DESTDIR =
 -BINDIR = /usr/local/bin
 -SHAREDIR = /usr/local/share/imapfilter
 -MANDIR = /usr/local/man
-+DESTDIR = $(PREFIX)
 +BINDIR = $(PREFIX)/bin
 +SHAREDIR = $(PREFIX)/share/imapfilter
 +MANDIR = $(PREFIX)/$(PKGMANDIR)
@@ -69,22 +68,22 @@ $NetBSD: patch-aa,v 1.10 2007/10/28 16:42:48 seb Exp $
 -		mkdir -p $(DESTDIR)$(MANDIR)/man5; fi
 -	cp -f $(MAN_CONFIG) $(DESTDIR)$(MANDIR)/man5 && \
 -		chmod 0644 $(DESTDIR)$(MANDIR)/man5/$(MAN_CONFIG)
-+	$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
-+	$(BSD_INSTALL_PROGRAM) $(BIN) $(BINDIR)/$(BIN)
-+	$(BSD_INSTALL_DATA_DIR) $(SHAREDIR)
-+	$(BSD_INSTALL_DATA) $(COMMON_LUA) $(SHAREDIR)/$(COMMON_LUA)
-+	$(BSD_INSTALL_DATA) $(SET_LUA) $(SHAREDIR)/$(SET_LUA)
-+	$(BSD_INSTALL_DATA) $(REGEX_LUA) $(SHAREDIR)/$(REGEX_LUA)
-+	$(BSD_INSTALL_DATA) $(ACCOUNT_LUA) $(SHAREDIR)/$(ACCOUNT_LUA)
-+	$(BSD_INSTALL_DATA) $(MAILBOX_LUA) $(SHAREDIR)/$(MAILBOX_LUA)
-+	$(BSD_INSTALL_DATA) $(MESSAGE_LUA) $(SHAREDIR)/$(MESSAGE_LUA)
-+	$(BSD_INSTALL_DATA) $(OPTIONS_LUA) $(SHAREDIR)/$(OPTIONS_LUA)
-+	$(BSD_INSTALL_DATA) $(AUXILIARY_LUA) $(SHAREDIR)/$(AUXILIARY_LUA)
-+	$(BSD_INSTALL_DATA) $(DEPRECATED_LUA) $(SHAREDIR)/$(DEPRECATED_LUA)
-+	$(BSD_INSTALL_MAN_DIR) $(MANDIR)/man1
-+	$(BSD_INSTALL_MAN) $(MAN_BIN) $(MANDIR)/man1/$(MAN_BIN)
-+	$(BSD_INSTALL_MAN_DIR) $(MANDIR)/man5
-+	$(BSD_INSTALL_MAN) $(MAN_CONFIG) $(MANDIR)/man5/$(MAN_CONFIG)
++	$(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(BINDIR)
++	$(BSD_INSTALL_PROGRAM) $(BIN) ${DESTDIR}$(BINDIR)/$(BIN)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(SHAREDIR)
++	$(BSD_INSTALL_DATA) $(COMMON_LUA) ${DESTDIR}$(SHAREDIR)/$(COMMON_LUA)
++	$(BSD_INSTALL_DATA) $(SET_LUA) ${DESTDIR}$(SHAREDIR)/$(SET_LUA)
++	$(BSD_INSTALL_DATA) $(REGEX_LUA) ${DESTDIR}$(SHAREDIR)/$(REGEX_LUA)
++	$(BSD_INSTALL_DATA) $(ACCOUNT_LUA) ${DESTDIR}$(SHAREDIR)/$(ACCOUNT_LUA)
++	$(BSD_INSTALL_DATA) $(MAILBOX_LUA) ${DESTDIR}$(SHAREDIR)/$(MAILBOX_LUA)
++	$(BSD_INSTALL_DATA) $(MESSAGE_LUA) ${DESTDIR}$(SHAREDIR)/$(MESSAGE_LUA)
++	$(BSD_INSTALL_DATA) $(OPTIONS_LUA) ${DESTDIR}$(SHAREDIR)/$(OPTIONS_LUA)
++	$(BSD_INSTALL_DATA) $(AUXILIARY_LUA) ${DESTDIR}$(SHAREDIR)/$(AUXILIARY_LUA)
++	$(BSD_INSTALL_DATA) $(DEPRECATED_LUA) ${DESTDIR}$(SHAREDIR)/$(DEPRECATED_LUA)
++	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(MANDIR)/man1
++	$(BSD_INSTALL_MAN) $(MAN_BIN) ${DESTDIR}$(MANDIR)/man1/$(MAN_BIN)
++	$(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(MANDIR)/man5
++	$(BSD_INSTALL_MAN) $(MAN_CONFIG) ${DESTDIR}$(MANDIR)/man5/$(MAN_CONFIG)
  
  deinstall:
  	rm -f $(DESTDIR)$(BINDIR)/$(BIN) \