merge of '93e88a1c0fbbb69dbad706857468d431d612b9c9'

     and 'f7aee16bb45052647fd1a8b8b1d5617ec91b95a9'

9 files changed, 105 insertions, 3 deletions

diff --git a/packages/libstroke/.mtn2git_empty b/packages/libstroke/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libstroke/.mtn2git_empty
diff --git a/packages/libstroke/libstroke-0.5.1/.mtn2git_empty b/packages/libstroke/libstroke-0.5.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libstroke/libstroke-0.5.1/.mtn2git_empty
diff --git a/packages/libstroke/libstroke-0.5.1/Makefile.am.patch b/packages/libstroke/libstroke-0.5.1/Makefile.am.patch
new file mode 100644
index 0000000000..631da1d25a
--- /dev/null
+++ b/packages/libstroke/libstroke-0.5.1/Makefile.am.patch
@@ -0,0 +1,11 @@
+--- libstroke-0.5.1/Makefile.am.orig	2008-06-11 14:10:49.000000000 +0400
++++ libstroke-0.5.1/Makefile.am	2008-06-11 14:12:06.000000000 +0400
+@@ -5,7 +5,7 @@
+ GSTROKE_SUBDS = 
+ endif
+ 
+-SUBDIRS = libstroke $(GSTROKE_SUBDS) tests doc javastroke 
++SUBDIRS = libstroke $(GSTROKE_SUBDS) doc
+ 
+ EXTRA_DIST = COPYRIGHT CREDITS README.javastroke README.libgstroke
+ 
diff --git a/packages/libstroke/libstroke-0.5.1/configure.in.patch b/packages/libstroke/libstroke-0.5.1/configure.in.patch
new file mode 100644
index 0000000000..d0ed97b88e
--- /dev/null
+++ b/packages/libstroke/libstroke-0.5.1/configure.in.patch
@@ -0,0 +1,24 @@
+--- libstroke-0.5.1/configure.in.orig	2008-06-11 12:54:29.000000000 +0400
++++ libstroke-0.5.1/configure.in	2008-06-11 12:54:35.000000000 +0400
+@@ -83,14 +83,14 @@
+ 
+ dnl check for GTK
+ dnl we won't build libgstroke if it's not found
+-AC_MSG_CHECKING(gtk+ library)
+-AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes
+-  AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]),
+-  AC_MSG_WARN(
+-***** NOTE: The GNOME stroke support won't be built
+-)
++dnl AC_MSG_CHECKING(gtk+ library)
++dnl AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes
++dnl   AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]),
++dnl   AC_MSG_WARN(
++dnl ***** NOTE: The GNOME stroke support won't be built
++dnl )
+   HAVE_LIBGTK=no,
+-)
++dnl )
+ AM_CONDITIONAL(HAVE_LIBGTK,        test "x$HAVE_LIBGTK" = "xyes")
+ 
+ 
diff --git a/packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch b/packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch
new file mode 100644
index 0000000000..b3251f3548
--- /dev/null
+++ b/packages/libstroke/libstroke-0.5.1/libgstroke-Makefile.am.patch
@@ -0,0 +1,11 @@
+--- libstroke-0.5.1/libgstroke/Makefile.am.orig	2008-06-11 13:01:29.000000000 +0400
++++ libstroke-0.5.1/libgstroke/Makefile.am	2008-06-11 13:01:44.000000000 +0400
+@@ -21,7 +21,7 @@
+ INCLUDES = @GTK_CFLAGS@
+ LDADD    = @GTK_LIBS@
+ 
+-EXTRA_DIST = 
++#EXTRA_DIST = 
+ 
+ MOSTLYCLEANFILES = core *~ 
+ CLEANFILES = core *~ 
diff --git a/packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch b/packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch
new file mode 100644
index 0000000000..98707faf09
--- /dev/null
+++ b/packages/libstroke/libstroke-0.5.1/libstroke-Makefile.am.patch
@@ -0,0 +1,15 @@
+--- libstroke-0.5.1/libstroke/Makefile.am.orig	2008-06-11 13:01:54.000000000 +0400
++++ libstroke-0.5.1/libstroke/Makefile.am	2008-06-11 13:02:02.000000000 +0400
+@@ -5,10 +5,10 @@
+ # level Makefile.
+ AUTOMAKE_OPTIONS = foreign
+ 
+-EXTRA_DIST = 
++#EXTRA_DIST = 
+ 
+ #tclpath::
+-	#echo ${ENABLE_TCL}
++#	echo ${ENABLE_TCL}
+ 
+ #if ENABLE_TCL
+ #SEL_BIB = libstroke.la libstroke_tcl.la
diff --git a/packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch b/packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch
new file mode 100644
index 0000000000..abd55d676f
--- /dev/null
+++ b/packages/libstroke/libstroke-0.5.1/tests-Makefile.am.patch
@@ -0,0 +1,15 @@
+--- libstroke-0.5.1/tests/Makefile.am.orig	2008-06-11 13:46:40.000000000 +0400
++++ libstroke-0.5.1/tests/Makefile.am	2008-06-11 13:47:23.000000000 +0400
+@@ -14,7 +14,11 @@
+ gnome_stroke_test_SOURCES = gnome_stroke_test.c
+ 
+ INCLUDES = -I$(top_srcdir)/libstroke -I$(top_srcdir)/libgstroke \
+-		@X_CFLAGS@ @GTK_CFLAGS@
++		@X_CFLAGS@
++
++if HAVE_LIBGTK
++INCLUDES += @GTK_CFLAGS@
++endif
+ 
+ stroke_test_LDADD = ../libstroke/libstroke.la @X_LDFLAGS@
+ gnome_stroke_test_LDADD = ../libgstroke/libgstroke.la @GTK_LIBS@
diff --git a/packages/libstroke/libstroke_0.5.1.bb b/packages/libstroke/libstroke_0.5.1.bb
new file mode 100644
index 0000000000..2b1b6e7275
--- /dev/null
+++ b/packages/libstroke/libstroke_0.5.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "LibStroke - a stroke translation library"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+#DEPENDS = "virtual/libx11 libxau libxdmcp"
+DEPENDS = "virtual/libx11"
+
+SRC_URI = "http://www.etla.net/libstroke/${P}.tar.gz \
+	file://configure.in.patch;patch=1 \
+	file://libstroke-Makefile.am.patch;patch=1 \
+	file://tests-Makefile.am.patch;patch=1 \
+	"
+#	file://Makefile.am.patch;patch=1 \
+#	file://libgstroke-Makefile.am.patch;patch=1 \
+
+inherit autotools pkgconfig
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/lrzsz/lrzsz_0.12.20.bb b/packages/lrzsz/lrzsz_0.12.20.bb
index 0a194f9a05..b44945e35f 100644
--- a/packages/lrzsz/lrzsz_0.12.20.bb
+++ b/packages/lrzsz/lrzsz_0.12.20.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 PRIORITY = "standard"
 DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer"
 DEPENDS = ""
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
 	   file://autotools.patch;patch=1 \
@@ -18,13 +18,19 @@ do_install() {
 }
 
 pkg_postinst() {
-	for util in rz rx rb sz sx sb; do
+	for util in rz rx rb; do
 		update-alternatives --install ${bindir}/$util $util lrz 100
 	done
+	for util in sz sx sb; do
+		update-alternatives --install ${bindir}/$util $util lsz 100
+	done
 }
 
 pkg_postrm() {
-	for util in rz rx rb sz sx sb; do
+	for util in rz rx rb; do
 		update-alternatives --remove $util ${bindir}/lrz
 	done
+	for util in sz sx sb; do
+		update-alternatives --remove $util ${bindir}/lsz
+	done
 }
\ No newline at end of file