This one fares well in a few runtime tests. The reason why I'm not
committing this now is 1. there's a pkgconfig file that was added
2. it references a termcap pkgconfig which doesn't exist in the base
system.
A few approaches to handle this problem:
- ignore that problem (always a good idea)
- just delete readline.pc
- remove the offending line in readline.pc
- in base, ship a .pc for termcap and friends
I guess the last option is the right thing to do, but that's only
a guess. Also, should we rename the .pc to ereadline.pc?
Input welcome.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/readline/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 12 Jul 2019 20:45:57 -0000 1.16
+++ Makefile 11 Nov 2019 20:10:13 -0000
@@ -2,12 +2,11 @@
COMMENT = library to edit command lines as they are typed in
-V = 7.0
+V = 8.0
DISTNAME = readline-${V}
PKGNAME = readline-${V}
-REVISION = 0
-LIBV = 2.0
+LIBV = 2.1
SHARED_LIBS += ehistory ${LIBV}
SHARED_LIBS += ereadline ${LIBV}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/readline/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 9 Jul 2018 07:51:05 -0000 1.5
+++ distinfo 11 Nov 2019 20:10:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (readline-7.0.tar.gz) = dQ1DcYUob0CjaeHk9HZO2pMrlFm17JpzFig5PdPTIzQ=
-SIZE (readline-7.0.tar.gz) = 2910016
+SHA256 (readline-8.0.tar.gz) = 4zn1GXFHjTafigU6MwoZB4GsuYZM9MVBBg8SB4lI5GE=
+SIZE (readline-8.0.tar.gz) = 2975937
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/readline/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 9 Jul 2018 07:51:05 -0000 1.4
+++ patches/patch-Makefile_in 11 Nov 2019 20:10:13 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2018/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -99,8 +99,8 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT_FLAGS) @CFLAG
+@@ -105,8 +105,8 @@ install_examples = @EXAMPLES_INSTALL_TARGET@
$(CC) -c $(CCFLAGS) $<
# The name of the main library target.
@@ -13,7 +13,7 @@ Index: Makefile.in
# The C code source files for this library.
CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
-@@ -162,12 +162,12 @@ everything: all examples
+@@ -171,12 +171,12 @@ asan:
static: $(STATIC_LIBS)
@@ -28,10 +28,10 @@ Index: Makefile.in
$(RM) $@
$(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o xfree.o
-test -n "$(RANLIB)" && $(RANLIB) $@
-@@ -233,12 +233,12 @@ uninstall-headers:
- maybe-uninstall-headers: uninstall-headers
+@@ -251,12 +251,12 @@ uninstall-pc:
+ maybe-uninstall-pc: uninstall-pc
- install-static: installdirs $(STATIC_LIBS) install-headers install-doc
install-examples
+ install-static: installdirs $(STATIC_LIBS) install-headers install-doc
${install_examples} install-pc
- -$(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
Index: patches/patch-readline_pc_in
===================================================================
RCS file: patches/patch-readline_pc_in
diff -N patches/patch-readline_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-readline_pc_in 11 Nov 2019 20:10:13 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: readline.pc.in
+--- readline.pc.in.orig
++++ readline.pc.in
+@@ -8,5 +8,5 @@ Description: Gnu Readline library for command line edi
+ URL: http://tiswww.cwru.edu/php/chet/readline/rltop.html
+ Version: @LIBVERSION@
+ Requires.private: @TERMCAP_PKG_CONFIG_LIB@
+-Libs: -L${libdir} -lreadline
++Libs: -L${libdir} -lereadline
+ Cflags: -I${includedir}/readline
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/readline/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 9 Jul 2018 07:51:05 -0000 1.7
+++ pkg/PLIST 11 Nov 2019 20:10:13 -0000
@@ -12,10 +12,11 @@ include/ereadline/readline/tilde.h
@info info/ehistory.info
@info info/ereadline.info
@info info/erluserman.info
-lib/libehistory.a
+@static-lib lib/libehistory.a
@lib lib/libehistory.so.${LIBehistory_VERSION}
-lib/libereadline.a
+@static-lib lib/libereadline.a
@lib lib/libereadline.so.${LIBereadline_VERSION}
+lib/pkgconfig/readline.pc
@man man/man3/ehistory.3
@man man/man3/ereadline.3
share/doc/readline/
@@ -25,11 +26,8 @@ share/doc/readline/README
share/readline/
share/readline/excallback.c
share/readline/fileman.c
-share/readline/hist_erasedups.c
-share/readline/hist_purgecmd.c
share/readline/histexamp.c
share/readline/manexamp.c
-share/readline/rl-callbacktest.c
share/readline/rl-fgets.c
share/readline/rl.c
share/readline/rlbasic.c
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
