9 files changed, 84 insertions, 86 deletions

diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index d23b6633e8d6..73ecb6751d4a 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -8,24 +8,14 @@
 
 DISTNAME=	popa3d-0.4
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.false.com/pub/security/popa3d/
+MASTER_SITES=	http://www.openwall.com/popa3d/ \
+		ftp://ftp.openwall.com/popa3d/ \
+		ftp://ftp.dataforce.net/pub/solar/ \
+		ftp://ftp.false.com/pub/security/popa3d/
 
 MAINTAINER=	gonza@techline.ru
 
-post-install:
-
-	@ ${ECHO} "==========================================================================="
-	@ ${ECHO} "1. Edit your /etc/inetd.conf to use popa3d. The line should look like this:"
-	@ ${ECHO} ""
-	@ ${ECHO} "pop3	stream	tcp	nowait	root	/usr/local/libexec/popa3d   popa3d"
-	@ ${ECHO} ""
-	@ ${ECHO} "Note: when started via an inetd clone, the logging of connections is left"
-	@ ${ECHO} "up to that inetd clone or TCP wrappers."
-	@ ${ECHO} ""
-	@ ${ECHO} "2. Restart inetd by sending it a SIGHUP:"
-	@ ${ECHO} ""
-	@ ${ECHO} "# killall -HUP inetd"
-	@ ${ECHO} "==========================================================================="
+ALL_TARGET=	popa3d
 
 do-install:
 	${INSTALL} ${COPY} -o root -g wheel -m 500 \
