Update to 0.5. Changes are since 0.4.9.4 are minimal but include a man page.

5 files changed, 46 insertions, 25 deletions

diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 7804160f7d9..3f0292604f1 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2001/12/09 22:06:45 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/12/23 23:03:22 wiz Exp $
 #
 
-DISTNAME=	popa3d-0.4.9.4
-PKGREVISION=	2
+DISTNAME=	popa3d-0.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.openwall.com/popa3d/ \
 		ftp://ftp.openwall.com/pub/projects/popa3d/ \
@@ -19,18 +18,20 @@ PKG_GROUPS=	${POPA3D_GROUP}
 PKG_USERS=	${POPA3D_USER}:${POPA3D_GROUP}
 
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
+USE_BUILDLINK_ONLY=	# defined
 
 FILES_SUBST+=	POPA3D_USER=${POPA3D_USER}
 FILES_SUBST+=	POPA3D_GROUP=${POPA3D_GROUP}
 
 post-patch:
 	cd ${WRKSRC} && \
-		${SED} "s,/usr/share/empty,${PREFIX}/share/empty," \
+		${SED} "s,/var/empty,${PREFIX}/share/empty," \
 			params.h > params.h.new && \
 		${MV} params.h.new params.h
 
 do-install:
-	${INSTALL_PROGRAM} -m 700 ${WRKSRC}/popa3d ${PREFIX}/libexec
+	${INSTALL_PROGRAM} -m 500 ${WRKSRC}/popa3d ${PREFIX}/libexec
+	${INSTALL_DATA} -m 644 ${WRKSRC}/popa3d.8 ${PREFIX}/man/man8/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/popa3d
 	cd ${WRKSRC} && ${INSTALL_DATA} DESIGN INSTALL LICENSE \
 		${PREFIX}/share/doc/popa3d
diff --git a/mail/popa3d/PLIST b/mail/popa3d/PLIST
index 2921cd704d8..9a684af2f02 100644
--- a/mail/popa3d/PLIST
+++ b/mail/popa3d/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:01 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/23 23:03:23 wiz Exp $
 libexec/popa3d
+man/man8/popa3d.8
 share/doc/popa3d/DESIGN
 share/doc/popa3d/INSTALL
 share/doc/popa3d/LICENSE
diff --git a/mail/popa3d/distinfo b/mail/popa3d/distinfo
index e5f0c731a9a..9e3e6448976 100644
--- a/mail/popa3d/distinfo
+++ b/mail/popa3d/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/09/11 16:47:12 wiz Exp $
+$NetBSD: distinfo,v 1.6 2001/12/23 23:03:23 wiz Exp $
 
-SHA1 (popa3d-0.4.9.4.tar.gz) = dee99e39e1bab97ae63baa3c9adae7fbe76a4846
-Size (popa3d-0.4.9.4.tar.gz) = 26193 bytes
-SHA1 (patch-aa) = 8b7aac7ec32034dd827359571d026231058535bd
-SHA1 (patch-ab) = 4cdb1515020d399c3da458b4ceab8dbcf157cfb6
+SHA1 (popa3d-0.5.tar.gz) = 3c14386d650899f5c63a41e863d0b5af7de8e7f8
+Size (popa3d-0.5.tar.gz) = 28231 bytes
+SHA1 (patch-aa) = 3af6d7cb89fdc4a9ab4206f4b87ffc1f32b6dd71
+SHA1 (patch-ab) = 277a99f1e50e5b675fa12308c37cc053e72b0cb0
diff --git a/mail/popa3d/patches/patch-aa b/mail/popa3d/patches/patch-aa
index 6bf31445e46..c4ec7126b10 100644
--- a/mail/popa3d/patches/patch-aa
+++ b/mail/popa3d/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2001/09/11 16:47:13 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2001/12/23 23:03:23 wiz Exp $
 
---- params.h.orig	Sat Sep  8 15:46:55 2001
+--- params.h.orig	Tue Oct 16 06:10:34 2001
 +++ params.h
 @@ -142,8 +142,8 @@
   *
@@ -13,12 +13,14 @@ $NetBSD: patch-aa,v 1.5 2001/09/11 16:47:13 wiz Exp $
  #define AUTH_PAM			0
  #define AUTH_PAM_USERPASS		0
  
-@@ -178,7 +178,7 @@
+@@ -195,8 +195,8 @@
   *
-  * #undef this for qmail-style $HOME/Mailbox mailboxes.
+  * *BSD's use flock(2), others typically use fcntl(2).
   */
--#define MAIL_SPOOL_PATH			"/var/spool/mail"
-+#define MAIL_SPOOL_PATH			"/var/mail"
+-#define LOCK_FCNTL			1
+-#define LOCK_FLOCK			0
++#define LOCK_FCNTL			0
++#define LOCK_FLOCK			1
  
- #ifndef MAIL_SPOOL_PATH
  /*
+  * How do we talk to syslogd? These should be fine for most systems.
diff --git a/mail/popa3d/patches/patch-ab b/mail/popa3d/patches/patch-ab
index 263227fb5cf..02eeb0d6ea8 100644
--- a/mail/popa3d/patches/patch-ab
+++ b/mail/popa3d/patches/patch-ab
@@ -1,20 +1,37 @@
-$NetBSD: patch-ab,v 1.3 2001/09/02 16:48:32 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2001/12/23 23:03:23 wiz Exp $
 
---- Makefile.orig	Sun Sep  2 18:32:03 2001
+--- Makefile.orig	Sun Oct 28 02:10:49 2001
 +++ Makefile
-@@ -1,10 +1,10 @@
+@@ -1,15 +1,15 @@
 -CC = gcc
 -LD = gcc
 -RM = rm -f
+-MKDIR = mkdir -p
+-INSTALL = install
 -CFLAGS = -c -Wall -O2 -fomit-frame-pointer
 +CC ?= gcc
 +LD = ${CC}
 +RM ?= rm -f
++MKDIR ?= mkdir -p
++INSTALL ?= install
 +CFLAGS += -c -Wall -fomit-frame-pointer
- LDFLAGS = -s
+ # You may use OpenSSL's MD5 routines instead of the ones supplied here
+ #CFLAGS += -DHAVE_OPENSSL
+-LDFLAGS = -s
++LDFLAGS =
  LIBS =
+ # Linux with glibc, FreeBSD, NetBSD
 -#LIBS += -lcrypt
 +LIBS += -lcrypt
- #LIBS += -lpam
- #LIBS += -lwrap
- #LIBS += -lnsl
+ # HP-UX trusted system
+ #LIBS += -lsec
+ # Solaris (POP_STANDALONE, POP_VIRTUAL)
+@@ -24,7 +24,7 @@
+ #LIBS += -lcrypto
+ 
+ DESTDIR =
+-PREFIX = /usr/local
++#PREFIX = /usr/local
+ SBINDIR = $(PREFIX)/sbin
+ MANDIR = $(PREFIX)/man
+