DESTDIR support

6 files changed, 40 insertions, 31 deletions

diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile
index 23bdcd26e74..1a426bc18b9 100644
--- a/mail/solid-pop3d/Makefile
+++ b/mail/solid-pop3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/09/07 22:07:31 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/04 02:42:23 joerg Exp $
 
 DISTNAME=		solid-pop3d-0.15
 CATEGORIES=		mail
@@ -8,6 +8,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://solidpop3d.pld.org.pl/
 COMMENT=		Flexible POP3 server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 EGDIR=			${PREFIX}/share/examples/spop3d
 MESSAGE_SUBST+=		EGDIR=${EGDIR}
 
@@ -23,14 +25,14 @@ CONFIGURE_ARGS+=	--enable-statistics
 PLIST_SRC+=		${PKGDIR}/PLIST
 EXAMPLES+=		config.example
 
+INSTALLATION_DIRS+=	${EGDIR} share/doc/solid-pop3d
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/doc; for i in ${EXAMPLES}; do			\
-		${INSTALL_DATA} $${i} ${EGDIR}/$${i};			\
+		${INSTALL_DATA} $${i} ${DESTDIR}${EGDIR}/$${i};			\
 	done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/solid-pop3d
 .for i in AUTHORS CONFIGFILE COPYING ChangeLog INSTALL README THANKS VIRTUALS
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/solid-pop3d
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/solid-pop3d
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index 92d09b84628..1add4cbb4d3 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/19 19:18:20 he Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/04 02:43:52 joerg Exp $
 
 DISTNAME=		sqlgrey-1.6.8
 PKGREVISION=		1
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://sqlgrey.sourceforge.net/
 COMMENT=		Postfix greylisting policy daemon
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		perl:run
 
 DEPENDS+=		p5-Net-Server>=0.87:../../net/p5-Net-Server
diff --git a/mail/sqlgrey/distinfo b/mail/sqlgrey/distinfo
index 5fe610c7e4c..3c6c7070f83 100644
--- a/mail/sqlgrey/distinfo
+++ b/mail/sqlgrey/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
+$NetBSD: distinfo,v 1.2 2010/02/04 02:43:52 joerg Exp $
 
 SHA1 (sqlgrey-1.6.8.tar.bz2) = 1c687d1839fd2911bf9ef535eef8e84bc97d56a6
 RMD160 (sqlgrey-1.6.8.tar.bz2) = f5f13004fa1a9228eb1c5a141ec1658738447899
 Size (sqlgrey-1.6.8.tar.bz2) = 43551 bytes
-SHA1 (patch-aa) = 9471d72a66d8557b969aef8d5400ff6d4da06c9a
+SHA1 (patch-aa) = 1bf8853fece173be36f9c3ac1112b89dbfe2796d
 SHA1 (patch-ab) = 637dc9870d6b01caa9cfe10109aeafd3192fbb66
 SHA1 (patch-ac) = 29100eb0d591abec3c2f628cc1c3eeaf46e739ac
 SHA1 (patch-ad) = 661dc0b5b08ca96bdc0f7b571e62a706b174fa13
diff --git a/mail/sqlgrey/patches/patch-aa b/mail/sqlgrey/patches/patch-aa
index 91f0d4da168..506fd0c4efa 100644
--- a/mail/sqlgrey/patches/patch-aa
+++ b/mail/sqlgrey/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
+$NetBSD: patch-aa,v 1.2 2010/02/04 02:43:52 joerg Exp $
 
 --- Makefile.orig	2005-06-07 02:28:38.000000000 +0200
 +++ Makefile
@@ -10,10 +10,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
 -BINDIR = $(ROOTDIR)/usr/bin
 -INITDIR = $(ETCDIR)/init.d
 -MANDIR = $(ROOTDIR)/usr/share/man/man1
