DESTDIR support

7 files changed, 44 insertions, 28 deletions

diff --git a/mail/OSBF-lua/Makefile b/mail/OSBF-lua/Makefile
index 80210e06f49..1f2eceededc 100644
--- a/mail/OSBF-lua/Makefile
+++ b/mail/OSBF-lua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:21 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/04 01:46:15 joerg Exp $
 #
 
 DISTNAME=	osbf-lua-2.0.4
@@ -11,6 +11,8 @@ HOMEPAGE=	http://osbf-lua.luaforge.net/
 COMMENT=	Lua C module for text classification
 LICENSE=	gnu-gpl-v2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PREV_PKGPATH=	mail/lua-OSBF
 
 USE_TOOLS+=		gmake
diff --git a/mail/OSBF-lua/distinfo b/mail/OSBF-lua/distinfo
index e8b386647cc..af274a620c0 100644
--- a/mail/OSBF-lua/distinfo
+++ b/mail/OSBF-lua/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/10/13 11:29:53 shannonjr Exp $
+$NetBSD: distinfo,v 1.2 2010/02/04 01:46:15 joerg Exp $
 
 SHA1 (osbf-lua-2.0.4.tar.gz) = 6fd4fb6496c20e9340cdcff4820c50a793e2ea27
 RMD160 (osbf-lua-2.0.4.tar.gz) = ba808072739de2bcb40ce81f0177ef7588508670
 Size (osbf-lua-2.0.4.tar.gz) = 82343 bytes
 SHA1 (patch-aa) = 25fe0abc6543893d88d147e418027cee9a544502
-SHA1 (patch-bb) = a03ceac6e22461359ef3a44564fde12a62056d82
+SHA1 (patch-bb) = 1d2cc734d37285c2d635fa9f72e6e50f28713e09
diff --git a/mail/OSBF-lua/patches/patch-bb b/mail/OSBF-lua/patches/patch-bb
index cdad522acd9..74c936ffc20 100644
--- a/mail/OSBF-lua/patches/patch-bb
+++ b/mail/OSBF-lua/patches/patch-bb
@@ -1,13 +1,28 @@
-$NetBSD: patch-bb,v 1.1.1.1 2008/10/13 11:29:53 shannonjr Exp $
+$NetBSD: patch-bb,v 1.2 2010/02/04 01:46:15 joerg Exp $
 
---- Makefile.orig	2007-01-14 11:57:19.000000000 -0700
+--- Makefile.orig	2007-01-14 18:57:19.000000000 +0000
 +++ Makefile
-@@ -18,6 +18,8 @@ lib: $(LIBNAME)
+@@ -18,16 +18,16 @@ lib: $(LIBNAME)
  $(LIBNAME): $(OBJS)
  	$(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBNAME) $(OBJS) $(LIBS)
  
 +all:	$(LIBNAME)
 +
  install: $(LIBNAME)
