Upgrade plor (SOUP/QWK reader) port.

PR:		ports/4017

6 files changed, 47 insertions, 106 deletions

diff --git a/news/plor/Makefile b/news/plor/Makefile
index 9330b7b31bb5..69c9563cb627 100644
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@@ -1,37 +1,36 @@
 # New ports collection makefile for:	plor
-# Version Required:	0.1 alpha
+# Version Required:	0.3.0
 # Date Created:		30 Dec 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
-# $Id: Makefile,v 1.1.1.1 1997/01/17 14:32:41 max Exp $
+# $Id: Makefile,v 1.2 1997/01/24 10:28:05 asami Exp $
 #
 
-DISTNAME=	plor
-PKGNAME=	plor-0.1
+DISTNAME=	plor-0.3.1
 CATEGORIES=	news
-# supposedly the primary site is sunsite, but the version there is
-# out-of-date, so... sunsite.unc.edu /pub/Linux/system/BBS/mail/ if you 
-# want to try again...
-MASTER_SITES=   ftp://ftp.dei.unipd.it/pub/pluto/developers/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://ftp.psy.unipd.it/pub/pluto/developers/ \
+		ftp://ftp.unipd.it/pub/Linux/pluto/developers/ \
+		ftp://ftp.linux.it/pub/Pluto/developers/
 
-MAINTAINER=	ac199@freenet.hamilton.on.ca
+MAINTAINER=	hoek@FreeBSD.ORG
+
+RUN_DEPENDS=    zip:${PORTSDIR}/archivers/zip
+
+GNU_CONFIGURE=	yes
 
 MAN1=		plor.1
 
-DOCFILES=	BUGS HISTORY PER_ZENO TODO plor-1.html plor-2.html \
+DOCFILES=	../AUTHORS ../NEWS TODO plor-1.html plor-2.html \
 		plor.html plor.txt
 
-do-install:
+post-install:
 .if !defined{NOPORTDOCS}
 	@${MKDIR} ${PREFIX}/share/doc/plor
