8 files changed, 78 insertions, 204 deletions

diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile
index 280d6d0da0d7..7341eabfb72c 100644
--- a/mail/rblcheck/Makefile
+++ b/mail/rblcheck/Makefile
@@ -6,35 +6,31 @@
 #
 
 PORTNAME=	rblcheck
-PORTVERSION=	1.4
-PORTREVISION=	2
+PORTVERSION=	1.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	leeym@leeym.com
+MAINTAINER=	moro@remus.dti.ne.jp
 
-post-configure:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.rbl
-.if !defined(BATCH)
-	@${ECHO} "NOTE: You can pre-compile your own sites into rblcheck by"
-	@${ECHO} "      creating ${WRKDIRPREFIX}${.CURDIR}/local.sites.  The"
-	@${ECHO} "      format of this file is:"
-	@${ECHO}
-	@${ECHO} "             SITE(\"my.rbl.site\")"
-	@${ECHO} "             SITE(\"another.rbl.site\")"
-.endif
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
-pre-build:
-.if exists(${WRKDIRPREFIX}${.CURDIR}/local.sites)
-	${CAT} ${WRKDIRPREFIX}${.CURDIR}/local.sites >> ${WRKSRC}/rblsites.h
-.endif
+post-build:
+	@${PERL} -pi -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/rbl
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/rbl ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin
+	@${INSTALL_DATA} ${FILESDIR}/rblcheckrc.sample ${PREFIX}/etc
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/rblcheck
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/rblcheck
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS COPYING ChangeLog INSTALL NEWS README
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/mail/rblcheck/distinfo b/mail/rblcheck/distinfo
index 8c992b299d3a..4b8e29770c17 100644
--- a/mail/rblcheck/distinfo
+++ b/mail/rblcheck/distinfo
@@ -1 +1 @@
-MD5 (rblcheck-1.4.tar.gz) = 6e415c34fd249333c057a4aedecd8877
+MD5 (rblcheck-1.5.tar.gz) = fb7ee9adc0e09eee9dda195f9b9e7ca4
diff --git a/mail/rblcheck/files/patch-aa b/mail/rblcheck/files/patch-aa
index 4caceae9bc30..3ab717674fb8 100644
--- a/mail/rblcheck/files/patch-aa
+++ b/mail/rblcheck/files/patch-aa
@@ -1,6 +1,6 @@
---- rblcheck.c.orig	Thu Aug 20 00:47:03 1998
-+++ rblcheck.c	Mon Jul 16 16:40:55 2001
-@@ -79,8 +79,10 @@
+--- rblcheck.c.orig	Thu Nov  8 14:05:27 2001
++++ rblcheck.c	Wed May  1 08:19:16 2002
+@@ -28,8 +28,10 @@
  #include <sys/types.h>
  #include <netinet/in.h>
  #include <arpa/nameser.h>
@@ -9,9 +9,9 @@
  #include <netdb.h>
 +#include <unistd.h>
  
- #define VERSION "1.4"
+ /*-- PORTABILITY ------------------------------------------------------------*/
  
-@@ -203,7 +205,7 @@
+@@ -184,7 +186,7 @@
   * domain. If "txt" is non-zero, we perform a TXT record lookup. We
   * return the text returned from a TXT match, or an empty string, on
   * a successful match, or NULL on an unsuccessful match. */
