diff options
40 files changed, 255 insertions, 666 deletions
diff --git a/mk/build.mk b/mk/build.mk index 20c08b15a..e7d1f0ae0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -48,7 +48,8 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ BUSYBOX_FEATURE_OSF_LABEL=n \ BUSYBOX_FEATURE_SGI_LABEL=n \ ADK_KERNEL_RT2X00_DEBUG=n \ - ADK_KERNEL_ATH5K_DEBUG=n + ADK_KERNEL_ATH5K_DEBUG=n \ + ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ _config \ diff --git a/package/binutils/Makefile b/package/binutils/Makefile index c130804de..c622a1af7 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -13,7 +13,9 @@ $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ TCFLAGS+= -fPIC CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-werror +CONFIGURE_ARGS+= --disable-werror \ + --host=$(REAL_GNU_TARGET_NAME) \ + --target=$(REAL_GNU_TARGET_NAME) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index dd5784512..3d89f2072 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -13,7 +13,7 @@ PKG_TARGET_DEPENDS:= alix1c alix2d alix2d13 wrap foxboard ag241 rb532 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 -CFLINE_CFGFS:= select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG +CFLINE_CFGFS:= select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT include ${TOPDIR}/mk/package.mk diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile index a945a534f..d45dcee52 100644 --- a/package/evilwm/patches/patch-Makefile +++ b/package/evilwm/patches/patch-Makefile @@ -1,5 +1,6 @@ +do not strip by install --- evilwm-1.0.1.orig/Makefile 2009-03-30 12:37:06.000000000 +0200 -+++ evilwm-1.0.1/Makefile 2010-01-22 17:14:53.000000000 +0100 ++++ evilwm-1.0.1/Makefile 2010-01-27 08:14:46.000000000 +0100 @@ -1,11 +1,11 @@ # If you don't use CC -CC = gcc @@ -34,3 +35,12 @@ #CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall CFLAGS += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls LDFLAGS += $(LDPATH) $(LIBS) +@@ -93,7 +93,7 @@ evilwm: $(OBJS) + install: evilwm + if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi + mkdir -p $(prefix)/bin $(prefix)/share/man/man1 +- install -s evilwm $(prefix)/bin ++ install evilwm $(prefix)/bin + install evilwm.1 $(prefix)/share/man/man1 + #gzip -9 $(prefix)/share/man/man1/evilwm.1 + diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile index 08d05d0d2..013910dd5 100644 --- a/package/font-adobe-100dpi/Makefile +++ b/package/font-adobe-100dpi/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 93bd04e2fb348a0c48e13ab3933f2381 PKG_DESCR:= X fonts PKG_SECTION:= x11 +PKG_DEPENDS:= font-util +PKG_BUILDDEP+= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile index f39871761..34ace47f1 100644 --- a/package/font-adobe-75dpi/Makefile +++ b/package/font-adobe-75dpi/Makefile @@ -9,6 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d22283daba10129643800d73f5496aab PKG_DESCR:= X fonts PKG_SECTION:= x11 +PKG_DEPENDS:= font-util +PKG_BUILDDEP+= font-util PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/gsm/Makefile b/package/gsm/Makefile index dfa0cbb5c..308c174c9 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= libs PKG_URL:= http://www-rn.informatik.uni-bremen.de/software/gsm/ PKG_SITES:= http://www-rn.informatik.uni-bremen.de/software/gsm/ +PKG_NOPARALLEL:= 1 PKG_DESCR_1:= A GSM 06.10 full-rate speech transcoding implementation (utilities) PKG_DEPENDS_1:= libgsm diff --git a/package/libmad/patches/patch-configure b/package/libmad/patches/patch-configure new file mode 100644 index 000000000..79126f24a --- /dev/null +++ b/package/libmad/patches/patch-configure @@ -0,0 +1,10 @@ +--- libmad-0.15.1b.orig/configure 2004-02-05 10:34:07.000000000 +0100 ++++ libmad-0.15.1b/configure 2010-01-22 22:03:54.000000000 +0100 +@@ -19099,7 +19099,6 @@ then + case "$optimize" in + -O|"-O "*) + optimize="-O" +- optimize="$optimize -fforce-mem" + optimize="$optimize -fforce-addr" + : #x optimize="$optimize -finline-functions" + : #- optimize="$optimize -fstrength-reduce" diff --git a/package/mutt/Makefile b/package/mutt/Makefile index cf698f6d3..89d85d7c6 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -21,6 +21,7 @@ $(eval $(call PKG_template,MUTT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --includedir=${WRKBUILD}/. \ --oldincludedir=${WRKBUILD}/. \ + --with-homespool="~/Maildir" \ --enable-pop \ --enable-imap \ --with-ssl diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in new file mode 100644 index 000000000..16af3373b --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in @@ -0,0 +1,66 @@ +--- nfs-utils-1.2.1.orig/tools/rpcgen/Makefile.in 2009-11-04 12:15:52.000000000 +0100 ++++ nfs-utils-1.2.1/tools/rpcgen/Makefile.in 2010-01-16 11:01:44.015625000 +0100 +@@ -66,21 +66,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$ + rpcgen_OBJECTS = $(am_rpcgen_OBJECTS) + rpcgen_LDADD = $(LDADD) + rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \ +- $(rpcgen_LDFLAGS) $(LDFLAGS) -o $@ ++ --mode=link $(CCLD) $(rpcgen_CFLAGS) \ ++ $(rpcgen_LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CFLAGS) $(HOSTCFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(HOSTCFLAGS) \ ++ -o $@ + SOURCES = $(rpcgen_SOURCES) + DIST_SOURCES = $(rpcgen_SOURCES) + ETAGS = etags +@@ -100,10 +100,10 @@ AWK = @AWK@ + CC = $(CC_FOR_BUILD) + CCDEPMODE = @CCDEPMODE@ + CC_FOR_BUILD = @CC_FOR_BUILD@ +-CFLAGS = @CFLAGS@ ++CFLAGS = + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ + CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ ++CPPFLAGS = + CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ +@@ -136,10 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P + K5VERS = @K5VERS@ + KRBCFLAGS = @KRBCFLAGS@ + KRBDIR = @KRBDIR@ +-KRBLDFLAGS = @KRBLDFLAGS@ ++KRBLDFLAGS = + KRBLIBS = @KRBLIBS@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = + LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ + LIBBLKID = @LIBBLKID@ + LIBBSD = @LIBBSD@ +@@ -299,7 +299,7 @@ clean-noinstPROGRAMS: + rm -f $$list + rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) + @rm -f rpcgen$(EXEEXT) +- $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS) ++ $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c new file mode 100644 index 000000000..5bc54e758 --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c @@ -0,0 +1,12 @@ +--- nfs-utils-1.2.1.orig/tools/rpcgen/rpc_main.c 2009-11-04 12:13:56.000000000 +0100 ++++ nfs-utils-1.2.1/tools/rpcgen/rpc_main.c 2010-01-16 11:22:02.359375000 +0100 +@@ -562,9 +562,6 @@ s_output(int argc, char **argv, char *in + f_print(fout, "#include <sys/types.h>\n"); + + f_print(fout, "#include <memory.h>\n"); +-#ifndef linux +- f_print(fout, "#include <stropts.h>\n"); +-#endif + if (inetdflag || !tirpcflag ) { + f_print(fout, "#include <sys/socket.h>\n"); + f_print(fout, "#include <netinet/in.h>\n"); diff --git a/package/openswan/patches/patch-programs_eroute_eroute_c b/package/openswan/patches/patch-programs_eroute_eroute_c deleted file mode 100644 index f2d2c52b2..000000000 --- a/package/openswan/patches/patch-programs_eroute_eroute_c +++ /dev/null @@ -1,11 +0,0 @@ ---- openswan-2.6.24.orig/programs/eroute/eroute.c 2010-01-10 02:34:38.000000000 +0100 -+++ openswan-2.6.24/programs/eroute/eroute.c 2010-01-20 08:43:00.000000000 +0100 -@@ -268,7 +268,7 @@ main(int argc, char **argv) - exit (1); - } - if(ntohl(said.spi) < 0x100) { -- fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%x Must be larger than 0x100.\n", -+ fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%lx Must be larger than 0x100.\n", - progname, optarg, ntohl(said.spi)); - exit(1); - } diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in index 028fd90b3..6f12634fa 100644 --- a/package/proftpd/patches/patch-Make_rules_in +++ b/package/proftpd/patches/patch-Make_rules_in @@ -1,6 +1,6 @@ do not try to set user or group id when installing --- proftpd-1.3.2b.orig/Make.rules.in 2008-11-19 04:51:38.000000000 +0100 -+++ proftpd-1.3.2b/Make.rules.in 2010-01-20 17:52:24.864178426 +0100 ++++ proftpd-1.3.2b/Make.rules.in 2010-01-27 23:00:19.000000000 +0100 @@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ INSTALL=@INSTALL@ INSTALL_USER=@install_user@ @@ -8,8 +8,8 @@ -INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 -INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 -INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 -+INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -m 0755 -+INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -m 0755 ++INSTALL_BIN=$(INSTALL) -m 0755 ++INSTALL_SBIN=$(INSTALL) -m 0755 +INSTALL_MAN=$(INSTALL) -m 0644 RM=rm -f diff --git a/package/screen/Makefile b/package/screen/Makefile index 424c3de5f..01451b900 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= screen PKG_VERSION:= 4.0.3 -PKG_RELEASE:= 1 -PKG_BUILDDEP+= ncurses +PKG_RELEASE:= 2 PKG_MD5SUM:= 8506fd205028a96c741e4037de6e3c42 PKG_DESCR:= A window manager for the terminal session PKG_SECTION:= misc PKG_DEPENDS:= libncurses +PKG_BUILDDEP+= ncurses PKG_URL:= http://www.gnu.org/software/screen PKG_SITES:= ${MASTER_SITE_GNU:=screen/} diff --git a/package/screen/patches/patch-Makefile b/package/screen/patches/patch-Makefile deleted file mode 100644 index 852a91342..000000000 --- a/package/screen/patches/patch-Makefile +++ /dev/null @@ -1,336 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/Makefile 2006-10-23 15:06:32.000000000 +0200 -+++ screen-4.0.3/Makefile 2008-12-08 04:54:09.000000000 +0100 -@@ -1,3 +1,331 @@ --install all Makefiles and config: -+# -+# Makefile template for screen -+# -+# See machine dependant config.h for more configuration options. -+# -+ -+srcdir = /home/wbx/openadk/build_x86/w-screen-4.0.3-1/screen-4.0.3 -+VPATH = /home/wbx/openadk/build_x86/w-screen-4.0.3-1/screen-4.0.3 -+ -+DESTDIR = -+ -+# Where to install screen. -+ -+prefix = /usr -+exec_prefix = ${prefix} -+ -+# don't forget to change mandir and infodir in doc/Makefile. -+bindir = $(exec_prefix)/bin -+ -+VERSION = 4.0.3 -+SCREEN = screen-$(VERSION) -+ -+ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'` -+SCREENENCODINGS = `sed < config.h -n -e '/define SCREENENCODINGS/s/^.*"\([^"]*\)"/\1/p'` -+ -+CC = /home/wbx/openadk/cross_x86/host/bin/i586-linux-uclibc-gcc -+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=i586 -+CPPFLAGS = -isystem /home/wbx/openadk/cross_x86/target/include -isystem /home/wbx/openadk/cross_x86/target/usr/include -DNDEBUG -+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_x86/target/usr/lib -L/home/wbx/openadk/cross_x86/target/lib -L/home/wbx/openadk/cross_x86/target/usr/lib -+LIBS = -lcurses -lutil -lcrypt -+ -+CPP=/home/wbx/openadk/cross_x86/host/bin/i586-linux-uclibc-gcc -E -+CPP_DEPEND=$(CC) -MM -+ -+INSTALL = /usr/bin/install -c -+INSTALL_PROGRAM = ${INSTALL} -+INSTALL_DATA = ${INSTALL} -m 644 -+ -+AWK = gawk -+ -+### Chose some debug configuration options: -+# -DDEBUG -+# Turn on really heavy debug output. This is written to -+# /tmp/debug/{SCREEN,screen}.<pid>. Look at these files and quote -+# questionable sections when sending bug-reports to the author. -+# -DDUMPSHADOW -+# With shadow-pw screen would never dump core. Use this option if -+# you still want to have a core. Use only for debugging. -+OPTIONS= -+#OPTIONS= -DDEBUG -+ -+SHELL=/bin/sh -+ -+CFILES= screen.c ansi.c fileio.c mark.c misc.c resize.c socket.c \ -+ search.c tty.c term.c window.c utmp.c loadav.c putenv.c help.c \ -+ termcap.c input.c attacher.c pty.c process.c display.c comm.c \ -+ kmapdef.c acls.c braille.c braille_tsi.c logfile.c layer.c \ -+ sched.c teln.c nethack.c encoding.c -+OFILES= screen.o ansi.o fileio.o mark.o misc.o resize.o socket.o \ -+ search.o tty.o term.o window.o utmp.o loadav.o putenv.o help.o \ -+ termcap.o input.o attacher.o pty.o process.o display.o comm.o \ -+ kmapdef.o acls.o braille.o braille_tsi.o logfile.o layer.o \ -+ sched.o teln.o nethack.o encoding.o -+ -+all: screen -+ -+screen: $(OFILES) -+ $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) -+ -+.c.o: -+ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< -+ -+install_bin: .version screen -+ -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ -+ then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi -+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -+ -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -+# This doesn't work if $(bindir)/screen is a symlink -+ -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi -+ rm -f $(DESTDIR)$(bindir)/screen -+ (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen) -+ cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -+ -+############################################################################### -+install: installdirs install_bin -+ cd doc ; $(MAKE) install -+ -if [ -d /usr/lib/terminfo ]; then \ -+ PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ -+ chmod 644 /usr/lib/terminfo/s/screen*; \ -+ fi -+# Better do this by hand. E.g. under RCS... -+# cat ${srcdir}/terminfo/screencap >> /etc/termcap -+ @echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually." -+ @echo "You may also want to install $(srcdir)/etc/etcscreenrc in" $(ETCSCREENRC) -+ -+installdirs: -+# Path leading to ETCSCREENRC and Socketdirectory not checked. -+ $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) -+ cd doc ; $(MAKE) installdirs -+ -+uninstall: .version -+ rm -f $(DESTDIR)$(bindir)/$(SCREEN) -+ rm -f $(DESTDIR)$(bindir)/screen -+ -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen -+ rm -f $(DESTDIR)$(ETCSCREENRC) -+ cd doc; $(MAKE) uninstall -+ -+shadow: -+ mkdir shadow; -+ cd shadow; ln -s ../*.[ch] ../*.in ../*.sh ../configure ../doc ../terminfo ../etc . -+ rm -f shadow/term.h shadow/tty.c shadow/comm.h shadow/osdef.h -+ echo "install all Makefiles and config:" > shadow/Makefile -+ echo " rm -f config.cache" >> shadow/Makefile -+ echo " sh ./configure" >> shadow/Makefile -+ -+term.h: term.c term.sh -+ AWK=$(AWK) srcdir=$(srcdir) sh $(srcdir)/term.sh -+ -+kmapdef.c: term.h -+ -+tty.c: tty.sh -+ sh $(srcdir)/tty.sh tty.c -+ -+comm.h: comm.c comm.sh config.h -+ AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh -+ -+osdef.h: osdef.sh config.h osdef.h.in -+ CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh -+ -+docs: -+ cd doc; $(MAKE) dvi screen.info -+ -+dvi info screen.info: -+ -cd doc; $(MAKE) $@ -+ -+mostlyclean: -+ rm -f $(OFILES) screen config.cache osdef0.c osdef1.sed osdef2.sed -+ -+clean celan: mostlyclean -+ rm -f tty.c term.h comm.h osdef.h kmapdef.c core -+ -+# Delete all files from the current directory that are created by -+# configuring or building the program. -+# building of term.h/comm.h requires awk. Keep it in the distribution -+# we keep config.h, as this file knows where 'make dist' finds the ETCSCREENRC. -+#distclean: mostlyclean -+# rm -f $(SCREEN).tar $(SCREEN).tar.gz -+# rm -f config.status Makefile -+# rm -f osdef.h doc/Makefile -+ -+maintainer-clean: -+ @echo "This command is not even intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+ -+# Delete everything from the current directory that can be -+# reconstructed with this Makefile. -+realclean: .version mostlyclean -+ rm -f $(SCREEN).tar $(SCREEN).tar.gz -+ rm -f config.status Makefile doc/Makefile -+ rm -f tty.c term.h comm.h osdef.h kmapdef.c -+ rm -f config.h -+ echo "install all Makefiles and config:" > Makefile -+ echo " sh ./configure" >> Makefile -+ -+tags TAGS: $(CFILES) -+ -ctags *.sh $(CFILES) *.h -+ -ctags -e *.sh $(CFILES) *.h -+ -+dist: .version $(SCREEN).tar.gz -+ -+$(SCREEN).tar: .version term.h comm.h tty.c kmapdef.c -+ -rm -rf dist -+ mkdir dist -+ mkdir dist/$(SCREEN) -+ ln acls.h ansi.h display.h extern.h logfile.h mark.h os.h \ -+ layer.h patchlevel.h screen.h window.h image.h \ -+ osdef.h.in term.sh tty.sh comm.sh osdef.sh braille.h \ -+ sched.h \ -+ $(CFILES) \ -+ ChangeLog COPYING INSTALL NEWS* TODO install.sh \ -+ dist/$(SCREEN) -+ cd dist/$(SCREEN); mv tty.c tty.c.dist -+ cd dist/$(SCREEN); mv kmapdef.c kmapdef.c.dist -+ ln configure.in configure dist/$(SCREEN) -+ sed -e 's@"/local/screens@"/tmp/screens@' -e 's@"/local@"/usr/local@g' < config.h.in > dist/$(SCREEN)/config.h.in -+ sed -e 's@[ ]/local@ /usr/local@g' -e 's/^CFLAGS = -g/CFLAGS = -O/' < Makefile.in > dist/$(SCREEN)/Makefile.in -+ ln term.h dist/$(SCREEN)/term.h.dist -+ ln comm.h dist/$(SCREEN)/comm.h.dist -+ ln README dist/$(SCREEN)/README -+ mkdir dist/$(SCREEN)/terminfo -+ cd terminfo; ln 8bits README checktc.c screencap \ -+ screeninfo.src test.txt tetris.c \ -+ ../dist/$(SCREEN)/terminfo -+ mkdir dist/$(SCREEN)/etc -+ cd etc; ln * ../dist/$(SCREEN)/etc -+ mkdir dist/$(SCREEN)/utf8encodings -+ cd utf8encodings; ln * ../dist/$(SCREEN)/utf8encodings -+ # sed -e 's/^startup/#startup/' -e 's/^autodetach/#autodetach/' < $(ETCSCREENRC) > dist/$(SCREEN)/etc/etcscreenrc -+ cp $(HOME)/.screenrc dist/$(SCREEN)/etc/screenrc -+ mkdir dist/$(SCREEN)/doc -+ sed -e 's@/local/emacs@/usr/local@g' < doc/Makefile.in > dist/$(SCREEN)/doc/Makefile.in -+ cd doc; ln FAQ README.DOTSCREEN screen.1 screen.texinfo fdpat.ps make.help window_to_display.ps \ -+ ../dist/$(SCREEN)/doc -+ cd doc; if test -f screen.info; then ln screen.info* \ -+ ../dist/$(SCREEN)/doc; fi -+ cd dist/$(SCREEN)/doc; ln -s ../install.sh . -+ cd dist/$(SCREEN); ln -s doc/FAQ . -+ echo "install all Makefiles and config:" > dist/$(SCREEN)/Makefile -+ echo " rm -f config.cache" >> dist/$(SCREEN)/Makefile -+ echo " sh ./configure" >> dist/$(SCREEN)/Makefile -+ cd dist; tar cf ../$(SCREEN).tar $(SCREEN) -+ rm -rf dist -+ -+$(SCREEN).tar.gz: $(SCREEN).tar -+ gzip -nf $(SCREEN).tar || gzip -f $(SCREEN).tar -+ -+# Perform self-tests (if any). -+check: -+ -+lint: -+ lint -I. $(CFILES) -+ -+saber: -+ #load $(CFLAGS) screen.c ansi.c $(LIBS) -+ -+config: - rm -f config.cache - sh ./configure -+ -+ -+############################################################################### -+ -+.version: -+ @rev=`sed < $(srcdir)/patchlevel.h -n -e '/#define REV/s/#define REV *//p'`; \ -+ vers=`sed < $(srcdir)/patchlevel.h -n -e '/#define VERS/s/#define VERS *//p'`; \ -+ pat=`sed < $(srcdir)/patchlevel.h -n -e '/#define PATCHLEVEL/s/#define PATCHLEVEL *//p'`; \ -+ if [ "$${rev}.$${vers}.$${pat}" != "$(VERSION)" ]; then \ -+ echo "This distribution is screen-$${rev}.$${vers}.$${pat}, but"; \ -+ echo "the Makefile is from $(VERSION). Please update!"; exit 1; fi -+ -+############################################################################### -+ -+mdepend: $(CFILES) term.h -+ @rm -f DEPEND ; \ -+ for i in ${CFILES} ; do \ -+ echo "$$i" ; \ -+ echo `echo "$$i" | sed -e 's/.c$$/.o/'`": $$i" `\ -+ cc -E $$i |\ -+ grep '^# .*"\./.*\.h"' |\ -+ (sort -t'"' -u -k 2,2 2>/dev/null || sort -t'"' -u +1 -2) |\ -+ sed -e 's/.*"\.\/\(.*\)".*/\1/'\ -+ ` >> DEPEND ; \ -+ done -+ -+ -+depend: depend.in -+ ./config.status || ./configure -+ -+depend.in: $(CFILES) term.h -+ cp Makefile.in Makefile.in~ -+ sed -e '/\#\#\# Dependencies/q' < Makefile.in > tmp_make -+ for i in $(CFILES); do echo $$i; $(CPP_DEPEND) $$i >> tmp_make; done -+ mv tmp_make Makefile.in -+ -+############################################################################### -+ -+### Dependencies: -+screen.o: screen.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h braille.h \ -+ patchlevel.h logfile.h extern.h -+ansi.o: ansi.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h braille.h extern.h \ -+ logfile.h -+fileio.o: fileio.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+mark.o: mark.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h mark.h extern.h -+misc.o: misc.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+resize.o: resize.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+socket.o: socket.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+search.o: search.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h mark.h extern.h -+tty.o: tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+term.o: term.c term.h -+window.o: window.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+utmp.o: utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+loadav.o: loadav.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+putenv.o: putenv.c config.h -+help.o: help.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+termcap.o: termcap.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+input.o: input.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+attacher.o: attacher.c config.h screen.h os.h osdef.h ansi.h \ -+ acls.h comm.h layer.h term.h image.h display.h window.h extern.h -+pty.o: pty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+process.o: process.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+display.o: display.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h braille.h -+comm.o: comm.c config.h acls.h comm.h -+kmapdef.o: kmapdef.c config.h -+acls.o: acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+braille.o: braille.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h braille.h -+braille_tsi.o: braille_tsi.c config.h screen.h os.h osdef.h ansi.h \ -+ acls.h comm.h layer.h term.h image.h display.h window.h extern.h \ -+ braille.h -+logfile.o: logfile.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+layer.o: layer.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+sched.o: sched.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+teln.o: teln.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+nethack.o: nethack.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+encoding.o: encoding.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h diff --git a/package/screen/patches/patch-ansi_c b/package/screen/patches/patch-ansi_c deleted file mode 100644 index f6da58abe..000000000 --- a/package/screen/patches/patch-ansi_c +++ /dev/null @@ -1,32 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/ansi.c 2003-12-05 14:57:05.000000000 +0100 -+++ screen-4.0.3/ansi.c 2008-12-08 04:59:17.000000000 +0100 -@@ -1462,7 +1462,7 @@ StringEnd() - switch (curr->w_StringType) - { - case OSC: /* special xterm compatibility hack */ -- if (curr->w_string[0] == ';' || (p = index(curr->w_string, ';')) == 0) -+ if (curr->w_string[0] == ';' || (p = strchr(curr->w_string, ';')) == 0) - break; - typ = atoi(curr->w_string); - p++; -@@ -2803,15 +2803,15 @@ int ys, ye; - debug2("MFindUsedLine: %d %d\n", ye, ys); - for (y = ye; y >= ys; y--, ml--) - { -- if (bcmp((char*)ml->image, blank, p->w_width)) -+ if (memcmp((char*)ml->image, blank, p->w_width)) - break; -- if (ml->attr != null && bcmp((char*)ml->attr, null, p->w_width)) -+ if (ml->attr != null && memcmp((char*)ml->attr, null, p->w_width)) - break; - #ifdef COLOR -- if (ml->color != null && bcmp((char*)ml->color, null, p->w_width)) -+ if (ml->color != null && memcmp((char*)ml->color, null, p->w_width)) - break; - # ifdef COLORS256 -- if (ml->colorx != null && bcmp((char*)ml->colorx, null, p->w_width)) -+ if (ml->colorx != null && memcmp((char*)ml->colorx, null, p->w_width)) - break |