- updating to 20080412

[packages/compat-ncurses5.git] / ncurses-linking.patch

diff --git a/ncurses-linking.patch b/ncurses-linking.patch
index 3ae30ab5cfdaaf0e4e03094342c909dd20187063..340c02db1ce4db50f765d7242b6482b1de8f9230 100644 (file)
--- a/ncurses-linking.patch
+++ b/ncurses-linking.patch
@@ -1,105 +1,11 @@
-diff -Nur ncurses-5.5.orig/mk-1st.awk ncurses-5.5.linking/mk-1st.awk
---- ncurses-5.5.orig/mk-1st.awk        2005-06-18 21:15:57.000000000 +0200
-+++ ncurses-5.5.linking/mk-1st.awk     2006-08-05 18:39:24.000000000 +0200
-@@ -210,9 +210,9 @@
-                                       print "\t-@rm -f $@";
-                               }
-                               if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
--                                      printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(TINFO_LIST) $(LDFLAGS)\n", OBJS
-+                                      printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(TINFO_LIST)\n", OBJS
-                               } else {
--                                      printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(SHLIB_LIST) $(LDFLAGS)\n", OBJS
-+                                      printf "\t$(MK_SHARED_LIB) $(LDFLAGS) $(%s_OBJS) $(SHLIB_LIST)\n", OBJS
-                               }
-                               sharedlinks("../lib")
+--- tack/Makefile.in~  2006-12-17 16:58:32.000000000 +0100
++++ tack/Makefile.in   2008-05-14 21:09:43.119532373 +0200
+@@ -93,7 +93,7 @@
+ LOCAL_LIBDIR  = @top_builddir@/lib
  
-diff -Nur ncurses-5.5.orig/progs/Makefile.in ncurses-5.5.linking/progs/Makefile.in
---- ncurses-5.5.orig/progs/Makefile.in 2006-08-05 18:39:19.000000000 +0200
-+++ ncurses-5.5.linking/progs/Makefile.in      2006-08-05 18:42:00.000000000 +0200
-@@ -96,7 +96,8 @@
  LD            = @LD@
- LINK          = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
+-LINK          = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
++LINK          = @LINK_PROGS@ $(LIBTOOL_LINK)
  LDFLAGS               = @EXTRA_LDFLAGS@ \
--              @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
-+              @LDFLAGS@ @LD_MODEL@
-+LIBS          = @TINFO_ARGS@ @LIBS@
+               @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
  
- LDFLAGS_LIBTOOL       = $(LDFLAGS) $(CFLAGS_LIBTOOL)
- LDFLAGS_NORMAL        = $(LDFLAGS) $(CFLAGS_NORMAL)
-@@ -207,40 +208,40 @@
-       $(MODEL)/dump_entry$o
- 
- tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
--      @ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
-+      @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TIC) $(LIBS) -o $@
- 
- DEPS_TOE = \
-       $(MODEL)/toe$o \
-       $(MODEL)/dump_entry$o
- 
- toe$x: $(DEPS_TOE) $(DEPS_CURSES)
--      @ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_DEFAULT) -o $@
-+      @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TOE) $(LIBS) -o $@
- 
- DEPS_CLEAR = \
-       $(MODEL)/clear$o
- 
- clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
--      @ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
-+      @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_CLEAR) $(LIBS) -o $@
- 
- DEPS_TPUT = \
-       $(MODEL)/tput$o
- 
- tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
--      @ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@
-+      @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TPUT) $(LIBS) -o $@
- 
- DEPS_INFOCMP = \
-       $(MODEL)/infocmp$o \
-       $(MODEL)/dump_entry$o
- 
- infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
--      @ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
-+      @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_INFOCMP) $(LIBS) -o $@
- 
- DEPS_TSET = \
-       $(MODEL)/tset$o \
-       $(MODEL)/dump_entry$o
- 
- tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
--      @ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_DEFAULT) -o $@
-+      @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TSET) $(LIBS) -o $@
- 
- termsort.c: $(srcdir)/MKtermsort.sh
-       sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
-diff -Nur ncurses-5.5.orig/tack/Makefile.in ncurses-5.5.linking/tack/Makefile.in
---- ncurses-5.5.orig/tack/Makefile.in  2005-06-19 01:01:59.000000000 +0200
-+++ ncurses-5.5.linking/tack/Makefile.in       2006-08-05 18:41:40.000000000 +0200
-@@ -64,7 +64,7 @@
- LD            = @LD@
- LINK          = @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
- LDFLAGS               = @EXTRA_LDFLAGS@ \
--              @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
-+              @LDFLAGS@ @LD_MODEL@
- 
- LDFLAGS_LIBTOOL       = $(LDFLAGS) $(CFLAGS_LIBTOOL)
- LDFLAGS_NORMAL        = $(LDFLAGS) $(CFLAGS_NORMAL)
-@@ -76,7 +76,7 @@
- 
- LINT          = @LINT@
- LINT_OPTS     = @LINT_OPTS@
--LINT_LIBS     = -lncurses@LIB_SUFFIX@ @LIBS@
-+LINT_LIBS     = -lncurses@LIB_SUFFIX@ @TINFO_ARGS@ @LIBS@
- 
- PROGS = tack$x
- 
-@@ -135,7 +135,7 @@
-       $(MODEL)/tack$o
- 
- tack$x: $(DEPS_TACK) $(DEPS_CURSES)
--      @ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
-+      @ECHO_LINK@ $(LINK) $(LDFLAGS_DEFAULT) $(DEPS_TACK) -o $@
- 
- #
- # Utility productions start here