-	(for f in ${DOCFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/docs/$$f ${PREFIX}/share/doc/plor; \
-		done)
-	${INSTALL_DATA} ${FILESDIR}/porting.notes ${PREFIX}/share/doc/plor
+.for f in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/plor
+.endfor
 .endif
 	${INSTALL_MAN} ${FILESDIR}/plor.1 ${PREFIX}/man/man1/plor.1
-	perl -pi -e '$$a = '\''${PREFIX}/doc/plor/'\''; $$a =~ s/([^\w\/])/\\$$1/g; s/FUNKYTOKENHERE/$$a/' ${PREFIX}/man/man1/plor.1
-	${INSTALL_PROGRAM} ${WRKSRC}/plor ${PREFIX}/bin
+	perl -pi -e '$$a = '\''${PREFIX}/share/doc/plor/'\''; $$a =~ s/([^\w\/])/\\$$1/g; s/FUNKYTOKENHERE/$$a/' ${PREFIX}/man/man1/plor.1
 
 .include <bsd.port.mk>
diff --git a/news/plor/distinfo b/news/plor/distinfo
index 262896cdd7ab..827d28f0e483 100644
--- a/news/plor/distinfo
+++ b/news/plor/distinfo
@@ -1 +1 @@
-MD5 (plor.tgz) = 2be4f7717f4a5e51c67f80d871ad6dc9
+MD5 (plor-0.3.1.tar.gz) = 40ad554318ebc47c13bd866108dc4f2d
diff --git a/news/plor/files/patch-aa b/news/plor/files/patch-aa
index 461886f5c908..fce28a76fc51 100644
--- a/news/plor/files/patch-aa
+++ b/news/plor/files/patch-aa
@@ -1,45 +1,12 @@
---- Makefile.orig	Thu Oct 31 06:36:14 1996
-+++ Makefile	Fri Jan 17 22:56:42 1997
-@@ -14,12 +14,12 @@
- INCLUDE = ./include/
- #LIBS =
- 
--ifdef DEBUG
-+.ifdef DEBUG
- #CFLAGS = -g -Wall -m486 -O2 -ansi -pedantic -finline-functions
--FLAGS = -g -Wall -m486 -O3 -ansi -pedantic -fomit-frame-pointer 
--else
--FLAGS = -m486 -O3 -fomit-frame-pointer  
--endif
-+FLAGS = -g -Wall -m486 -O3 -ansi -pedantic -fomit-frame-pointer -D_HAVE_PARAM_H
-+.else
-+FLAGS = -m486 -O3 -fomit-frame-pointer -D_HAVE_PARAM_H
-+.endif
- 
- CFLAGS = -I$(INCLUDE) $(FLAGS)
- 
-@@ -28,18 +28,18 @@
- 
- ############# END USER CONFIGURATION ##################
- 
--ifdef DEBUG
-+.ifdef DEBUG
- all: TODO $(OBJECTS) del plor 
--else
-+.else
- all: $(OBJECTS) del plor
--endif
-+.endif
- 
- plor: $(OBJECTS) 
- 	$(CC) $(FLAGS) $(OBJECTS) $(LIBS) -o plor 
--ifdef DEBUG
--else
-+.ifdef DEBUG
-+.else
- 	strip plor
--endif
-+.endif
- 
- # OBJECTS to compile
- main.o: main.c  
+diff -ur plor-0.3.1/main.c plor-new/main.c
+--- plor-0.3.1/main.c	Thu May  1 11:38:35 1997
++++ main.c	Thu Jul  3 12:20:45 1997
+@@ -28,7 +28,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <getopt.h>
++#include <unistd.h>
+ 
+ /* will be included when we will have locale support
+ #include <locale.h>
diff --git a/news/plor/files/patch-ab b/news/plor/files/patch-ab
index 55b330614a18..4c37c31bbda1 100644
--- a/news/plor/files/patch-ab
+++ b/news/plor/files/patch-ab
@@ -1,37 +1,13 @@
-diff -ud work/plor/main.c src/main.c
---- work/plor/main.c	Sun Oct 27 09:24:00 1996
-+++ ./main.c	Mon Dec 30 09:40:07 1996
-@@ -19,10 +19,20 @@
- 
+diff -ur plor-0.3.1/video.c plor-new/video.c
+--- plor-0.3.1/video.c	Sat Mar 15 07:15:40 1997
++++ video.c	Thu Jul  3 12:17:24 1997
+@@ -8,9 +8,7 @@
+  * see file COPYING for more information on copyright policy
   */
  
-+#ifdef _HAVE_PARAM_H
-+#include <sys/param.h>
-+#endif
+-#ifdef _HAVE_PARAM_H
+ #include <sys/param.h>
+-#endif
  #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#if !defined(BSD)
- #include <getopt.h>
-+#else
-+#if BSD >= 199506
-+/* Lite2, need getopt() prototypes */
-+#include <unistd.h>
-+#endif
-+#endif
- 
- /* will be included when we will have locale support
- #include <locale.h>
-@@ -75,10 +80,10 @@
-       Show_SConf();
-       break;
-     case '3':
--      printf("Help on Line, not yet supported!!!");
-+      printf("Help on Line, not yet supported!!!\n");
-       continue;
-     case '4':
--      printf("Replies not yet implemented!!!");
-+      printf("Replies not yet implemented!!!\n");
-       continue;
-     case '5':
-     case 'q':
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/news/plor/pkg-descr b/news/plor/pkg-descr
index 755b42092694..545f31590935 100644
--- a/news/plor/pkg-descr
+++ b/news/plor/pkg-descr
@@ -1,7 +1,7 @@
 This is a port of plor (which stands for Pluto Offline Linux Reader).
-Plor reads soup and qwk message packets.  It is alpha software, and
-does not yet support the creation of reply packets, nor does it
-support advanced features such as kill-files.
+Plor reads soup and qwk message packets.  It is alpha software.
+
+You can use this as an alternative to the slnr package.
 
 - Tim Vanderhoek
-ac199@freenet.hamilton.on.ca
+hoek@FreeBSD.ORG
diff --git a/news/plor/pkg-plist b/news/plor/pkg-plist
index ac59dd9213a1..cd4b4a05b3b6 100644
--- a/news/plor/pkg-plist
+++ b/news/plor/pkg-plist
@@ -1,11 +1,10 @@
 bin/plor
 man/man1/plor.1.gz
-share/doc/plor/BUGS
-share/doc/plor/HISTORY
-share/doc/plor/PER_ZENO
+share/doc/plor/AUTHORS
+share/doc/plor/NEWS
 share/doc/plor/TODO
 share/doc/plor/plor-1.html
 share/doc/plor/plor-2.html
 share/doc/plor/plor.html
 share/doc/plor/plor.txt
-share/doc/plor/porting.notes
+@dirrm share/doc/plor