elvis: versoin 2.2.1pre (unreleased version)

6 files changed, 83 insertions, 71 deletions

diff --git a/recipes/elvis/elvis-tiny.inc b/recipes/elvis/elvis-tiny.inc
new file mode 100644
index 0000000000..3fcf709cc8
--- /dev/null
+++ b/recipes/elvis/elvis-tiny.inc
@@ -0,0 +1,17 @@
+do_configure_append() {
+	for i in DISPLAY_MAN DISPLAY_HTML DISPLAY_TEX \
+			PROTOCOL_HTTP PROTOCOL_FTP FEATURE_ARRAY \
+			FEATURE_BROWSE FEATURE_FOLD FEATURE_INCSEARCH \
+			FEATURE_LPR FEATURE_MAKE FEATURE_MAPDB \
+			FEATURE_MKEXRC FEATURE_RCSID FEATURE_SHOWTAG \
+			FEATURE_SPELL FEATURE_TEXTOBJ; do
+		sed -i -e "s/^#define[	 ]*${i}/#undef ${i}/g" config.h
+	done
+}
+
+do_install_append() {
+	sed -i -e "s/^source\(.* .*elvis.clr.*\)/\"source\1/" ${D}/etc/elvis/elvis.ini
+	sed -i -e "s/^set\(.*lptype.*\)/\"set\1/" ${D}/etc/elvis/elvis.ini
+}
+
+FILES_${PN} = "/usr/bin/elvis /etc/elvis"
diff --git a/recipes/elvis/elvis-tiny_2.2.0.bb b/recipes/elvis/elvis-tiny_2.2.0.bb
index a5e42bf07c..b4c9806994 100644
--- a/recipes/elvis/elvis-tiny_2.2.0.bb
+++ b/recipes/elvis/elvis-tiny_2.2.0.bb
@@ -1,19 +1,2 @@
 require elvis_${PV}.bb
