ckermit: version bump 211 -> 300

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 45 insertions, 114 deletions

diff --git a/patches/cku211/cross-build.patch b/patches/cku211/cross-build.patch
deleted file mode 100644
index 1c231febd..000000000
--- a/patches/cku211/cross-build.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Subject: Enable cross build
-From: Gary Thomas <gary@mlbassoc.com>
-
-Minor Makefile changes to allow package to be cross-built for targets.
-In addition, we make the install stage fully DESTDIR aware.
-
-Signed-off-by: Gary Thomas <gary@mlbassoc.com>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
-# 20081123 Garry Thomas: created patch
-# 20090105 mkl: made install stage fully DESTDIR aware
-
- makefile |   47 +++++++++++++++++++++++------------------------
- 1 file changed, 23 insertions(+), 24 deletions(-)
-
-Index: cku211/makefile
-===================================================================
---- cku211.orig/makefile
-+++ cku211/makefile
-@@ -1018,41 +1018,41 @@ install:
- 	echo " to match the 'cu' program.  See the ckuins.txt file";\
- 	echo " for details.";\
- 	echo;\
--	echo MANDIR=$(MANDIR);\
-+	echo MANDIR=$(DESTDIR)$(MANDIR);\
- 	if test -n "$(MANDIR)"; then\
--		if test -d $(MANDIR); then\
--			echo  "$(MANDIR) exists...";\
-+		if test -d $(DESTDIR)$(MANDIR); then\
-+			echo  "$(DESTDIR)$(MANDIR) exists...";\
- 		else\
--			echo "Creating $(MANDIR)...";\
--			mkdir $(MANDIR) || exit 1;\
--			chmod 755 $(MANDIR) || exit 1;\
-+			echo "Creating $(DESTDIR)$(MANDIR)...";\
-+			mkdir $(DESTDIR)$(MANDIR) || exit 1;\
-+			chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
- 		fi;\
- 		echo "Installing man page...";\
--		rm -f $(MANDIR)/kermit.$(MANEXT);\
--		cp    ckuker.nr $(MANDIR)/kermit.$(MANEXT) || exit 1;\
--		chmod 644       $(MANDIR)/kermit.$(MANEXT) || exit 1;\
-+		rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
-+		cp    ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
-+		chmod 644       $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
- 		echo 'set flag=f\nPrC Removing man pages' >&3;\
--		echo "RmF $(MANDIR)/kermit.$(MANEXT)" >&3;\
-+		echo "RmF $(DESTDIR)$(MANDIR)/kermit.$(MANEXT)" >&3;\
- 		echo 'EfM' >&3;\
- 		echo;\
- 	else\
- 		echo "Not installing man page!\n";\
- 	fi;\
--	echo CERTDIR=$(CERTDIR);\
-+	echo CERTDIR=$(DESTDIR)$(CERTDIR);\
- 	if test -n "$(CERTDIR)"; then\
- 		if test -f ca_certs.pem; then\
--			if test -d $(CERTDIR); then\
--				echo  "$(CERTDIR) exists...";\
-+			if test -d $(DESTDIR)$(CERTDIR); then\
-+				echo  "$(DESTDIR)$(CERTDIR) exists...";\
- 			else\
--				echo "Creating $(CERTDIR)...";\
--				mkdir $(CERTDIR) || exit 1;\
--				chmod 755 $(CERTDIR) || exit 1;\
-+				echo "Creating $(DESTDIR)$(CERTDIR)...";\
-+				mkdir $(DESTDIR)$(CERTDIR) || exit 1;\
-+				chmod 755 $(DESTDIR)$(CERTDIR) || exit 1;\
- 			fi;\
- 			echo "Installing certificates file...";\
--			cp ca_certs.pem $(CERTDIR) || exit 1;\
-+			cp ca_certs.pem $(DESTDIR)$(CERTDIR) || exit 1;\
- 			echo 'set flag=f' >&3;\
- 			echo 'PrC Removing certificates file' >&3;\
--			echo "RmF $(CERTDIR)/ca_certs.pem" >&3;\
-+			echo "RmF $(DESTDIR)$(CERTDIR)/ca_certs.pem" >&3;\
- 			echo 'EfM' >&3;\
- 			echo;\
- 		fi;\
-@@ -1110,8 +1110,8 @@ install:
- 	echo "RmD $(DESTDIR)$(BINDIR)" >&3;\
- 	echo "RmD $(DESTDIR)$(SRCDIR)" >&3;\
- 	echo "RmD $(DESTDIR)$(INFODIR)" >&3;\
--	echo "RmD $(CERTDIR)" >&3;\
--	echo "RmD $(MANDIR)" >&3;\
-+	echo "RmD $(DESTDIR)$(CERTDIR)" >&3;\
-+	echo "RmD $(DESTDIR)$(MANDIR)" >&3;\
- 	echo "RmD $(DESTDIR)" >&3;\
- 	echo "EfM" >&3;\
- 	echo "PrN C-Kermit version $(CKVER) is uninstalled!" >&3;\
-@@ -1406,13 +1406,12 @@ ckcnet.$(EXT): ckcnet.c ckcdeb.h ckcker.
- 
- ckctel.$(EXT): ckcsym.h ckcdeb.h ckcker.h ckcnet.h ckctel.h ckclib.h
- 
--wart: ckwart.$(EXT)
--	$(CC) $(LNKFLAGS) -o wart ckwart.$(EXT) $(LIBS)
-+HOST_CC := $(CC)
-+wart: ckwart.c
-+	$(HOST_CC) -o wart ckwart.c
- 
- ckcmdb.$(EXT): ckcmdb.c ckcdeb.h ckcsym.h ckclib.h
- 
--ckwart.$(EXT): ckwart.c
--
- ckudia.$(EXT): ckudia.c ckcker.h ckcdeb.h ckucmd.h ckcasc.h ckcsym.h ckcsig.h \
- 		ckcnet.h ckctel.h ckclib.h
- 
diff --git a/patches/cku211/series b/patches/cku211/series
deleted file mode 100644
index 0d8ac4fc7..000000000
--- a/patches/cku211/series
+++ /dev/null
@@ -1 +0,0 @@
-cross-build.patch
diff --git a/patches/cku300/0001-add-variable-to-allow-external-wart.patch b/patches/cku300/0001-add-variable-to-allow-external-wart.patch
new file mode 100644
index 000000000..290761c57
--- /dev/null
+++ b/patches/cku300/0001-add-variable-to-allow-external-wart.patch
@@ -0,0 +1,35 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 5 Jul 2011 11:14:02 +0200
+Subject: [PATCH] add variable to allow external 'wart'
+
+this fixes cross-compiling
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ makefile |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/makefile b/makefile
+index 176bc4e..ba5e3ba 100644
+--- a/makefile
++++ b/makefile
+@@ -920,6 +920,7 @@ CC= cc
+ CC2= cc
+ MAKE= make
+ SHELL=/bin/sh
++WART=./wart
+ 
+ ###########################################################################
+ # (Ancient) UNIX V7-specific variables.
+@@ -1414,9 +1415,9 @@ ckclib.$(EXT): ckclib.c ckclib.h ckcdeb.h ckcasc.h ckcsym.h
+ 
+ ckcpro.$(EXT): ckcpro.c ckcker.h ckcdeb.h ckcsym.h ckcasc.h ckclib.h
+ 
+-ckcpro.c: ckcpro.w wart ckcdeb.h ckcsym.h ckcasc.h ckcker.h ckcnet.h ckctel.h \
++ckcpro.c: ckcpro.w $(WART) ckcdeb.h ckcsym.h ckcasc.h ckcker.h ckcnet.h ckctel.h \
+ 	 ckclib.h
+-	./wart ckcpro.w ckcpro.c
++	$(WART) ckcpro.w ckcpro.c
+ 
+ ckcfns.$(EXT): ckcfns.c ckcker.h ckcdeb.h ckcsym.h ckcasc.h ckcxla.h ckcuni.h \
+ 		ckuxla.h ckclib.h ckcnet.h
diff --git a/patches/cku300/series b/patches/cku300/series
new file mode 100644
index 000000000..72202965c
--- /dev/null
+++ b/patches/cku300/series
@@ -0,0 +1,3 @@
+# generated by git-ptx-patches
+0001-add-variable-to-allow-external-wart.patch
+# 926370d951efb2163ebb2240f84062f0  - git-ptx-patches magic
diff --git a/rules/ckermit.in b/rules/ckermit.in
index 1756548b2..564fabfc1 100644
--- a/rules/ckermit.in
+++ b/rules/ckermit.in
@@ -7,6 +7,7 @@ config CKERMIT
 	select LIBC_CRYPT
 	select LIBC_RESOLV
 	select NCURSES
