the RL_VERSION_foo patching in the installed header, and the library
version compiled into the .so, are wrong, they are meant to be version
numbers for other programs to check against, the .so name should be
handled separately.
slight port cleanup while there, and why not update as well..
nothing uses this in the tree yet, but I'm looking at it for cgdb.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/readline/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 11 Mar 2013 10:50:27 -0000 1.8
+++ Makefile 18 Apr 2013 11:31:02 -0000
@@ -1,13 +1,17 @@
# $OpenBSD: Makefile,v 1.8 2013/03/11 10:50:27 espie Exp $
+
COMMENT = library to edit command lines as they are typed in
-V = 6.1
+V = 6.2
DISTNAME = readline-${V}
-
-REVISION = 1
-
-SHARED_LIBS += ehistory 0.0 # 6.1
-SHARED_LIBS += ereadline 0.0 # 6.1
+PATCHFILES = readline62-001:0 \
+ readline62-002:0 \
+ readline62-003:0 \
+ readline62-004:0
+
+LIBV = 0.1
+SHARED_LIBS += ehistory ${LIBV}
+SHARED_LIBS += ereadline ${LIBV}
CATEGORIES = devel
@@ -15,25 +19,21 @@ HOMEPAGE = http://tiswww.case.edu/php/c
MAINTAINER = Laurent Fanis <[email protected]>
-#GPLv3
+# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_GNU:=readline/}
MASTER_SITES0 =
${MASTER_SITE_GNU:=readline/${DISTNAME}-patches/}
CONFIGURE_STYLE = gnu
-USE_GROFF = Yes
+SEPARATE_BUILD = Yes
-PATCHFILES = readline61-001:0 \
- readline61-002:0
+MAKE_ENV = RL_SHLIB_V=${LIBereadline_VERSION}
pre-configure:
perl -pi \
- -e 's,^#define RL_VERSION_MAJOR.*,#define RL_VERSION_MAJOR
${LIBereadline_VERSION:R},;' \
- -e 's,^#define RL_VERSION_MINOR.*,#define RL_VERSION_MINOR
${LIBereadline_VERSION:E},' \
- ${WRKSRC}/readline.h
- perl -pi -e 's,^LIBVERSION=6.1,LIBVERSION=${LIBereadline_VERSION},' \
- ${WRKSRC}/configure
- perl -pi \
+ -e 's,History: \(history\). ,eHistory: (ehistory).,;' \
+ -e 's,Readline: \(readline\). ,eReadline: (ereadline).,;' \
+ -e 's,RLuserman: \(rluserman\). ,eRLuserman: (erluserman).,;' \
-e 's,readline.info,ereadline.info,g;' \
-e 's,history.info,ehistory.info,g;' \
-e 's,rluserman.info,erluserman.info,g' \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/readline/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 23 Jul 2010 18:29:47 -0000 1.2
+++ distinfo 18 Apr 2013 11:31:02 -0000
@@ -1,15 +1,10 @@
-MD5 (readline-6.1.tar.gz) = /C9+cU/nktsc5t3EyftO8w==
-MD5 (readline61-001) = xkLy6E2CCISwv5/RdrxsPw==
-MD5 (readline61-002) = GnZ4Gh6nNOgxWIKF237JsQ==
-RMD160 (readline-6.1.tar.gz) = tQ9Ho5UuNUZVBW2WhLBe5lAn4pE=
-RMD160 (readline61-001) = s8nDUAieL8GcIXsU5gWABP2nxcs=
-RMD160 (readline61-002) = KgSbEh34bDpSNLXKSVPPF7ZcSrM=
-SHA1 (readline-6.1.tar.gz) = VIQKDckH5/pZjX/83L0XuuaazoM=
-SHA1 (readline61-001) = sL/Xpmk2dLkVmV5t1RO/3O7ZiUY=
-SHA1 (readline61-002) = WvJOfzPYC0pYj3cVPvffjZwEM4A=
-SHA256 (readline-6.1.tar.gz) = 8Mr2CMBszW1Ws77hhDRY1QnFP5tT3//+B8wR2PA/qWk=
-SHA256 (readline61-001) = mtvHkcC3bU8WFiOtnkpZONdjv0Bn1Z0YAxLWINfJTd4=
-SHA256 (readline61-002) = oZUZzVa/PFXSziJrcLrhqWL/D0DiR40JDdErZiTCPWI=
-SIZE (readline-6.1.tar.gz) = 2261725
-SIZE (readline61-001) = 1631
-SIZE (readline61-002) = 1177
+SHA256 (readline-6.2.tar.gz) = eaaWBwoFjCM8ct1qxpcCHMZKvV7VHlnbhn1m0Zaok4E=
+SHA256 (readline62-001) = OKhsQXQ3aS2wEGnIq0CpqPVI5nrZrwOQIhsCSxw5tOM=
+SHA256 (readline62-002) = HmNJEoy1cxcgY+oAfGeveSVoicgJlzACymbF38UDx9Q=
+SHA256 (readline62-003) = yyEx/zUtbl+C7cCXVRkfdCILFfAmvbbFJiSTHHliI3Q=
+SHA256 (readline62-004) = Cb00JHnqW7i2QRv999MC+rLlIdHSQby4NE07rV2fVHY=
+SIZE (readline-6.2.tar.gz) = 2277926
+SIZE (readline62-001) = 1388
+SIZE (readline62-002) = 1714
+SIZE (readline62-003) = 1911
+SIZE (readline62-004) = 3335
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/readline/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 23 Jul 2010 14:51:11 -0000 1.1.1.1
+++ patches/patch-Makefile_in 18 Apr 2013 11:31:02 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/07/23 14:51:11 laurent Exp $
---- Makefile.in.orig Sun Apr 19 18:14:24 2009
-+++ Makefile.in Tue Jul 13 13:34:53 2010
+--- Makefile.in.orig Mon Oct 11 16:53:52 2010
++++ Makefile.in Thu Apr 18 11:55:26 2013
@@ -97,8 +97,8 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT_FLAGS) @CFLAG
$(CC) -c $(CCFLAGS) $<
@@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
# The C code source files for this library.
CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
-@@ -151,12 +151,12 @@ everything: all examples
+@@ -154,12 +154,12 @@ everything: all examples
static: $(STATIC_LIBS)
@@ -22,12 +22,12 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
$(AR) $(ARFLAGS) $@ $(OBJECTS)
-test -n "$(RANLIB)" && $(RANLIB) $@
--libhistory.a: $(HISTOBJ) xmalloc.o
-+libehistory.a: $(HISTOBJ) xmalloc.o
+-libhistory.a: $(HISTOBJ) xmalloc.o xfree.o
++libehistory.a: $(HISTOBJ) xmalloc.o xfree.o
$(RM) $@
- $(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o
+ $(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o xfree.o
-test -n "$(RANLIB)" && $(RANLIB) $@
-@@ -222,12 +222,12 @@ uninstall-headers:
+@@ -225,12 +225,12 @@ uninstall-headers:
maybe-uninstall-headers: uninstall-headers
install-static: installdirs $(STATIC_LIBS) install-headers install-doc
install-examples
Index: patches/patch-doc_history_info
===================================================================
RCS file: patches/patch-doc_history_info
diff -N patches/patch-doc_history_info
--- patches/patch-doc_history_info 1 Aug 2010 08:08:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_history_info,v 1.1 2010/08/01 08:08:58 ajacoutot Exp $
---- doc/history.info.orig Sun Aug 1 10:05:00 2010
-+++ doc/history.info Sun Aug 1 10:05:06 2010
-@@ -26,7 +26,7 @@ preserved on all copies.
-
- INFO-DIR-SECTION Libraries
- START-INFO-DIR-ENTRY
--* History: (history). The GNU history library API.
-+* eHistory: (ehistory). The GNU history library API.
- END-INFO-DIR-ENTRY
-
-
Index: patches/patch-doc_readline_info
===================================================================
RCS file: patches/patch-doc_readline_info
diff -N patches/patch-doc_readline_info
--- patches/patch-doc_readline_info 1 Aug 2010 08:08:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_readline_info,v 1.1 2010/08/01 08:08:58 ajacoutot Exp $
---- doc/readline.info.orig Sun Aug 1 10:04:37 2010
-+++ doc/readline.info Sun Aug 1 10:04:55 2010
-@@ -26,7 +26,7 @@ preserved on all copies.
-
- INFO-DIR-SECTION Libraries
- START-INFO-DIR-ENTRY
--* Readline: (readline). The GNU readline library API.
-+* eReadline: (ereadline). The GNU readline library API.
- END-INFO-DIR-ENTRY
-
-
Index: patches/patch-doc_rluserman_info
===================================================================
RCS file: patches/patch-doc_rluserman_info
diff -N patches/patch-doc_rluserman_info
--- patches/patch-doc_rluserman_info 1 Aug 2010 08:08:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_rluserman_info,v 1.1 2010/08/01 08:08:58 ajacoutot Exp $
---- doc/rluserman.info.orig Sun Aug 1 10:05:11 2010
-+++ doc/rluserman.info Sun Aug 1 10:05:17 2010
-@@ -27,7 +27,7 @@ preserved on all copies.
-
- INFO-DIR-SECTION Libraries
- START-INFO-DIR-ENTRY
--* RLuserman: (rluserman). The GNU readline library User's Manual.
-+* eRLuserman: (erluserman). The GNU readline library User's Manual.
- END-INFO-DIR-ENTRY
-
-
Index: patches/patch-support_shobj-conf
===================================================================
RCS file: patches/patch-support_shobj-conf
diff -N patches/patch-support_shobj-conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-support_shobj-conf 18 Apr 2013 11:31:02 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- support/shobj-conf.orig Thu Apr 18 12:16:39 2013
++++ support/shobj-conf Thu Apr 18 12:17:33 2013
+@@ -197,7 +197,16 @@ darwin*|macosx*)
+ SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
+ ;;
+
+-openbsd*|netbsd*)
++openbsd*)
++ SHOBJ_CFLAGS=-fPIC
++ SHOBJ_LD='${CC}'
++ SHOBJ_LDFLAGS='-shared'
++
++ SHLIB_XLDFLAGS='-R$(libdir)'
++ SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(RL_SHLIB_V)'
++ ;;
++
++netbsd*)
+ SHOBJ_CFLAGS=-fPIC
+ SHOBJ_LD='${CC}'
+ SHOBJ_LDFLAGS='-shared'
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 23 Jul 2010 14:51:11 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/07/23 14:51:11 laurent Exp $
-@lib lib/libehistory.so.${LIBehistory_VERSION}
-@lib lib/libereadline.so.${LIBereadline_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/readline/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 25 Jul 2010 12:45:08 -0000 1.2
+++ pkg/PLIST 18 Apr 2013 11:31:02 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2010/07/25 12:45:08 ajacoutot Exp $
-%%SHARED%%
include/readline/
include/readline/chardefs.h
include/readline/history.h
@@ -13,7 +12,9 @@ include/readline/tilde.h
@info info/ereadline.info
@info info/erluserman.info
lib/libehistory.a
+@lib lib/libehistory.so.${LIBehistory_VERSION}
lib/libereadline.a
+@lib lib/libereadline.so.${LIBereadline_VERSION}
@man man/man3/ehistory.3
@man man/man3/ereadline.3
share/readline/
