Update to version 0.3.0 -- patch-ab is no longer needed.

8 files changed, 30 insertions, 92 deletions

diff --git a/mail/teapop-devel/Makefile b/mail/teapop-devel/Makefile
index 2b21ab2..23cde53 100644
--- a/mail/teapop-devel/Makefile
+++ b/mail/teapop-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	teapop
-PORTVERSION=	0.28
-PORTREVISION=	1
+PORTVERSION=	0.3.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 		http://www.toontown.org/pub/teapop/
diff --git a/mail/teapop-devel/distinfo b/mail/teapop-devel/distinfo
index 342ec4a..ae0fec3 100644
--- a/mail/teapop-devel/distinfo
+++ b/mail/teapop-devel/distinfo
@@ -1 +1 @@
-MD5 (teapop-0.28.tar.gz) = 666d0c9c80d1d15b1cae72c988e4d0c8
+MD5 (teapop-0.3.0.tar.gz) = a49265e190c2ddab6914471dabd955c0
diff --git a/mail/teapop-devel/files/patch-aa b/mail/teapop-devel/files/patch-aa
index 2a5ad53..65ca84e 100644
--- a/mail/teapop-devel/files/patch-aa
+++ b/mail/teapop-devel/files/patch-aa
@@ -1,21 +1,21 @@
---- etc/Makefile.in.orig	Sat Mar 10 19:51:58 2001
-+++ etc/Makefile.in	Sat Mar 10 19:55:01 2001
+--- etc/Makefile.in.orig	Wed Apr  4 12:39:19 2001
++++ etc/Makefile.in	Wed Apr  4 12:41:14 2001
 @@ -23,15 +23,9 @@
  	fi
  
  install: build
--	@echo Checking for existing teapop.passwd; \
--	if [ -f ${sysconfdir}/teapop.passwd ]; then \
--		echo "Exists...NOT installing teapop.passwd"; \
--	else \
--		echo "Not found, installing teapop.passwd"; \
--		${INSTALL} -d ${sysconfdir}; \
--		${INSTALL} teapop.passwd ${sysconfdir}; \
--		${CHMOD} 0755 ${sysconfdir}/teapop.passwd; \
+-	@ echo Checking for existing teapop.passwd;			\
+-	if [ -f ${sysconfdir}/teapop.passwd ]; then			\
+-		echo "Exists...NOT installing teapop.passwd";		\
+-	else								\
+-		echo "Not found, installing teapop.passwd";		\
+-		${INSTALL} -d ${sysconfdir};				\
+-		${INSTALL} teapop.passwd ${sysconfdir};			\
+-		${CHMOD} 0755 ${sysconfdir}/teapop.passwd;		\
 -	fi
 +	@echo Installing teapop.passwd.sample; \