+	select HOST_CKERMIT
 	help
 	  Columbia Univ 'kermit' terminal program: Basic file transfer &
           terminal control.
diff --git a/rules/ckermit.make b/rules/ckermit.make
index a7c326458..d211f7d9c 100644
--- a/rules/ckermit.make
+++ b/rules/ckermit.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_CKERMIT) += ckermit
 #
 # Paths and names
 #
-CKERMIT_VERSION		:= 211
-CKERMIT_MD5		:= 5767ec5e6ff0857cbfe2d3ec1ee0e2bc
+CKERMIT_VERSION		:= 300
+CKERMIT_MD5		:= cde4676b0a31cdb3afa42e10fa81105f
 CKERMIT			:= cku$(CKERMIT_VERSION)
 CKERMIT_SUFFIX		:= tar.gz
 CKERMIT_URL		:= http://www.columbia.edu/kermit/ftp/archives/$(CKERMIT).$(CKERMIT_SUFFIX)
@@ -43,10 +43,10 @@ CKERMIT_MAKEVARS := \
 	prefix=/usr \
 	CC=$(CROSS_CC) \
 	CC2=$(CROSS_CC) \
-	HOST_CC=$(HOSTCC) \
+	WART=$(PTXCONF_SYSROOT_HOST)/bin/wart \
 	CFLAGS='$(CROSS_CPPFLAGS) $(CROSS_CFLAGS) -O2 -g -DLINUX -DFNFLOAT -DCK_POSIX_SIG -DCK_NEWTERM -DTCPSOCKET -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR -DCK_NCURSES -DHAVE_PTMX' \
 	LNKFLAGS='$(CROSS_LDFLAGS)' \
