[oe] [PATCH] putty: Update ancient recipe to use recent gtk2-based svn
Bernd Wachter
bwachter-oe at lart.info
Sun Mar 7 18:06:33 UTC 2010
---
recipes/putty/putty/configure.patch | 11 ++++++++
recipes/putty/putty/lib.pro | 43 ---------------------------------
recipes/putty/putty/plink.pro | 10 -------
recipes/putty/putty/pscp.pro | 10 -------
recipes/putty/putty/psftp.pro | 10 -------
recipes/putty/putty_svn.bb | 45 +++++++++-------------------------
6 files changed, 23 insertions(+), 106 deletions(-)
create mode 100644 recipes/putty/putty/configure.patch
delete mode 100644 recipes/putty/putty/lib.pro
delete mode 100644 recipes/putty/putty/plink.pro
delete mode 100644 recipes/putty/putty/pscp.pro
delete mode 100644 recipes/putty/putty/psftp.pro
diff --git a/recipes/putty/putty/configure.patch b/recipes/putty/putty/configure.patch
new file mode 100644
index 0000000..cf4c21a
--- /dev/null
+++ b/recipes/putty/putty/configure.patch
@@ -0,0 +1,11 @@
+--- putty.a/unix/configure.ac 2010-03-01 18:12:20.000000000 +0100
++++ putty.b/unix/configure.ac 2010-03-01 18:12:48.000000000 +0100
+@@ -27,8 +27,6 @@
+ AC_CHECK_HEADERS([gssapi/gssapi.h])
+ fi
+
+-# Look for both GTK 1 and GTK 2.
+-AM_PATH_GTK([1.2.0], [gtk=1], [gtk=none])
+ AM_PATH_GTK_2_0([2.0.0], [gtk=2], [])
+ if test "$gtk" = "none"; then
+ all_targets="all-cli"
diff --git a/recipes/putty/putty/lib.pro b/recipes/putty/putty/lib.pro
deleted file mode 100644
index 7006228..0000000
--- a/recipes/putty/putty/lib.pro
+++ /dev/null
@@ -1,43 +0,0 @@
-######################################################################
-# Automatically generated by qmake (1.06c) Wed Jun 16 23:28:56 2004
-######################################################################
-
-TEMPLATE = lib
-CONFIG = warn_on release console
-TARGET = putty
-INCLUDEPATH += . unix charset
-
-SOURCES += cmdline.c int64.c ldisc.c logging.c misc.c portfwd.c proxy.c raw.c \
- rlogin.c settings.c ssh.c sshaes.c sshblowf.c \
- sshbn.c sshcrc.c sshcrcda.c sshdes.c sshdh.c sshdss.c \
- sshmd5.c sshpubk.c sshrand.c sshrsa.c sshsh512.c sshsha.c \
- sshzlib.c telnet.c tree234.c version.c wildcard.c x11fwd.c
-
-#Charset
-SOURCES += \
- charset/localenc.c \
- charset/mimeenc.c \
- charset/sbcsdat.c \
- charset/toucs.c \
- charset/xenc.c \
- charset/fromucs.c \
- charset/macenc.c \
- charset/sbcs.c \
- charset/slookup.c \
- charset/utf8.c
-
-# Unix
-HEADERS += unix/unix.h
-SOURCES += unix/signal.c \
- unix/uxagentc.c \
- unix/uxcons.c \
- unix/uxmisc.c \
- unix/uxnet.c \
- unix/uxnoise.c \
- unix/uxproxy.c \
- unix/uxplink.c \
- unix/uxsel.c \
- unix/uxstore.c \
- unix/uxucs.c \
- unix/ux_x11.c \
- unix/xkeysym.c
diff --git a/recipes/putty/putty/plink.pro b/recipes/putty/putty/plink.pro
deleted file mode 100644
index 3cbf15a..0000000
--- a/recipes/putty/putty/plink.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET = plink
-CONFIG = warn_on release console
-DEPENDPATH += unix charset
-INCLUDEPATH += . unix charset
-
-SOURCES += be_all.c uxplink.c
-
-LIBS += -L. -lputty
-
diff --git a/recipes/putty/putty/pscp.pro b/recipes/putty/putty/pscp.pro
deleted file mode 100644
index 6e30d3e..0000000
--- a/recipes/putty/putty/pscp.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET = pscp
-CONFIG = warn_on release console
-DEPENDPATH += unix charset
-INCLUDEPATH += . unix charset
-
-SOURCES += be_none.c scp.c sftp.c unix/uxsftp.c
-
-LIBS += -L. -lputty
-
diff --git a/recipes/putty/putty/psftp.pro b/recipes/putty/putty/psftp.pro
deleted file mode 100644
index 4c491ba..0000000
--- a/recipes/putty/putty/psftp.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET = psftp
-CONFIG = warn_on release console
-DEPENDPATH += unix charset
-INCLUDEPATH += . unix charset
-
-SOURCES += be_none.c psftp.c sftp.o unix/uxsftp.c
-
-LIBS += -L. -lputty
-
diff --git a/recipes/putty/putty_svn.bb b/recipes/putty/putty_svn.bb
index c96ffbb..95208e9 100644
--- a/recipes/putty/putty_svn.bb
+++ b/recipes/putty/putty_svn.bb
@@ -1,44 +1,23 @@
+# requires halibut to be installed on the host system
DESCRIPTION = "PuTTY is a free implementation of Telnet and SSH for Win32 and Unix platforms"
SECTION = "console/network"
LICENSE = "MIT"
-#Remove the dash below when 0.58 changes in PV
-PV = "0.58+cvs-${SRCDATE}"
-SRC_URI = "svn://ixion.tartarus.org/main;module=putty \
- file://lib.pro \
- file://plink.pro \
- file://pscp.pro \
- file://psftp.pro"
+SRCREV = "8878"
+PV = "0.60+svnr${SRCPV}"
-TARGETS = "lib plink pscp psftp"
+SRC_URI = "svn://svn.tartarus.org/sgt;module=putty \
+ file://configure.patch;patch=1;pnum=2"
-S = "${WORKDIR}/putty"
+S = "${WORKDIR}/putty/unix"
-inherit qmake_base
+inherit autotools pkgconfig
-do_configure() {
- for t in ${TARGETS}
- do
- install -m 0644 ${WORKDIR}/$t.pro .
- done
- cd charset && perl sbcsgen.pl
+do_configure_prepend() {
+ ../mkfiles.pl
+ ../mkauto.sh
}
-do_compile() {
- for t in ${TARGETS}
- do
- rm -f Makefile
- qmake -makefile -o Makefile -spec ${QMAKESPEC} $t.pro
- oe_runmake
- done
+do_install_prepend() {
+ make -C ../doc man
}
-
-do_install() {
- install -d ${D}${libdir}
- oe_libinstall -so libputty ${D}${libdir}
- install -d ${D}${bindir}/
- install -m 0755 plink ${D}${bindir}/ssh
- install -m 0755 pscp ${D}${bindir}/scp
- install -m 0755 psftp ${D}${bindir}/sftp
-}
-
--
1.5.6.5
More information about the Openembedded-devel
mailing list