From 313951d823609e52ab4e5aeea30f4e3dafc2454f Mon Sep 17 00:00:00 2001 From: allan Date: Fri, 28 Aug 2015 16:38:21 +0200 Subject: [PATCH 1/2] picocom: update to 2.0 --- srcpkgs/picocom/template | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/srcpkgs/picocom/template b/srcpkgs/picocom/template index 4867c31c594..30bcf3ae286 100644 --- a/srcpkgs/picocom/template +++ b/srcpkgs/picocom/template @@ -1,18 +1,27 @@ # Template file for 'picocom' pkgname=picocom -version=1.8 +version=2.0 revision=1 short_desc="Minimal dumb-terminal emulation program like minicom" maintainer="allan " license="GPL-2" homepage="https://github.com/npat-efault/picocom" distfiles="https://github.com/npat-efault/picocom/archive/${version}.tar.gz" -checksum=6a3e6ba74eec3dd111d5c6f8245b8f08ee54db783e5d319a8589e8f7a4a108f0 +checksum=e0f7095c118f43c1c09787a16ef5c7d4c4ad4457dd3b1281efcc4cdb8906af9a +pre_build() { + case "$XBPS_TARGET_MACHINE" in + *-musl) ed term.c <<-EDIT + ,s:termios.h:asm/termbits.h: + w + q + EDIT + esac +} do_build() { make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs} } do_install() { - vman picocom.8 + vman picocom.1 vbin picocom } From 662405406e2d4b1d415e95e3ca53be6590b3de57 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 30 Aug 2015 11:42:57 +0200 Subject: [PATCH 2/2] picocom: use patch instead of ed call. --- srcpkgs/picocom/patches/fix-musl.patch | 12 ++++++++++++ srcpkgs/picocom/template | 9 --------- 2 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/picocom/patches/fix-musl.patch diff --git a/srcpkgs/picocom/patches/fix-musl.patch b/srcpkgs/picocom/patches/fix-musl.patch new file mode 100644 index 00000000000..b43a2762399 --- /dev/null +++ b/srcpkgs/picocom/patches/fix-musl.patch @@ -0,0 +1,12 @@ +diff -up term.c.orig term.c +--- term.c.orig 2015-08-25 19:53:25.000000000 +0200 ++++ term.c 2015-08-30 11:40:05.723748387 +0200 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #ifdef __linux__ + #include + #endif diff --git a/srcpkgs/picocom/template b/srcpkgs/picocom/template index 30bcf3ae286..22cf9f1150b 100644 --- a/srcpkgs/picocom/template +++ b/srcpkgs/picocom/template @@ -9,15 +9,6 @@ homepage="https://github.com/npat-efault/picocom" distfiles="https://github.com/npat-efault/picocom/archive/${version}.tar.gz" checksum=e0f7095c118f43c1c09787a16ef5c7d4c4ad4457dd3b1281efcc4cdb8906af9a -pre_build() { - case "$XBPS_TARGET_MACHINE" in - *-musl) ed term.c <<-EDIT - ,s:termios.h:asm/termbits.h: - w - q - EDIT - esac -} do_build() { make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs} }