-+	${INSTALL} -d ${sysconfdir}
-+	${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample;
++	${INSTALL} -d ${sysconfdir}; \
++	${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample; \
  
  makefile: ../config/timestamp
- 	@echo Updating Makefile
+ 	@ echo Updating Makefile
diff --git a/mail/teapop-devel/files/patch-ab b/mail/teapop-devel/files/patch-ab
deleted file mode 100644
index aad97bb..0000000
--- a/mail/teapop-devel/files/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
---- teapop/pop_auth.c.orig	Mon Nov 13 02:03:11 2000
-+++ teapop/pop_auth.c	Wed Mar 28 23:58:33 2001
-@@ -111,7 +111,11 @@
- #endif /* ALLOW_APOP */
- 				pop_cmd_capa(NULL, pinfo);
- 				continue;
-+#ifdef ALLOW_APOP
- 			case 4:
-+#else
-+			case 3:
-+#endif /* ALLOW_APOP */
- 				return 1;
- 			}
- 			/* If we get this far we have a good USER or APOP */
-@@ -158,7 +162,14 @@
- 
- #ifdef VPOP
- 		ptr = pop_string_find(pinfo->userid, DIVIDERS);
--		if (ptr != NULL) {
-+		if (ptr == NULL) {
-+			syslog(LOG_ERR, "pop_auth: malloc failure");
-+			pop_socket_send(pinfo->out, "%s %s", POP_ERR,
-+				POP_WRONG);
-+			exit(0);
-+		}
-+		if (*ptr != '\0') {
-+			/* domain delimiters found */
- 			strcpy(pinfo->domain, ptr+1);
- 			*ptr = '\0';
- 		} else
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index 2b21ab2..23cde53 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	teapop
-PORTVERSION=	0.28
-PORTREVISION=	1
+PORTVERSION=	0.3.0
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.toontown.org/pub/teapop/ \
 		http://www.toontown.org/pub/teapop/
diff --git a/mail/teapop/distinfo b/mail/teapop/distinfo
index 342ec4a..ae0fec3 100644
--- a/mail/teapop/distinfo
+++ b/mail/teapop/distinfo
@@ -1 +1 @@
-MD5 (teapop-0.28.tar.gz) = 666d0c9c80d1d15b1cae72c988e4d0c8
+MD5 (teapop-0.3.0.tar.gz) = a49265e190c2ddab6914471dabd955c0
diff --git a/mail/teapop/files/patch-aa b/mail/teapop/files/patch-aa
index 2a5ad53..65ca84e 100644
--- a/mail/teapop/files/patch-aa
+++ b/mail/teapop/files/patch-aa
@@ -1,21 +1,21 @@
---- etc/Makefile.in.orig	Sat Mar 10 19:51:58 2001
-+++ etc/Makefile.in	Sat Mar 10 19:55:01 2001
+--- etc/Makefile.in.orig	Wed Apr  4 12:39:19 2001
++++ etc/Makefile.in	Wed Apr  4 12:41:14 2001
 @@ -23,15 +23,9 @@
  	fi
  
  install: build
--	@echo Checking for existing teapop.passwd; \
--	if [ -f ${sysconfdir}/teapop.passwd ]; then \
--		echo "Exists...NOT installing teapop.passwd"; \
--	else \
--		echo "Not found, installing teapop.passwd"; \
--		${INSTALL} -d ${sysconfdir}; \
--		${INSTALL} teapop.passwd ${sysconfdir}; \
--		${CHMOD} 0755 ${sysconfdir}/teapop.passwd; \
+-	@ echo Checking for existing teapop.passwd;			\
+-	if [ -f ${sysconfdir}/teapop.passwd ]; then			\
+-		echo "Exists...NOT installing teapop.passwd";		\
+-	else								\
+-		echo "Not found, installing teapop.passwd";		\
+-		${INSTALL} -d ${sysconfdir};				\
+-		${INSTALL} teapop.passwd ${sysconfdir};			\
+-		${CHMOD} 0755 ${sysconfdir}/teapop.passwd;		\
 -	fi
 +	@echo Installing teapop.passwd.sample; \
-+	${INSTALL} -d ${sysconfdir}
-+	${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample;
++	${INSTALL} -d ${sysconfdir}; \
++	${INSTALL} -m 0644 teapop.passwd ${sysconfdir}/teapop.passwd.sample; \
  
  makefile: ../config/timestamp
- 	@echo Updating Makefile
+ 	@ echo Updating Makefile
diff --git a/mail/teapop/files/patch-ab b/mail/teapop/files/patch-ab
deleted file mode 100644
index aad97bb..0000000
--- a/mail/teapop/files/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
---- teapop/pop_auth.c.orig	Mon Nov 13 02:03:11 2000
-+++ teapop/pop_auth.c	Wed Mar 28 23:58:33 2001
-@@ -111,7 +111,11 @@
- #endif /* ALLOW_APOP */
- 				pop_cmd_capa(NULL, pinfo);
- 				continue;
-+#ifdef ALLOW_APOP
- 			case 4:
-+#else
-+			case 3:
-+#endif /* ALLOW_APOP */
- 				return 1;
- 			}
- 			/* If we get this far we have a good USER or APOP */
-@@ -158,7 +162,14 @@
- 
- #ifdef VPOP
- 		ptr = pop_string_find(pinfo->userid, DIVIDERS);
--		if (ptr != NULL) {
-+		if (ptr == NULL) {
-+			syslog(LOG_ERR, "pop_auth: malloc failure");
-+			pop_socket_send(pinfo->out, "%s %s", POP_ERR,
-+				POP_WRONG);
-+			exit(0);
-+		}
-+		if (*ptr != '\0') {
-+			/* domain delimiters found */
- 			strcpy(pinfo->domain, ptr+1);
- 			*ptr = '\0';
- 		} else