bring up the package to current pkgsrc standards, especially DESTDIR

and paths being used.
MAJORDOMO_HOMEDIR moves from /home/majordom to $VARBASE/majordomo, unless
overridden by the package builder
MAJORDOMO_CF is now ${PREFIX}/etc/majordomo/majordomo.cf

5 files changed, 187 insertions, 100 deletions

diff --git a/mail/majordomo/MESSAGE b/mail/majordomo/MESSAGE
index ddfe207a453..d823df9da40 100644
--- a/mail/majordomo/MESSAGE
+++ b/mail/majordomo/MESSAGE
@@ -1,39 +1,44 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/06/16 16:43:37 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2010/10/29 21:51:21 spz 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
+	- configure ${MAJORDOMO_CF}.
 	  be sure to change instances of ${HOSTNAME} as appropriate.
 
-	- create lists in ${HOME}/${MAJORDOMO_USER}.
+	- create lists in ${HOME}
 	  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
+	- add a .forward file in ${HOME} (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
+	- install majordomo aliases for your mail server software.
+	  For example, create ${PREFIX}/etc/majordomo/aliases 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 :
+	  your mailer configuration.
 
-	  OA/etc/aliases.majordomo (for 8.6.x Sendmail),
+	  For sendmail, add a line similar to the following to
+	  /etc/sendmail.cf :
 
-	  O AliasFile=/etc/aliases,/etc/aliases.majordomo (for 8.7.x and up),
+	  OA${PREFIX}/etc/majordomo/aliases (for 8.6.x Sendmail),
+
+	  O AliasFile=/etc/mail/aliases,${PREFIX}/etc/majordomo/aliases
+	        (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')
+	  define(`ALIAS_FILE',`/etc/mail/aliases,${PREFIX}/etc/majordomo/aliases')
+
+	  For postfix, add eg hash:${PREFIX}/etc/majordomo/aliases
+	  to the alias_maps and alias_database parameters in main.cf
 
-	- if the group for ${MAJORDOMO_USER} (${MAJORDOMO_GROUP}) is not
-	  daemon, add ${MAJORDOMO_USER} as a trusted user for sendmail.
+	- for sendmail, if the group for ${MAJORDOMO_USER} (${MAJORDOMO_GROUP}) is not
+	  daemon, add ${MAJORDOMO_USER} as a trusted user for your mailer.
 	  This can be done by adding a line similar to the following
 	  in /etc/sendmail.cf:
 
@@ -43,12 +48,11 @@ manually:
 
 	  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)
+	- be sure to run `newaliases' to create the aliases database,
+	  and be sure that your mailer has reloaded its config
 
 	- add entries in /etc/newsyslog.conf to rotate the log in
-	  ${HOME}/${MAJORDOMO_USER}/Log if necessary.
+	  ${HOME}/Log if necessary.
 
 Enjoy Majordomo!
 ===========================================================================
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 90f27f65496..6099ec34744 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2010/10/16 10:30:56 spz Exp $
+# $NetBSD: Makefile,v 1.35 2010/10/29 21:51:21 spz Exp $
 
 DISTNAME=		majordomo-1.94.5
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
 			ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
@@ -10,13 +10,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=		spz@NetBSD.org
 HOMEPAGE=		http://www.greatcircle.com/majordomo/
 COMMENT=		The Majordomo mailing list manager
+
 LICENSE=		majordomo-license
 
-RESTRICTED=             No distribution of modified binary packages to the general public
-NO_BIN_ON_FTP=          ${RESTRICTED}
-NO_BIN_ON_CDROM=        ${RESTRICTED}
+PKG_DESTDIR_SUPPORT=	destdir
+MAKE_JOBS_SAFE=		NO
+
+RESTRICTED=		No distribution of modified binary packages to the general public
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
 
-CONFLICTS+=		bounce-*
+CONFLICTS+=		bounce-[0-9]*
 
 USE_TOOLS+=		perl:run
 
@@ -24,15 +28,26 @@ BUILD_TARGET=		wrapper
 INSTALL_TARGET=		install install-wrapper
 MAKE_FILE=		Makefile.netbsd
 
-MAJORDOMO_TMPDIR?=	/var/tmp
-MAJORDOMO_HOMEDIR?=	/home
+.include "../../mk/bsd.prefs.mk"
+
+MAJORDOMO_TMPDIR?=	${VARBASE}/majordomo/tmp
+MAJORDOMO_HOMEDIR?=	${VARBASE}/majordomo
+MAJORDOMO_CF?=		${PREFIX}/etc/majordomo/majordomo.cf
 MAJORDOMO_USER?=	majordom
 MAJORDOMO_GROUP?=	majordom
 
+PKG_GECOS.${MAJORDOMO_USER}=	Majordomo Mailinglist Manager
+PKG_HOME.${MAJORDOMO_USER}=	${MAJORDOMO_HOMEDIR}
+
 PKG_GROUPS_VARS+=	MAJORDOMO_GROUP
 PKG_USERS_VARS+=	MAJORDOMO_USER
 
+PKG_SYSCONFDIR.majordomo=	${PREFIX}/etc/majordomo
+CONF_FILES+=		${EXAMPLEDIR}/aliases.majordomo ${PKG_SYSCONFDIR.majordomo}/aliases
+CONF_FILES+=		${EXAMPLEDIR}/majordomo.cf ${PKG_SYSCONFDIR.majordomo}/majordomo.cf
+
 MESSAGE_SUBST+=		HOME=${MAJORDOMO_HOMEDIR}			\
+			MAJORDOMO_CF=${MAJORDOMO_CF}		\
 			MAJORDOMO_USER=${MAJORDOMO_USER}		\
 			MAJORDOMO_GROUP=${MAJORDOMO_GROUP}
 
@@ -41,29 +56,35 @@ 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
+EXAMPLEDIR=		${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
+BUILD_DEFS+=		MAJORDOMO_HOMEDIR
+BUILD_DEFS+=		MAJORDOMO_CF
+BUILD_DEFS+=		VARBASE
 
 USERGROUP_PHASE=	configure
 PKG_GROUPS=		${MAJORDOMO_GROUP}
 PKG_USERS=		${MAJORDOMO_USER}:${MAJORDOMO_GROUP}
-OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}		\
+OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}		\
+			${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
+OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/archives	\
 			${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/archives	\
+OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/digests	\
 			${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/digests	\
+OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/lists	\
 			${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0775
-OWN_DIRS_PERMS+=	${MAJORDOMO_HOMEDIR}/${MAJORDOMO_USER}/lists	\
+OWN_DIRS_PERMS+=	${MAJORDOMO_TMPDIR}		\
 			${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_CF@|${MAJORDOMO_CF}|g"		\
 			-e "s|@MAJORDOMO_USER@|${MAJORDOMO_USER}|g"	\
 			-e "s|@UID@|${PKG_UID.${MAJORDOMO_USER}}|g"	\
 			-e "s|@GID@|${PKG_GID.${MAJORDOMO_GROUP}}|g"	\
@@ -71,10 +92,15 @@ CONFIGURE_SED=		-e "s|@PREFIX@|${PREFIX}|g"			\
 
 MESSAGE_SED=		-e 's|$${PREFIX}|${PREFIX}|g'			\
 			-e 's|$${HOME}|${HOME}|g'			\
+			-e 's|$${MAJORDOMO_CF}|${MAJORDOMO_CF}|g'	\
 			-e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g'	\
-			-e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g'	\
+			-e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g'
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man8
+INSTALLATION_DIRS+=	${PKG_SYSCONFDIR.majordomo}
+INSTALLATION_DIRS+=	${PREFIX}/bin
+INSTALLATION_DIRS+=	${PREFIX}/libexec/majordomo
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	${PKGMANDIR}/man8
 
 do-configure:
 	${SED} ${CONFIGURE_SED} ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.netbsd
@@ -85,45 +111,46 @@ post-build:
 		> ${WRKSRC}/aliases.majordomo
 	${SED}	-e 's|$${PREFIX}|${PREFIX}|g'				\
 		-e 's|$${HOME}|${HOME}|g'				\
+		-e 's|$${MAJORDOMO_CF}|${MAJORDOMO_CF}|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}
+	${LN} -sf archive2.pl ${DESTDIR}${PREFIX}/libexec/majordomo/archive
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 .for file in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCDIR}/${file}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${DOCDIR}/${file}
 .endfor
 .for file in ${DOCDOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DOCDIR}/${file}
+	${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DESTDIR}${DOCDIR}/${file}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/post-install-notes ${DOCDIR}/post-install-notes
-	${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}
+	${INSTALL_DATA} ${WRKSRC}/post-install-notes ${DESTDIR}${DOCDIR}/post-install-notes
+	${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${DESTDIR}${EXAMPLEDIR}
 .for dir in ${EXDIRS}
-	${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}/${dir}
+	${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${DESTDIR}${EXAMPLEDIR}/${dir}
 .endfor
 	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${WRKSRC}/aliases.majordomo ${EXDIR}/aliases.majordomo
+		${WRKSRC}/aliases.majordomo ${DESTDIR}${EXAMPLEDIR}/aliases.majordomo
 	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${FILESDIR}/keep_me ${EXDIR}/archives/example-l/.keep_me
+		${FILESDIR}/keep_me ${DESTDIR}${EXAMPLEDIR}/archives/example-l/.keep_me
 	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${FILESDIR}/keep_me ${EXDIR}/digests/example-l-digest/.keep_me
+		${FILESDIR}/keep_me ${DESTDIR}${EXAMPLEDIR}/digests/example-l-digest/.keep_me
 .for file in ${EXFILES}
 	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${FILESDIR}/${file} ${EXDIR}/lists/${file}
+		${FILESDIR}/${file} ${DESTDIR}${EXAMPLEDIR}/lists/${file}
 .endfor
 .for file in ${EXLISTS}
 	${INSTALL} -m 664 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		/dev/null ${EXDIR}/lists/${file}
+		/dev/null ${DESTDIR}${EXAMPLEDIR}/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
+	${LN} -sf example-l.info ${DESTDIR}${EXAMPLEDIR}/lists/example-l-digest.info
+	${LN} -sf example-l.passwd ${DESTDIR}${EXAMPLEDIR}/lists/example-l-digest.passwd
 	${INSTALL_DATA} -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \
-		${WRKSRC}/majordomo.cf ${EXDIR}/majordomo.cf
+		${WRKSRC}/majordomo.cf ${DESTDIR}${EXAMPLEDIR}/majordomo.cf
 
 # verify installation; requires interaction
 test: install
-	${PREFIX}/libexec/majordomo/wrapper config-test
+	${DESTDIR}${PREFIX}/libexec/majordomo/wrapper config-test
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo
index a8e08ccec87..b1f8d5e19ec 100644
--- a/mail/majordomo/distinfo
+++ b/mail/majordomo/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2010/10/16 10:30:56 spz Exp $
+$NetBSD: distinfo,v 1.8 2010/10/29 21:51:21 spz 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-aa) = 532bfe02d535231da689d1d5968a5247d624f005
 SHA1 (patch-ab) = 68bdbd77029ebd8f113c492e50e60aa7efb35de9
 SHA1 (patch-ac) = bea997e785b2656b1660a11efce759a56a700ab2
 SHA1 (patch-ad) = 65370547240539128a405484e98c7ed15a869464
@@ -12,7 +12,7 @@ SHA1 (patch-af) = 9f3d21953ada62876f7c2ba2be0fa5edb48335fb
 SHA1 (patch-ag) = b469a639270d369732e75e6ae4df7f559e9c436e
 SHA1 (patch-ah) = 666b52100cb50a948c145da0ba83c197386cbd1e
 SHA1 (patch-ai) = 771c487d1a3392bf3b523330b8d60fd9a190c58b
-SHA1 (patch-aj) = 6d4fe712af39cb986c24d0227f86aacb6d048870
+SHA1 (patch-aj) = 2185ba182561ca3e003fa0879e696092c3b237fd
 SHA1 (patch-ak) = 401da2e552ff92ef35a60e45d6b8994dfd091b49
 SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76
 SHA1 (patch-am) = cb557337c586c39f86b1c8f8fe265c7db022491c
diff --git a/mail/majordomo/patches/patch-aa b/mail/majordomo/patches/patch-aa
index 8b24ca9d84b..986888bf3c5 100644
--- a/mail/majordomo/patches/patch-aa
+++ b/mail/majordomo/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2010/10/29 21:51:22 spz Exp $
 
---- Makefile.orig	Wed Aug 27 16:56:21 1997
-+++ Makefile	Tue Mar 27 12:41:29 2001
+--- Makefile.orig	2000-01-18 14:01:17.000000000 +0000
++++ Makefile
 @@ -13,27 +13,29 @@
  #
   
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
  # current directory (where you unpacked the distribution)
 -W_HOME = /usr/test/majordomo-$(VERSION)
 +W_HOME = @PREFIX@/libexec/majordomo
-+HOME = @HOME@/@MAJORDOMO_USER@
++HOME = @HOME@
   
  # Where do you want man pages to be installed?
 -MAN = $(W_HOME)/man
@@ -38,14 +38,14 @@ $NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
  EXEC_MODE = 755
  HOME_MODE = 751
  
-@@ -62,11 +64,11 @@
+@@ -62,11 +64,11 @@ POSIX = -DPOSIX_UID=$(W_USER) -DPOSIX_GI
  # 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
++W_MAJORDOMO_CF = @MAJORDOMO_CF@
  
  # A directory for temp files..
 -TMPDIR = /usr/tmp
@@ -53,7 +53,7 @@ $NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
  
  #--------YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW THIS LINE.-------------
  
-@@ -76,7 +78,7 @@
+@@ -76,7 +78,7 @@ VERSION =	1.94.5
  SHELL = /bin/sh
  
  WRAPPER_FLAGS = -DBIN=\"$(W_HOME)\" -DPATH=\"PATH=$(W_PATH)\" \
@@ -62,49 +62,98 @@ $NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
  	-DMAJORDOMO_CF=\"MAJORDOMO_CF=$(W_MAJORDOMO_CF)\"      \
  	$(POSIX)
  
-@@ -144,13 +146,12 @@
+@@ -118,12 +120,12 @@ install: wrapper install-scripts install
+ 
+ install-wrapper: wrapper
+ 	$(INSTALL) -o $(WRAPPER_OWNER) -g $(WRAPPER_GROUP) \
+-		-m $(WRAPPER_MODE) wrapper $(W_HOME)/wrapper
++		-m $(WRAPPER_MODE) wrapper $(DESTDIR)$(W_HOME)/wrapper
+ 	@echo ""
+ 	@echo "To verify that all the permissions and etc are correct,"
+ 	@echo "run the command"
+ 	@echo ""
+-	@echo "	     cd $(W_HOME); ./wrapper config-test"
++	@echo "	     cd $(DESTDIR)$(W_HOME); ./wrapper config-test"
+ 
+ # fix where perl lives.
+ # Create a tmp directory to stuff all the files in, so we 
+@@ -143,30 +145,29 @@ config-scripts:
+ 
  
  install-scripts: config-scripts
- 	$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(W_HOME)
+-	$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(W_HOME)
 -	$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(W_HOME)/bin
++	$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(DESTDIR)$(W_HOME)
  
 -	@echo "Copying tools to $(W_HOME)/bin"
-+	@echo "Copying tools to @PREFIX@/bin"
++	@echo "Copying tools to $(DESTDIR)@PREFIX@/bin"
  
  	@for file in $(BINBIN); do \
  		$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
 -			$(TMP)/$$file $(W_HOME)/bin/$$file; \
-+			$(TMP)/$$file @PREFIX@/bin/$$file; \
++			$(TMP)/$$file $(DESTDIR)@PREFIX@/bin/$$file; \
+ 	done
+ 
+-	@echo "Copying Majordomo files to $(W_HOME)"
++	@echo "Copying Majordomo files to $(DESTDIR)$(W_HOME)"
+ 
+ 	@for file in $(BIN); do \
+ 		$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
+-			$(TMP)/$$file $(W_HOME)/$$file; \
++			$(TMP)/$$file $(DESTDIR)$(W_HOME)/$$file; \
+ 	done
+ 
+-	@echo "Copying archiving and other tools to $(W_HOME)/Tools"
++	@echo "Copying archiving and other tools to $(DESTDIR)$(W_HOME)/Tools"
+ 
+-	$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(W_HOME)/Tools
++	$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(DESTDIR)$(W_HOME)/Tools
+ 
+ 	@for file in $(TOOLS); do \
+ 		$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
+-			$(TMP)/$$file $(W_HOME)/Tools/$$file; \
++			$(TMP)/$$file $(DESTDIR)$(W_HOME)/Tools/$$file; \
  	done
  
- 	@echo "Copying Majordomo files to $(W_HOME)"
-@@ -177,45 +178,39 @@
+ 	@rm -rf $(TMP)	
+@@ -177,46 +178,40 @@ install-scripts: config-scripts
  # 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"; \
+-	  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"; \
+-	      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;
+-	    fi; \
+-	else \
+-	   echo "Using installed majordomo.cf"; \
+-	fi;
 -	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
+-		sample.cf $(W_HOME)
++	# @if [ ! -f $(W_MAJORDOMO_CF) ]; \
++	#   then \
++	#     if [ -f majordomo.cf ]; \
++	#       then \
++	# 	echo "Using majordomo.cf"; \
++	#   	$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
++	# 		majordomo.cf $(DESTDIR)$(W_MAJORDOMO_CF); \
++	#       else \
++	# 	echo "Using sample.cf"; \
++	# 	$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
++	# 		sample.cf $(DESTDIR)$(W_MAJORDOMO_CF); \
++	#     fi; \
++	# else \
++	#    echo "Using installed majordomo.cf"; \
++	# fi;
 +	@$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
- 		sample.cf $(W_HOME)
++		sample.cf $(DESTDIR)$(W_HOME)
  
  install-man:
  	@echo "Installing manual pages in $(MAN)"
@@ -115,26 +164,33 @@ $NetBSD: patch-aa,v 1.3 2006/06/16 17:11:25 jlam Exp $
 -	@$(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
+-		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) \
+-		Doc/man/bounce.1 $(MAN)/man1/bounce.1
+-	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
+-		Doc/man/bounce-remind.1 $(MAN)/man1/bounce-remind.1
+-	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
+-		Doc/man/resend.1 $(MAN)/man1/resend.1
+-	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
+-		Doc/man/majordomo.8 $(MAN)/man8/majordomo.8
+-	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
+-		Doc/man/resend.1 $(MAN)/man1/resend.1
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
-+		Doc/man/digest.1 $(MAN)/man8/digest.8
++		Doc/man/approve.1 $(DESTDIR)$(MAN)/man1/approve.1
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/bounce.1 $(MAN)/man1/bounce.1
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
++		Doc/man/digest.1 $(DESTDIR)$(MAN)/man8/digest.8
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/bounce-remind.1 $(MAN)/man1/bounce-remind.1
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
++		Doc/man/bounce.1 $(DESTDIR)$(MAN)/man1/bounce.1
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/resend.1 $(MAN)/man1/resend.1
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
++		Doc/man/bounce-remind.1 $(DESTDIR)$(MAN)/man1/bounce-remind.1
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/majordomo.8 $(MAN)/man8/majordomo.8
--	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
++		Doc/man/resend.1 $(DESTDIR)$(MAN)/man1/resend.1
++	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
++		Doc/man/majordomo.8 $(DESTDIR)$(MAN)/man8/majordomo.8
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/resend.1 $(MAN)/man1/resend.1
++		Doc/man/resend.1 $(DESTDIR)$(MAN)/man1/resend.1
  
  wrapper: wrapper.c
+ 	$(CC)  $(WRAPPER_FLAGS) -o wrapper wrapper.c
diff --git a/mail/majordomo/patches/patch-aj b/mail/majordomo/patches/patch-aj
index ff46f7e9c87..112d7d21b0a 100644
--- a/mail/majordomo/patches/patch-aj
+++ b/mail/majordomo/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
+$NetBSD: patch-aj,v 1.2 2010/10/29 21:51:22 spz Exp $
 
 --- ./sample.cf.orig	Wed Aug 27 09:00:31 1997
 +++ ./sample.cf	Tue Jun  8 10:55:13 1999
@@ -20,7 +20,7 @@ $NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
       $homedir = $ENV{"HOME"};
  } else {
 -     $homedir = "/usr/test/majordomo";
-+     $homedir = "@HOME@/@MAJORDOMO_USER@";
++     $homedir = "@HOME@";
 +}
 +
 +# $bindir -- Where can I find my extra .pl files, like majordomo.pl?
@@ -36,7 +36,7 @@ $NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
  # 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
++# 	@HOME@/digests/bblisa
  # as its directory.
  #
 -$digest_work_dir = "/usr/local/mail/digest";
@@ -56,7 +56,7 @@ $NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
  # 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";
++#   $mailer = "@HOME@/tlb @HOME@/lists/${opt_l}.tlb";
  # }
  #
 @@ -128,6 +137,6 @@
@@ -64,8 +64,8 @@ $NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
  # $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";
++# @HOME@/mail/files/$list, use:
++#   $filedir = "@HOME@/mail/files";
  #   $filedir_suffix = "";		# empty string
  # or to look in $listdir/$list.archive, use:
 @@ -135,6 +144,6 @@
@@ -73,7 +73,7 @@ $NetBSD: patch-aj,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
  
 -$filedir = "$listdir";
 -$filedir_suffix = ".archive";
-+$filedir = "@HOME@/@MAJORDOMO_USER@/archives";
++$filedir = "@HOME@/archives";
 +$filedir_suffix = "";
  
  # What command should I use to process an "index" request?