upgrade to 0.98

PR:		75530

5 files changed, 13 insertions, 85 deletions

diff --git a/mail/nbsmtp/Makefile b/mail/nbsmtp/Makefile
index b8f7ce3d8e8e..2e5d2f42fd1a 100644
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -6,19 +6,23 @@
 #
 
 PORTNAME=	nbsmtp
-PORTVERSION=	0.8
+PORTVERSION=	0.98
 CATEGORIES=	mail
-MASTER_SITES=	http://physeeks.dyndns.org:8000/download/ \
-		ftp://ftp.nuug.no/pub/anders/distfiles/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.gentoo-es.org/~ferdy/ \
+		http://www.it.uc3m.es/~ferdy/nbsmtp/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple program for outgoing SMTP delivery
 
-NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/nbsmtp
+GNU_CONFIGURE=	yes
+
+MAN5=	nbsmtprc.5
+MAN8=	nbsmtp.8
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nbsmtp ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/nbsmtp ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/nbsmtp.8 ${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/nbsmtprc.5 ${MAN5PREFIX}/man/man5
 
 .include <bsd.port.mk>
diff --git a/mail/nbsmtp/distinfo b/mail/nbsmtp/distinfo
index cdb17d44f770..febc0a363917 100644
--- a/mail/nbsmtp/distinfo
+++ b/mail/nbsmtp/distinfo
@@ -1,2 +1,2 @@
-MD5 (nbsmtp-0.8.tgz) = 88e43a1d9d22210a4c9beba57ba96058
-SIZE (nbsmtp-0.8.tgz) = 9687
+MD5 (nbsmtp-0.98.tar.gz) = fe055f4e01e6cfd9eb9c80681a42f7eb
+SIZE (nbsmtp-0.98.tar.gz) = 111390
diff --git a/mail/nbsmtp/files/patch-aa b/mail/nbsmtp/files/patch-aa
deleted file mode 100644
index 87f91ecc7706..000000000000
--- a/mail/nbsmtp/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	Sat May  5 19:30:42 2001
-+++ Makefile	Sat May  5 19:31:41 2001
-@@ -1,5 +1,5 @@
--linux: nbsmtp.c
--	gcc -o nbsmtp nbsmtp.c
-+all: nbsmtp.c
-+	gcc $(CFLAGS) -o nbsmtp nbsmtp.c
- 
- solaris: nbsmtp.c
- 	gcc -o nbsmtp nbsmtp.c -lxnet 
diff --git a/mail/nbsmtp/files/patch-nbsmtp.c b/mail/nbsmtp/files/patch-nbsmtp.c
deleted file mode 100644
index 3d18f430a5a3..000000000000
--- a/mail/nbsmtp/files/patch-nbsmtp.c
+++ /dev/null
@@ -1,66 +0,0 @@
---- nbsmtp.c.orig	Sat Apr  7 02:09:01 2001
-+++ nbsmtp.c	Wed Apr 10 22:03:27 2002
-@@ -19,6 +19,8 @@
- */
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -76,42 +78,45 @@
- {
-   printf("Usage:\n");
-   printf("%s -d domain -f from@addr -h host [-p port] [-l debuglevel]\n", prog);
-+  exit(EXIT_FAILURE);
- }
- 
- int main(int argc, char *argv[])
- {
--  int i;
-+  int ch;
- 
--  for(i=1; i<argc; i+=2){
--    switch(*(argv[i]+1))
-+  while ( (ch = getopt(argc, argv, "h:d:f:p:l:")) != -1){
-+    switch (ch)
-       {
-       case 'h':
--	host = (char *)strdup(argv[i+1]);
-+	host = strdup(optarg);
- 	break;
-       case 'd':
--	domain = (char *)strdup(argv[i+1]);
-+	domain = strdup(optarg);
- 	break;
-       case 'f':
--	fromaddr = (char *)strdup(argv[i+1]);
-+	fromaddr = strdup(optarg);
- 	break;
-       case 'p':
--	port = atoi(argv[i+1]);
-+	port = atoi(optarg);
- 	break;
-       case 'l':
--	debug_level =  atoi(argv[i+1]);
-+	debug_level = atoi(optarg);
- 	if(debug_level > 1)
- 	  stdlog = fopen("nbsmtp.log", "w");
- 	else
- 	  stdlog = stdout;
- 	break;
-+      case '?':
-       default:
- 	print_usage(argv[0]);
-+	break;
-       }
-   }
- 
-+  argc -= optind;
-   if(domain==NULL || fromaddr==NULL || host==NULL){
-     print_usage(argv[0]);
--    return 1;
-   }
- 
-   if(port==0)
diff --git a/mail/nbsmtp/pkg-descr b/mail/nbsmtp/pkg-descr
index d27cbe58b981..7237daae737f 100644
--- a/mail/nbsmtp/pkg-descr
+++ b/mail/nbsmtp/pkg-descr
@@ -13,6 +13,6 @@ host: This is the smtp server you are sending to.
 port: The smtp port you want to connect to. 25 is standard, don't change it
 unless you know what you are doing.
 
-WWW: http://physeeks.dyndns.org:8000/software.html
+WWW: http://nbsmtp.ferdyx.org/
 
 - Anders Nordby <anders@fix.no>