-	LIBS='-lncurses -lm -lcrypt -lresolv'
+	LIBS='-lncurses -lutil -lresolv -lcrypt -lm'
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/host-ckermit.make b/rules/host-ckermit.make
index 58b378272..c037d2ff6 100644
--- a/rules/host-ckermit.make
+++ b/rules/host-ckermit.make
@@ -19,7 +19,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_CKERMIT) += host-ckermit
 #
 HOST_CKERMIT_DIR		= $(HOST_BUILDDIR)/$(CKERMIT)
 HOST_CKERMIT_STRIP_LEVEL	:= 0
-HOST_CKERMIT_MAKE_OPT		:= linuxnc
+HOST_CKERMIT_MAKE_OPT		:= linux
 HOST_CKERMIT_INSTALL_OPT	:= install prefix=
 
 # ----------------------------------------------------------------------------
@@ -36,6 +36,7 @@ $(STATEDIR)/host-ckermit.install:
 	@$(call targetinfo)
 	@$(call install, HOST_CKERMIT)
 	@ln -sf kermit $(HOST_CKERMIT_PKGDIR)/bin/ckermit
+	@install -m755  $(HOST_CKERMIT_DIR)/wart $(HOST_CKERMIT_PKGDIR)/bin/
 	@$(call touch)
 
 # vim: syntax=make