7 files changed, 41 insertions, 34 deletions

diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 3acdb95fc1bf..629de27a61ba 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	newt
-PORTVERSION=	0.50.13
+PORTVERSION=	0.50.8.2
 CATEGORIES=	devel
 MASTER_SITES=	\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/redhat-6.1/SRPMS/SRPMS/ \
-	ftp://ftp.redhat.com/pub/redhat/redhat-6.1/SRPMS/SRPMS/ \
-	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/redhat-6.1/SRPMS/SRPMS/
-DISTNAME=	${PORTNAME}-0.50-13
+	ftp://ftp.freesoftware.com/pub/linux/redhat/redhat-6.2/SRPMS/SRPMS/ \
+	ftp://ftp.redhat.com/pub/redhat/redhat-6.2/SRPMS/SRPMS/ \
+	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/redhat-6.2/SRPMS/SRPMS/
+DISTNAME=	${PORTNAME}-0.50.8-2
 EXTRACT_SUFX=	.src.rpm
 
 MAINTAINER=	ports@FreeBSD.org
@@ -26,7 +26,7 @@ BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm \
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/newt-0.50
+WRKSRC=		${WRKDIR}/newt-0.50.8
 VERSION=	0
 MAKE_ENV+=	prefix=${PREFIX} VERSION=${VERSION} CC=${CC} PCFLAGS="${CFLAGS}"
 PLIST_SUB+=	VERSION="${VERSION}"
diff --git a/devel/newt/distinfo b/devel/newt/distinfo
index d2deaff1acc1..8a00c1689897 100644
--- a/devel/newt/distinfo
+++ b/devel/newt/distinfo
@@ -1 +1 @@
-MD5 (newt-0.50-13.src.rpm) = 20558ad28c9091272000192b53c435de
+MD5 (newt-0.50.8-2.src.rpm) = e3af47fa49859b7a72ac03ab352c793f
diff --git a/devel/newt/files/patch-aa b/devel/newt/files/patch-aa
index 0f9064103a1b..8ee0ac286898 100644
--- a/devel/newt/files/patch-aa
+++ b/devel/newt/files/patch-aa
@@ -1,5 +1,5 @@
---- grid.c	Mon Feb  8 11:41:47 1999
-+++ grid.c.new	Sun Jan  9 01:15:24 2000
+--- grid.c.orig	Mon Feb  8 16:41:47 1999
++++ grid.c	Sat Jul 22 01:14:25 2000
 @@ -1,4 +1,3 @@
 -#include <alloca.h>
  #include <stdlib.h>
diff --git a/devel/newt/files/patch-ab b/devel/newt/files/patch-ab
index 2a90af65b816..ae3d4224493f 100644
--- a/devel/newt/files/patch-ab
+++ b/devel/newt/files/patch-ab
@@ -1,6 +1,6 @@
---- Makefile.in	Wed Feb  2 22:18:26 2000
-+++ Makefile.in.new	Wed Feb  2 22:19:01 2000
-@@ -1,16 +1,11 @@
+--- Makefile.in.orig	Thu Feb  3 18:57:57 2000
++++ Makefile.in	Sat Jul 22 01:45:55 2000
+@@ -1,16 +1,12 @@
 -LIBS = -lslang -lm #-lefence
 -SHLIBS = -lslang -lm -lc
 +CC ?= cc
@@ -16,14 +16,14 @@
 -endif
 -
 -VERSION = @VERSION@
--CVSTAG = r$(subst .,-,$(VERSION))
--SONAME = @VERSION@
 +VERSION ?= 0
+ CVSTAG = r$(subst .,-,$(VERSION))
+-SONAME = @SONAME@
 +SONAME = $(VERSION)
  
  PROGS = test whiptail whiptcl.so testgrid testtree
  TESTOBJS = test.o
-@@ -25,7 +20,7 @@
+@@ -25,7 +21,7 @@
  
  SHCFLAGS = -fPIC
  
@@ -32,7 +32,7 @@
  includedir = $(prefix)/include
  libdir = $(prefix)/lib
  bindir = $(prefix)/bin
-@@ -49,25 +44,25 @@
+@@ -49,25 +45,25 @@
  all:	$(TARGET) _snackmodule.so
  
  test:	$(TESTOBJS) $(LIBNEWT)
@@ -65,7 +65,7 @@
  
  $(LIBNEWT): $(LIBNEWT)($(LIBOBJS))
  
