From f05d3aea04f0cd740e1f2b2087f52fcdab6be695 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Tue, 20 Jun 2000 20:23:59 +0000
Subject: [PATCH] upgrade to solid-pop3d 0.15, from port maintainer

---
 mail/solid-pop3d/Makefile                     | 29 ++++-----
 mail/solid-pop3d/files/md5                    |  6 +-
 mail/solid-pop3d/patches/patch-Makefile_in    | 65 +++++++++++++++++++
 mail/solid-pop3d/patches/patch-aa             | 11 ----
 mail/solid-pop3d/patches/patch-ab             | 11 ----
 mail/solid-pop3d/patches/patch-ac             | 11 ----
 mail/solid-pop3d/patches/patch-ad             | 11 ----
 mail/solid-pop3d/patches/patch-ae             | 33 ----------
 mail/solid-pop3d/patches/patch-af             | 38 -----------
 .../solid-pop3d/patches/patch-man_Makefile_in | 15 +++++
 mail/solid-pop3d/patches/patch-man_spop3d_8   | 11 ++++
 .../patches/patch-man_spop3d_conf_5           | 20 ++++++
 mail/solid-pop3d/patches/patch-src_const_h    | 20 ++++++
 mail/solid-pop3d/pkg/DESCR                    |  2 +
 mail/solid-pop3d/pkg/MESSAGE                  | 11 ++--
 15 files changed, 155 insertions(+), 139 deletions(-)
 create mode 100644 mail/solid-pop3d/patches/patch-Makefile_in
 delete mode 100644 mail/solid-pop3d/patches/patch-aa
 delete mode 100644 mail/solid-pop3d/patches/patch-ab
 delete mode 100644 mail/solid-pop3d/patches/patch-ac
 delete mode 100644 mail/solid-pop3d/patches/patch-ad
 delete mode 100644 mail/solid-pop3d/patches/patch-ae
 delete mode 100644 mail/solid-pop3d/patches/patch-af
 create mode 100644 mail/solid-pop3d/patches/patch-man_Makefile_in
 create mode 100644 mail/solid-pop3d/patches/patch-man_spop3d_8
 create mode 100644 mail/solid-pop3d/patches/patch-man_spop3d_conf_5
 create mode 100644 mail/solid-pop3d/patches/patch-src_const_h

diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile
index 729f087565d..325adf85784 100644
--- a/mail/solid-pop3d/Makefile
+++ b/mail/solid-pop3d/Makefile
@@ -1,27 +1,22 @@
-#
-# $OpenBSD: Makefile,v 1.1.1.1 2000/05/26 01:51:34 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.2 2000/06/20 20:23:59 brad Exp $
 
-DISTNAME=       	solid-pop3d-0.14
-CATEGORIES=		net mail
-MAINTAINER=		danh@nfol.com
+DISTNAME=	solid-pop3d-0.15
+CATEGORIES=	net mail
+NEED_VERSION=	1.302
+MASTER_SITES=	http://solidpop3d.pld.org.pl/
 
-MASTER_SITES=		http://solidpop3d.pld.org.pl/
+HOMEPAGE=	http://solidpop3d.pld.org.pl/
+
+MAINTAINER=	danh@nfol.com
 
-LICENCE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-HAS_CONFIGURE=	 	Yes
-CONFIGURE_ARGS+=	--sysconfdir='/etc'
-CONFIGURE_ARGS+=	--localstatedir="/var/spool/spop3d" 
-CONFIGURE_ARGS+=	--enable-last
-CONFIGURE_ARGS+=	--enable-bulletins
-CONFIGURE_ARGS+=	--enable-nonip
-
-FAKE=			Yes
-FAKE_FLAGS+=		prefix='${WRKINST}${PREFIX}'
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --localstatedir="/var/spool/spop3d" --mandir="${PREFIX}/man" \
+		 --enable-last --enable-bulletins --enable-nonip --enable-ipv6 \
+		 --enable-logextend --enable-statistics
 
 .include <bsd.port.mk>