@@ -20,7 +20,7 @@
  {
  	char * domain;
  	char * result = NULL;
-@@ -214,12 +216,15 @@
+@@ -195,12 +197,15 @@
  	const u_char * cend;
  	const u_char * rend;
  	int len;
@@ -37,7 +37,7 @@
  
  	/* Make our DNS query. */
  	res_init();
-@@ -261,8 +266,8 @@
+@@ -242,8 +247,8 @@
  	cp = answer + sizeof( HEADER );
  	while( *cp != '\0' )
  	{
@@ -48,7 +48,7 @@
  			cp++;
  	}
  
-@@ -277,8 +282,8 @@
+@@ -258,8 +263,8 @@
  	cp += ( NS_INT16SZ * 2 ) + NS_INT32SZ;
  
  	/* Get the length and end of the buffer. */
@@ -59,7 +59,7 @@
  
  	/* Iterate over any multiple answers we might have. In
  	   this context, it's unlikely, but anyway. */
-@@ -286,10 +291,10 @@
+@@ -267,10 +272,10 @@
  	rend = result + RESULT_SIZE - 1;
  	while( cp < cend && rp < rend )
  	{
@@ -74,75 +74,49 @@
  			{
  				if( *cp == '\n' || *cp == '"' ||
  				  *cp == '\\' )
-@@ -308,23 +313,27 @@
- 	char **argv;
+@@ -289,22 +294,39 @@
+  * RBL listing, handling output of results if necessary. */
+ int full_rblcheck( char * addr )
  {
- 	extern int optind;
 -	int a, b, c, d;
-+	extern char *optarg;
 +	struct hostent *ent;
 +	struct in_addr a;
- 	int quiet = 0;
- 	int txt = 0;
- 	int rblfiltered = 0;
+ 	int count = 0;
++	int rblchecking = 0;
  	char * response;
- 	struct rbl * rblsites = NULL;
  	struct rbl * ptr;
 +	int fail;
 +	int c;
  
--	/* Add more sites you want in the default list of RBL-alike
--	   systems here. ### An easier way to change this is needed. ### */
--	rblsites = togglesite( "rbl.maps.vix.com", rblsites );
--	rblsites = togglesite( "rbl.dorkslayers.com", rblsites );
-+/* Hack to handle the easy addition of sites at compile time */
-+#define SITE(x) rblsites = togglesite( (x), rblsites);
-+#include "rblsites.h"
-+#undef SITE
- 
- 	progname = argv[ 0 ];
- 
--	while( ( a = getopt( argc, argv, "qtls:c?hv" ) ) != EOF )
--		switch( a )
-+	while( ( c = getopt( argc, argv, "qtls:c?hv" ) ) != EOF )
-+		switch( c )
- 		{
- 			case 'q':
- 				/* Quiet */
-@@ -372,10 +381,23 @@
- 		return -1;
- 	}
- 
--	if( sscanf( argv[ optind ], "%d.%d.%d.%d", &a, &b, &c, &d ) != 4 ||
--	  a < 0 || a > 255 || b < 0 || b > 255 || c < 0 || c > 255 ||
--	  d < 0 || d > 255 )
--	{
-+	fail = 0;
-+	if ((ent = gethostbyname(argv[optind])) != NULL) {
-+		memcpy(&a, ent->h_addr_list[0], sizeof(a));
-+		if (ent->h_addr_list[1]) {
-+			if (!quiet)
-+				fprintf(stderr,
-+				    "%s resolved to mutiple addresses: ",
-+				    argv[optind]);
-+		}
-+		if (!quiet)
-+			fprintf(stderr, "checking %s\n", inet_ntoa(a));
-+	} else {
-+		if (!inet_aton(argv[optind], &a))
-+			fail++;
-+	}
-+
-+	if (fail) {
- 		fprintf( stderr, "%s: invalid IP address\n", progname );
- 		usage();	
- 		return -1;
-@@ -383,7 +405,7 @@
- 
  	for( ptr = rblsites; ptr != NULL; ptr = ptr->next )
  	{
+-		if( sscanf( addr, "%d.%d.%d.%d", &a, &b, &c, &d ) != 4
+-		  || a < 0 || a > 255 || b < 0 || b > 255 || c < 0 || c > 255
+-		  || d < 0 || d > 255 )
+-		{
++		fail = 0;
++		if ((ent = gethostbyname(addr)) != NULL) {
++			memcpy(&a, ent->h_addr_list[0], sizeof(a));
++			if (ent->h_addr_list[1]) {
++				if (!quiet && rblchecking == 0)
++					fprintf(stderr,
++					    "%s resolved to mutiple addresses: ",
++					    addr);
++			}
++			if (!quiet && rblchecking++ == 0)
++				fprintf(stderr, "checking %s\n", inet_ntoa(a));
++		} else {
++			if (!inet_aton(addr, &a))
++				fail++;
++		}
++
++		if (fail) {
+ 			fprintf( stderr, "%s: warning: invalid address `%s'\n",
+ 			  progname, addr );
+ 			return 0;
+ 		}
 -		response = rblcheck( a, b, c, d, ptr->site, txt );
 +		response = rblcheck( a, ptr->site, txt );
- 		printf( "%s%s%s%s%s%s", !quiet && !response ? "not " : "",
- 		  !quiet ? "RBL filtered by " : "", !quiet ? ptr->site : "",
- 		  txt && response && strlen( response ) && !quiet ? ": " : "",
+ 		if( !quiet || response )
+ 			printf( "%s %s%s%s%s%s%s", addr,
+ 			  ( !quiet && !response ? "not " : "" ),
diff --git a/mail/rblcheck/files/patch-ab b/mail/rblcheck/files/patch-ab
deleted file mode 100644
index 2d225953fbb6..000000000000
--- a/mail/rblcheck/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.orig	Thu Aug 20 01:47:03 1998
-+++ Makefile	Wed Nov  4 15:56:48 1998
-@@ -41,4 +41,3 @@
- # below for an entry for your system.
--CC=gcc
--CFLAGS=-O -Wall
-+CFLAGS+=-Wall
- LDFLAGS=-s
diff --git a/mail/rblcheck/files/rblcheckrc.sample b/mail/rblcheck/files/rblcheckrc.sample
new file mode 100644
index 000000000000..54a79d7d94a5
--- /dev/null
+++ b/mail/rblcheck/files/rblcheckrc.sample
@@ -0,0 +1,9 @@
+-s dev.null.dk
+-s blackholes.mail-abuse.org
+-s relays.mail-abuse.org
+-s dialups.mail-abuse.org
+-s 3y.spam.mrs.kithrup.com
+-s or.orbl.org
+-s orbz.gst-group.co.uk
+-s manual.orbz.gst-group.co.uk
+-s relays.ordb.org
diff --git a/mail/rblcheck/pkg-message b/mail/rblcheck/pkg-message
new file mode 100644
index 000000000000..5e09ec0dc01d
--- /dev/null
+++ b/mail/rblcheck/pkg-message
@@ -0,0 +1,3 @@
+
+Please copy rblcheckrc.sample to rblcheckrc and modify it as you wish.
+
diff --git a/mail/rblcheck/pkg-plist b/mail/rblcheck/pkg-plist
index 2f0134310a44..de1490bfb11f 100644
--- a/mail/rblcheck/pkg-plist
+++ b/mail/rblcheck/pkg-plist
@@ -1,8 +1,10 @@
+bin/rbl
 bin/rblcheck
-%%PORTDOCS%%share/doc/rblcheck/BUGS
-%%PORTDOCS%%share/doc/rblcheck/CHANGES
-%%PORTDOCS%%share/doc/rblcheck/CREDITS
+etc/rblcheckrc.sample
+%%PORTDOCS%%share/doc/rblcheck/AUTHORS
+%%PORTDOCS%%share/doc/rblcheck/COPYING
+%%PORTDOCS%%share/doc/rblcheck/ChangeLog
 %%PORTDOCS%%share/doc/rblcheck/INSTALL
-%%PORTDOCS%%share/doc/rblcheck/PLATFORMS
-%%PORTDOCS%%share/doc/rblcheck/TODO
+%%PORTDOCS%%share/doc/rblcheck/NEWS
+%%PORTDOCS%%share/doc/rblcheck/README
 %%PORTDOCS%%@dirrm share/doc/rblcheck
diff --git a/mail/rblcheck/scripts/configure.rbl b/mail/rblcheck/scripts/configure.rbl
deleted file mode 100644
index 723c4519fbfc..000000000000
--- a/mail/rblcheck/scripts/configure.rbl
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/rblcheck/scripts/Attic/configure.rbl,v 1.4 2001-08-24 16:08:10 dwcjr Exp $
-
-if [ -f ${WRKSRC}/rblsites.h ]; then
-	exit
-fi
-
-tempfile=`mktemp -t checklist`
-
-SET_MAPS_RBL="OFF"
-SET_MAPS_DUL="OFF"
-SET_MAPS_RSS="OFF"
-SET_ORBL="OFF"
-SET_ORBZ="OFF"
-SET_ORBZ_MAN="OFF"
-SET_ORDB="OFF"
-
-TODAY=`date "+%Y%m%d"`
-
-if [ "${BATCH}" ]; then
-	# MAPS is changing to a subscription service on 20010731
-	if [ ${TODAY} -lt 20010801 ]; then
-		OPTIONS="\"MAPS_RBL\" \"MAPS_DUL\" \"MAPS_RSS\""
-	else
-		OPTIONS="\"ORBZ\""
-	fi
-	if [ "x${OPTIONS}" != "x" ]; then
-		set ${OPTIONS}
-	fi
-else
-	# MAPS is changing to a subscription service on 20010731
-	if [ ${TODAY} -lt 20010801 ]; then
-		SET_MAPS_RBL="ON"
-		SET_MAPS_DUL="ON"
-		SET_MAPS_RSS="ON"
-	else
-		SET_ORBZ="ON"
-	fi
-
-	/usr/bin/dialog --title "RBL Sites" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-MAPS_RBL	"MAPS Blackhole list   www.mail-abuse.org" ${SET_MAPS_RBL} \
-MAPS_DUL	"MAPS DialUp List      www.mail-abuse.org" ${SET_MAPS_DUL} \
-MAPS_RSS	"MAPS Open Relay list  www.mail-abuse.org" ${SET_MAPS_RSS} \
-ORBL		"ORBL Open Relay list  www.orbl.org" ${SET_ORBL} \
-ORBZ		"ORBZ Open Relay list  orbz.gst-group.co.uk" ${SET_ORBZ} \
-ORBZ_MAN	"ORBZ Manual list      orbz.gst-group.co.uk" ${SET_ORBZ_MAN} \
-ORDB		"ORDB Open Relay list  www.ordb.org" ${SET_ORDB} \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-exec > ${WRKSRC}/rblsites.h
-
-while [ "$1" ]; do
-	case $1 in
-		\"MAPS_RBL\")
-			echo "SITE(\"blackholes.mail-abuse.org\")"
-			;;
-		\"MAPS_DUL\")
-			echo "SITE(\"dialups.mail-abuse.org\")"
-			;;
-		\"MAPS_RSS\")
-			echo "SITE(\"relays.mail-abuse.org\")"
-			;;
-		\"ORBL\")
-			echo "SITE(\"or.orbl.org\")"
-			;;
-		\"ORBZ\")
-			echo "SITE(\"orbz.gst-group.co.uk\")"
-			;;
-		\"ORBZ_MAN\")
-			echo "SITE(\"manual.orbz.gst-group.co.uk\")"
-			;;
-		\"ORDB\")
-			echo "SITE(\"relays.ordb.org\")"
-			;;
-		*)
-			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKSRC}/rblsites.h
-			exit 1
-			;;
-	esac
-	shift
-done