Fix spool directory default for *BSD. Add DragonFly support.

Add DESTDIR support. Bump revision.

4 files changed, 93 insertions, 5 deletions

diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 83ea58fa991..c9171efd390 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/05/17 21:58:58 abs Exp $
+# $NetBSD: Makefile,v 1.3 2007/06/12 13:29:50 joerg Exp $
 #
 
 DISTNAME=	alpine-0.99
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/alpine/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,13 +11,17 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.washington.edu/alpine/
 COMMENT=	Program for Internet News and E-mail
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q}
 USE_LIBTOOL=	yes
 
+INSTALLATION_DIRS=	bin ${PKMANDIR}/man1
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine ${PREFIX}/bin/alpine
-	${INSTALL_DATA} ${WRKSRC}/doc/alpine.1 ${PREFIX}/${PKGMANDIR}/man1/alpine.1
+	${INSTALL_PROGRAM} ${WRKSRC}/alpine/alpine ${DESTDIR}${PREFIX}/bin/alpine
+	${INSTALL_MAN} ${WRKSRC}/doc/alpine.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/alpine.1
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo
index c7bb2e3deb0..4ab9eabf4d0 100644
--- a/mail/alpine/distinfo
+++ b/mail/alpine/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2007/05/17 21:58:58 abs Exp $
+$NetBSD: distinfo,v 1.3 2007/06/12 13:29:51 joerg Exp $
 
 SHA1 (alpine-0.99.tar.bz2) = 240f2b3d5229714ab1e7cc1ef3a4339dfaccf2e7
 RMD160 (alpine-0.99.tar.bz2) = a896213860badede88500e746f9186310b4d1364
 Size (alpine-0.99.tar.bz2) = 4920156 bytes
 SHA1 (patch-aa) = 1269dcd9b9a86980ac02facc65ec5beb6dd45221
 SHA1 (patch-ab) = f0f4d6c8017cbb5bda8d46d7cb62b323c6e3a8d7
+SHA1 (patch-ac) = 2f0473a89b6676767c1b6bdc75a71eeb0fbad584
+SHA1 (patch-ad) = 5a1308c324f705c63a2be4542522923d9d4d95e9
diff --git a/mail/alpine/patches/patch-ac b/mail/alpine/patches/patch-ac
new file mode 100644
index 00000000000..47a5c36a1ff
--- /dev/null
+++ b/mail/alpine/patches/patch-ac
@@ -0,0 +1,41 @@
+$NetBSD: patch-ac,v 1.1 2007/06/12 13:29:51 joerg Exp $
+
+--- configure.ac.orig	2007-06-12 13:04:37.000000000 +0000
++++ configure.ac
+@@ -1091,10 +1091,17 @@ case "$host" in
+   *-*-netbsd*)
+     systype="NEB"
+     alpine_path_delim="/"
+-    alpine_local_maildir="/usr/spool/mail"
++    alpine_local_maildir="/var/mail"
+     alpine_mode_readonly="(0600)"
+     alpine_c_client_target="neb"
+     ;;
++  *-*-dragonfly*)
++    systype="DFB"
++    alpine_path_delim="/"
++    alpine_local_maildir="/var/mail"
++    alpine_mode_readonly="(0600)"
++    alpine_c_client_target="neb"
++    ;;
+   *-*-bsdi*)
+     systype="BSI"
+     alpine_path_delim="/"
+@@ -1105,7 +1112,7 @@ case "$host" in
+   *-*-freebsd*)
+     systype="BSF"
+     alpine_path_delim="/"
+-    alpine_local_maildir="/usr/spool/mail"
++    alpine_local_maildir="/var/mail"
+     alpine_mode_readonly="(0600)"
+     alpine_c_client_target="bsf"
+     LIBS="$LIBS $LIBINTL"
+@@ -1113,7 +1120,7 @@ case "$host" in
+   *-*-openbsd*)
+     systype="BSO"
+     alpine_path_delim="/"
+-    alpine_local_maildir="/usr/spool/mail"
++    alpine_local_maildir="/var/mail"
+     alpine_mode_readonly="(0600)"
+     alpine_c_client_target="bso"
+     LIBS="$LIBS $LIBINTL"
diff --git a/mail/alpine/patches/patch-ad b/mail/alpine/patches/patch-ad
new file mode 100644
index 00000000000..dbdf1d8a495
--- /dev/null
+++ b/mail/alpine/patches/patch-ad
@@ -0,0 +1,41 @@
+$NetBSD: patch-ad,v 1.1 2007/06/12 13:29:51 joerg Exp $
+
+--- configure.orig	2007-04-23 21:41:33.000000000 +0000
++++ configure
+@@ -32062,10 +32062,17 @@ _ACEOF
+   *-*-netbsd*)
+     systype="NEB"
+     alpine_path_delim="/"
+-    alpine_local_maildir="/usr/spool/mail"
++    alpine_local_maildir="/var/mail"
+     alpine_mode_readonly="(0600)"
+     alpine_c_client_target="neb"
+     ;;
++  *-*-dragonfly*)
++    systype="DFB"
++    alpine_path_delim="/"
++    alpine_local_maildir="/var/mail"
++    alpine_mode_readonly="(0600)"
++    alpine_c_client_target="neb"
++    ;;
+   *-*-bsdi*)
+     systype="BSI"
+     alpine_path_delim="/"
+@@ -32076,7 +32083,7 @@ _ACEOF
+   *-*-freebsd*)
+     systype="BSF"
+     alpine_path_delim="/"
+-    alpine_local_maildir="/usr/spool/mail"
++    alpine_local_maildir="/var/mail"
+     alpine_mode_readonly="(0600)"
+     alpine_c_client_target="bsf"
+     LIBS="$LIBS $LIBINTL"
+@@ -32084,7 +32091,7 @@ _ACEOF
+   *-*-openbsd*)
+     systype="BSO"
+     alpine_path_delim="/"
+-    alpine_local_maildir="/usr/spool/mail"
++    alpine_local_maildir="/var/mail"
+     alpine_mode_readonly="(0600)"
+     alpine_c_client_target="bso"
+     LIBS="$LIBS $LIBINTL"