diff --git a/mail/solid-pop3d/files/md5 b/mail/solid-pop3d/files/md5
index 38e27ea58a5..ebc428e2b62 100644
--- a/mail/solid-pop3d/files/md5
+++ b/mail/solid-pop3d/files/md5
@@ -1,3 +1,3 @@
-MD5 (solid-pop3d-0.14.tar.gz) = 05974b00a495b520687f763d1f074f1c
-RMD160 (solid-pop3d-0.14.tar.gz) = 311ba1acc06dc7ac589e83c24a43baeb27275ddc
-SHA1 (solid-pop3d-0.14.tar.gz) = dc452c5e09acb0fccc9b8655c8c25699434e8c14
+MD5 (solid-pop3d-0.15.tar.gz) = 1b893fcfdceef7d3c209094e34023c02
+RMD160 (solid-pop3d-0.15.tar.gz) = c01c120bb835c0e7b139ff091e3f80aecada1b05
+SHA1 (solid-pop3d-0.15.tar.gz) = 77534072dc352700acf23d29c781659833e53a04
diff --git a/mail/solid-pop3d/patches/patch-Makefile_in b/mail/solid-pop3d/patches/patch-Makefile_in
new file mode 100644
index 00000000000..2d235931b3c
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-Makefile_in
@@ -0,0 +1,65 @@
+--- Makefile.in.orig	Tue Jun 20 15:51:42 2000
++++ Makefile.in	Tue Jun 20 15:53:43 2000
+@@ -45,7 +45,7 @@
+ all-recursive:
+ 	@for subdir in $(SUBDIRS); do \
+ 	  target=`echo $@ | sed s/-recursive//`; \
+-	  (cd $$subdir && $(MAKE) $$target) \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
+ 	  || exit 1; \
+ 	done
+ 
+@@ -55,7 +55,7 @@
+ 
+ clean-recursive:
+ 	@for subdir in $(SUBDIRS); do \
+-	  (cd $$subdir && $(MAKE) clean) \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean) \
+ 	  || exit 1; \
+ 	done
+ 
+@@ -66,7 +66,7 @@
+ 
+ distclean-recursive:
+ 	@for subdir in $(SUBDIRS); do \
+-	  (cd $$subdir && $(MAKE) distclean) \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) distclean) \
+ 	  || exit 1; \
+ 	done
+ 
+@@ -74,7 +74,7 @@
+ 
+ maintainer-clean-recursive:
+ 	@for subdir in $(SUBDIRS); do \
+-	  (cd $$subdir && $(MAKE) maintainer-clean) \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) maintainer-clean) \
+ 	  || exit 1; \
+ 	done
+ 
+@@ -85,7 +85,7 @@
+ 
+ install-recursive:
+ 	@for subdir in $(SUBDIRS); do \
+-	  (cd $$subdir && $(MAKE) install) \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) install) \
+ 	  || exit 1; \
+ 	done
+ 
+@@ -93,7 +93,7 @@
+ 
+ uninstall-recursive:
+ 	@for subdir in $(SUBDIRS); do \
+-	  (cd $$subdir && $(MAKE) uninstall) \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) uninstall) \
+ 	  || exit 1; \
+ 	done
+ 
+@@ -119,7 +119,7 @@
+ 	  mkdir $(distdir)/$$subdir \
+ 	  || exit 1; \
+ 	  chmod 755 $(distdir)/$$subdir; \
+-	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+ 	  || exit 1; \
+ 	  chmod 644 $(distdir)/$$subdir/*; \
+ 	done
diff --git a/mail/solid-pop3d/patches/patch-aa b/mail/solid-pop3d/patches/patch-aa
deleted file mode 100644
index f47f97f1936..00000000000
--- a/mail/solid-pop3d/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Fri May 19 14:11:49 2000
-+++ doc/Makefile.in	Fri May 19 14:11:56 2000
-@@ -15,8 +15,6 @@
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
--DESTDIR =
--
- top_builddir = ..
- 
- EXTRA_DIST = spop3d config.example
diff --git a/mail/solid-pop3d/patches/patch-ab b/mail/solid-pop3d/patches/patch-ab
deleted file mode 100644
index 067f81e8898..00000000000
--- a/mail/solid-pop3d/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Fri May 19 14:12:21 2000
-+++ src/Makefile.in	Fri May 19 14:12:28 2000
-@@ -26,8 +26,6 @@
- sysconfdir = @sysconfdir@
- localstatedir = @localstatedir@
- 
--DESTDIR =
--
- top_builddir = ..
- 
- INSTALL = @INSTALL@
diff --git a/mail/solid-pop3d/patches/patch-ac b/mail/solid-pop3d/patches/patch-ac
deleted file mode 100644
index 4eaecaf0a1c..00000000000
--- a/mail/solid-pop3d/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/Makefile.in.orig	Fri May 19 14:12:53 2000
-+++ man/Makefile.in	Fri May 19 14:12:59 2000
-@@ -20,8 +20,6 @@
- prefix = @prefix@
- mandir = @mandir@
- 
--DESTDIR =
--
- top_builddir = ..
- 
- INSTALL = @INSTALL@
diff --git a/mail/solid-pop3d/patches/patch-ad b/mail/solid-pop3d/patches/patch-ad
deleted file mode 100644
index 3baffe5be43..00000000000
--- a/mail/solid-pop3d/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/const.h.orig	Fri May 19 14:13:34 2000
-+++ src/const.h	Fri May 19 14:13:46 2000
-@@ -36,7 +36,7 @@
- #define DEFWCCOUNT 5
- 
- #ifdef MDMAILBOX
--#define DEFMAILDROPNAME "/var/spool/mail/%s"
-+#define DEFMAILDROPNAME "/var/mail/%s"
- #else
- #define DEFMAILDROPNAME "Maildir"
- #endif
diff --git a/mail/solid-pop3d/patches/patch-ae b/mail/solid-pop3d/patches/patch-ae
deleted file mode 100644
index 14a2560d8e5..00000000000
--- a/mail/solid-pop3d/patches/patch-ae
+++ /dev/null
@@ -1,33 +0,0 @@
-$OpenBSD: patch-ae,v 1.1 2000/05/31 16:09:52 form Exp $
---- man/spop3d.8.orig	Wed May 31 22:48:35 2000
-+++ man/spop3d.8	Wed May 31 22:50:55 2000
-@@ -70,7 +70,7 @@ and
- is expanded to
- .I /home/jurekb/Mail/bugtraq
- for "jurekb" user on my system. The default is
--.I /var/spool/mail/%s
-+.I /var/mail/%s
- or
- .I Maildir
- when mailbox support is not compiled in.
-@@ -108,7 +108,7 @@ Seconds are used if no suffix is present
- .RE
- .IP "-f \fIconfigfile\fP"
- Specify a configuration file. The default is
--.I ${/spop3d.conf
-+.I /etc/spop3d.conf
- .IP "-d"
- Set server into debugging mode.
- .IP "-r"
-@@ -119,9 +119,9 @@ Allow root login. This feature is disabl
- User configuration file.
- .IP "~/.spop3d-bull"
- This file is used by bulletin code to determine last bulletin received by user.
--.IP ${localstatedir}/bulletins"
-+.IP /var/spool/spop3d/bulletins"
- Bulletins directory.
--.IP ${sysconfdir}/spop3d.conf"
-+.IP /etc/spop3d.conf"
- Global configuration file.
- .SH SEE ALSO
- .PP
diff --git a/mail/solid-pop3d/patches/patch-af b/mail/solid-pop3d/patches/patch-af
deleted file mode 100644
index 3760567e57c..00000000000
--- a/mail/solid-pop3d/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
---- man/spop3d.conf.5.orig	Wed May 31 22:58:45 2000
-+++ man/spop3d.conf.5	Wed May 31 22:59:44 2000
-@@ -107,7 +107,7 @@
- .B MailDropName string
- Specify path to maildrop. The format is the same as for \fB-n\fP option in
- \fBspop3d\fP (8). Default value is
--.I /var/spool/mail/%s
-+.I /var/mail/%s
- .TP
- .B MailDropType string
- Specify type of maildrop. The allowed values are \fImailbox\fP and
-@@ -159,7 +159,7 @@
- .TP
- .B BulletinDirectory string
- Specify path to bulletin directory. 
--Default value is ${localstatedir}/bulletins (/usr/local/var/bulletins).
-+Default value is /var/spool/spop3d/bulletins.
- .TP
- .B AddBuletins boolean
- Server checks for new bulletins in BulletinDirectory if enabled.
-@@ -181,7 +181,7 @@
- 	DoMapping 	true
- 	UnreadExpire	never
- 	APOPServerName	jakis.tam.host.w.pl
--	MailDropName	"/var/spool/mail/%s" /* It is a comment */
-+	MailDropName	"/var/mail/%s" /* It is a comment */
- 	MailDropType	mailbox
- 	AutoLogoutTime	5s
- 	UserOverride	yes
-@@ -196,7 +196,7 @@
- syntax error occurs in a configuration file. If a configuration file doesn't
- exist (stat() failed), the server logs this fact only when in debugging mode.
- .SH FILES
--.IP "${sysconfdir}/spop3d.conf"
-+.IP "/etc/spop3d.conf"
- Global configuration file.
- .SH SEE ALSO
- .PP
diff --git a/mail/solid-pop3d/patches/patch-man_Makefile_in b/mail/solid-pop3d/patches/patch-man_Makefile_in
new file mode 100644
index 00000000000..a617fe0c332
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-man_Makefile_in
@@ -0,0 +1,15 @@
+--- man/Makefile.in.orig	Tue Jun 20 16:11:13 2000
++++ man/Makefile.in	Tue Jun 20 16:11:49 2000
+@@ -157,10 +157,10 @@
+ 	done
+ install-man: $(MANS)
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) install-man1 install-man5 install-man8
++	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man5 install-man8
+ uninstall-man:
+ 	@$(NORMAL_UNINSTALL)
+-	$(MAKE) uninstall-man1 uninstall-man5 uninstall-man8
++	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man5 uninstall-man8
+ 
+ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+ 
diff --git a/mail/solid-pop3d/patches/patch-man_spop3d_8 b/mail/solid-pop3d/patches/patch-man_spop3d_8
new file mode 100644
index 00000000000..00bbc1a8cbb
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-man_spop3d_8
@@ -0,0 +1,11 @@
+--- man/spop3d.8.orig	Mon Jun 19 10:12:57 2000
++++ man/spop3d.8	Mon Jun 19 10:13:38 2000
+@@ -70,7 +70,7 @@ and
+ is expanded to
+ .I /home/jurekb/Mail/bugtraq
+ for "jurekb" user on my system. The default is
+-.I /var/spool/mail/%s
++.I /var/mail/%s
+ or
+ .I Maildir
+ when mailbox support is not compiled in.
diff --git a/mail/solid-pop3d/patches/patch-man_spop3d_conf_5 b/mail/solid-pop3d/patches/patch-man_spop3d_conf_5
new file mode 100644
index 00000000000..14e2f01670f
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-man_spop3d_conf_5
@@ -0,0 +1,20 @@
+--- man/spop3d.conf.5.orig	Mon Jun 19 10:14:10 2000
++++ man/spop3d.conf.5	Mon Jun 19 10:14:43 2000
+@@ -107,7 +107,7 @@ Users can authenticate themselves with A
+ .B MailDropName string
+ Specify path to maildrop. The format is the same as for \fB-n\fP option in
+ \fBspop3d\fP (8). Default value is
+-.I /var/spool/mail/%s
++.I /var/mail/%s
+ .TP
+ .B MailDropType string
+ Specify type of maildrop. The allowed values are \fImailbox\fP and
+@@ -204,7 +204,7 @@ exist. Option is disabled by default.
+ 	DoMapping 	true
+ 	UnreadExpire	never
+ 	APOPServerName	jakis.tam.host.w.pl
+-	MailDropName	"/var/spool/mail/%s" /* It is a comment */
++	MailDropName	"/var/mail/%s" /* It is a comment */
+ 	MailDropType	mailbox
+ 	AutoLogoutTime	5s
+ 	UserOverride	yes
diff --git a/mail/solid-pop3d/patches/patch-src_const_h b/mail/solid-pop3d/patches/patch-src_const_h
new file mode 100644
index 00000000000..3fc3be9d961
--- /dev/null
+++ b/mail/solid-pop3d/patches/patch-src_const_h
@@ -0,0 +1,20 @@
+--- src/const.h.orig	Tue Apr 18 12:04:05 2000
++++ src/const.h	Mon Jun 19 10:42:31 2000
+@@ -36,7 +36,7 @@
+ #define DEFWCCOUNT 5
+ 
+ #ifdef MDMAILBOX
+-#define DEFMAILDROPNAME "/var/spool/mail/%s"
++#define DEFMAILDROPNAME "/var/mail/%s"
+ #else
+ #define DEFMAILDROPNAME "Maildir"
+ #endif
+@@ -50,7 +50,7 @@
+ #define MAXMDTYPENAMELENGTH 40
+ #define USERCFG ".spop3d"
+ #define USERBULL ".spop3d-bull"
+-#define POPUSER "spop3d"
++#define POPUSER "nobody"
+ 
+ #define PER_SOURCE 5
+ #define MAX_SESSIONS 50
diff --git a/mail/solid-pop3d/pkg/DESCR b/mail/solid-pop3d/pkg/DESCR
index aa7da2b730b..e0766da4906 100644
--- a/mail/solid-pop3d/pkg/DESCR
+++ b/mail/solid-pop3d/pkg/DESCR
@@ -18,3 +18,5 @@ buffer overflow leaks and file races. None have been found as for now. All
 operations on files are done with user privileges. There is no SUID APOP secrets
 database management program (as in QPOP). Each user can specify his secret in 
 his own home directory.
+
+WWW: ${HOMEPAGE}
diff --git a/mail/solid-pop3d/pkg/MESSAGE b/mail/solid-pop3d/pkg/MESSAGE
index a74c8f98b38..6bf5ade27f3 100644
--- a/mail/solid-pop3d/pkg/MESSAGE
+++ b/mail/solid-pop3d/pkg/MESSAGE
@@ -1,9 +1,12 @@
 +---------------
-| This program requires an account named spop3d.  You'll also
-| have to edit /etc/inetd.conf manually and add a line like the
-| following:
+| You'll also have to edit /etc/inetd.conf manually and add 
+| lines like the following:
 |
-|   pop3 stream tcp nowait root /usr/local/sbin/spop3d spop3d
+|   pop3 stream tcp  nowait root ${PREFIX}/sbin/spop3d spop3d
+|   pop3 stream tcp6 nowait root ${PREFIX}/sbin/spop3d spop3d
+|
+| The second line is only necessary if you want to use IPv6
+| support.
 |
 | An optional global configuration file may be used in /etc
 | called spop3d.conf.