-+CONFDIR = $(EGDIR)
-+SBINDIR = $(PREFIX)/sbin
-+BINDIR = $(PREFIX)/bin
-+MANDIR = $(PREFIX)/$(PKGMANDIR)/man1
++CONFDIR = ${DESTDIR}$(EGDIR)
++SBINDIR = ${DESTDIR}$(PREFIX)/sbin
++BINDIR = ${DESTDIR}$(PREFIX)/bin
++MANDIR = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1
  
  VERSION := $(shell cat VERSION)
  TBZ2 = sqlgrey-$(VERSION).tar.bz2
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index 9412f594d35..f4b9db1ac6b 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/12/02 11:20:22 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/02/04 02:45:20 joerg Exp $
 
 DISTNAME=	teapop-0.3.8
 PKGREVISION=	5
@@ -9,6 +9,8 @@ MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://www.toontown.org/teapop/
 COMMENT=	Yet another RFC1939 compliant POP3 server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 
 GNU_CONFIGURE=		YES
@@ -24,9 +26,10 @@ RCD_SCRIPTS=	teapop
 
 .include "options.mk"
 
+INSTALLATION_DIRS+=	${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/teapop.passwd ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/teapop.passwd ${DESTDIR}${EGDIR}
 
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 0ba5c4ed265..66e94e40e37 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2009/07/08 13:56:00 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2010/02/04 02:47:31 joerg Exp $
 #
 
 DISTNAME=	tmda-1.1.12
@@ -12,6 +12,8 @@ MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://tmda.net/
 COMMENT=	Python-based SPAM reduction system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PYTHON_PATCH_SCRIPTS=	${TMDA_PROGRAMS}
 PY_PATCHPLIST=		yes
 
@@ -60,40 +62,40 @@ pre-install:
 
 do-install:
 	for f in ${TMDA_PROGRAMS}; do \
-		${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${PREFIX}/bin; \
+		${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${DESTDIR}${PREFIX}/bin; \
 	done
 
-	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${PREFIX}/${PYSITELIB}/TMDA
+	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/*.py* ${DESTDIR}${PREFIX}/${PYSITELIB}/TMDA
 
 	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/pythonlib/email/*.py* \
-		${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email
+		${DESTDIR}${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email
 	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/pythonlib/email/mime/*.py* \
-		${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email/mime
+		${DESTDIR}${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email/mime
 	${INSTALL_SCRIPT} ${WRKSRC}/TMDA/Queue/*.py* \
-		${PREFIX}/${PYSITELIB}/TMDA/Queue
+		${DESTDIR}${PREFIX}/${PYSITELIB}/TMDA/Queue
 
-	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${PREFIX}/${SHAREDIR}
+	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${DESTDIR}${PREFIX}/${SHAREDIR}
 
 	for f in ${TMDA_DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${DOCDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$${f} ${DESTDIR}${PREFIX}/${DOCDIR}; \
 	done
 
 	for f in ${TMDA_CONTRIB}; do \
 		if [ -f $${f} ]; then \
 			${INSTALL_DATA} ${WRKSRC}/$${f} \
-				${PREFIX}/${EGDIR}; \
+				${DESTDIR}${PREFIX}/${EGDIR}; \
 		else \
-			cp -Rp ${WRKSRC}/$${f} ${PREFIX}/${EGDIR}; \
+			cp -Rp ${WRKSRC}/$${f} ${DESTDIR}${PREFIX}/${EGDIR}; \
 		fi; \
 	done
 
-	cp -Rp ${WRKSRC}/doc/html/* ${PREFIX}/${HTMLDIR}
+	cp -Rp ${WRKSRC}/doc/html/* ${DESTDIR}${PREFIX}/${HTMLDIR}
 
 post-install:
-	${PY_COMPILE_ALL} ${PREFIX}/${PYSITELIB}/TMDA \
-		${PREFIX}/${PYSITELIB}/TMDA/Queue \
-		${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email \
-		${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email/mime
+	${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/${PYSITELIB}/TMDA \
+		${DESTDIR}${PREFIX}/${PYSITELIB}/TMDA/Queue \
+		${DESTDIR}${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email \
+		${DESTDIR}${PREFIX}/${PYSITELIB}/TMDA/pythonlib/email/mime
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"