Attachment 221477 Details for Bug 251765 – Patch for readline v2

[patch] Patch for readline v2

0001-readline81_2.patch (text/plain), 10.39 KB, created by Daniel Engberg on 2021-01-11 21:42:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-01-11 21:42:22 UTC

Size: 10.39 KB

patch

obsolete

>From 7017bb19f98a333c82b348d232d99557ceaea646 Mon Sep 17 00:00:00 2001
>From: Daniel Engberg <daniel.engberg.lists@pyret.net>
>Date: Mon, 11 Jan 2021 19:18:16 +0100
>Subject: [PATCH] readline81_2
>
>readline81_2
>
>Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
>---
> devel/readline/Makefile                       | 34 +++++++-----
> devel/readline/distinfo                       | 14 +----
> devel/readline/files/patch-Makefile.in        | 15 +++++
> .../readline/files/patch-examples_Makefile.in | 11 ++++
> .../files/patch-support-shlib-install         | 50 -----------------
> devel/readline/files/patch-support-shobj-conf | 55 -------------------
> devel/readline/pkg-plist                      | 32 ++++++-----
> 7 files changed, 67 insertions(+), 144 deletions(-)
> create mode 100644 devel/readline/files/patch-Makefile.in
> create mode 100644 devel/readline/files/patch-examples_Makefile.in
> delete mode 100644 devel/readline/files/patch-support-shlib-install
> delete mode 100644 devel/readline/files/patch-support-shobj-conf
>
>diff --git a/devel/readline/Makefile b/devel/readline/Makefile
>index 36a5590c925e..5d08674f436a 100644
>--- a/devel/readline/Makefile
>+++ b/devel/readline/Makefile
>@@ -2,13 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	readline
>-PORTVERSION=	8.0.${PATCHLEVEL}
>-PORTREVISION=	1
>+DISTVERSION=	8.1
>+#DISTVERSION=	8.0.${PATCHLEVEL}
> CATEGORIES=	devel
> MASTER_SITES=	GNU
>-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
>-
>-PATCH_SITES=	GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-patches
>+#DISTNAME=	${PORTNAME}-${DISTVERSION:R}
>+#PATCH_SITES=	GNU/${PORTNAME}/${PORTNAME}-${DISTVERSION:R}-patches
> 
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	Library for editing command lines as they are typed
>@@ -16,7 +15,7 @@ COMMENT=	Library for editing command lines as they are typed
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		cpe
>+USES=		cpe ncurses
> 
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>@@ -25,17 +24,24 @@ INFO=		history readline rluserman
> PORTDOCS=	CHANGES INSTALL README
> 
> CPE_VENDOR=	gnu
>-CPE_VERSION=	${PORTVERSION:R}
>-CPE_UPDATE=	${PATCHLEVEL}
>+#CPE_VERSION=	${DISTVERSION:R}
>+#CPE_UPDATE=	${PATCHLEVEL}
> 
> OPTIONS_DEFINE=	DOCS
> 
>-PATCHES=	1 2 3 4
>-PATCHLEVEL=	${PATCHES:O:[-1]}
>+#PATCHES=	1 2 3 4
>+#PATCHLEVEL=	${PATCHES:O:[-1]}
> #PATCHLEVEL=	0
>-.for patch in ${PATCHES}
>-PATCHFILES+=	${PORTNAME}${PORTVERSION:R:S|.||}-${patch:S|^|00|:S|.*(...)$|\1|}
>-.endfor
>+#.for patch in ${PATCHES}
>+#PATCHFILES+=	${PORTNAME}${PORTVERSION:R:S|.||}-${patch:S|^|00|:S|.*(...)$|\1|}
>+#.endfor
>+
>+CONFIGURE_ARGS=	--with-curses
>+
>+OPTIONS_DEFINE=	DOCS EXAMPLES
>+OPTIONS_SUB=	yes
>+
>+EXAMPLES_CONFIGURE_OFF=	--disable-install-examples
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/rlconf.h
>@@ -44,6 +50,6 @@ post-patch:
> .endif
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libhistory.so.8.0 ${STAGEDIR}${PREFIX}/lib/libreadline.so.8.0
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libhistory.so.8.1 ${STAGEDIR}${PREFIX}/lib/libreadline.so.8.1
> 
> .include <bsd.port.mk>
>diff --git a/devel/readline/distinfo b/devel/readline/distinfo
>index 0155af688887..16ebd55b73ac 100644
>--- a/devel/readline/distinfo
>+++ b/devel/readline/distinfo
>@@ -1,11 +1,3 @@
>-TIMESTAMP = 1582888984
>-SHA256 (readline-8.0.tar.gz) = e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461
>-SIZE (readline-8.0.tar.gz) = 2975937
>-SHA256 (readline80-001) = d8e5e98933cf5756f862243c0601cb69d3667bb33f2c7b751fe4e40b2c3fd069
>-SIZE (readline80-001) = 927
>-SHA256 (readline80-002) = 36b0febff1e560091ae7476026921f31b6d1dd4c918dcb7b741aa2dad1aec8f7
>-SIZE (readline80-002) = 1401
>-SHA256 (readline80-003) = 94ddb2210b71eb5389c7756865d60e343666dfb722c85892f8226b26bb3eeaef
>-SIZE (readline80-003) = 2158
>-SHA256 (readline80-004) = b1aa3d2a40eee2dea9708229740742e649c32bb8db13535ea78f8ac15377394c
>-SIZE (readline80-004) = 1275
>+TIMESTAMP = 1610387882
>+SHA256 (readline-8.1.tar.gz) = f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02
>+SIZE (readline-8.1.tar.gz) = 2993288
>diff --git a/devel/readline/files/patch-Makefile.in b/devel/readline/files/patch-Makefile.in
>new file mode 100644
>index 000000000000..b30386132144
>--- /dev/null
>+++ b/devel/readline/files/patch-Makefile.in
>@@ -0,0 +1,15 @@
>+--- Makefile.in.orig	2020-12-11 20:15:25 UTC
>++++ Makefile.in
>+@@ -251,10 +251,10 @@ uninstall-pc:
>+ maybe-uninstall-pc: uninstall-pc
>+ 
>+ install-static: installdirs $(STATIC_LIBS) install-headers install-doc ${install_examples} install-pc
>+-	-$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
>++#	-$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
>+ 	$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
>+ 	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a
>+-	-$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old
>++#	-$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old
>+ 	$(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a
>+ 	-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a
>+ 
>diff --git a/devel/readline/files/patch-examples_Makefile.in b/devel/readline/files/patch-examples_Makefile.in
>new file mode 100644
>index 000000000000..55bf3175a3ec
>--- /dev/null
>+++ b/devel/readline/files/patch-examples_Makefile.in
>@@ -0,0 +1,11 @@
>+--- examples/Makefile.in.orig	2020-12-11 20:08:41 UTC
>++++ examples/Makefile.in
>+@@ -71,7 +71,7 @@ TERMCAP_LIB = @TERMCAP_LIB@
>+ 
>+ SOURCES = excallback.c fileman.c histexamp.c manexamp.c rl-fgets.c rl.c \
>+ 		rlbasic.c rlcat.c rlevent.c rlptytest.c rltest.c rlversion.c \
>+-		rltest2.c rl-callbacktest.c hist_erasedups.c hist_purgecmd.c \
>++		rl-callbacktest.c hist_erasedups.c hist_purgecmd.c \
>+ 		rlkeymaps.c
>+ 
>+ EXECUTABLES = fileman$(EXEEXT) rltest$(EXEEXT) rl$(EXEEXT) rlcat$(EXEEXT) \
>diff --git a/devel/readline/files/patch-support-shlib-install b/devel/readline/files/patch-support-shlib-install
>deleted file mode 100644
>index d849b0549bcc..000000000000
>--- a/devel/readline/files/patch-support-shlib-install
>+++ /dev/null
>@@ -1,50 +0,0 @@
>---- support/shlib-install.orig	2018-05-04 13:45:39 UTC
>-+++ support/shlib-install
>-@@ -118,7 +118,7 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN}
>- # Create symlinks to the installed library.  This section is incomplete.
>- #
>- case "$host_os-$host_vendor" in
>--*linux*|freebsd*-gentoo)
>-+*linux*|freebsd*|dragonfly*)
>- 	# libname.so.M -> libname.so.M.N
>- 	${echo} ${RM} ${INSTALLDIR}/$LINK2
>- 	if [ -z "$uninstall" ]; then
>-@@ -154,38 +154,6 @@ solaris2*|aix4.[2-9]*|aix[5-9]*|osf*|irix[56]*|sysv[45
>- 	fi
>- 	;;
>- 
>--
>--# FreeBSD 3.x and above can have either a.out or ELF shared libraries
>--freebsd3*|freebsdaout*)
>--	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
>--		# libname.so -> libname.so.M
>--		${echo} ${RM} ${INSTALLDIR}/$LINK1
>--		if [ -z "$uninstall" ]; then
>--			eval $INSTALL_LINK1
>--		fi
>--	else
>--		# libname.so.M -> libname.so.M.N
>--		${echo} ${RM} ${INSTALLDIR}/$LINK2
>--		if [ -z "$uninstall" ]; then
>--			eval $INSTALL_LINK2
>--		fi
>--
>--		# libname.so -> libname.so.M.N
>--		${echo} ${RM} ${INSTALLDIR}/$LINK1
>--		if [ -z "$uninstall" ]; then
>--			eval $INSTALL_LINK1
>--		fi
>--	fi
>--	;;
>--
>--freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*)
>--	# libname.so -> libname.so.M
>--	${echo} ${RM} ${INSTALLDIR}/$LINK1
>--	if [ -z "$uninstall" ]; then
>--		eval $INSTALL_LINK1
>--	fi
>--	;;
>--	
>- hpux1*)
>- 	# libname.sl -> libname.M
>- 	${echo} ${RM} ${INSTALLDIR}/$LINK1.sl
>diff --git a/devel/readline/files/patch-support-shobj-conf b/devel/readline/files/patch-support-shobj-conf
>deleted file mode 100644
>index 6566d8e52225..000000000000
>--- a/devel/readline/files/patch-support-shobj-conf
>+++ /dev/null
>@@ -1,55 +0,0 @@
>---- support/shobj-conf.orig	2016-10-05 20:02:11 UTC
>-+++ support/shobj-conf
>-@@ -123,51 +123,13 @@ sunos5*|solaris2*)
>- 	;;
>- 
>- # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd.
>--linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
>-+linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*)
>- 	SHOBJ_CFLAGS=-fPIC
>- 	SHOBJ_LD='${CC}'
>- 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
>- 
>- 	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
>- 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
>--	;;
>--
>--freebsd2*)
>--	SHOBJ_CFLAGS=-fpic
>--	SHOBJ_LD=ld
>--	SHOBJ_LDFLAGS='-x -Bshareable'
>--
>--	SHLIB_XLDFLAGS='-R$(libdir)'
>--	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
>--	;;
>--
>--# FreeBSD-3.x ELF
>--freebsd3*|freebsdaout*)
>--	SHOBJ_CFLAGS=-fPIC
>--	SHOBJ_LD='${CC}'
>--
>--	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
>--		SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
>--
>--		SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)'
>--		SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
>--	else
>--		SHOBJ_LDFLAGS='-shared'
>--
>--		SHLIB_XLDFLAGS='-R$(libdir)'
>--		SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
>--	fi
>--	;;
>--
>--# FreeBSD-4.x and later have only ELF
>--freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*)
>--	SHOBJ_CFLAGS=-fPIC
>--	SHOBJ_LD='${CC}'
>--
>--	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
>--	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)'
>--
>--	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
>- 	;;
>- 
>- # Darwin/MacOS X
>diff --git a/devel/readline/pkg-plist b/devel/readline/pkg-plist
>index 3b1cec75b888..7a0986788549 100644
>--- a/devel/readline/pkg-plist
>+++ b/devel/readline/pkg-plist
>@@ -9,23 +9,27 @@ include/readline/tilde.h
> lib/libhistory.a
> lib/libhistory.so
> lib/libhistory.so.8
>-lib/libhistory.so.8.0
>+lib/libhistory.so.8.1
> lib/libreadline.a
> lib/libreadline.so
> lib/libreadline.so.8
>-lib/libreadline.so.8.0
>+lib/libreadline.so.8.1
> libdata/pkgconfig/readline.pc
> man/man3/history.3.gz
> man/man3/readline.3.gz
>-%%DATADIR%%/excallback.c
>-%%DATADIR%%/fileman.c
>-%%DATADIR%%/histexamp.c
>-%%DATADIR%%/manexamp.c
>-%%DATADIR%%/rl-fgets.c
>-%%DATADIR%%/rl.c
>-%%DATADIR%%/rlbasic.c
>-%%DATADIR%%/rlcat.c
>-%%DATADIR%%/rlevent.c
>-%%DATADIR%%/rlptytest.c
>-%%DATADIR%%/rltest.c
>-%%DATADIR%%/rlversion.c
>+%%EXAMPLES%%%%DATADIR%%/excallback.c
>+%%EXAMPLES%%%%DATADIR%%/fileman.c
>+%%EXAMPLES%%%%DATADIR%%/hist_erasedups.c
>+%%EXAMPLES%%%%DATADIR%%/hist_purgecmd.c
>+%%EXAMPLES%%%%DATADIR%%/histexamp.c
>+%%EXAMPLES%%%%DATADIR%%/manexamp.c
>+%%EXAMPLES%%%%DATADIR%%/rl-callbacktest.c
>+%%EXAMPLES%%%%DATADIR%%/rl-fgets.c
>+%%EXAMPLES%%%%DATADIR%%/rl.c
>+%%EXAMPLES%%%%DATADIR%%/rlbasic.c
>+%%EXAMPLES%%%%DATADIR%%/rlcat.c
>+%%EXAMPLES%%%%DATADIR%%/rlevent.c
>+%%EXAMPLES%%%%DATADIR%%/rlkeymaps.c
>+%%EXAMPLES%%%%DATADIR%%/rlptytest.c
>+%%EXAMPLES%%%%DATADIR%%/rltest.c
>+%%EXAMPLES%%%%DATADIR%%/rlversion.c
>-- 
>2.29.2
>

Actions: View | Diff

Attachments on bug 251765: 220466 | 221477