summaryrefslogtreecommitdiff
path: root/putty
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-06-30 13:36:54 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-06-30 13:36:54 +0000
commit771a76830cf1ad682d540eae777a0bf286576b44 (patch)
treeefec07b0793a96581c9dfb7c87c114c2fefbbcd1 /putty
parentdbdf8af05eb0127406d079d19b3df570e7314f78 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/06/30 15:36:17+02:00 uni-frankfurt.de!mickey add keyring, a password storage application for Opie/Qtopia 2004/06/30 15:34:48+02:00 uni-frankfurt.de!mickey make putty use a library for shared code BKrev: 40e2c1f6mz6pJJMDyK1L2C6OjcKQ5A
Diffstat (limited to 'putty')
-rw-r--r--putty/putty/lib.pro (renamed from putty/putty-cvs/lib.pro)0
-rw-r--r--putty/putty/plink.pro (renamed from putty/putty-cvs/plink.pro)0
-rw-r--r--putty/putty/pscp.pro (renamed from putty/putty-cvs/pscp.pro)0
-rw-r--r--putty/putty/psftp.pro (renamed from putty/putty-cvs/psftp.pro)0
-rw-r--r--putty/putty_0.54.oe26
-rw-r--r--putty/putty_cvs.oe39
6 files changed, 24 insertions, 41 deletions
diff --git a/putty/putty-cvs/lib.pro b/putty/putty/lib.pro
index e69de29bb2..e69de29bb2 100644
--- a/putty/putty-cvs/lib.pro
+++ b/putty/putty/lib.pro
diff --git a/putty/putty-cvs/plink.pro b/putty/putty/plink.pro
index e69de29bb2..e69de29bb2 100644
--- a/putty/putty-cvs/plink.pro
+++ b/putty/putty/plink.pro
diff --git a/putty/putty-cvs/pscp.pro b/putty/putty/pscp.pro
index e69de29bb2..e69de29bb2 100644
--- a/putty/putty-cvs/pscp.pro
+++ b/putty/putty/pscp.pro
diff --git a/putty/putty-cvs/psftp.pro b/putty/putty/psftp.pro
index e69de29bb2..e69de29bb2 100644
--- a/putty/putty-cvs/psftp.pro
+++ b/putty/putty/psftp.pro
diff --git a/putty/putty_0.54.oe b/putty/putty_0.54.oe
deleted file mode 100644
index fb5a41b33c..0000000000
--- a/putty/putty_0.54.oe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "PuTTY is a free implementation of Telnet and SSH for Win32 and Unix platforms"
-SECTION = "net"
-
-SRC_URI = "http://the.earth.li/~sgtatham/putty/latest/putty-${PV}.tar.gz"
-
-TARGETS = "plink pscp psftp puttygen"
-
-do_compile() {
- cd unix && oe_runmake -f Makefile.gtk ${TARGETS} CC="${CC}" CFLAGS="${CFLAGS} -I. -I.. -I../charset"
-}
-
-do_install() {
- install -d ${D}/${bindir}/
- install -m 0755 unix/plink ${D}/${bindir}/ssh
- install -m 0755 unix/pscp ${D}/${bindir}/scp
- install -m 0755 unix/psftp ${D}/${bindir}/sftp
- install -m 0755 unix/puttygen ${D}/${bindir}/puttygen
-}
-
-PACKAGES = "putty-ssh putty-scp putty-sftp putty-gen"
-FILES_putty = ""
-FILES_putty-ssh = "${bindir}/ssh"
-FILES_putty-scp = "${bindir}/scp"
-FILES_putty-sftp = "${bindir}/sftp"
-FILES_putty-gen = "${bindir}/puttygen"
-
diff --git a/putty/putty_cvs.oe b/putty/putty_cvs.oe
index 5132b43e32..a504c660d2 100644
--- a/putty/putty_cvs.oe
+++ b/putty/putty_cvs.oe
@@ -1,33 +1,42 @@
DESCRIPTION = "PuTTY is a free implementation of Telnet and SSH for Win32 and Unix platforms"
SECTION = "net"
-SRC_URI = "cvs://cvsuser:anonymous@cvs.tartarus.org/home/cvs;module=putty;date=${CVSDATE}"
+SRC_URI = "cvs://cvsuser:anonymous@cvs.tartarus.org/home/cvs;module=putty;date=${CVSDATE} \
+ file://lib.pro \
+ file://plink.pro \
+ file://pscp.pro \
+ file://psftp.pro"
-TARGETS = "plink pscp psftp puttygen"
+TARGETS = "lib plink pscp psftp"
PV = "0.54-cvs-${CVSDATE}"
S = "${WORKDIR}/putty"
+inherit qmake-base
+
do_configure() {
- perl mkfiles.pl
+ for t in ${TARGETS}
+ do
+ install -m 0644 ${WORKDIR}/$t.pro .
+ done
+ cd charset && perl sbcsgen.pl
}
do_compile() {
- cd unix && oe_runmake -f Makefile.gtk ${TARGETS} CC="${CC}" CFLAGS="${CFLAGS} -I. -I.. -I../charset"
+ for t in ${TARGETS}
+ do
+ rm -f Makefile
+ qmake -makefile -o Makefile -spec ${QMAKESPEC} $t.pro
+ oe_runmake
+ done
}
do_install() {
+ install -d ${D}/${libdir}
+ oe_libinstall -so libputty ${D}/${libdir}
install -d ${D}/${bindir}/
- install -m 0755 unix/plink ${D}/${bindir}/ssh
- install -m 0755 unix/pscp ${D}/${bindir}/scp
- install -m 0755 unix/psftp ${D}/${bindir}/sftp
- install -m 0755 unix/puttygen ${D}/${bindir}/puttygen
+ install -m 0755 plink ${D}/${bindir}/ssh
+ install -m 0755 pscp ${D}/${bindir}/scp
+ install -m 0755 psftp ${D}/${bindir}/sftp
}
-PACKAGES = "putty-ssh putty-scp putty-sftp putty-gen"
-FILES_putty = ""
-FILES_putty-ssh = "${bindir}/ssh"
-FILES_putty-scp = "${bindir}/scp"
-FILES_putty-sftp = "${bindir}/sftp"
-FILES_putty-gen = "${bindir}/puttygen"
-