From 660a0feb66e64979ec74a6e58d0b8d190bd4e5eb Mon Sep 17 00:00:00 2001
From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 3 Jul 2006 03:25:30 +0000
Subject: [PATCH] psmisc 22.2: Add 22.2 and use a common .inc file for 21.8 and
 22.8. Added to fix some IPv6 related bugs. See the changelog in 22.2 source
 for full list.

---
 packages/psmisc/files/.mtn2git_empty          |  0
 .../{psmisc-21.8 => files}/libintl-link.patch |  0
 packages/psmisc/psmisc.inc                    | 42 +++++++++++++++++
 packages/psmisc/psmisc_21.8.bb                | 45 +------------------
 packages/psmisc/psmisc_22.2.bb                |  2 +
 5 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 packages/psmisc/files/.mtn2git_empty
 rename packages/psmisc/{psmisc-21.8 => files}/libintl-link.patch (100%)
 create mode 100644 packages/psmisc/psmisc.inc
 create mode 100644 packages/psmisc/psmisc_22.2.bb

diff --git a/packages/psmisc/files/.mtn2git_empty b/packages/psmisc/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/psmisc/psmisc-21.8/libintl-link.patch b/packages/psmisc/files/libintl-link.patch
similarity index 100%
rename from packages/psmisc/psmisc-21.8/libintl-link.patch
rename to packages/psmisc/files/libintl-link.patch
diff --git a/packages/psmisc/psmisc.inc b/packages/psmisc/psmisc.inc
new file mode 100644
index 0000000000..31647c7b4b
--- /dev/null
+++ b/packages/psmisc/psmisc.inc
@@ -0,0 +1,42 @@
+LICENSE = "GPL"
+DESCRIPTION = "procfs tools"
+SECTION = "base"
+PRIORITY = "required"
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+DEPENDS = "ncurses virtual/libintl"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
+	   file://libintl-link.patch;patch=1"
+S = "${WORKDIR}/psmisc-${PV}"
+
+inherit autotools gettext
+
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN} fuser fuser-doc \
+	    killall killall-doc \
+	    pstree pstree-doc"
+
+FILES_${PN} = ""
+RDEPENDS_${PN} = "fuser killall pstree"
+
+FILES_fuser = "${bindir}/fuser"
+FILES_fuser-doc = "${mandir}/man1/fuser*"
+
+FILES_killall = "${bindir}/killall.${PN}"
+FILES_killall-doc = "${mandir}/man1/killall*"
+
+FILES_pstree = "${bindir}/pstree"
+FILES_pstree-doc = "${mandir}/man1/pstree*"
+
+do_install_append() {
+	mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
+}
+
+pkg_postinst_killall() {
+	update-alternatives --install ${bindir}/killall killall killall.${PN} 90
+}
+
+pkg_postrm_killall() {
+	update-alternatives --remove ${bindir}/killall killall.${PN}
+}
diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb
index f7d6828a94..085ee18a77 100644
--- a/packages/psmisc/psmisc_21.8.bb
+++ b/packages/psmisc/psmisc_21.8.bb
@@ -1,44 +1,3 @@
-LICENSE = "GPL"
-DESCRIPTION = "procfs tools"
-SECTION = "base"
-PRIORITY = "required"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
-DEPENDS = "ncurses virtual/libintl"
+include psmisc.inc
 PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
-	   file://signames-header-fix.patch;patch=1 \
-	   file://libintl-link.patch;patch=1"
-S = "${WORKDIR}/psmisc-${PV}"
-
-inherit autotools gettext
-
-ALLOW_EMPTY = "1"
-
-PACKAGES = "${PN} fuser fuser-doc \
-	    killall killall-doc \
-	    pstree pstree-doc"
-
-FILES_${PN} = ""
-RDEPENDS_${PN} = "fuser killall pstree"
-
-FILES_fuser = "${bindir}/fuser"
-FILES_fuser-doc = "${mandir}/man1/fuser*"
-
-FILES_killall = "${bindir}/killall.${PN}"
-FILES_killall-doc = "${mandir}/man1/killall*"
-
-FILES_pstree = "${bindir}/pstree"
-FILES_pstree-doc = "${mandir}/man1/pstree*"
-
-do_install_append() {
-	mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
-}
-
-pkg_postinst_killall() {
-	update-alternatives --install ${bindir}/killall killall killall.${PN} 90
-}
-
-pkg_postrm_killall() {
-	update-alternatives --remove ${bindir}/killall killall.${PN}
-}
+SRC_URI += "file://signames-header-fix.patch;patch=1"
diff --git a/packages/psmisc/psmisc_22.2.bb b/packages/psmisc/psmisc_22.2.bb
new file mode 100644
index 0000000000..6bf1780582
--- /dev/null
+++ b/packages/psmisc/psmisc_22.2.bb
@@ -0,0 +1,2 @@
+include psmisc.inc
+PR = "r0"
-- 
2.39.5