3 files changed, 13 insertions, 65 deletions

diff --git a/sysutils/ucspi-tcp/Makefile b/sysutils/ucspi-tcp/Makefile
index 5224a4e18380..76ac63f2e925 100644
--- a/sysutils/ucspi-tcp/Makefile
+++ b/sysutils/ucspi-tcp/Makefile
@@ -12,6 +12,12 @@ CATEGORIES=	sysutils net
 MASTER_SITES=	http://cr.yp.to/ucspi-tcp/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
+.if defined(WITH_RSS_DIFF)
+PATCH_SITES=	http://www.qmail.org/
+PATCHFILES=	ucspi-rss.diff
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	Command-line tools for building TCP client-server applications
 
@@ -31,6 +37,8 @@ ALL_TARGET=	prog install instcheck
 SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
 		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
 
+.include <bsd.port.pre.mk>
+
 post-configure:
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
@@ -47,4 +55,4 @@ do-install:
 	@cd ${WRKSRC}-man; ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/ucspi-tcp/distinfo b/sysutils/ucspi-tcp/distinfo
index 874d1b700941..48d986142192 100644
--- a/sysutils/ucspi-tcp/distinfo
+++ b/sysutils/ucspi-tcp/distinfo
@@ -1,2 +1,6 @@
 MD5 (ucspi-tcp-0.88.tar.gz) = 39b619147db54687c4a583a7a94c9163
+SIZE (ucspi-tcp-0.88.tar.gz) = 53019
 MD5 (ucspi-tcp-0.88-man.tar.gz) = d33160cbd43bccbc0963d0499dfcebdb
+SIZE (ucspi-tcp-0.88-man.tar.gz) = 7562
+MD5 (ucspi-rss.diff) = 554ec0eb60f619667efde3fb5325310d
+SIZE (ucspi-rss.diff) = 1828
diff --git a/sysutils/ucspi-tcp/files/patch-ucspi-rss.diff b/sysutils/ucspi-tcp/files/patch-ucspi-rss.diff
deleted file mode 100644
index 80e1632b6dc0..000000000000
--- a/sysutils/ucspi-tcp/files/patch-ucspi-rss.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ruN --exclude conf-* ucspi-tcp-0.88/rblsmtpd.c ucspi-tcp-0.88.fix/rblsmtpd.c
---- rblsmtpd.c.orig	Sat Mar 18 10:18:42 2000
-+++ rblsmtpd.c	Wed Aug  9 16:42:33 2000
-@@ -60,16 +60,54 @@
- 
- void rbl(char *base)
- {
-+  int i;
-+  char *altreply = 0;
-   if (decision) return;
-   if (!stralloc_copy(&tmp,&ip_reverse)) nomem();
-+  i = str_chr(base, ':');
-+  if (base[i]) {
-+    base[i] = 0;
-+    altreply = base+i+1;
-+  }
-   if (!stralloc_cats(&tmp,base)) nomem();
--  if (dns_txt(&text,&tmp) == -1) {
--    flagmustnotbounce = 1;
--    if (flagfailclosed) {
--      if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
--      decision = 2;
-+  if (altreply) {
-+    if (dns_ip4(&text,&tmp) == -1) {
-+      flagmustnotbounce = 1;
-+      if (flagfailclosed) {
-+        if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
-+        decision = 2;
-+      }
-+      return;
-+    }
-+    if (text.len) {
-+      if(!stralloc_copys(&text, "")) nomem();
-+      while(*altreply) {
-+        char *x;
-+        i = str_chr(altreply, '%');
-+        if(!stralloc_catb(&text, altreply, i)) nomem();
-+        if(altreply[i] &&
-+           altreply[i+1]=='I' &&
-+           altreply[i+2]=='P' &&
-+           altreply[i+3]=='%') {
-+          if(!stralloc_catb(&text, ip_env, str_len(ip_env))) nomem();
-+          altreply+=i+4;
-+        } else if(altreply[i]) {
-+          if(!stralloc_cats(&text, "%")) nomem();
-+          altreply+=i+1;
-+        } else {
-+          altreply+=i;
-+        }
-+      }
-+    }
-+  } else {
-+    if (dns_txt(&text,&tmp) == -1) {
-+      flagmustnotbounce = 1;
-+      if (flagfailclosed) {
-+        if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
-+        decision = 2;
-+      }
-+      return;
-     }
--    return;
-   }
-   if (text.len)
-     if (flagrblbounce)