On 08/21/15 15:00, Michael Reed wrote:
> Hi all,
>
> This updates plan9/rc from 1.6 to 1.7.4.
> The following changes were made:
>
> - add HOMEPAGE
> - Dropped existing MASTER_SITES in favor of new one.
> 2/3 of them redirected to an unrelated page, while
> ftp.sys.toronto.edu had only up to rc-1.7.2.
> - Patch "configure" to emulate GNU date(1)'s 'I' flag.
> - Remove patch-print_c, which has apparently been upstreamed.
> - Replace the configure args --with-{edit,read}line with
> --with-edit={edit,read}line as the former doesn't work anymore.
>
> This is my first port, so I might have missed something obvious.
>
> Regard,
> Michael
I updated the port. Here's the difference between the changes mentioned above:
- Instead of having a post-patch phase and 1 patch, just have two patches.
- Remove editline flavor, as the editline variant mentioned in SUPDISTFILES
didn't pass the ./configure stage, as did the system editline(3).
Regards,
Michael
Index: Makefile
===================================================================
RCS file: /cvs/ports/plan9/rc/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 21 Mar 2015 21:28:27 -0000 1.22
+++ Makefile 26 Aug 2015 21:08:23 -0000
@@ -2,13 +2,11 @@
COMMENT= shell (clone of plan9 shell)
-DISTNAME= rc-1.6
-REVISION= 1
+DISTNAME= rc-1.7.4
CATEGORIES= plan9 shells
-MASTER_SITES= http://www.star.le.ac.uk/~tjg/rc/release/ \
- ftp://ftp.sys.toronto.edu/pub/rc/
-MASTER_SITES0= http://www.star.le.ac.uk/~tjg/rc/misc/
-SUPDISTFILES= editline-1.5.tar.gz:0
+MASTER_SITES= http://static.tobold.org/rc/
+
+HOMEPAGE= http://tobold.org/article/rc
MAINTAINER= Markus Friedl <mar...@openbsd.org>
@@ -20,31 +18,18 @@ SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-history
-FLAVORS= readline editline
+FLAVORS= readline
FLAVOR?=
TEST_TARGET= trip
.if defined(WITH_READLINE) && ${WITH_READLINE:U} == YES
FLAVOR+=readline
-.elif defined(WITH_EDITLINE) && ${WITH_EDITLINE:U} == YES
-FLAVOR+=editline
.endif
.if ${FLAVOR} == "readline"
CONFIGURE_ARGS+= --with-readline
WANTLIB+= readline termcap
-.elif ${FLAVOR} == "editline"
-DISTFILES= ${DISTNAME}.tar.gz editline-1.5.tar.gz:0
-EDITLINE= ${WRKSRC}/../editline
-CONFIGURE_ARGS+= --with-editline
-CONFIGURE_ENV= LIBS="-L${EDITLINE}"
-.endif
-
-.if ${FLAVOR} == "editline"
-pre-configure:
- @echo "===> Compiling editline"
- @cd ${EDITLINE} && ${MAKE_PROGRAM}
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/plan9/rc/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:14:56 -0000 1.6
+++ distinfo 26 Aug 2015 21:08:23 -0000
@@ -1,4 +1,2 @@
-SHA256 (editline-1.5.tar.gz) = gMtItn8V0KTaYqEGbSXSYHCRCWhzZV3IkTvmcf+Nhfo=
-SHA256 (rc-1.6.tar.gz) = 1ufjnDlU4FC4QUkaYzg2PEvyGqX4Stamiuv/+Qpi1/A=
-SIZE (editline-1.5.tar.gz) = 13823
-SIZE (rc-1.6.tar.gz) = 139914
+SHA256 (rc-1.7.4.tar.gz) = XtJjNN0MGmFiSLFa18kMpniuMGb6AsXd0OaTb5r5v9g=
+SIZE (rc-1.7.4.tar.gz) = 215206
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/plan9/rc/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 15 May 2003 03:25:56 -0000 1.3
+++ patches/patch-Makefile_in 26 Aug 2015 21:08:23 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2003/05/15 03:25:56 markus Exp $
---- Makefile.in.orig Wed Jun 7 02:07:28 2000
-+++ Makefile.in Wed Jun 7 02:09:33 2000
-@@ -517,10 +517,10 @@ trip: rc tripping
+--- Makefile.in.orig Wed May 13 17:26:18 2015
++++ Makefile.in Fri Aug 21 16:06:58 2015
+@@ -945,10 +945,10 @@ trip: rc tripping
./rc -p < $(srcdir)/trip.rc
install-exec-hook:
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 26 Aug 2015 21:08:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Wed Aug 26 16:57:31 2015
++++ configure Wed Aug 26 16:57:45 2015
+@@ -2224,7 +2224,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-RELDATE=`date -I`
++RELDATE=`date +%Y-%m-%d`
+
+ cat >>confdefs.h <<_ACEOF
+ #define RELDATE "$RELDATE"
Index: patches/patch-print_c
===================================================================
RCS file: patches/patch-print_c
diff -N patches/patch-print_c
--- patches/patch-print_c 15 May 2003 03:25:56 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-print_c,v 1.3 2003/05/15 03:25:56 markus Exp $
---- print.c.orig Wed Nov 20 21:42:09 2002
-+++ print.c Wed Nov 20 21:42:50 2002
-@@ -103,8 +103,6 @@ static void intconv(Format *format, unsi
-
- if (flags & FMT_long)
- n = va_arg(format->args, long);
-- else if (flags & FMT_short)
-- n = va_arg(format->args, short);
- else
- n = va_arg(format->args, int);
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/plan9/rc/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 9 Aug 2013 23:17:56 -0000 1.4
+++ pkg/PLIST 26 Aug 2015 21:08:23 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.4 2013/08/09 23:17:56 landry Exp $
-bin/-
-bin/--
-bin/--p
-bin/-p
+@bin bin/-
+@bin bin/--
+@bin bin/--p
+@bin bin/-p
@shell bin/rc
@man man/man1/history.1
@man man/man1/rc.1
