8 files changed, 104 insertions, 22 deletions

diff --git a/news/nntpbtr/Makefile b/news/nntpbtr/Makefile
index ccd4e07efe7c..306af2d3b78c 100644
--- a/news/nntpbtr/Makefile
+++ b/news/nntpbtr/Makefile
@@ -5,21 +5,21 @@ PORTNAME=	nntpbtr
 PORTVERSION=	1.7
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/news/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	dk@farm.org
 COMMENT=	NNTP bulk transfer
 
-MAN1=		nntpbtr.1
-PLIST_FILES=	sbin/nntpbtr
+USES=	tar:Z
+PLIST_FILES=	sbin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
-# "patch" complains otherwise
-NO_STAGE=	yes
-post-extract:
-	@${RM} -rf ${WRKSRC}/RCS
+ALL_TARGET=	${PORTNAME}
 
 pre-build:
-	cd ${FILESDIR} ; ${PAX} -rw -l -u dbz ${WRKDIR} || ${TRUE}
-	cd ${WRKDIR}/dbz ; ${CC} ${CFLAGS} -c -I. dbz.c
+	(cd ${FILESDIR} ; ${PAX} -rw -l -u dbz ${WRKDIR}) || ${TRUE}
+	(cd ${WRKDIR}/dbz ; ${CC} ${CFLAGS} -c -I. dbz.c)
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/news/nntpbtr/files/patch-Makefile b/news/nntpbtr/files/patch-Makefile
new file mode 100644
index 000000000000..b7b8c09eac94
--- /dev/null
+++ b/news/nntpbtr/files/patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig	1994-11-25 07:09:25.000000000 -0500
++++ Makefile	2014-03-29 11:43:43.000000000 -0400
+@@ -3,10 +3,10 @@
+ #
+ 
+ # C compiler
+-CC=gcc
++CC?=gcc
+ 
+ # C compilation flags
+-CFLAGS= -O -I../dbz
++CFLAGS+= -I../dbz
+ 
+ # Loader flags
+ LDFLAGS=
diff --git a/news/nntpbtr/files/patch-ab b/news/nntpbtr/files/patch-ab
deleted file mode 100644
index 6e833db604f0..000000000000
--- a/news/nntpbtr/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile	1994/11/25 15:09:23	1.1
-+++ Makefile	1996/07/02 05:37:31
-@@ -32,3 +32,10 @@
- 
- clean:
- 	rm -f *.o nntpbtr
-+
-+all:	nntpbtr
-+
-+install:
-+	install -c -m555 nntpbtr ${PREFIX}/sbin
-+	install -c -m555 nntpbtr.1 ${PREFIX}/man/man1
-+
diff --git a/news/nntpbtr/files/patch-aa b/news/nntpbtr/files/patch-btrspc.c
index dabc0c8a1569..dabc0c8a1569 100644
--- a/news/nntpbtr/files/patch-aa
+++ b/news/nntpbtr/files/patch-btrspc.c
diff --git a/news/nntpbtr/files/patch-ac b/news/nntpbtr/files/patch-conf.h
index 7fc2de86e97a..7fc2de86e97a 100644
--- a/news/nntpbtr/files/patch-ac
+++ b/news/nntpbtr/files/patch-conf.h
diff --git a/news/nntpbtr/files/patch-ad b/news/nntpbtr/files/patch-nntpbtr_1.c
index bc102f117794..bc102f117794 100644
--- a/news/nntpbtr/files/patch-ad
+++ b/news/nntpbtr/files/patch-nntpbtr_1.c
diff --git a/news/nntpbtr/files/patch-nntpbtr.c b/news/nntpbtr/files/patch-nntpbtr_2.c
index f6a80ccd9299..f6a80ccd9299 100644
--- a/news/nntpbtr/files/patch-nntpbtr.c
+++ b/news/nntpbtr/files/patch-nntpbtr_2.c
diff --git a/news/nntpbtr/files/patch-nntpbtr_3.c b/news/nntpbtr/files/patch-nntpbtr_3.c
new file mode 100644
index 000000000000..8f39b0d0255c
--- /dev/null
+++ b/news/nntpbtr/files/patch-nntpbtr_3.c
@@ -0,0 +1,80 @@
+--- nntpbtr.c.orig	2014-03-29 11:51:17.000000000 -0400
++++ nntpbtr.c	2014-03-29 11:55:16.000000000 -0400
+@@ -88,6 +88,14 @@
+ char *mktemp();
+ char *malloc();
+ 
++void qsaveunread();
++void readarticle();
++void getnewnews();
++void goodbye();
++void get_time();
++void getlock();
++void unlock();
++
+ int  rnum = 0, anum = 0;
+ 
+ #ifdef SIGTTIN
+@@ -106,7 +114,7 @@
+  *	Save all unreaded articles in art. list file.
+  */
+ 
+-qsaveunread()
++void qsaveunread()
+ {
+ 	if( intflag++ )
+ 		return;
+@@ -381,7 +389,7 @@
+  *	Then get implicit lock of host...
+  */
+ 
+-getlock(host,oldtime)
++void getlock(host,oldtime)
+ 	char *host, *oldtime;
+ {
+ 	time_t tim;
+@@ -428,7 +436,7 @@
+ }
+ 
+ 
+-unlock(host)
++void unlock(host)
+ 	char *host;
+ {
+ 	int i;
+@@ -453,7 +461,7 @@
+ }
+ 
+ 
+-get_time(host,newtime)
++void get_time(host,newtime)
+ 	char *host, *newtime;
+ {
+ 	int server, i;
+@@ -520,7 +528,7 @@
+ /*	Normal goodbye talk
+  */
+ 
+-goodbye()
++void goodbye()
+ {
+ 	char string[NNTP_STRLEN+1];
+ 
+@@ -741,7 +749,7 @@
+  *	If channel fail - reconnect.
+  */
+ 
+-readarticle()
++void readarticle()
+ {
+ 	int incore, n;
+ 	char *endart, *line;
+@@ -914,7 +922,7 @@
+  *	from time of last session.
+  */
+ 
+-getnewnews()
++void getnewnews()
+ {
+ 	int n;
+ 	char string[NNTP_STRLEN+1];