From 4e21487bd77381b0abe4e6ab30c8c39a7a938d41 Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Mon, 29 Jun 2009 22:40:28 +0000
Subject: [PATCH] Add files from parent branch HEAD: 	mail/deliver/Makefile 
 mail/deliver/PLIST 	mail/deliver/distinfo 	mail/deliver/patches/patch-aa

---
 mail/deliver/Makefile         | 58 +++++++++++++++++++++++++++++++++++
 mail/deliver/PLIST            | 15 +++++++++
 mail/deliver/distinfo         | 18 +++++++++++
 mail/deliver/patches/patch-aa | 21 +++++++++++++
 4 files changed, 112 insertions(+)
 create mode 100644 mail/deliver/Makefile
 create mode 100644 mail/deliver/PLIST
 create mode 100644 mail/deliver/distinfo
 create mode 100644 mail/deliver/patches/patch-aa

diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile
new file mode 100644
index 000000000000..b68dd3a1197b
--- /dev/null
+++ b/mail/deliver/Makefile
@@ -0,0 +1,58 @@
+# $NetBSD: Makefile,v 1.13 2008/03/11 18:47:40 tnn Exp $
+
+DISTNAME=	deliver-2.1.14
+PKGREVISION=	2
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=deliver/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://deliver.sourceforge.net/
+COMMENT=	Local mail delivery agent with shell-script control
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=	yacc
+
+PKG_SYSCONFSUBDIR=		deliver
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.deliver
+PKG_SUPPORTED_OPTIONS=		deliver-suid
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 \
+	share/doc/deliver share/examples/deliver
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MIRIX-5*)
+CPPFLAGS+=	-DNO_SYS_TIMEB_H
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdeliver-suid)
+SPECIAL_PERMS+=		bin/deliver ${SETUID_ROOT_PERMS}
+.endif
+
+pre-configure:
+	cd ${WRKSRC};							\
+	for FILE in config.h deliver.8 conf/os-netbsd.h; do		\
+		${MV} $${FILE} $${FILE}.bak;				\
+		${SED} -e 's#@DELIVER_CONF_PREFIX@#${PKG_SYSCONFDIR}#g' \
+		       -e 's#@PREFIX@#${PREFIX}#g'			\
+		< $${FILE}.bak > $${FILE};				\
+	done;								\
+	${MV} deliver.8 deliver.1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/deliver ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/header ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/deliver.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/header.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	cd ${WRKSRC}; \
+	${INSTALL_DATA} INSTALL MMDF README SENDMAIL \
+		${DESTDIR}${PREFIX}/share/doc/deliver
+	cd ${WRKSRC}/samples; \
+	${INSTALL_DATA} README p-aliases s-aliases u-chip u-notify u-vacation \
+		${DESTDIR}${PREFIX}/share/examples/deliver
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/deliver/PLIST b/mail/deliver/PLIST
new file mode 100644
index 000000000000..14df07c8a6af
--- /dev/null
+++ b/mail/deliver/PLIST
@@ -0,0 +1,15 @@
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:31 joerg Exp $
+bin/deliver
+bin/header
+man/man1/deliver.1
+man/man1/header.1
+share/doc/deliver/INSTALL
+share/doc/deliver/MMDF
+share/doc/deliver/README
+share/doc/deliver/SENDMAIL
+share/examples/deliver/README
+share/examples/deliver/p-aliases
+share/examples/deliver/s-aliases
+share/examples/deliver/u-chip
+share/examples/deliver/u-notify
+share/examples/deliver/u-vacation
diff --git a/mail/deliver/distinfo b/mail/deliver/distinfo
new file mode 100644
index 000000000000..5c8bc4fff133
--- /dev/null
+++ b/mail/deliver/distinfo
@@ -0,0 +1,18 @@
+$NetBSD: distinfo,v 1.9 2006/10/28 15:17:17 schwarz Exp $
+
+SHA1 (deliver-2.1.14.tar.gz) = 77d591f29b8829b3c347eb107a427ad826ffca99
+RMD160 (deliver-2.1.14.tar.gz) = fb3857e952ea7b4b20f3e77b38a4f633434ce533
+Size (deliver-2.1.14.tar.gz) = 80892 bytes
+SHA1 (patch-aa) = 10f3d7d4d57e897066974e20c6b5017203983d18
+SHA1 (patch-ab) = 719d400005844fe824bab7106c97f66e4c8867b3
+SHA1 (patch-ac) = 2f47891e3bc46aec12c93a647fbd751397b7d9fe
+SHA1 (patch-ad) = b497c475867bce9d9b9246aac14b5794b43b5877
+SHA1 (patch-ae) = a4e478765a240a2099c101ddd2d6abf3ddcf0ba2
+SHA1 (patch-af) = bc14f87956fde8f08146c79b9435cb753d5f5a2a
+SHA1 (patch-ag) = 1ea8ca73ce2f930444cdcb3a09f49a11926bf3da
+SHA1 (patch-ah) = 86941685feaf22dac4f6de3d50c7d35affb4776e
+SHA1 (patch-ai) = 63e86f1dc5353bfa8519746b48e743614ce6ca46
+SHA1 (patch-aj) = 7ccbe4c2420d097608eec6dccf75fcbc7a47247e
+SHA1 (patch-ak) = d99847ed1cf65c244440fc7b6cb9a3cc4315f832
+SHA1 (patch-al) = 5263f4369110e693cfd603cb7e00fa8333589c2b
+SHA1 (patch-am) = 31dfa1ba8ae5db753134c3be6ecc78e43aaf3b43
diff --git a/mail/deliver/patches/patch-aa b/mail/deliver/patches/patch-aa
new file mode 100644
index 000000000000..7b111b42cbe4
--- /dev/null
+++ b/mail/deliver/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 14:06:05 wiz Exp $
+
+--- Makefile.orig	Wed Dec  1 20:53:49 1999
++++ Makefile	Sat Jan 29 15:21:49 2000
+@@ -74,13 +74,12 @@
+ #DELHOME = /usr/deliver
+ #HDEFS	= -DDELHOME=\"$(DELHOME)\"
+ UDEFS	=
+-OSHEADER = os-dummy.h
++OSHEADER = os-netbsd.h
+ DEFS	= -Iconf -DOSINCLUDE=\"$(OSHEADER)\" $(HDEFS) $(UDEFS)
+-CFLAGS	= -O $(DEFS)
+-LDFLAGS	=
++CFLAGS	+= $(DEFS)
+ LIBS	=
+ LINT	= lint -x
+-BIN	= /usr/bin
++BIN	= ${PREFIX}/bin
+ #BIN	= $(DELHOME)/bin
+ GROUP	= root
+ 
-- 
2.41.0