Update of /cvsroot/fink/experimental/beren12/finkinfo/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28887
Modified Files:
ncurses.info
Added Files:
big.patch ncurses-5.4-20040718.patch
ncurses-5.4-20040724.patch ncurses-5.4-20040731.patch
ncurses-5.4-20040807.patch ncurses-5.4-20040814.patch
ncurses-5.4-20040821.patch ncurses-5.4-20040828.patch
ncurses-5.4-20040911.patch ncurses-5.4-20040918.patch
ncurses-5.4-20040925.patch ncurses-5.4-20041002.patch
ncurses-5.4-20041009.patch ncurses-5.4-20041016.patch
ncurses.patch ncurses5.info ncurses5.patch
Log Message:
should be actuaclly working (amazingly), need a few testers
--- NEW FILE: ncurses-5.4-20040718.patch ---
--- NEW FILE: ncurses-5.4-20040724.patch ---
--- NEW FILE: ncurses-5.4-20040814.patch ---
--- NEW FILE: ncurses-5.4-20041009.patch ---
--- NEW FILE: ncurses5.patch ---
diff -r -U 3 ncurses-5.4/aclocal.m4 ncurses-5.4-fix-misappended-w/aclocal.m4
--- ncurses-5.4/aclocal.m4 Fri Jan 30 15:59:56 2004
+++ ncurses-5.4-fix-misappended-w/aclocal.m4 Thu Sep 2 13:58:19 2004
@@ -1170,13 +1170,27 @@
case "$cf_cv_shlib_version" in #(vi
rel) #(vi
case "$cf_cv_system_name" in #(vi
- darwin*)
cf_suffix='.$(REL_VERSION)'"$cf_suffix" ;; #(vi
+ darwin*)
+ if test -n "$LIB_SUFFIX" -a x`echo $LIB_SUFFIX
| cut -c1` = xw ; then
+ cf_suffix=`echo $cf_suffix | sed
's/^w//'`
+
cf_suffix=w'.$(REL_VERSION)'"$cf_suffix"
+ else
+ cf_suffix='.$(REL_VERSION)'"$cf_suffix"
+ fi
+ ;; #(vi
*) cf_suffix="$cf_suffix"'.$(REL_VERSION)' ;;
esac
;;
abi)
case "$cf_cv_system_name" in #(vi
- darwin*)
cf_suffix='.$(ABI_VERSION)'"$cf_suffix" ;; #(vi
+ darwin*)
+ if test -n "$LIB_SUFFIX" -a x`echo $LIB_SUFFIX
| cut -c1` = xw ; then
+ cf_suffix=`echo $cf_suffix | sed
's/^w//'`
+
cf_suffix=w'.$(ABI_VERSION)'"$cf_suffix"
+ else
+ cf_suffix='.$(ABI_VERSION)'"$cf_suffix"
+ fi
+ ;; #(vi
*) cf_suffix="$cf_suffix"'.$(ABI_VERSION)' ;;
esac
;;
@@ -1240,9 +1254,18 @@
elif test -f $srcdir/$cf_dir/curses.priv.h; then
cf_depend="$cf_depend $cf_reldir/curses.priv.h"
fi
+
+ cf_dir_suffix=
+ old_cf_suffix="$cf_suffix"
+ if test "$cf_cv_shlib_version_infix" = yes ; then
+ if test -n "$LIB_SUFFIX" -a x`echo $LIB_SUFFIX | cut
-c1` = xw ; then
+ cf_suffix=`echo $cf_suffix | sed 's/^w//'`
+ cf_dir_suffix=w
+ fi
+ fi
$AWK -f $srcdir/mk-1st.awk \
- name=$cf_dir \
+ name=${cf_dir}$cf_dir_suffix \
traces=$LIB_TRACING \
MODEL=$CF_ITEM \
model=$cf_subdir \
@@ -1258,6 +1281,9 @@
depend="$cf_depend" \
host="$host" \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile
+
+ cf_suffix="$old_cf_suffix"
+
for cf_subdir2 in $cf_subdirs lib
do
test $cf_subdir = $cf_subdir2 && break
diff -r -U 3 ncurses-5.4/configure ncurses-5.4-fix-misappended-w/configure
--- ncurses-5.4/configure Sat Jan 31 20:03:42 2004
+++ ncurses-5.4-fix-misappended-w/configure Thu Sep 2 14:02:15 2004
@@ -13026,13 +13026,27 @@
case "$cf_cv_shlib_version" in #(vi
rel) #(vi
case "$cf_cv_system_name" in #(vi
- darwin*)
cf_suffix='.$(REL_VERSION)'"$cf_suffix" ;; #(vi
+ darwin*)
+ if test -n "$LIB_SUFFIX" -a x`echo $LIB_SUFFIX
| cut -c1` = xw ; then
+ cf_suffix=`echo $cf_suffix | sed
's/^w//'`
+
cf_suffix=w'.$(REL_VERSION)'"$cf_suffix"
+ else
+ cf_suffix='.$(REL_VERSION)'"$cf_suffix"
+ fi
+ ;; #(vi
*) cf_suffix="$cf_suffix"'.$(REL_VERSION)' ;;
esac
;;
abi)
case "$cf_cv_system_name" in #(vi
- darwin*)
cf_suffix='.$(ABI_VERSION)'"$cf_suffix" ;; #(vi
+ darwin*)
+ if test -n "$LIB_SUFFIX" -a x`echo $LIB_SUFFIX
| cut -c1` = xw ; then
+ cf_suffix=`echo $cf_suffix | sed
's/^w//'`
+
cf_suffix=w'.$(ABI_VERSION)'"$cf_suffix"
+ else
+ cf_suffix='.$(ABI_VERSION)'"$cf_suffix"
+ fi
+ ;; #(vi
*) cf_suffix="$cf_suffix"'.$(ABI_VERSION)' ;;
esac
;;
@@ -13130,8 +13144,17 @@
cf_depend="$cf_depend $cf_reldir/curses.priv.h"
fi
+ cf_dir_suffix=
+ old_cf_suffix="$cf_suffix"
+ if test "$cf_cv_shlib_version_infix" = yes ; then
+ if test -n "$LIB_SUFFIX" -a x`echo $LIB_SUFFIX | cut
-c1` = xw ; then
+ cf_suffix=`echo $cf_suffix | sed 's/^w//'`
+ cf_dir_suffix=w
+ fi
+ fi
+
$AWK -f $srcdir/mk-1st.awk \
- name=$cf_dir \
+ name=${cf_dir}$cf_dir_suffix \
traces=$LIB_TRACING \
MODEL=$CF_ITEM \
model=$cf_subdir \
@@ -13147,6 +13170,9 @@
depend="$cf_depend" \
host="$host" \
$srcdir/$cf_dir/modules >>$cf_dir/Makefile
+
+ cf_suffix="$old_cf_suffix"
+
for cf_subdir2 in $cf_subdirs lib
do
test $cf_subdir = $cf_subdir2 && break
Index: ncurses.info
===================================================================
RCS file: /cvsroot/fink/experimental/beren12/finkinfo/base/ncurses.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ncurses.info 19 Oct 2004 15:28:06 -0000 1.4
+++ ncurses.info 22 Oct 2004 17:11:43 -0000 1.5
@@ -1,91 +1,55 @@
Package: ncurses
-Version: 5.4-20041016
-Revision: 1
+Version: 5.3-20031018
+Revision: 500
GCC: 3.3
-Source: mirror:gnu:%n/%n-5.4.tar.gz
+Source: mirror:sourceforge:fink/%n-5.3.tar.gz
Source-MD5: 5dcc9faa93157eafa572494bffed131a
-#Source2: mirror:sourceforge:fink/%n-20031004-patch.sh.bz2
-Source2: ftp://invisible-island.net/ncurses/5.4/%n-5.4-20040711-patch.sh.bz2
+Source2: mirror:sourceforge:fink/%n-5.3-20031004-patch.sh.bz2
Source2-MD5: 3c1d1c4c78a4e2b9d99924ba8aa2a608
-Source2ExtractDir: %n-5.4
-Source3: ftp://invisible-island.net/ncurses/5.4/%n-5.4-20041016.patch.gz
-Source3-MD5: 3c1d1c4c78a4e2b9d99924ba8aa2a608
-Source3ExtractDir: %n-5.4
+Source2ExtractDir: %n-5.3
PatchScript: <<
#!/bin/sh -e
- bunzip2 %n-5.4-20040711-patch.sh.bz2
- chmod +x %n-5.4-20040711-patch.sh
- ./%n-5.4-20040711-patch.sh
+ bunzip2 %n-5.3-20031004-patch.sh.bz2
+ chmod +x %n-5.3-20031004-patch.sh
+ ./%n-5.3-20031004-patch.sh
echo "***********************************************************************"
- patch -p1 < %n-%v.patch
- perl -p -i -e 's|tic\$suffix|tic\$suffix -x|;' misc/run_tic*
+ patch -p1 < %a/%n.patch
+ perl -p -i.bak -e 's|tic\$suffix|tic\$suffix -x|;' misc/run_tic*
echo "***********************************************************************"
<<
-Essential: yes
-Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.13.0)
-ConfigureParams: --without-ada --with-shared --with-debug --enable-termcap
--mandir=%p/share/man --with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo"
--with-default-terminfo-dir="%p/share/terminfo" --enable-no-padding --enable-sigwinch
--enable-tcap-names --enable-hard-tabs
+ConfigureParams: --without-ada --without-debug --with-shared --with-debug
--enable-termcap --mandir=%p/share/man
--with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo"
--with-default-terminfo-dir="%p/share/terminfo" --enable-no-padding --enable-sigwinch
--enable-tcap-names --enable-hard-tabs
NoSetCFLAGS: true
NoSetLDFLAGS: true
SetLDFLAGS: -Wl,-search_paths_first
-#NoSetCPPFLAGS: true
-#SetCPPFLAGS: -no-cpp-precomp
CompileScript: <<
#!/bin/sh -e
./configure %c
- make
+ make -j1
<<
InstallScript: <<
#!/bin/sh -e
make install DESTDIR=%d DYLD_LIBRARY_PATH=`pwd`/lib
- mkdir -p %i/share/doc/%n
- cp tack/README %i/share/doc/%n/README.tack
- cp tack/COPYING %i/share/doc/%n/COPYING.tack
-
-ln -s %p/lib/libform.5.dylib %i/lib/libform.dylib.5
-ln -s %p/lib/libmenu.5.dylib %i/lib/libmenu.dylib.5
-ln -s %p/lib/libncurses.5.dylib %i/lib/libncurses.dylib.5
-ln -s %p/lib/libpanel.5.dylib %i/lib/libpanel.dylib.5
-
<<
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 5.3-1)
Depends: base-files
Essential: true
- Files: <<
- lib/libform.*.dylib
- lib/libmenu.*.dylib
- lib/libncurses.*.dylib
- lib/libpanel.*.dylib
- lib/libform.dylib.5
- lib/libmenu.dylib.5
- lib/libncurses.dylib.5
- lib/libpanel.dylib.5
- <<
- Shlibs: <<
- %p/lib/libform.5.dylib 5.0.0 %n (>= 5.4-20040711)
- %p/lib/libmenu.5.dylib 5.0.0 %n (>= 5.4-20040711)
- %p/lib/libncurses.5.dylib 5.0.0 %n (>= 5.4-20040711)
- %p/lib/libpanel.5.dylib 5.0.0 %n (>= 5.4-20040711)
- %p/lib/libform.dylib.5 5.0.0 %n (>= 5.4-20040711)
- %p/lib/libmenu.dylib.5 5.0.0 %n (>= 5.4-20040711)
- %p/lib/libncurses.dylib.5 5.0.0 %n (>= 5.4-20040711)
- %p/lib/libpanel.dylib.5 5.0.0 %n (>= 5.4-20040711)
+ InstallScript: <<
+ #!/bin/sh -e
+
+ mkdir -p %i/lib
+ mv %I/lib/libform.*.dylib %I/lib/libmenu.*.dylib %I/lib/libncurses.*.dylib
%I/lib/libpanel.*.dylib %i/lib
+
+ rm -rf %I/bin %I/include %I/lib %I/share/man %I/share/terminfo %I/share/tabset
<<
- Description: Shared libraries for ncurses package
-<<
-SplitOff2: <<
- Package: %N-dev
- Depends: %N-shlibs (= %v-%r)
- Replaces: %N (<= 5.3-1)
- BuildDependsOnly: True
- Files: include lib/libform.dylib lib/libmenu.dylib lib/libncurses.dylib
lib/libpanel.dylib lib/*.a
- Description: Development files for ncurses package
+Description: Transition for old ncurses package
<<
DocFiles: README ANNOUNCE NEWS INSTALL TO-DO MANIFEST
Description: Full-screen ascii drawing library
+DescDetail: This is for backword compat only, purge as soon as an update-all has been
done
DescPort: <<
The -no-cpp-precomp is strictly needed.
More changes by Chris Zubrzycki to be more compatable with apple's lib
--- NEW FILE: ncurses-5.4-20040918.patch ---
--- NEW FILE: ncurses-5.4-20040911.patch ---
--- NEW FILE: ncurses-5.4-20041002.patch ---
--- NEW FILE: ncurses-5.4-20041016.patch ---
--- NEW FILE: ncurses.patch ---
# ncurses 5.3 - patch 20031018 - T.Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 5.3 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 5.3 are in the subdirectory
# ftp://dickey.his.com/ncurses/5.3
#
# ------------------------------------------------------------------------------
# NEWS | 13
# aclocal.m4 | 16
# c++/Makefile.in | 3
# configure | 1813 +++++++++++++++++++++++++---------------------------
# configure.in | 12
# dist.mk | 4
# progs/Makefile.in | 3
# progs/infocmp.c | 27
[...8680 lines suppressed...]
#include <curses.h>
#include <term.h>
+#endif
#if NCURSES_NOMACROS
#include <nomacros.h>
Binary files ncurses-5.3/.configure.swo and ncurses-5.3-new/.configure.swo differ
Binary files ncurses-5.3/.configure.swp and ncurses-5.3-new/.configure.swp differ
diff -uNr ncurses-5.3/configure ncurses-5.3-new/configure
--- ncurses-5.3/configure Wed Oct 22 09:41:57 2003
+++ ncurses-5.3-new/configure Wed Oct 22 09:50:47 2003
@@ -4458,7 +4458,7 @@
darwin*)
EXTRA_CFLAGS="-no-cpp-precomp"
CC_SHARED_OPTS="-dynamic"
- MK_SHARED_LIB='$(CC) -dynamiclib -install_name
$(DESTDIR)$(libdir)/`basename [EMAIL PROTECTED] -compatibility_version $(ABI_VERSION)
-current_version $(ABI_VERSION) -o $@'
+ MK_SHARED_LIB='$(CC) -dynamiclib -install_name
$(DESTDIR)$(libdir)/`basename [EMAIL PROTECTED] -compatibility_version 6
-current_version 6.3 -o $@'
test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
cf_cv_shlib_version_infix=yes
;;
--- NEW FILE: ncurses5.info ---
Package: ncurses5
Version: 5.4-20041016
Revision: 10
GCC: 3.3
Source: mirror:gnu:ncurses/ncurses-5.4.tar.gz
Source-MD5: 069c8880072060373290a4fefff43520
#Source2: mirror:sourceforge:fink/ncurses-20031004-patch.sh.bz2
Source2: ftp://invisible-island.net/ncurses/5.4/ncurses-5.4-20040711-patch.sh.bz2
Source2-MD5: 5cb04a825432ad968ef4e1ab6094353b
Source2ExtractDir: ncurses-5.4
Source3: ftp://invisible-island.net/ncurses/5.4/ncurses-5.4-20041016.patch.gz
Source3-MD5: 1d1590e5c6d0297a09543ed791505a67
Source3ExtractDir: ncurses-5.4
PatchScript: <<
#!/bin/sh -e
bunzip2 ncurses-5.4-20040711-patch.sh.bz2
chmod +x ncurses-5.4-20040711-patch.sh
./ncurses-5.4-20040711-patch.sh
echo "***********************************************************************"
# gunzip -c ncurses-%v.patch.gz | patch -p1
patch -p1 < %a/big.patch
perl -p -i -e 's|tic\$suffix|tic\$suffix -x|;' misc/run_tic*
echo "***********************************************************************"
<<
Essential: yes
Depends: %N-shlibs (= %v-%r), %Nw-shlibs (= %v-%r)
BuildDepends: fink (>= 0.13.0)
#Conflicts: ncurses (< 5.3-20031018-500)
Replaces: ncurses
ConfigureParams: --without-ada --with-shared --with-debug --enable-termcap
--mandir=%p/share/man --with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo"
--with-default-terminfo-dir="%p/share/terminfo" --enable-no-padding --enable-sigwinch
--enable-tcap-names --enable-hard-tabs
NoSetCFLAGS: true
NoSetLDFLAGS: true
SetLDFLAGS: -Wl,-search_paths_first
#NoSetCPPFLAGS: true
#SetCPPFLAGS: -no-cpp-precomp
CompileScript: <<
#!/bin/sh -e
./configure %c --libdir=%p/lib/ncurses
make
<<
InstallScript: <<
#!/bin/sh -e
make install DESTDIR=%d DYLD_LIBRARY_PATH=`pwd`/lib:`pwd`/lib/ncurses
mkdir -p %i/share/doc/%n
cp tack/README %i/share/doc/%n/README.tack
cp tack/COPYING %i/share/doc/%n/COPYING.tack
# configure and make widechar ncurses
./configure %c --enable-widec
make -j1
make install DESTDIR=%d DYLD_LIBRARY_PATH=`pwd`/lib:`pwd`/lib/ncurses
<<
SplitOff: <<
Package: %Nw-shlibs
Replaces: %Nw (<= 5.4-1)
Depends: base-files
Essential: false
Files: <<
lib/libformw.*.dylib
lib/libmenuw.*.dylib
lib/libncursesw.*.dylib
lib/libpanelw.*.dylib
<<
Shlibs: <<
%p/lib/libformw.5.dylib 5.0.0 %n (>= 5.4-1)
%p/lib/libmenuw.5.dylib 5.0.0 %n (>= 5.4-1)
%p/lib/libncursesw.5.dylib 5.0.0 %n (>= 5.4-1)
%p/lib/libpanelw.5.dylib 5.0.0 %n (>= 5.4-1)
<<
Description: Shared libraries for ncursesw package
<<
SplitOff2: <<
Package: %Nw-dev
Depends: %Nw-shlibs (= %v-%r)
BuildDependsOnly: True
Files: include/ncursesw lib/libformw.dylib lib/libmenuw.dylib lib/libncursesw.dylib
lib/libpanelw.dylib lib/*w*.a
Description: Development files for ncursesw package
<<
SplitOff3: <<
Package: %N-shlibs
# Conflicts: ncurses-shlibs (< 5.3-20031018-500)
Replaces: ncurses-shlibs
Depends: base-files
Essential: true
Files: <<
lib/ncurses/libform.*.dylib
lib/ncurses/libmenu.*.dylib
lib/ncurses/libncurses.*.dylib
lib/ncurses/libpanel.*.dylib
<<
Shlibs: <<
%p/lib/libform.5.dylib 5.0.0 %n (>= 5.4-20040711)
%p/lib/libmenu.5.dylib 5.0.0 %n (>= 5.4-20040711)
%p/lib/libncurses.5.dylib 5.0.0 %n (>= 5.4-20040711)
%p/lib/libpanel.5.dylib 5.0.0 %n (>= 5.4-20040711)
<<
Description: Shared libraries for ncurses package
<<
SplitOff4: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
# Conflicts: ncurses-dev (< 5.3-20031018-500)
Replaces: ncurses-dev
BuildDependsOnly: True
Files: include
InstallScript: <<
#!/bin/sh -e
rm -f %I/lib/ncurses/*dylib
mkdir -p %i/lib
mv %I/lib/ncurses/* %i/lib
DYLIBS="libform libmenu libncurses libpanel"
for lib in $DYLIBS ; do
ln -s ncurses/$lib.5.dylib %i/lib/$lib.dylib
done
<<
Description: Development files for ncurses package
<<
DocFiles: README ANNOUNCE NEWS INSTALL TO-DO MANIFEST
Description: Full-screen ascii drawing library
DescPort: <<
The -no-cpp-precomp is strictly needed.
More changes by Chris Zubrzycki to be more compatable with apple's lib
-udates to the (sometimes) monthly releases of ncurses (in patch form)
grab all the patches from ftp://invisible-island.net/ncurses/5.4 except the one the
same date
as the patch script, gunzip *, cat ncurses-5.4*patch >> big.patch
to get to the current patch level.
<<
DescPackaging: <<
First revision by David Ross.
Previous versions by Christoph Pfisterer.
<<
License: OSI-Approved
Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
Homepage: http://www.gnu.org/software/ncurses/ncurses.html
--- NEW FILE: big.patch ---
# ncurses 5.4 - patch 20040717 - T.Dickey
#
# ------------------------------------------------------------------------------
#
# Ncurses 5.4 is at
# ftp.gnu.org:/pub/gnu
#
# Patches for ncurses 5.4 are in the subdirectory
# ftp://invisible-island.net/ncurses/5.4
#
# ------------------------------------------------------------------------------
# NEWS | 11 ++++
# dist.mk | 4 -
# misc/terminfo.src | 117 ++++++++++++++++++++++++++++++++++++----------------
# 3 files changed, 93 insertions(+), 39 deletions(-)
# ------------------------------------------------------------------------------
Index: NEWS
Prereq: 1.826
--- ncurses-5.4-20040711+/NEWS 2004-07-11 15:05:59.000000000 +0000
[...22982 lines suppressed...]
#include <term.h>
-MODULE_ID("$Id: lib_get_wstr.c,v 1.7 2004/09/25 20:59:57 tom Exp $")
+MODULE_ID("$Id: lib_get_wstr.c,v 1.8 2004/10/16 21:55:36 tom Exp $")
static int
wadd_wint(WINDOW *win, wint_t *src)
{
cchar_t tmp;
- wchar_t wch;
+ wchar_t wch[2];
- wch = *src;
- setcchar(&tmp, &wch, A_NORMAL, 0, NULL);
+ wch[0] = *src;
+ wch[1] = 0;
+ setcchar(&tmp, wch, A_NORMAL, 0, NULL);
return wadd_wch(win, &tmp);
}
--- NEW FILE: ncurses-5.4-20040828.patch ---
--- NEW FILE: ncurses-5.4-20040807.patch ---
--- NEW FILE: ncurses-5.4-20040731.patch ---
--- NEW FILE: ncurses-5.4-20040925.patch ---
--- NEW FILE: ncurses-5.4-20040821.patch ---
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
