Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv7607
Modified Files:
readline5.info
Added Files:
readline6.info readline6.patch
Log Message:
readline{5,6}: sync. w/ 10.!4/stable, validated on powerpc-darwin8
--- NEW FILE: readline6.info ---
Info4: <<
Package: readline6%type_pkg[-64bit]
Version: 6.2
Revision: 1
Maintainer: Fink Core Group <[email protected]>
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
#
Depends: %n-shlibs (= %v-%r), ( %type_raw[-64bit] = -64bit ) 64bit-cpu
BuildDepends: <<
fink (>= 0.24.12),
fink-package-precedence,
libncurses5%type_pkg[-64bit] (>= 5.4-20041023-1006)
<<
Conflicts: readline, readline5, readline5-64bit, readline6, readline6-64bit
Replaces: readline, readline5, readline5-64bit, readline6, readline6-64bit
Source: mirror:gnu:readline/readline-%v.tar.gz
Source2: mirror:gnu:readline/readline-%v-patches/readline62-001
Source3: mirror:gnu:readline/readline-%v-patches/readline62-002
Source-MD5: 67948acb2ca081f23359d0256e9a271c
Source2-MD5: 83287d52a482f790dfb30ec0a8746669
Source3-MD5: 0665020ea118e8434bd145fb71f452cc
PatchFile: %{ni}.patch
PatchFile-MD5: 263b727a7f3a9f9353eb92a99489588e
PatchScript: <<
patch -p0 < ../readline62-001
patch -p0 < ../readline62-002
%{default_script}
<<
SetCFLAGS: -DNEED_EXTERN_PC=1
SetCPPFLAGS: -MD
CompileScript: <<
#! /bin/sh -ev
if [ "%type_raw[-64bit]" != "." ]; then
export CC="gcc -m64"
fi
./configure %c
make
fink-package-precedence --depfile-ext='\.d' --prohibit-bdep=%n .
<<
InstallScript: make install DESTDIR=%d
DocFiles: NEWS CHANGELOG CHANGES COPYING README USAGE
InfoDocs: history.info readline.info rluserman.info
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Depends: libncurses5%type_pkg[-64bit]-shlibs (>= 5.4-20041023-1006), (
%type_raw[-64bit] = -64bit ) 64bit-cpu
Replaces: %N
Files: %lib/libhistory.6.2.dylib %lib/libreadline.6.2.dylib
%lib/libhistory.6.dylib %lib/libreadline.6.dylib
Shlibs: <<
%p/%lib/libhistory.6.dylib 6.0.0 %n (>= 6.2-1) %type_num[-64bit]
%p/%lib/libreadline.6.dylib 6.0.0 %n (>= 6.2-1) %type_num[-64bit]
<<
DocFiles: NEWS CHANGELOG CHANGES COPYING README USAGE
<<
#
Description: Comfortable terminal input library
DescDetail: <<
The GNU Readline library provides a set of functions for use by
applications that allow users to edit command lines as they are typed
in. Both Emacs and vi editing modes are available. The Readline
library includes additional functions to maintain a list of
previously-entered command lines, to recall and perhaps reedit those
lines, and perform csh-like history expansion on previous commands.
<<
DescPort: <<
1) fix the --install-name flag to only specify the major version
2) dmacks: patch doc/Makefile.in to skip even trying to create
texinfo dir file
3) dmacks: installing into empty %d, so don't try to remove old .a
4) fingolfin: revert a change from 6.1->6.2 in input.c which makes
pasting text into terminal apps using readline and rl_event_hook
painfully slow.
<<
License: GPL
Homepage: http://tiswww.case.edu/php/chet/readline/rltop.html
<<
Index: readline5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/libs/readline5.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- readline5.info 6 Nov 2011 02:41:14 -0000 1.5
+++ readline5.info 5 Jul 2012 22:44:23 -0000 1.6
@@ -1,7 +1,7 @@
Info4: <<
Package: readline5%type_pkg[-64bit]
Version: 5.2
-Revision: 16
+Revision: 17
Maintainer: Fink Core Group <[email protected]>
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
@@ -12,8 +12,8 @@
fink-package-precedence,
libncurses5%type_pkg[-64bit] (>= 5.4-20041023-1006)
<<
-Conflicts: readline, readline5, readline5-64bit
-Replaces: readline, readline5, readline5-64bit
+Conflicts: readline, readline5, readline5-64bit, readline6, readline6-64bit
+Replaces: readline, readline5, readline5-64bit, readline6, readline6-64bit
Source: mirror:gnu:readline/readline-%v.tar.gz
Source2: mirror:gnu:readline/readline-%v-patches/readline52-001
Source3: mirror:gnu:readline/readline-%v-patches/readline52-002
--- NEW FILE: readline6.patch ---
diff -ru readline-6.2/Makefile.in readline-6.2-patched/Makefile.in
--- readline-6.2/Makefile.in 2010-10-11 17:53:52.000000000 +0200
+++ readline-6.2-patched/Makefile.in 2012-06-14 22:35:58.000000000 +0200
@@ -83,7 +83,7 @@
# For libraries which include headers from other libraries.
INCLUDES = -I. -I$(srcdir)
-XCCFLAGS = $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES)
+XCCFLAGS = $(DEFS) $(LOCAL_DEFS) $(INCLUDES) $(CPPFLAGS)
CCFLAGS = $(XCCFLAGS) $(LOCAL_CFLAGS) $(CFLAGS)
# could add -Werror here
@@ -225,10 +225,8 @@
maybe-uninstall-headers: uninstall-headers
install-static: installdirs $(STATIC_LIBS) install-headers install-doc
install-examples
- -$(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
$(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a
-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a
diff -ru readline-6.2/doc/Makefile.in readline-6.2-patched/doc/Makefile.in
--- readline-6.2/doc/Makefile.in 2009-12-23 16:42:59.000000000 +0100
+++ readline-6.2-patched/doc/Makefile.in 2012-06-14 22:36:31.000000000
+0200
@@ -215,14 +215,6 @@
else \
${INSTALL_DATA} $(srcdir)/history.info
$(DESTDIR)$(infodir)/history.info; \
fi
- -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --dir-file=$(DESTDIR)$(infodir)/dir \
- $(DESTDIR)$(infodir)/readline.info ; \
- install-info --dir-file=$(DESTDIR)$(infodir)/dir \
- $(DESTDIR)$(infodir)/history.info ; \
- install-info --dir-file=$(DESTDIR)$(infodir)/dir \
- $(DESTDIR)$(infodir)/rluserman.info ; \
- else true; fi
-${INSTALL_DATA} $(srcdir)/readline.3
$(DESTDIR)$(man3dir)/readline$(man3ext)
-${INSTALL_DATA} $(srcdir)/history.3
$(DESTDIR)$(man3dir)/history$(man3ext)
-if test -n "${htmldir}" ; then \
diff -ru readline-6.2/examples/Makefile.in
readline-6.2-patched/examples/Makefile.in
--- readline-6.2/examples/Makefile.in 2010-12-28 21:55:32.000000000 +0100
+++ readline-6.2-patched/examples/Makefile.in 2012-06-14 22:35:12.000000000
+0200
@@ -53,7 +53,7 @@
INCLUDES = -I$(srcdir) -I$(top_srcdir) -I..
-CCFLAGS = $(DEFS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
+CCFLAGS = $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LDFLAGS = -g -L.. @LDFLAGS@
PURIFY = @PURIFY@
diff -ru readline-6.2/input.c readline-6.2-patched/input.c
--- readline-6.2/input.c 2010-05-31 00:33:01.000000000 +0200
+++ readline-6.2-patched/input.c 2012-06-25 00:39:31.000000000 +0200
@@ -427,19 +427,17 @@
/* If the user has an event function, then call it periodically. */
if (rl_event_hook)
{
- while (rl_event_hook)
+ while (rl_event_hook && rl_get_char (&c) == 0)
{
+ (*rl_event_hook) ();
+ RL_CHECK_SIGNALS ();
+ if (rl_done) /* XXX - experimental */
+ return ('\n');
if (rl_gather_tyi () < 0) /* XXX - EIO */
{
rl_done = 1;
return ('\n');
}
- RL_CHECK_SIGNALS ();
- if (rl_get_char (&c) != 0)
- break;
- if (rl_done) /* XXX - experimental */
- return ('\n');
- (*rl_event_hook) ();
}
}
else
diff -ru readline-6.2/shlib/Makefile.in readline-6.2-patched/shlib/Makefile.in
--- readline-6.2/shlib/Makefile.in 2010-12-28 21:56:21.000000000 +0100
+++ readline-6.2-patched/shlib/Makefile.in 2012-06-14 22:34:55.000000000
+0200
@@ -107,7 +107,7 @@
# For libraries which include headers from other libraries.
INCLUDES = -I. -I.. -I$(topdir)
-CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES) $(LOCAL_CFLAGS)
$(CFLAGS)
+CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(INCLUDES) $(CPPFLAGS) $(LOCAL_CFLAGS)
$(CFLAGS)
.SUFFIXES: .so
diff -ru readline-6.2/support/shobj-conf readline-6.2-patched/support/shobj-conf
--- readline-6.2/support/shobj-conf 2012-06-14 23:02:19.000000000 +0200
+++ readline-6.2-patched/support/shobj-conf 2012-06-18 14:37:26.000000000
+0200
@@ -169,7 +169,7 @@
SHLIB_LIBSUFF='dylib'
SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup
-arch_only `/usr/bin/arch`'
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name
$(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)
-compatibility_version $(SHLIB_MAJOR) -v'
+ SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name
$(libdir)/`echo $@ | sed "s:\\(.*\\.[0-9]\\)\\.[0-9]:\\1:"` -current_version
$(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
;;
@@ -187,7 +187,7 @@
case "${host_os}" in
darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS=''
- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch`
-install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)
-compatibility_version $(SHLIB_MAJOR) -v'
+ SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch`
-install_name $(libdir)/`echo $@ | sed "s:\\(.*\\.[0-9]\\)\\.[0-9]:\\1:"`
-current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version
$(SHLIB_MAJOR) -v'
;;
*) SHOBJ_LDFLAGS='-dynamic'
SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch`
-install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)
-compatibility_version $(SHLIB_MAJOR) -v'
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