@@ -33,15 +23,14 @@ do-install:
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/popa3d
-	${INSTALL_MAN} ${WRKSRC}/INSTALL \
-		${PREFIX}/share/doc/popa3d
-	${INSTALL_MAN} ${WRKSRC}/DESIGN \
-		${PREFIX}/share/doc/popa3d
-	${INSTALL_MAN} ${WRKSRC}/COPYING \
-		${PREFIX}/share/doc/popa3d
+	${INSTALL_MAN} ${WRKSRC}/DESIGN ${PREFIX}/share/doc/popa3d
+	${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/popa3d
 .endif
 
 pre-install:
-	${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+	@ ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+
+post-install:
+	@ ${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/mail/popa3d/files/patch-aa b/mail/popa3d/files/patch-aa
index eac93b14a7f4..b873e9ac3561 100644
--- a/mail/popa3d/files/patch-aa
+++ b/mail/popa3d/files/patch-aa
@@ -1,5 +1,14 @@
 --- params.h.orig	Tue Feb  1 09:16:24 2000
-+++ params.h	Sun Feb  6 15:24:46 2000
++++ params.h	Sat Mar  4 16:12:48 2000
+@@ -33,7 +33,7 @@
+  * An unprivileged dummy user to run as before authentication. The user
+  * and its UID must not be used for any other purpose.
+  */
+-#define POP_USER			"popa3d"
++#define POP_USER			"pop"
+ 
+ /*
+  * Sessions will be closed if idle for longer than POP_TIMEOUT seconds.
 @@ -62,7 +62,7 @@
   * Do we have shadow passwords? (Not for *BSD.)
   * Note: password aging is not supported.
diff --git a/mail/popa3d/files/patch-ab b/mail/popa3d/files/patch-ab
index e70979c30661..b08ab0b7125b 100644
--- a/mail/popa3d/files/patch-ab
+++ b/mail/popa3d/files/patch-ab
@@ -1,25 +1,24 @@
---- Makefile.orig	Mon Jan 31 22:56:46 2000
-+++ Makefile	Sat Feb 19 08:43:33 2000
-@@ -1,9 +1,9 @@
+--- Makefile.orig	Tue Feb  1 06:56:46 2000
++++ Makefile	Sat Mar  4 18:34:28 2000
+@@ -1,9 +1,8 @@
 -CC = gcc
+-LD = gcc
 +CC?= gcc
- LD = gcc
  RM = rm -f
--CFLAGS = -c -Wall -O2 -fomit-frame-pointer
+ CFLAGS = -c -Wall -O2 -fomit-frame-pointer
 -LDFLAGS = -s
 -#LDFLAGS = -s -lcrypt
-+CFLAGS+= -c -Wall
 +#LDFLAGS = -s
 +LDFLAGS = -s -lcrypt
  
  PROJ = popa3d
  OBJS = md5/md5.o \
-@@ -12,7 +12,7 @@
- 	protocol.o database.o mailbox.o \
+@@ -13,7 +12,7 @@
  	misc.o
  
--popa3d: $(OBJS)
-+all: $(OBJS)
- 	$(LD) $(LDFLAGS) $(OBJS) -o popa3d
+ popa3d: $(OBJS)
+-	$(LD) $(LDFLAGS) $(OBJS) -o popa3d
++	$(CC) $(LDFLAGS) $(OBJS) -o popa3d
  
  md5/md5.o: md5/md5.c md5/md5.h
+ 	$(CC) $(CFLAGS) -D_LIBC md5/md5.c -o md5/md5.o
diff --git a/mail/popa3d/pkg-comment b/mail/popa3d/pkg-comment
index 61db83c20175..39083bf17999 100644
--- a/mail/popa3d/pkg-comment
+++ b/mail/popa3d/pkg-comment
@@ -1 +1 @@
-Tiny, Secure, Performance POP3 daemon.
+Secure, performance, tiny POP3 daemon
diff --git a/mail/popa3d/pkg-deinstall b/mail/popa3d/pkg-deinstall
index dc5f858cea27..a6591cde0d93 100644
--- a/mail/popa3d/pkg-deinstall
+++ b/mail/popa3d/pkg-deinstall
@@ -1,20 +1,10 @@
-#!/bin/sh
+# $FreeBSD$
+#
 
-USER=popa3d
-GROUP=popa3d
+if [ "$2" != "POST-DEINSTALL" ]; then
+    exit 0
+fi
 
-case $2 in
-    DEINSTALL)
-	
-	;;
-    POST-DEINSTALL)
-	    pw groupdel $GROUP
-	    pw userdel $USER 
-	;;
-    *)
-	echo "usage: $0 <pkg-name> 
-{DEINSTALL|POST-DEINSTALL}"
-	exit 64
-esac
+PATH=/bin
 
-exit 0
+echo "Remember to remove popa3d from /etc/inetd.conf and restart inetd"
diff --git a/mail/popa3d/pkg-descr b/mail/popa3d/pkg-descr
index ef47695f4427..811ace934acd 100644
--- a/mail/popa3d/pkg-descr
+++ b/mail/popa3d/pkg-descr
@@ -1,8 +1,10 @@
-The popa3d goals
+the popa3d goals
 ================
 
-Well, the goals themselves are obvious; they"re probably the same for most
-other POP3 servers as well. It"s their priority that differs. For popa3d,
+Is a POP3 daemon by Solar Designer.
+
+Well, the goals themselves are obvious; they're probably the same for most
+other POP3 servers as well. It's their priority that differs. For popa3d,
 the goals are:
 
 1. Security (to the extent that is possible with POP3 at all, of course).
@@ -10,5 +12,11 @@ the goals are:
 3. RFC compliance (slightly relaxed to work with real-world POP3 clients).
 4. Performance (limited by the more important goals, above).
 
+This port is installed to be run from inetd, which is sufficient 
+for normal usage. However, it is possible to build a stand-alone 
+version, should you need better performance. 
+
+WWW: http://www.openwall.com/popa3d/
+
 -- Sergey Samoyloff
 gonza@techline.ru
diff --git a/mail/popa3d/pkg-install b/mail/popa3d/pkg-install
index 7f90da837520..4f0e5c9c3ca2 100644
--- a/mail/popa3d/pkg-install
+++ b/mail/popa3d/pkg-install
@@ -1,39 +1,30 @@
-#!/bin/sh 
+# $FreeBSD$
+#
 
-USER=popa3d
-UID=89
-GID=89
-GROUP=popa3d
-GECOS="popa3d"
-HOME=/nonexistent
-SHELL=/sbin/nologin
+if [ "$2" != "PRE-INSTALL" ]; then
+    exit 0
+fi
 
-case $2 in
-    PRE-INSTALL)
-	which -s pw || {
-	    cat << EOF
+PATH=/bin:/usr/bin
 
-I see that it is missing the "pw" utility. I need this utility.
-Please get it and install it, and try again.
+use_vipw () {
 
-EOF
-	    exit 1
-	}
-	pw groupshow $GROUP > /dev/null 2>&1 || {
-	    pw groupadd $GROUP -g $GID;
-	}
+    cat << EOF
+
+You need an account "pop" to install this package.
+Please add it by hand (try "man vipw") and try again.
 
-	pw usershow $USER > /dev/null 2>&1 || {
-	    pw useradd $USER -g $GROUP -u $UID -h - -d $HOME -s $SHELL -c "$GECOS";
-	}
+An example passwd entry is:
+pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent
 
-	;;
-    POST-INSTALL)
+EOF
 
-	;;
-    *)
-	echo "usage: $0 <pkg-name> {PRE-INSTALL|POST-INSTALL}"
-	exit 64
-esac
+}
+
+if ! id -u "pop" > /dev/null 2>&1; then
+    use_vipw
+    exit 1
+fi
 
 exit 0
+
diff --git a/mail/popa3d/pkg-message b/mail/popa3d/pkg-message
new file mode 100644
index 000000000000..ce3b696eac7f
--- /dev/null
+++ b/mail/popa3d/pkg-message
@@ -0,0 +1,12 @@
+===========================================================================
+1. Edit your /etc/inetd.conf to use popa3d. The line should look like this:
+
+pop3	stream	tcp	nowait	root	/usr/local/libexec/popa3d   popa3d
+
+Note: when started via an inetd clone, the logging of connections is left
+up to that inetd clone or TCP wrappers.
+
+2. Restart inetd by sending it a SIGHUP:
+
+# killall -HUP inetd
+===========================================================================
diff --git a/mail/popa3d/pkg-plist b/mail/popa3d/pkg-plist
index 9553947f1ab2..89792500cea3 100644
--- a/mail/popa3d/pkg-plist
+++ b/mail/popa3d/pkg-plist
@@ -1,5 +1,5 @@
+@comment $FreeBSD$
 libexec/popa3d
 share/doc/popa3d/DESIGN
-share/doc/popa3d/INSTALL
 share/doc/popa3d/COPYING
 @dirrm share/doc/popa3d