Add a clean pkg_add implementation on top of libarchive and libfetch.

Known regressions:
- "pkg_add -" (aka reading from stdin) is currently not supported
- "pkg_add -s" is not supported either
- no progress reports for the downloads
- binary packages with hardlinks created by pkg_create before
  pkg_install-20080422 will not extract correctly (libarchive issue)
- no adhoc check for potential conflicts between dependencies and
  already installed packages

Features:
- Twice as fast for the typical case of /var/tmp and /usr/pkg on
  different filesystems
- Standalone
- implicit conflict detection before actual installation.

22 files changed, 0 insertions, 779 deletions

diff --git a/mail/majordomo/DESCR b/mail/majordomo/DESCR
deleted file mode 100644
index 87b1b327e00..00000000000
--- a/mail/majordomo/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Majordomo is a program which automates the management of Internet
-mailing lists.  Commands are sent to Majordomo via electronic mail to
-handle all aspects of list maintainance.  Once a list is set up,
-virtually all operations can be performed remotely, requiring no
-intervention upon the postmaster of the list site.
-
-     majordomo - n: a person who speaks, makes arrangements, or takes
-     charge for another. From latin "major domus" - "master of the
-     house".
diff --git a/mail/majordomo/MESSAGE b/mail/majordomo/MESSAGE
deleted file mode 100644
index ddfe207a453..00000000000
--- a/mail/majordomo/MESSAGE
+++ /dev/null
@@ -1,54 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/06/16 16:43:37 jlam Exp $
-
-Before you can use Majordomo, you will need to complete a few steps
-manually:
-
-	- install majordomo.cf in ${HOME}/${MAJORDOMO_USER}.
-	  Look in ${PREFIX}/share/examples/majordomo for an example and
-	  be sure to change instances of ${HOSTNAME} as appropriate.
-
-	- create lists in ${HOME}/${MAJORDOMO_USER}.
-	  Look in ${PREFIX}/share/doc/majordomo for information and see
-	  the files and directories for an example list (example-l) in
-	  ${PREFIX}/share/examples/majordomo.  Pay attention to the
-	  permissions on the files and directories.
-
-	- add a .forward file in ${HOME}/${MAJORDOMO_USER} (or an
-	  appropriate alias) so administrative mail to
-	  ${MAJORDOMO_USER} gets redirected properly.
-
-	- install majordomo aliases for sendmail.
-	  For example, create /etc/aliases.majordomo following the
-	  example in ${PREFIX}/share/examples/majordomo and add it to
-	  your sendmail configuration.  This can be done by adding a
-	  line similar to the following to /etc/sendmail.cf :
-
-	  OA/etc/aliases.majordomo (for 8.6.x Sendmail),
-
-	  O AliasFile=/etc/aliases,/etc/aliases.majordomo (for 8.7.x and up),
-
-	  or a line similar to the following to your m4 macros file:
-
-	  define(`ALIAS_FILE',`/etc/aliases,/etc/aliases.majordomo')
-
-	- if the group for ${MAJORDOMO_USER} (${MAJORDOMO_GROUP}) is not
-	  daemon, add ${MAJORDOMO_USER} as a trusted user for sendmail.
-	  This can be done by adding a line similar to the following
-	  in /etc/sendmail.cf:
-
-	  T${MAJORDOMO_USER}
-
-	  or a line similar to the following to your m4 macros file:
-
-	  define(`confTRUSTED_USERS', ${MAJORDOMO_USER})dnl
-
-	- be sure to run `newaliases' to create the sendmail database,
-	  and be sure that sendmail knows about any changes to
-	  /etc/sendmail.cf (e.g., reboot or restart sendmail)
-
-	- add entries in /etc/newsyslog.conf to rotate the log in
-	  ${HOME}/${MAJORDOMO_USER}/Log if necessary.
-
-Enjoy Majordomo!
-===========================================================================
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
deleted file mode 100644
index fc6b6cdae13..00000000000
--- a/mail/majordomo/Makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2007/07/04 20:54:44 jlam Exp $
-
-DISTNAME=		majordomo-1.94.5
-PKGREVISION=		2
-CATEGORIES=		mail
-MASTER_SITES=		ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
-			ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=		packages@biology.nmsu.edu
-HOMEPAGE=		http://www.greatcircle.com/majordomo/
-COMMENT=		The Majordomo mailing list manager
-
-LICENSE=		majordomo-license
-
-CONFLICTS+=		bounce-*
-
-USE_TOOLS+=		perl:run
-
-BUILD_TARGET=		wrapper
-INSTALL_TARGET=		install install-wrapper
-MAKE_FILE=		Makefile.netbsd
-
-MAJORDOMO_TMPDIR?=	/var/tmp
-MAJORDOMO_HOMEDIR?=	/home
-MAJORDOMO_USER?=	majordom
-MAJORDOMO_GROUP?=	majordom
-
-PKG_GROUPS_VARS+=	MAJORDOMO_GROUP
-PKG_USERS_VARS+=	MAJORDOMO_USER
-
-MESSAGE_SUBST+=		HOME=${MAJORDOMO_HOMEDIR}			\
-			MAJORDOMO_USER=${MAJORDOMO_USER}		\
-			MAJORDOMO_GROUP=${MAJORDOMO_GROUP}
-
-DOCDIR=			${PREFIX}/share/doc/majordomo
-DOCFILES=		Changelog FUTURE INSTALL LICENSE NEWLIST README
-DOCDOCFILES=		FAQ README.sequencer list-owner-info \
-			majordomo-faq.html majordomo.lisa6.ps majordomo.ora
-
-EXDIR=			${PREFIX}/share/examples/majordomo
-EXDIRS=			archives archives/example-l digests \
-			digests/example-l-digest lists
-EXFILES=		example-l.passwd example-l.info
-EXLISTS=		example-l example-l-digest
-
-BUILD_DEFS+=		MAJORDOMO_TMPDIR
-
-USERGROUP_PHASE=	configure
-PKG_GROUPS=		${MAJORDOMO_GROUP}
-PKG_USERS=		${MAJORDOMO_USER}:${MAJORDOMO_GROUP}
-OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}		\
-			${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/archives	\
-			${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/digests	\
-			${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/lists	\
-			${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-
-CONFIGURE_SED=		-e "s|@PREFIX@|${PREFIX}|g"			\
-			-e "s|@PERL@|${PERL5}|g"			\
-			-e "s|@HOME@|${MAJORDOMO_HOMEDIR}|g"		\
-			-e "s|@MAJORDOMO_USER@|${MAJORDOMO_USER}|g"	\
-			-e "s|@UID@|${PKG_UID.${MAJORDOMO_USER}}|g"	\
-			-e "s|@GID@|${PKG_GID.${MAJORDOMO_GROUP}}|g"	\
-			-e "s|@TMPDIR@|${MAJORDOMO_TMPDIR}|g"
-
-MESSAGE_SED=		-e 's|$${PREFIX}|${PREFIX}|g'			\
-			-e 's|$${HOME}|${HOME}|g'			\
-			-e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g'	\
-			-e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g'	\
-
-do-configure:
-	${SED} ${CONFIGURE_SED} ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.netbsd
-
-post-build:
-	${SED} ${CONFIGURE_SED} ${WRKSRC}/sample.cf > ${WRKSRC}/majordomo.cf
-	${SED} ${CONFIGURE_SED} ${FILESDIR}/aliases.majordomo		\
-		> ${WRKSRC}/aliases.majordomo
-	${SED}	-e 's|$${PREFIX}|${PREFIX}|g'				\
-		-e 's|$${HOME}|${HOME}|g'				\
-		-e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g'		\
-		-e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g'		\
-		${PKGDIR}/MESSAGE > ${WRKSRC}/post-install-notes
-
-post-install:
-	${LN} -sf archive2.pl ${PREFIX}/libexec/majordomo/archive
-	${INSTALL_DATA_DIR} ${DOCDIR}
-.for file in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}/${file}
-.endfor
-.for file in ${DOCDOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DOCDIR}/${file}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/post-install-notes ${DOCDIR}/post-install-notes
-	${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}
-.for dir in ${EXDIRS}
-	${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}/${dir}
-.endfor
-	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${WRKSRC}/aliases.majordomo ${EXDIR}/aliases.majordomo
-	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${FILESDIR}/keep_me ${EXDIR}/archives/example-l/.keep_me
-	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${FILESDIR}/keep_me ${EXDIR}/digests/example-l-digest/.keep_me
-.for file in ${EXFILES}
-	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${FILESDIR}/${file} ${EXDIR}/lists/${file}
-.endfor
-.for file in ${EXLISTS}
-	${INSTALL} -m 664 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		/dev/null ${EXDIR}/lists/${file}
-.endfor
-	${LN} -sf example-l.info ${EXDIR}/lists/example-l-digest.info
-	${LN} -sf example-l.passwd ${EXDIR}/lists/example-l-digest.passwd
-	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${WRKSRC}/majordomo.cf ${EXDIR}/majordomo.cf
-
-# verify installation; requires interaction
-test: install
-	${PREFIX}/libexec/majordomo/wrapper config-test
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/majordomo/PLIST b/mail/majordomo/PLIST
deleted file mode 100644
index 8b3ffe22e56..00000000000
--- a/mail/majordomo/PLIST
+++ /dev/null
@@ -1,63 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/07/23 22:56:16 he Exp $
-bin/approve
-bin/bounce
-bin/medit
-libexec/majordomo/Tools/archive.pl
-libexec/majordomo/Tools/archive_mh.pl
-libexec/majordomo/Tools/digest.send
-libexec/majordomo/Tools/logsummary.pl
-libexec/majordomo/Tools/makeindex.pl
-libexec/majordomo/Tools/new-list
-libexec/majordomo/Tools/sequencer
-libexec/majordomo/archive
-libexec/majordomo/archive2.pl
-libexec/majordomo/bounce-remind
-libexec/majordomo/config-test
-libexec/majordomo/config_parse.pl
-libexec/majordomo/digest
-libexec/majordomo/majordomo
-libexec/majordomo/majordomo.pl
-libexec/majordomo/majordomo_version.pl
-libexec/majordomo/request-answer
-libexec/majordomo/resend
-libexec/majordomo/sample.cf
-libexec/majordomo/shlock.pl
-libexec/majordomo/wrapper
-man/man1/approve.1
-man/man1/bounce-remind.1
-man/man1/bounce.1
-man/man1/resend.1
-man/man8/digest.8
-man/man8/majordomo.8
-share/doc/majordomo/Changelog
-share/doc/majordomo/FAQ
-share/doc/majordomo/FUTURE
-share/doc/majordomo/INSTALL
-share/doc/majordomo/LICENSE
-share/doc/majordomo/NEWLIST
-share/doc/majordomo/README
-share/doc/majordomo/README.sequencer
-share/doc/majordomo/list-owner-info
-share/doc/majordomo/majordomo-faq.html
-share/doc/majordomo/majordomo.lisa6.ps
-share/doc/majordomo/majordomo.ora
-share/doc/majordomo/post-install-notes
-share/examples/majordomo/aliases.majordomo
-share/examples/majordomo/archives/example-l/.keep_me
-share/examples/majordomo/digests/example-l-digest/.keep_me
-share/examples/majordomo/lists/example-l
-share/examples/majordomo/lists/example-l-digest
-share/examples/majordomo/lists/example-l-digest.info
-share/examples/majordomo/lists/example-l-digest.passwd
-share/examples/majordomo/lists/example-l.info
-share/examples/majordomo/lists/example-l.passwd
-share/examples/majordomo/majordomo.cf
-@dirrm share/examples/majordomo/lists
-@dirrm share/examples/majordomo/digests/example-l-digest
-@dirrm share/examples/majordomo/digests
-@dirrm share/examples/majordomo/archives/example-l
-@dirrm share/examples/majordomo/archives
-@dirrm share/examples/majordomo
-@dirrm share/doc/majordomo
-@dirrm libexec/majordomo/Tools
-@dirrm libexec/majordomo
diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo
deleted file mode 100644
index b9aa41c9c07..00000000000
--- a/mail/majordomo/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/06/16 17:11:25 jlam Exp $
-
-SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00
-RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4
-Size (majordomo-1.94.5.tgz) = 312244 bytes
-SHA1 (patch-aa) = 6cc6cd49eb6413489fb782a3bcac70baac99fa7f
-SHA1 (patch-ab) = 68bdbd77029ebd8f113c492e50e60aa7efb35de9
-SHA1 (patch-ac) = bea997e785b2656b1660a11efce759a56a700ab2
-SHA1 (patch-ad) = 65370547240539128a405484e98c7ed15a869464
-SHA1 (patch-ae) = 692f5018cccef565bec3be0f24e7009ed1902edd
-SHA1 (patch-af) = 9f3d21953ada62876f7c2ba2be0fa5edb48335fb
-SHA1 (patch-ag) = b469a639270d369732e75e6ae4df7f559e9c436e
-SHA1 (patch-ah) = 666b52100cb50a948c145da0ba83c197386cbd1e
-SHA1 (patch-ai) = 771c487d1a3392bf3b523330b8d60fd9a190c58b
-SHA1 (patch-aj) = 6d4fe712af39cb986c24d0227f86aacb6d048870
-SHA1 (patch-ak) = 401da2e552ff92ef35a60e45d6b8994dfd091b49
-SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76
-SHA1 (patch-am) = bbdc7c4d650c99e182bac2ae50ccd82f111c7bcc
diff --git a/mail/majordomo/files/aliases.majordomo b/mail/majordomo/files/aliases.majordomo
deleted file mode 100644
index 33af435fb0f..00000000000
--- a/mail/majordomo/files/aliases.majordomo
+++ /dev/null
@@ -1,127 +0,0 @@
-## $NetBSD: aliases.majordomo,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-##
-## Basic Majordomo Aliases
-##
-## Replace your own hostname for "@HOSTNAME@" in the aliases.
-##
-
-majordomo: "|@PREFIX@/libexec/majordomo/wrapper majordomo"
-majordomo-owner: @MAJORDOMO_USER@
-owner-majordomo: majordomo-owner
-majordom: majordomo-owner
-
-## The bounces mailing list is used to move people off of lists when their
-## e-mail address becomes undeliverable.  See the bounce-remind script for a
-## way to inform people that they've been moved.
-
-## bounces mailing list
-#owner-bounces:majordomo-owner
-#bounces-approval:owner-bounces
-#owner-bounces-outgoing:owner-bounces
-
-#bounces: "|@PREFIX@/libexec/majordomo/wrapper resend -l bounces -h @HOSTNAME@ bounces-outgoing"
-
-#bounces-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/bounces
-
-## Example List
-##
-## This is a example list that should be removed once you are familiar with
-## the operation of Majordomo.
-##
-owner-example-l:@MAJORDOMO_USER@
-owner-example-l-digest:owner-example-l
-owner-example-l-outgoing:owner-example-l
-owner-example-l-digest-outgoing:owner-example-l
-example-l-approval:owner-example-l 
-example-l-digest-approval:owner-example-l
-
-example-l: "|@PREFIX@/libexec/majordomo/wrapper resend -l example-l -h @HOSTNAME@ example-l-outgoing"
-example-l-digest:example-l
-example-l-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/example-l,
-	"|@PREFIX@/libexec/majordomo/wrapper archive -a -m -f @HOME@/@MAJORDOMO_USER@/archives/example-l/example-l",
-	"|@PREFIX@/libexec/majordomo/wrapper digest -r -C -l example-l-digest example-l-digest-outgoing"
-example-l-digest-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/example-l-digest
-
-example-l-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l example-l"
-example-l-digest-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l example-l-digest"
-
-
-## Sample Lists
-##
-## Majordomo lists take one of four general forms:
-##
-## 1. Regular mailing list
-## 2. Mailing list with archiving
-## 3. Mailing list with a digested form of the list
-## 4. Mailing list with a digested form of the list and archiving
-##
-## Examples for each are commented out below
-##
-
-
-# Regular Mailing List
-#
-
-#owner-listname:user
-#owner-listname-outgoing:owner-listname
-#listname-approval:owner-listname 
-
-#listname: "|@PREFIX@/libexec/majordomo/wrapper resend -l listname -h @HOSTNAME@ listname-outgoing"
-#listname-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname
-
-#listname-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname"
-
-
-# Mailing List with archiving
-#
-
-#owner-listname:user
-#owner-listname-outgoing:owner-listname
-#listname-approval:owner-listname 
-
-#listname: "|@PREFIX@/libexec/majordomo/wrapper resend -l listname -h @HOSTNAME@ listname-outgoing"
-#listname-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname,
-#	"|@PREFIX@/libexec/majordomo/wrapper archive -a -m -f @HOME@/@MAJORDOMO_USER@/archives/listname/listname"
-
-#listname-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname"
-
-
-# Mailing List with a digested form of the list
-#
-
-#owner-listname:user
-#owner-listname-digest:owner-listname
-#owner-listname-outgoing:owner-listname
-#owner-listname-digest-outgoing:owner-listname
-#listname-approval:owner-listname 
-#listname-digest-approval:owner-listname
-
-#listname: "|@PREFIX@/libexec/majordomo/wrapper resend -l listname -h @HOSTNAME@ listname-outgoing"
-#listname-digest:listname
-#listname-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname,
-#	"|@PREFIX@/libexec/majordomo/wrapper digest -r -C -l listname-digest listname-digest-outgoing"
-#listname-digest-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname-digest
-
-#listname-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname"
-#listname-digest-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname-digest"
-
-
-# Mailing List with a digested form of the list and archiving
-#
-
-#owner-listname:user
-#owner-listname-digest:owner-listname
-#owner-listname-outgoing:owner-listname
-#owner-listname-digest-outgoing:owner-listname
-#listname-approval:owner-listname 
-#listname-digest-approval:owner-listname
-
-#listname: "|@PREFIX@/libexec/majordomo/wrapper resend -l listname -h @HOSTNAME@ listname-outgoing"
-#listname-digest:listname
-#listname-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname,
-#	"|@PREFIX@/libexec/majordomo/wrapper archive -a -m -f @HOME@/@MAJORDOMO_USER@/archives/listname/listname",
-#	"|@PREFIX@/libexec/majordomo/wrapper digest -r -C -l listname-digest listname-digest-outgoing"
-#listname-digest-outgoing::include:@HOME@/@MAJORDOMO_USER@/lists/listname-digest
-
-#listname-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname"
-#listname-digest-request: "|@PREFIX@/libexec/majordomo/wrapper majordomo -l listname-digest"
diff --git a/mail/majordomo/files/example-l.info b/mail/majordomo/files/example-l.info
deleted file mode 100644
index 23d4e92b2a2..00000000000
--- a/mail/majordomo/files/example-l.info
+++ /dev/null
@@ -1 +0,0 @@
-This is an example list installed with the NetBSD port of majordomo.
diff --git a/mail/majordomo/files/example-l.passwd b/mail/majordomo/files/example-l.passwd
deleted file mode 100644
index 33a9488b167..00000000000
--- a/mail/majordomo/files/example-l.passwd
+++ /dev/null
@@ -1 +0,0 @@
-example
diff --git a/mail/majordomo/files/keep_me b/mail/majordomo/files/keep_me
deleted file mode 100644
index aedb72a50a7..00000000000
--- a/mail/majordomo/files/keep_me
+++ /dev/null
@@ -1 +0,0 @@
-This normally empty directory needs to be kept in the distribution.
diff --git a/mail/majordomo/patches/patch-aa b/mail/majordomo/patches/patch-aa
deleted file mode 100644
index 8b24ca9d84b..00000000000
--- a/mail/majordomo/patches/patch-aa
+++ /dev/null
@@ -1,140 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
-
---- Makefile.orig	Wed Aug 27 16:56:21 1997
-+++ Makefile	Tue Mar 27 12:41:29 2001
-@@ -13,27 +13,29 @@
- #
-  
- # Put the location of your Perl binary here:
--PERL = /bin/perl
-+PERL = @PERL@
- 
- # What do you call your C compiler?
- CC = cc
-  
- # Where do you want Majordomo to be installed?  This CANNOT be the
- # current directory (where you unpacked the distribution)
--W_HOME = /usr/test/majordomo-$(VERSION)
-+W_HOME = @PREFIX@/libexec/majordomo
-+HOME = @HOME@/@MAJORDOMO_USER@
-  
- # Where do you want man pages to be installed?
--MAN = $(W_HOME)/man
-+MAN = @PREFIX@/man
-  
- # You need to have or create a user and group which majordomo will run as.
- # Enter the numeric UID and GID (not their names!) here:
--W_USER = 123
--W_GROUP = 45
-+W_USER = @UID@
-+W_GROUP = @GID@
- 
- # These set the permissions for all installed files and executables (except
- # the wrapper), respectively.  Some sites may wish to make these more
- # lenient, or more restrictive.
--FILE_MODE = 644
-+CF_MODE = 664
-+MAN_MODE = 444
- EXEC_MODE = 755
- HOME_MODE = 751
- 
-@@ -62,11 +64,11 @@
- # parent process, and without the leading "W_" in the variable names) gets
- # passed to processes run by "wrapper"
- W_SHELL = /bin/sh
--W_PATH = /bin:/usr/bin:/usr/ucb
--W_MAJORDOMO_CF = $(W_HOME)/majordomo.cf
-+W_PATH = /bin:/usr/bin
-+W_MAJORDOMO_CF = @HOME@/@MAJORDOMO_USER@/majordomo.cf
- 
- # A directory for temp files..
--TMPDIR = /usr/tmp
-+TMPDIR = @TMPDIR@
- 
- #--------YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW THIS LINE.-------------
- 
-@@ -76,7 +78,7 @@
- SHELL = /bin/sh
- 
- WRAPPER_FLAGS = -DBIN=\"$(W_HOME)\" -DPATH=\"PATH=$(W_PATH)\" \
--	-DHOME=\"HOME=$(W_HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
-+	-DHOME=\"HOME=$(HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
- 	-DMAJORDOMO_CF=\"MAJORDOMO_CF=$(W_MAJORDOMO_CF)\"      \
- 	$(POSIX)
- 
-@@ -144,13 +146,12 @@
- 
- install-scripts: config-scripts
- 	$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(W_HOME)
--	$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(W_HOME)/bin
- 
--	@echo "Copying tools to $(W_HOME)/bin"
-+	@echo "Copying tools to @PREFIX@/bin"
- 
- 	@for file in $(BINBIN); do \
- 		$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
--			$(TMP)/$$file $(W_HOME)/bin/$$file; \
-+			$(TMP)/$$file @PREFIX@/bin/$$file; \
- 	done
- 
- 	@echo "Copying Majordomo files to $(W_HOME)"
-@@ -177,45 +178,39 @@
- # all cases, the sample.cf file must be installed so that config-test will
- # be able to check for new variables.
- install-cf:
--	@if [ ! -f $(W_HOME)/majordomo.cf ]; \
-+	@if [ ! -f $(W_MAJORDOMO_CF) ]; \
- 	  then \
- 	    if [ -f majordomo.cf ]; \
- 	      then \
- 		echo "Using majordomo.cf"; \
--	  	$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
--			majordomo.cf $(W_HOME)/majordomo.cf; \
-+	  	$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
-+			majordomo.cf $(W_MAJORDOMO_CF); \
- 	      else \
- 		echo "Using sample.cf"; \
--		$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
--			sample.cf $(W_HOME)/majordomo.cf; \
-+		$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
-+			sample.cf $(W_MAJORDOMO_CF); \
- 	    fi; \
- 	else \
- 	   echo "Using installed majordomo.cf"; \
- 	fi;
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+	@$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
- 		sample.cf $(W_HOME)
- 
- install-man:
- 	@echo "Installing manual pages in $(MAN)"
--	@$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
--		. $(MAN)
--	@$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
--		. $(MAN)/man1
--	@$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
--		. $(MAN)/man8
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/approve.1 $(MAN)/man1/approve.1
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
--		Doc/man/digest.1 $(MAN)/man1/digest.1
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
-+		Doc/man/digest.1 $(MAN)/man8/digest.8
-+	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/bounce.1 $(MAN)/man1/bounce.1
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/bounce-remind.1 $(MAN)/man1/bounce-remind.1
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/resend.1 $(MAN)/man1/resend.1
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/majordomo.8 $(MAN)/man8/majordomo.8
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/resend.1 $(MAN)/man1/resend.1
- 
- wrapper: wrapper.c
diff --git a/mail/majordomo/patches/patch-ab b/mail/majordomo/patches/patch-ab
deleted file mode 100644
index faf6a3ee621..00000000000
--- a/mail/majordomo/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./archive2.pl.orig	Wed Aug 27 09:07:44 1997
-+++ ./archive2.pl	Tue Jun  8 10:55:12 1999
-@@ -61,4 +61,5 @@
- 
- # All these should be in the standard PERL library
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "ctime.pl";		# To get MoY definitions for month abbrevs
diff --git a/mail/majordomo/patches/patch-ac b/mail/majordomo/patches/patch-ac
deleted file mode 100644
index 24788b2645d..00000000000
--- a/mail/majordomo/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./bounce-remind.orig	Mon Dec  9 09:49:46 1996
-+++ ./bounce-remind	Tue Jun  8 10:55:12 1999
-@@ -34,4 +34,5 @@
- 
- # All these should be in the standard PERL library
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- 
diff --git a/mail/majordomo/patches/patch-ad b/mail/majordomo/patches/patch-ad
deleted file mode 100644
index 604a0e5db98..00000000000
--- a/mail/majordomo/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./config-test.orig	Wed Aug 27 09:17:13 1997
-+++ ./config-test	Tue Jun  8 10:55:12 1999
-@@ -126,4 +126,5 @@
- }
- 
-+unshift(@INC, $bindir);
- foreach (@requires) {
-     if (require $_) {
-@@ -287,5 +288,5 @@
- 
- open($cf, $cf) || &bad("Couldn't open $cf for reading, $!");
--open(S, 'sample.cf') || &bad("Couldn't open sample.cf for reading, $!");
-+open(S, "$bindir/sample.cf") || &bad("Couldn't open $bindir/sample.cf for reading, $!");
- 
- while (<S>) {
diff --git a/mail/majordomo/patches/patch-ae b/mail/majordomo/patches/patch-ae
deleted file mode 100644
index 3f51328300c..00000000000
--- a/mail/majordomo/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./digest.orig	Wed Aug 27 08:42:52 1997
-+++ ./digest	Tue Jun  8 10:55:12 1999
-@@ -320,4 +320,8 @@
- 		chdir($homedir);
- 
-+		# All these should be in the standard PERL library
-+		unshift(@INC, $bindir);
-+		unshift(@INC, $homedir);
-+
- 		$opt_l =~ tr/A-Z/a-z/;
- 
diff --git a/mail/majordomo/patches/patch-af b/mail/majordomo/patches/patch-af
deleted file mode 100644
index aba5c959188..00000000000
--- a/mail/majordomo/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/01/09 01:28:07 wiz Exp $
---- majordomo.orig	Sat Nov 27 17:28:39 1999
-+++ majordomo	Sat Nov 27 17:29:16 1999
-@@ -58,6 +58,7 @@
- print STDERR "$0: starting\n" if $DEBUG;
- 
- # All these should be in the standard PERL library
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "ctime.pl";		# To get MoY definitions for month abbrevs
- require "majordomo_version.pl";	# What version of Majordomo is this?
-@@ -1138,7 +1139,7 @@
- 	# The password is valid, so run digest
- 
-     	    open(DIGEST, 
--		"$homedir/digest -m -C -l $list $list_outgoing 2>&1 |");
-+		"$bindir/digest -m -C -l $list $list_outgoing 2>&1 |");
- 	    @digest_errors = <DIGEST>;
- 	    close(DIGEST);
- 
diff --git a/mail/majordomo/patches/patch-ag b/mail/majordomo/patches/patch-ag
deleted file mode 100644
index d68b1a67c4e..00000000000
--- a/mail/majordomo/patches/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./medit.orig	Mon Apr 28 12:38:05 1997
-+++ ./medit	Tue Jun  8 10:55:13 1999
-@@ -30,4 +30,5 @@
- 
- # All these should be in the standard PERL library
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "shlock.pl";		# NNTP-style file locking
diff --git a/mail/majordomo/patches/patch-ah b/mail/majordomo/patches/patch-ah
deleted file mode 100644
index f4ce9534e87..00000000000
--- a/mail/majordomo/patches/patch-ah
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./request-answer.orig	Mon Dec  9 09:50:20 1996
-+++ ./request-answer	Tue Jun  8 10:55:13 1999
-@@ -27,4 +27,5 @@
- 
- chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "shlock.pl";
diff --git a/mail/majordomo/patches/patch-ai b/mail/majordomo/patches/patch-ai
deleted file mode 100644
index 388e25e2de6..00000000000
--- a/mail/majordomo/patches/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./resend.orig	Wed Aug 27 08:59:24 1997
-+++ ./resend	Tue Jun  8 10:55:13 1999
-@@ -93,4 +93,5 @@
- chdir($homedir) || die("Can't chdir(\"$homedir\"): $!");
- 
-+unshift(@INC, $bindir);
- unshift(@INC, $homedir);
- require "ctime.pl";  # For logging purposes
-@@ -316,5 +317,5 @@
-     &bitch("resend:  \$admin_body not defined in $cf !!\n" .
- 	   "Majordomo will only catch \"subscribe\" and \"unsubscribe\" in\n" .
--	   "the body.\nLook at $homedir/sample.cf for a good definition.");
-+	   "the body.\nLook at $bindir/sample.cf for a good definition.");
-     @admin_body = ('/^subject:\s*subscribe\b/i' ,
- 		      '/^subject:\s*unsubscribe\b/i');
diff --git a/mail/majordomo/patches/patch-aj b/mail/majordomo/patches/patch-aj
deleted file mode 100644
index ff46f7e9c87..00000000000
--- a/mail/majordomo/patches/patch-aj
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./sample.cf.orig	Wed Aug 27 09:00:31 1997
-+++ ./sample.cf	Tue Jun  8 10:55:13 1999
-@@ -7,5 +7,5 @@
- # $whereami -- What machine am I running on?
- #
--$whereami = "example.com";
-+$whereami = "@HOSTNAME@";
- 
- # $whoami -- Who do users send requests to me as?
-@@ -17,5 +17,5 @@
- $whoami_owner = "Majordomo-Owner\@$whereami";
- 
--# $homedir -- Where can I find my extra .pl files, like majordomo.pl?
-+# $homedir -- Where can I find my lists?
- # the environment variable HOME is set by the wrapper
- #
-@@ -23,5 +23,14 @@
-      $homedir = $ENV{"HOME"};
- } else {
--     $homedir = "/usr/test/majordomo";
-+     $homedir = "@HOME@/@MAJORDOMO_USER@";
-+}
-+
-+# $bindir -- Where can I find my extra .pl files, like majordomo.pl?
-+# the environment variable BIN is set by the wrapper
-+#
-+if ( defined $ENV{"BIN"}) {
-+     $bindir = $ENV{"BIN"};
-+} else {
-+     $bindir = "@PREFIX@/libexec/majordomo";
- }
- 
-@@ -33,8 +42,8 @@
- # Each list must have a subdirectory under this directory in order for
- # digest to work. E.G. The bblisa list would use:
--# 	/usr/local/mail/digest/bblisa
-+# 	@HOME@/@MAJORDOMO_USER@/digests/bblisa
- # as its directory.
- #
--$digest_work_dir = "/usr/local/mail/digest";
-+$digest_work_dir = "$homedir/digests";
- 
- # $log -- Where do I write my log?
-@@ -46,6 +55,6 @@
- #                      seem to prefer /usr/sbin/sendmail
- #
--$sendmail_command = "/usr/lib/sendmail";
--# $sendmail_command = "/usr/sbin/sendmail";
-+# $sendmail_command = "/usr/lib/sendmail";
-+$sendmail_command = "/usr/sbin/sendmail";
- 
- # $mailer -- What program and args do I use to send mail to the list?
-@@ -69,5 +78,5 @@
- # To use TLB and use no outgoing alias:
- # if ($main'program_name eq 'mj_resend' && $opt_l eq 'test-list') {
--#   $mailer = "/usr/local/majordomo/tlb /usr/local/lists/${opt_l}.tlb";
-+#   $mailer = "@HOME@/@MAJORDOMO_USER@/tlb @HOME@/@MAJORDOMO_USER@/lists/${opt_l}.tlb";
- # }
- #
-@@ -128,6 +137,6 @@
- # directory "$filedir/$list$filedir_suffix", so set $filedir and
- # $filedir_suffix appropriately.  For instance, to look in
--# /usr/local/mail/files/$list, use:
--#   $filedir = "/usr/local/mail/files";
-+# @HOME@/@MAJORDOMO_USER@/mail/files/$list, use:
-+#   $filedir = "@HOME@/@MAJORDOMO_USER@/mail/files";
- #   $filedir_suffix = "";		# empty string
- # or to look in $listdir/$list.archive, use:
-@@ -135,6 +144,6 @@
- #   $filedir_suffix = ".archive";
- 
--$filedir = "$listdir";
--$filedir_suffix = ".archive";
-+$filedir = "@HOME@/@MAJORDOMO_USER@/archives";
-+$filedir_suffix = "";
- 
- # What command should I use to process an "index" request?
-@@ -191,5 +200,5 @@
- # Uses the environment variable TMPDIR, since that's pretty common
- #
--$TMPDIR = $ENV{'TMPDIR'} || "/usr/tmp";
-+$TMPDIR = $ENV{'TMPDIR'} || "@TMPDIR@";
- 
- # Tune how long set_lock tries to obtain a lock before giving up. Each
diff --git a/mail/majordomo/patches/patch-ak b/mail/majordomo/patches/patch-ak
deleted file mode 100644
index 3cec2448241..00000000000
--- a/mail/majordomo/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2000/02/05 19:51:44 wiz Exp $
---- wrapper.c.orig	Sat Nov 27 17:43:56 1999
-+++ wrapper.c	Sat Nov 27 17:45:54 1999
-@@ -16,10 +16,14 @@
- #include <stdio.h>
- #include <sysexits.h>
- 
--#if defined(sun) && defined(sparc)
-+#if (defined(sun) && defined(sparc)) || defined(__NetBSD__)
- #include <stdlib.h>
- #endif
- 
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <unistd.h>
-+#endif
- 
- #ifndef STRCHR
- #  include <string.h>
diff --git a/mail/majordomo/patches/patch-al b/mail/majordomo/patches/patch-al
deleted file mode 100644
index d3c276439d5..00000000000
--- a/mail/majordomo/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2001/03/27 11:53:18 agc Exp $
-
-Change the manual page section, so that it doesn't conflict
-with the digest(1) manpage.
-
---- Doc/man/digest.1	2001/03/27 11:46:32	1.1
-+++ Doc/man/digest.1	2001/03/27 11:46:42
-@@ -1,4 +1,4 @@
--.TH digest 1
-+.TH digest 8
- .SH NAME
- digest \- receive a file for a digest, or create and mail a digest
- .LP
diff --git a/mail/majordomo/patches/patch-am b/mail/majordomo/patches/patch-am
deleted file mode 100644
index 632eebcd563..00000000000
--- a/mail/majordomo/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/07/23 14:44:39 he Exp $
-
---- approve.orig	1997-04-05 21:18:36.000000000 +0200
-+++ approve
-@@ -214,6 +214,11 @@ sub process_bounce {
- 	    $from_skipped = 1;
- 	    next;
- 	}
-+	if (/^delivered-to: $post_to/i) {
-+		# Remove Delivered-To: lines that point to the list, since they
-+		# will cause postfix to think that the message is looping.
-+		next;
-+	}
- 	s/^~/~~/;
- 	print MAIL $_;
-     }