Wed Aug 13 09:28:37 2014 UTC ()
Backout Official Patch 5.  Some packages have already dealt with removal
of the obsolete "Function" and adding it back in breaks them.

Noted by Takahiro Kambe.


(markd)
diff -r1.58 -r1.59 pkgsrc/devel/readline/Makefile
diff -r1.23 -r1.24 pkgsrc/devel/readline/distinfo
diff -r1.1 -r0 pkgsrc/devel/readline/patches/patch-rltypedefs.h

cvs diff -r1.58 -r1.59 pkgsrc/devel/readline/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/readline/Makefile 2014/08/11 21:29:00 1.58
+++ pkgsrc/devel/readline/Makefile 2014/08/13 09:28:37 1.59
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.58 2014/08/11 21:29:00 markd Exp $ 1# $NetBSD: Makefile,v 1.59 2014/08/13 09:28:37 markd Exp $
2 2
3READLINE_VERSION= 6.3 3READLINE_VERSION= 6.3
4 4
5DISTNAME= readline-${READLINE_VERSION} 5DISTNAME= readline-${READLINE_VERSION}
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GNU:=readline/} 8MASTER_SITES= ${MASTER_SITE_GNU:=readline/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html 11HOMEPAGE= http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
12COMMENT= GNU library that can recall and edit previous input 12COMMENT= GNU library that can recall and edit previous input
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16 16
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19INFO_FILES= yes 19INFO_FILES= yes

cvs diff -r1.23 -r1.24 pkgsrc/devel/readline/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/readline/distinfo 2014/08/11 21:29:00 1.23
+++ pkgsrc/devel/readline/distinfo 2014/08/13 09:28:37 1.24
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1$NetBSD: distinfo,v 1.23 2014/08/11 21:29:00 markd Exp $ 1$NetBSD: distinfo,v 1.24 2014/08/13 09:28:37 markd Exp $
2 2
3SHA1 (readline-6.3.tar.gz) = 017b92dc7fd4e636a2b5c9265a77ccc05798c9e1 3SHA1 (readline-6.3.tar.gz) = 017b92dc7fd4e636a2b5c9265a77ccc05798c9e1
4RMD160 (readline-6.3.tar.gz) = 986262d811d9dbe1e38bc9d714853272967dca7e 4RMD160 (readline-6.3.tar.gz) = 986262d811d9dbe1e38bc9d714853272967dca7e
5Size (readline-6.3.tar.gz) = 2468560 bytes 5Size (readline-6.3.tar.gz) = 2468560 bytes
6SHA1 (patch-ae) = 98ef48c55111de4a9cc9b19fb44b7d139f6de40f 6SHA1 (patch-ae) = 98ef48c55111de4a9cc9b19fb44b7d139f6de40f
7SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb 7SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
8SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1 8SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
9SHA1 (patch-colors.c) = 42ffd2766a808a670a445a8ac34740cf4bdf02d5 9SHA1 (patch-colors.c) = 42ffd2766a808a670a445a8ac34740cf4bdf02d5
10SHA1 (patch-display.c) = 8dc455e5cb3ad4208834518f55f93d1d60f52087 10SHA1 (patch-display.c) = 8dc455e5cb3ad4208834518f55f93d1d60f52087
11SHA1 (patch-examples_Makefile.in) = d8268b7de6d548f673b23eb0718394245e56ab1f 11SHA1 (patch-examples_Makefile.in) = d8268b7de6d548f673b23eb0718394245e56ab1f
12SHA1 (patch-patchlevel) = 04d5af0e90455d7dcbc1917c07b30656afc725a5 12SHA1 (patch-patchlevel) = 04d5af0e90455d7dcbc1917c07b30656afc725a5
13SHA1 (patch-readline.c) = ad9aef8a3e9a199d2b9a1a32fc3f715784136c89 13SHA1 (patch-readline.c) = ad9aef8a3e9a199d2b9a1a32fc3f715784136c89
14SHA1 (patch-rltypedefs.h) = 895bb236df834f890cbe23b20eba542773907d4d 
15SHA1 (patch-util.c) = b7c22aa43cbd1d0225099e2ee1d4d1772d402b5f 14SHA1 (patch-util.c) = b7c22aa43cbd1d0225099e2ee1d4d1772d402b5f

File Deleted: pkgsrc/devel/readline/patches/Attic/patch-rltypedefs.h