-
-do_configure_append() {
-	for i in DISPLAY_MAN DISPLAY_HTML DISPLAY_TEX \
-			PROTOCOL_HTTP PROTOCOL_FTP FEATURE_ARRAY \
-			FEATURE_BROWSE FEATURE_FOLD FEATURE_INCSEARCH \
-			FEATURE_LPR FEATURE_MAKE FEATURE_MAPDB \
-			FEATURE_MKEXRC FEATURE_RCSID FEATURE_SHOWTAG \
-			FEATURE_SPELL FEATURE_TEXTOBJ; do
-		sed -i -e "s/^#define[	 ]*${i}/#undef ${i}/g" config.h
-	done
-}
-
-do_install_append() {
-	sed -i -e "s/^source\(.* .*elvis.clr.*\)/\"source\1/" ${D}/etc/elvis/elvis.ini
-	sed -i -e "s/^set\(.*lptype.*\)/\"set\1/" ${D}/etc/elvis/elvis.ini
-}
-
-FILES_${PN} = "/usr/bin/elvis /etc/elvis"
+require elvis-tiny.inc
diff --git a/recipes/elvis/elvis-tiny_2.2.1pre.bb b/recipes/elvis/elvis-tiny_2.2.1pre.bb
new file mode 100644
index 0000000000..b4c9806994
--- /dev/null
+++ b/recipes/elvis/elvis-tiny_2.2.1pre.bb
@@ -0,0 +1,2 @@
+require elvis_${PV}.bb
+require elvis-tiny.inc
diff --git a/recipes/elvis/elvis.inc b/recipes/elvis/elvis.inc
new file mode 100644
index 0000000000..20fba5582b
--- /dev/null
+++ b/recipes/elvis/elvis.inc
@@ -0,0 +1,53 @@
+DEPENDS = "ncurses"
+CFLAGS_prepend = " -I. -Iosunix -L${STAGING_LIBDIR} "
+
+do_configure() {
+	./configure --libs=-lncurses --without-x --without-gnome --datadir=/etc/elvis --bindir=/usr/bin linux
+}
+
+do_compile() {
+        (
+                unset CC LD CXX CCLD CFLAGS LDFLAGS CPPFLAGS
+                oe_runmake 'CC=${BUILD_CC}' elvtags
+		rm *.o
+		mv elvtags elvtags-native
+        ) || exit 1
+	oe_runmake all
+	mv elvtags elvtags-target
+	mv elvtags-native elvtags
+}
+
+do_install() {
+	install -d -m 755 ${D}/usr
+	install -d -m 755 ${D}/etc/elvis
+	oe_runmake PREFIX=${D} \
+		BINDIR=${D}/usr/bin \
+		DATADIR=${D}/usr/share/elvis \
+		DOCDIR=${D}/usr/share/elvis/manual \
+		install
+	install -m 755 elvtags-target ${D}/usr/bin/elvtags
+	cd ${D}/usr/share/elvis
+	for i in ali arf awf brf bwf clr ini msg ps spe syn; do
+		mv elvis."$i" ${D}/etc/elvis
+	done
+	rm elvis.x11
+	rm elvis.rc
+	rm -rf ${D}/usr/share/elvis/themes
+	rm -rf ${D}/usr/share/elvis/stubs
+	rm -rf ${D}/usr/share/elvis/icons
+}
+
+pkg_postinst_${PN}() {
+	update-alternatives --install /bin/vi vi /usr/bin/elvis 100
+}
+
+pkg_prerm_${PN} () {
+	update-alternatives --remove vi /usr/bin/elvis
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-tools"
+FILES_${PN}-doc = "/usr/share/elvis/manual /usr/share/elvis/README"
+FILES_${PN}-tools = "/usr/bin/elvfmt /usr/bin/elvtags /usr/bin/ref"
+FILES_${PN} = "/usr/bin/elvis /etc/elvis /usr/share/elvis/scripts /usr/share/elvis/README /usr/share/elvis/*.*"
+
+
diff --git a/recipes/elvis/elvis_2.2.0.bb b/recipes/elvis/elvis_2.2.0.bb
index f038c6b110..008391b4ab 100644
--- a/recipes/elvis/elvis_2.2.0.bb
+++ b/recipes/elvis/elvis_2.2.0.bb
@@ -2,60 +2,8 @@ DESCRIPTION = "A vi clone"
 SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "Perl Clarified Artistic License"
-DEPENDS = "ncurses"
 
 SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz"
 S = "${WORKDIR}/elvis-2.2_0"
 
-CFLAGS_prepend = " -I. -Iosunix -L${STAGING_LIBDIR} "
-
-do_configure() {
-	./configure --without-x --without-gnome --datadir=/etc/elvis --bindir=/usr/bin linux
-}
-
-do_compile() {
-        (
-                unset CC LD CXX CCLD CFLAGS LDFLAGS CPPFLAGS
-                oe_runmake 'CC=${BUILD_CC}' elvtags
-		rm *.o
-		mv elvtags elvtags-native
-        ) || exit 1
-	oe_runmake all
-	mv elvtags elvtags-target
-	mv elvtags-native elvtags
-}
-
-do_install() {
-	install -d -m 755 ${D}/usr
-	install -d -m 755 ${D}/etc/elvis
-	oe_runmake PREFIX=${D} \
-		BINDIR=${D}/usr/bin \
-		DATADIR=${D}/usr/share/elvis \
-		DOCDIR=${D}/usr/share/elvis/manual \
-		install
-	install -m 755 elvtags-target ${D}/usr/bin/elvtags
-	cd ${D}/usr/share/elvis
-	for i in ali arf awf brf bwf clr ini msg ps spe syn; do
-		mv elvis."$i" ${D}/etc/elvis
-	done
-	rm elvis.x11
-	rm elvis.rc
-	rm -rf ${D}/usr/share/elvis/themes
-	rm -rf ${D}/usr/share/elvis/stubs
-	rm -rf ${D}/usr/share/elvis/icons
-}
-
-pkg_postinst_${PN}() {
-	update-alternatives --install /bin/vi vi /usr/bin/elvis 100
-}
-
-pkg_prerm_${PN} () {
-	update-alternatives --remove vi /usr/bin/elvis
-}
-
-PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-tools"
-FILES_${PN}-doc = "/usr/share/elvis/manual /usr/share/elvis/README"
-FILES_${PN}-tools = "/usr/bin/elvfmt /usr/bin/elvtags /usr/bin/ref"
-FILES_${PN} = "/usr/bin/elvis /etc/elvis /usr/share/elvis/scripts /usr/share/elvis/README /usr/share/elvis/*.*"
-
-
+require elvis.inc
diff --git a/recipes/elvis/elvis_2.2.1pre.bb b/recipes/elvis/elvis_2.2.1pre.bb
new file mode 100644
index 0000000000..51b1b5cfa7
--- /dev/null
+++ b/recipes/elvis/elvis_2.2.1pre.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "A vi clone"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "Perl Clarified Artistic License"
+
+SRC_URI = "http://www.the-little-red-haired-girl.org/pub/elvis/almost_2.2.1-unofficial-1.tar.gz"
+S = "${WORKDIR}/elvis-2.2_1"
+
+require elvis.inc