package: get rid of editors subdir

Not much point in a seperate subdir for only four packages.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

4 files changed, 104 insertions, 0 deletions

diff --git a/package/uemacs/Config.in b/package/uemacs/Config.in
new file mode 100644
index 000000000..f093218fb
--- /dev/null
+++ b/package/uemacs/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_UEMACS
+	bool "uemacs"
+	select BR2_PACKAGE_NCURSES
+	help
+	  A small emacs.
+
+	  ftp://ftp.kernel.org/pub/software/editors/uemacs/
diff --git a/package/uemacs/uemacs-4.0.15-lt.01.patch b/package/uemacs/uemacs-4.0.15-lt.01.patch
new file mode 100644
index 000000000..855dd3510
--- /dev/null
+++ b/package/uemacs/uemacs-4.0.15-lt.01.patch
@@ -0,0 +1,33 @@
+diff -rup em-4.0.15-lt.oorig/display.c em-4.0.15-lt/display.c
+--- em-4.0.15-lt.oorig/display.c	1994-05-21 12:40:56.000000000 +0200
++++ em-4.0.15-lt/display.c	2005-11-16 16:54:22.000000000 +0100
+@@ -9,6 +9,7 @@
+  */
+ 
+ #include        <stdio.h>
++#include        <errno.h>
+ #include	"estruct.h"
+ #include        "edef.h"
+ 
+diff -rup em-4.0.15-lt.oorig/main.c em-4.0.15-lt/main.c
+--- em-4.0.15-lt.oorig/main.c	1994-05-21 12:41:03.000000000 +0200
++++ em-4.0.15-lt/main.c	2005-11-16 16:54:01.000000000 +0100
+@@ -123,7 +123,7 @@ char *argv[];	/* argument strings */
+ #endif
+ 
+ #if UNIX
+-	static void emergencyexit();
++	void emergencyexit();
+ #ifdef SIGWINCH
+ 	extern void sizesignal();
+ #endif
+@@ -599,7 +599,7 @@ quickexit(f, n)
+ 	return(TRUE);
+ }
+ 
+-static void emergencyexit(signr)
++void emergencyexit(signr)
+ int signr;
+ {
+ 	quickexit(FALSE, 0);
+
diff --git a/package/uemacs/uemacs-4.0.15-lt.02.patch b/package/uemacs/uemacs-4.0.15-lt.02.patch
new file mode 100644
index 000000000..946b3d5d6
--- /dev/null
+++ b/package/uemacs/uemacs-4.0.15-lt.02.patch
@@ -0,0 +1,16 @@
+--- em-4.0.15-lt.oorig/lock.c	1999-05-16 09:04:17.000000000 +0200
++++ em-4.0.15-lt/lock.c	2006-03-10 15:22:16.000000000 +0100
+@@ -152,10 +152,8 @@
+ 
+ 	strcpy(obuf, errstr);
+ 	strcat(obuf, " - ");
+-	if (errno < sys_nerr)
+-		strcat(obuf, sys_errlist[errno]);
+-	else
+-		strcat(obuf, "(can not get system error message)");
++	strcat(obuf, strerror(errno));
++
+ 	mlwrite(obuf);
+ }
+ #endif
+
diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
new file mode 100644
index 000000000..6e2f4c497
--- /dev/null
+++ b/package/uemacs/uemacs.mk
@@ -0,0 +1,48 @@
+#############################################################
+#
+# uemacs
+#
+#############################################################
+UEMACS_VERSION:=4.0.15-lt
+UEMACS_SOURCE:=em-$(UEMACS_VERSION).tar.bz2
+UEMACS_CAT:=$(BZCAT)
+UEMACS_SITE:=$(BR2_KERNEL_MIRROR)/software/editors/uemacs/
+UEMACS_DIR:=$(BUILD_DIR)/em-$(UEMACS_VERSION)
+UEMACS_BINARY:=em
+UEMACS_TARGET_BINARY:=usr/bin/emacs
+
+$(DL_DIR)/$(UEMACS_SOURCE):
+	 $(call DOWNLOAD,$(UEMACS_SITE),$(UEMACS_SOURCE))
+
+uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
+
+$(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE)
+	$(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
+	touch $(UEMACS_DIR)/.unpacked
+
+$(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked
+	$(MAKE) -C $(UEMACS_DIR) \
+	CC="$(TARGET_CC)" DEFINES="-DAUTOCONF -DPOSIX -DUSG" CFLAGS+="$(TARGET_CFLAGS) " LIBS=-lncurses
+	$(STRIPCMD) $(UEMACS_DIR)/$(UEMACS_BINARY)
+
+$(TARGET_DIR)/$(UEMACS_TARGET_BINARY): $(UEMACS_DIR)/$(UEMACS_BINARY)
+	$(INSTALL) -m 0755 -D $(UEMACS_DIR)/$(UEMACS_BINARY) $(TARGET_DIR)/$(UEMACS_TARGET_BINARY)
+
+uemacs: ncurses $(TARGET_DIR)/$(UEMACS_TARGET_BINARY)
+
+uemacs-clean:
+	rm -f $(TARGET_DIR)/$(UEMACS_TARGET_BINARY)
+	-$(MAKE) -C $(UEMACS_DIR) clean
+
+uemacs-dirclean:
+	rm -rf $(UEMACS_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_PACKAGE_UEMACS),y)
+TARGETS+=uemacs
+endif