- 	mkdir -p $(LUA_LIBDIR)
- 	strip $(LIBNAME)
+-	mkdir -p $(LUA_LIBDIR)
+-	strip $(LIBNAME)
+-	cp $(LIBNAME) $(LUA_LIBDIR)
+-	(cd $(LUA_LIBDIR) ; rm -f $T$(LIB_EXT) ; ln -fs $(LIBNAME) $T$(LIB_EXT))
++	mkdir -p ${DESTDIR}$(LUA_LIBDIR)
++	${BSD_INSTALL_LIB} $(LIBNAME) ${DESTDIR}$(LUA_LIBDIR)
++	(cd ${DESTDIR}$(LUA_LIBDIR) ; rm -f $T$(LIB_EXT) ; ln -fs $(LIBNAME) $T$(LIB_EXT))
+ 
+ install_spamfilter:
+-	mkdir -p $(SPAMFILTER_DIR)
+-	cp spamfilter/* $(SPAMFILTER_DIR)
+-	chmod 755 $(SPAMFILTER_DIR)/*.lua
++	mkdir -p ${DESTDIR}$(SPAMFILTER_DIR)
++	${BSD_INSTALL_SCRIPT} spamfilter/* ${DESTDIR}$(SPAMFILTER_DIR)
+ 
+ clean:
+ 	rm -f $L $(LIBNAME) $(OBJS) *.so *~ spamfilter/*~
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index 08f530c627a..370c4c7fd30 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/01/19 09:16:25 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/04 01:48:01 joerg Exp $
 
 DISTNAME=		coolmail-1.3
 PKGREVISION=		2
@@ -9,6 +9,8 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Xbiff replacement with 3D animation and sound
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 OPSYSVARS+=		EXTRA_LIBS
 EXTRA_LIBS.*=		-lcompat
 EXTRA_LIBS.Interix=	-lSM
@@ -21,7 +23,7 @@ INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man1
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Coolmail.ad \
-	  ${PREFIX}/lib/X11/app-defaults/Coolmail
+	    ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Coolmail
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/mail/coolmail/distinfo b/mail/coolmail/distinfo
index 69c139aa824..156e27cd48e 100644
--- a/mail/coolmail/distinfo
+++ b/mail/coolmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/10/22 17:56:31 rillig Exp $
+$NetBSD: distinfo,v 1.7 2010/02/04 01:48:01 joerg Exp $
 
 SHA1 (coolmail-1.3.tgz) = 7b8dccf16f575827a595f1025294dfc66f00a6dc
 RMD160 (coolmail-1.3.tgz) = e23a8e8a465d700163393e70ebed60870ddcbc95
 Size (coolmail-1.3.tgz) = 26809 bytes
-SHA1 (patch-aa) = 3baa02ca2f01c67724c1e01c095c0fbe65038df7
+SHA1 (patch-aa) = dd16e3150674a92f4ad43270d523bbc1f5b5eb16
 SHA1 (patch-ab) = 35879a8f39e83e47b1598b761adcfa412d6b3104
 SHA1 (patch-ac) = 1054bda16101047024e2f6811034cfdc4d340a66
diff --git a/mail/coolmail/patches/patch-aa b/mail/coolmail/patches/patch-aa
index c0c91ab8f6d..4a3e5920dea 100644
--- a/mail/coolmail/patches/patch-aa
+++ b/mail/coolmail/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2005/10/22 16:17:14 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2010/02/04 01:48:01 joerg Exp $
 
 --- Makefile.orig	Thu Jan 11 10:55:40 1996
 +++ Makefile	Thu Jul 16 05:07:04 1998
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.5 2005/10/22 16:17:14 rillig Exp $
 -MANDIR   = /usr/local/man/man1
 +INCLUDES = -I$(X11BASE)/include
 +LIB_DIRS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib
-+BINDIR   = $(PREFIX)/bin
-+MANDIR   = $(PREFIX)/man/man1
++BINDIR   = ${DESTDIR}$(PREFIX)/bin
++MANDIR   = ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
  
 @@ -33,4 +33,6 @@
  # feature.
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 0a3ddd9c68a..8c2d02cf420 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2010/01/17 12:02:23 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/02/04 01:51:24 joerg Exp $
 
 DISTNAME=		cyrus-imapd-2.1.18
 PKGREVISION=		6
@@ -12,6 +12,7 @@ HOMEPAGE=		http://cyrusimap.web.cmu.edu/imapd/
 COMMENT=		Cyrus IMAP server
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
@@ -165,18 +166,14 @@ post-patch:
 pre-configure:
 	cd ${WRKSRC} && autoheader && autoconf
 
+INSTALLATION_DIRS+=	${EGDIR} ${HTMLDIR}
+
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${PREFIX}/cyrus/bin
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
-	cd ${WRKSRC}/master/conf; for file in *.conf; do		\
-		${INSTALL_DATA} $$file ${EGDIR};			\
-	done
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do		\
-		${INSTALL_DATA} $$file ${HTMLDIR};			\
-	done
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/cyrus/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/cyrus/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/cyrus/bin
+	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/master/conf/*.conf ${DESTDIR}${EGDIR};			\
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/cyrusv2.mc ${DESTDIR}${HTMLDIR}
 
 .include "../../mk/bsd.pkg.mk"