-@@ -90,7 +85,7 @@
+@@ -90,7 +86,7 @@
  sharedlib: $(LIBNEWTSH)
  
  $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
@@ -74,7 +74,7 @@
  
  $(SHAREDDIR)/%.o : %.c
  	$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
-@@ -100,21 +95,21 @@
+@@ -100,21 +96,23 @@
  
  
  install: $(LIBNEWT) install-sh whiptail
@@ -90,14 +90,15 @@
 +	install -c -m 644 newt.h $(includedir)
 +	install -c -m 644 $(LIBNEWT) $(libdir)
 +	install -c -s -m 755 whiptail $(bindir)
++
  
  install-sh: sharedlib whiptcl.so _snackmodule.so
 -	[ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
--	install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
+-	install -s -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
 -	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/libnewt.so
--	install -m 755 whiptcl.so $(instroot)/$(libdir)
+-	install -s -m 755 whiptcl.so $(instroot)/$(libdir)
 -	[ -d $(instroot)/$(pythonbindir) ] || install -m 755 -d $(instroot)/$(pythonbindir)
--	install -m 755 _snackmodule.so $(instroot)/$(pythonbindir)
+-	install -s -m 755 _snackmodule.so $(instroot)/$(pythonbindir)
 -	install -m 755 snack.py $(instroot)/$(pythondir)
 +	[ -d $(libdir) ] || install -m 755 -d $(libdir)
 +	install -c -m 755 $(LIBNEWTSH) $(libdir)
@@ -106,6 +107,7 @@
 +	[ -d $(pythonbindir) ] || install -m 755 -d $(pythonbindir)
 +	install -c -m 755 _snackmodule.so $(pythonbindir)
 +	install -c -m 755 snack.py $(pythondir)
++
  
- archive:
- 	@cvs tag -F $(CVSTAG)
+ configure:  configure.in
+ 	autoconf
diff --git a/devel/newt/files/patch-ac b/devel/newt/files/patch-ac
index 00e0f26439d6..7a93f66b94b6 100644
--- a/devel/newt/files/patch-ac
+++ b/devel/newt/files/patch-ac
@@ -1,17 +1,18 @@
---- form.c	Fri Mar  5 18:27:57 1999
-+++ form.c.new	Wed Jan 26 20:33:25 2000
-@@ -3,9 +3,7 @@
+--- form.c.orig	Sat Dec 11 21:04:22 1999
++++ form.c	Sat Jul 22 01:49:24 2000
+@@ -3,10 +3,8 @@
  #include <slang.h>
  #include <stdarg.h>
  #include <stdlib.h>
 -#include <sys/select.h>
+ #include <sys/time.h>
 -
 -#ifdef USE_GPM
 +#include <string.h>
  #include <ctype.h>
  #include <sys/time.h>      /* timeval */
  #include <sys/types.h>     /* socket() */
-@@ -15,11 +13,8 @@
+@@ -16,11 +14,8 @@
  #include <sys/stat.h>      /* stat() */
  #include <termios.h>       /* winsize */
  #include <unistd.h>
diff --git a/devel/newt/pkg-comment b/devel/newt/pkg-comment
index d4db52e2123c..1a2e6f9b61ae 100644
--- a/devel/newt/pkg-comment
+++ b/devel/newt/pkg-comment
@@ -1 +1 @@
-Console I/O handling library from the Redhat people
+Not Erik's Windowing Toolkit:  console I/O handling library
diff --git a/devel/newt/pkg-descr b/devel/newt/pkg-descr
index 628ab54a8ad3..71cb0598a4f1 100644
--- a/devel/newt/pkg-descr
+++ b/devel/newt/pkg-descr
@@ -1,8 +1,12 @@
-This is the Redhat newt library, a library that is
-similar to (and based on) ncurses in that it does
-special things with console I/O.
+   Newt is a windowing toolkit for text mode built from the slang
+   library. It allows color text mode applications to easily use
+   stackable windows, push buttons, check boxes, radio buttons, lists,   
+   entry fields, labels, and displayable text. Scrollbars are supported,
+   and forms may be nested to provide extra functionality.
 
-Unfortunately, there do not seem to be any documentation
-available on Redhat's website about newt.
+WWW: http://www.redhat.com/support/manuals/archive/RHL-5.1-Installation-Guide/ manual/doc102.html
 
---Will <andrews@technologist.com>
+Besides the newt library, this port provides whiptail, which may
+be used from shell scripts similarly to Savio Lam's "dialog". Newt
+provides the textual interface for the Red Hat and Debian boot
+disks.