shells/rc: Update to 1.7.4, Fix build

After ports r440197, there is a build problem with the default option.

- Update to 1.7.4 and fix build
- Move MASTER_SITES to the currently upstream address
- Improve pkg-descr
- Set LICENSE

PR:		219596
Approved by:	garga (mentor), maintainer (timeout)
Differential Revision:	https://reviews.freebsd.org/D11126

4 files changed, 20 insertions, 18 deletions

diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 2564fe97f858..dd708f7a7d28 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -2,22 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	rc
-PORTVERSION=	1.7.1
+PORTVERSION=	1.7.4
 CATEGORIES=	shells plan9
-MASTER_SITES=	ftp://rc.quanstro.net/pub/ \
-		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
+MASTER_SITES=	http://static.tobold.org/rc/
 
 MAINTAINER=	quanstro@quanstro.net
 COMMENT=	Unix incarnation of the plan9 shell
 
-USES=		tar:bzip2
+LICENSE=	ZLIB
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-history
 
 OPTIONS_DEFINE=	READLINE
 
 READLINE_USES=		readline
-READLINE_CONFIGURE_WITH=readline
+READLINE_CONFIGURE_ON=	--with-edit=readline
 READLINE_MAKE_ARGS_OFF=	CFLAGS="${CFLAGS} -static"
 
 .include <bsd.port.mk>
diff --git a/shells/rc/distinfo b/shells/rc/distinfo
index 3c471e0512fe..997830479f60 100644
--- a/shells/rc/distinfo
+++ b/shells/rc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rc-1.7.1.tar.bz2) = 3a885d1c75e3ff22e22cc2b397b21a2a75810bc1a0d39adc4b2a47b7c81f4bd5
-SIZE (rc-1.7.1.tar.bz2) = 149624
+TIMESTAMP = 1495848718
+SHA256 (rc-1.7.4.tar.gz) = 5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8
+SIZE (rc-1.7.4.tar.gz) = 215206
diff --git a/shells/rc/files/patch-Makefile.in b/shells/rc/files/patch-Makefile.in
index b8a6b661b37f..f9ebb236f4ac 100644
--- a/shells/rc/files/patch-Makefile.in
+++ b/shells/rc/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- ./Makefile.in.orig	2003-07-17 14:24:25.000000000 +0200
-+++ ./Makefile.in	2014-03-06 18:42:44.943985391 +0100
-@@ -716,10 +716,10 @@
+--- Makefile.in.orig	2017-05-27 01:41:41 UTC
++++ Makefile.in
+@@ -945,10 +945,10 @@ trip: rc tripping
  	./rc -p < $(srcdir)/trip.rc
  
  install-exec-hook:
@@ -12,6 +12,6 @@
 +@AMC_HISTORY_TRUE@	rm -f $(DESTDIR)$(bindir)/--;  $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/-- ;\
 +@AMC_HISTORY_TRUE@	rm -f $(DESTDIR)$(bindir)/-p;  $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/-p ;\
 +@AMC_HISTORY_TRUE@	rm -f $(DESTDIR)$(bindir)/--p; $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/--p
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/shells/rc/pkg-descr b/shells/rc/pkg-descr
index 3fe93bd9b1c9..bf8b865c0a7f 100644
--- a/shells/rc/pkg-descr
+++ b/shells/rc/pkg-descr
@@ -1,8 +1,8 @@
-This is a reimplementation for Unix, by Byron Rakitzis, of the Plan
-9 shell. rc offers much the same capabilities as a traditional
-Bourne shell, but with a much cleaner syntax.
+This is a reimplementation for Unix, by Byron Rakitzis, of the Plan 9 shell.
+The original rc was designed and implemented by Tom Duff at Bell Labs. It has
+a small feature set similar to a traditional Bourne shell, but with a much
+cleaner and simpler syntax. Among other things, this makes rc much better than
+Bourne-compatible shells at handling filenames which contain spaces. Thus,
+writing rc scripts is less error-prone than writing sh scripts.
 
-See the end of the man page, under "INCOMPATIBILITIES" for (known?)
-differences from the "real" rc.
-
-Scott Kenney <saken@hotel.rmta.org>
+WWW: http://tobold.org/article/rc