4 files changed, 34 insertions, 24 deletions

diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index ac0f9c40dfd0..cdee68a4bd7c 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	majordomo
-# Version required:	1.94.1
+# Version required:	1.94.2
 # Date created:		23 October 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/12/20 03:32:37 jfitz Exp $
+# $Id: Makefile,v 1.8 1996/12/27 06:24:57 jfitz Exp $
 #
 
-DISTNAME=	majordomo-1.94.1
+DISTNAME=	majordomo-1.94.2
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.greatcircle.com/pub/majordomo/ \
-		ftp://ftp.sgi.com/other/majordomo/ \
+MASTER_SITES=	ftp://ftp.greatcircle.com/pub/majordomo/1.94.2/ \
+		ftp://ftp.sgi.com/other/majordomo/1.94.2/ \
 		ftp://ftp-europe.sgi.com/other/majordomo/
 EXTRACT_SUFX=   .tar.Z
 
@@ -26,12 +26,13 @@ MAN8=		majordomo.8
 pre-configure:
 		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
 		@ ${CP} ${FILESDIR}/aliases.majordomo ${WRKSRC}
+		@ ${RM} ${WRKSRC}/wrapper
 
 pre-install:
 		@ ${CP} ${WRKSRC}/sample.cf ${WRKSRC}/majordomo.cf
 
 post-install:
-		@ ln -sf ${PREFIX}/majordomo/archive2.pl ${PREFIX}/majordomo/archive
+		@ ln -sf archive2.pl ${PREFIX}/majordomo/archive
 		@ for dir in tmp lists/test-l.archive lists/test-l-digest.archive digests/test-l-digest doc; do \
 			${MKDIR} -p ${PREFIX}/majordomo/$$dir; \
 		done
@@ -55,8 +56,8 @@ post-install:
 		@ for file in test-l test-l-digest test-l.passwd test-l.info; do \
 			${INSTALL_DATA} ${FILESDIR}/$$file ${PREFIX}/majordomo/lists; \
 		done
-		@ ln -sf ${PREFIX}/majordomo/lists/test-l.info ${PREFIX}/majordomo/lists/test-l-digest.info
-		@ ln -sf ${PREFIX}/majordomo/lists/test-l.passwd ${PREFIX}/majordomo/lists/test-l-digest.passwd
+		@ ln -sf test-l.info ${PREFIX}/majordomo/lists/test-l-digest.info
+		@ ln -sf test-l.passwd ${PREFIX}/majordomo/lists/test-l-digest.passwd
 		@ /bin/chmod 660 ${PREFIX}/majordomo/lists/test-l.passwd
 		@ /usr/sbin/chown -R majordom.majordom ${PREFIX}/majordomo/lists
 		@ /bin/chmod -R 664 ${PREFIX}/majordomo/lists
diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo
index c5fc7a3fcc5e..60e433f622cf 100644
--- a/mail/majordomo/distinfo
+++ b/mail/majordomo/distinfo
@@ -1 +1 @@
-MD5 (majordomo-1.94.1.tar.Z) = ae40ce0aeafb9364b97ae9d59740e711
+MD5 (majordomo-1.94.2.tar.Z) = 8c5005822eadb9c5cd8c9ac093477d00
diff --git a/mail/majordomo/files/post-install-notes b/mail/majordomo/files/post-install-notes
index c7dd1dc46b0e..112f41066a25 100644
--- a/mail/majordomo/files/post-install-notes
+++ b/mail/majordomo/files/post-install-notes
@@ -1,4 +1,4 @@
-Post-Install Notes for Majordomo v1.94.1
+Post-Install Notes for Majordomo v1.94.2
 ========================================
 
 Before you can use Majordomo, you will need to complete a few steps
diff --git a/mail/majordomo/scripts/createuser b/mail/majordomo/scripts/createuser
index a3671cdf4ab5..e75f9d4c71a8 100644
--- a/mail/majordomo/scripts/createuser
+++ b/mail/majordomo/scripts/createuser
@@ -10,7 +10,15 @@ if( $> ) {
 	exit 1;
 } 
 
+if( ! -x "/usr/sbin/pw" ) {
+	print "\nYou require the pw command, which was included in FreeBSD v2.2 builds\n";
+	print "as of Dec 9th 1996.  If you don't have it, try looking in\n";
+	print "/usr/src/usr.sbin/pw and building it\n\n";
+	exit 1;
+}
+
 if( getpwnam( "majordom" ) ) {
+	$have_user = 1;
 	( $null, $null, $mjUID ) = getpwnam( "majordom" );
 } else {
 	$mjUID = 54;
@@ -20,31 +28,32 @@ if( getpwnam( "majordom" ) ) {
 }
 
 if( getgrnam( "majordom" ) ) {
+	$have_group = 1;
 	( $null, $null, $mjGID ) = getgrnam( "majordom" );
 } else {
 	$mjGID = 54;
 	while( getgrgid( $mjGID ) ) {
 		$mjGID++;
 	}
-	&append_file( "/etc/group", "majordom:*:$mjGID:" );
 }
 
 print "majordom user using uid $mjUID\n";
 print "majordom user using gid $mjGID\n";
 
-system( "/usr/bin/chpass -a \"majordom:*:$mjUID:$mjGID::0:0:Majordomo pseudo-user:$ENV{'PREFIX'}/majordomo:/nonexistent\"" );
-
-sub append_file {
-	local($file,@list) = @_;
-	local($LOCK_EX) = 2;
-	local($LOCK_NB) = 4;
-	local($LOCK_UN) = 8;
-
-	open(F, ">> $file") || die "$file: $!\n";
-	while( ! flock( F, $LOCK_EX | $LOCK_NB ) ) {
+if( ! $have_group ) {
+	$result = system( "/usr/sbin/pw groupadd majordom -g $mjGID" );
+	if( $result ) {
+		print "Failed to add group majordom!\n";
 		exit 1;
 	}
-	print F join( "\n", @list) . "\n";
-	close F;
-	flock( F, $LOCK_UN );
+}
+
+if( ! $have_user ) {
+	$result = system( "pw useradd majordom -u $mjUID -g $mjGID -d \"$ENV{PREFIX}/majordomo\" -c \"Majordomo Pseudo User\" -p \"*\" -s \"/nonexistent\"" );
+} else {
+	$result = system( "pw usermod majordom -u $mjUID -g $mjGID -d \"$ENV{PREFIX}/majordomo\" -c \"Majordomo Pseudo User\" -p \"*\" -s \"/nonexistent\"" );
+}
+if( $result ) {
+	print "Failed to add/modify user majordom!\n";
+	exit 1;
 }