[gentoo-commits] repo/gentoo:master commit in: sys-apps/setserial/files/, sys-apps/setserial/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/setserial/files/, sys-apps/setserial/

[Fabian Groffen]

commit:     1490e73dda15c34b881ace1568214bd4d1fd2b08
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 17:24:07 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 17:24:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1490e73d

sys-apps/setserial: add patch for Darwin, bug #541536

Package-Manager: portage-2.2.28

 .../setserial/files/setserial-2.17-darwin.patch    | 33 ++++++++++++++++++++++
 sys-apps/setserial/setserial-2.17-r4.ebuild        |  1 +
 2 files changed, 34 insertions(+)

diff --git a/sys-apps/setserial/files/setserial-2.17-darwin.patch b/sys-apps/setserial/files/setserial-2.17-darwin.patch
new file mode 100644
index 0000000..681f793
--- /dev/null
+++ b/sys-apps/setserial/files/setserial-2.17-darwin.patch
@@ -0,0 +1,33 @@
+https://541536.bugs.gentoo.org/attachment.cgi?id=397618
+https://bugs.gentoo.org/show_bug.cgi?id=541536
+
+diff --git a/setserial.c b/setserial.c
+index 3474402..3ce8009 100644
+--- a/setserial.c
++++ b/setserial.c
+@@ -31,6 +31,25 @@
+ 
+ #include "version.h"
+ 
++#ifdef __APPLE__
++// see http://www.insanelymac.com/forum/topic/155999-compiling-setserial-on-mac-os-x/
++#ifndef TIOCGSERIAL
++#define TIOCGSERIAL 0x541E
++#endif
++#ifndef TIOCSERCONFIG
++#define TIOCSERCONFIG 0x5453
++#endif
++#ifndef TIOCSSERIAL
++#define TIOCSSERIAL 0x541F
++#endif
++#ifndef TIOCSERGWILD
++#define TIOCSERGWILD 0x5454
++#endif
++#ifndef TIOCSERSWILD
++#define TIOCSERSWILD 0x5455
++#endif
++#endif
++
+ static char version_str[] = "setserial version " SETSERIAL_VERSION ", "
+ 	SETSERIAL_DATE;
+ 

diff --git a/sys-apps/setserial/setserial-2.17-r4.ebuild b/sys-apps/setserial/setserial-2.17-r4.ebuild
index e15f4fb..950bd57 100644
--- a/sys-apps/setserial/setserial-2.17-r4.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r4.ebuild
@@ -22,6 +22,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-headers.patch
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-hayes-esp.patch #309883
+	epatch "${FILESDIR}"/${P}-darwin.patch #541536
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/setserial/files/, sys-apps/setserial/

[Patrice Clement]

commit:     885f844bf71d5a10fe5543ef692fa1d281f3c91a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 20:30:30 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 20:30:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885f844b

sys-apps/setserial: EAPI 6 bump.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../setserial/files/setserial-2.17-build.patch     |  4 +-
 .../setserial/files/setserial-2.17-headers.patch   |  4 +-
 .../files/setserial-2.17-manpage-updates.patch     |  4 +-
 .../setserial/files/setserial-2.17-spelling.patch  |  4 +-
 sys-apps/setserial/setserial-2.17-r5.ebuild        | 44 ++++++++++++++++++++++
 5 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/sys-apps/setserial/files/setserial-2.17-build.patch b/sys-apps/setserial/files/setserial-2.17-build.patch
index d3f3d69cead..7e7ea25c8a0 100644
--- a/sys-apps/setserial/files/setserial-2.17-build.patch
+++ b/sys-apps/setserial/files/setserial-2.17-build.patch
@@ -1,5 +1,5 @@
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -20,7 +20,7 @@
  all: setserial setserial.cat
  

diff --git a/sys-apps/setserial/files/setserial-2.17-headers.patch b/sys-apps/setserial/files/setserial-2.17-headers.patch
index a6d5f38e3e6..f8aed4c4862 100644
--- a/sys-apps/setserial/files/setserial-2.17-headers.patch
+++ b/sys-apps/setserial/files/setserial-2.17-headers.patch
@@ -1,5 +1,5 @@
---- setserial.c
-+++ setserial.c
+--- a/setserial.c
++++ b/setserial.c
 @@ -15,6 +15,9 @@
  #include <termios.h>
  #include <string.h>

diff --git a/sys-apps/setserial/files/setserial-2.17-manpage-updates.patch b/sys-apps/setserial/files/setserial-2.17-manpage-updates.patch
index 02f4a454a3d..3e6b7f01619 100644
--- a/sys-apps/setserial/files/setserial-2.17-manpage-updates.patch
+++ b/sys-apps/setserial/files/setserial-2.17-manpage-updates.patch
@@ -1,5 +1,5 @@
---- setserial-2.17/setserial.8.in
-+++ setserial-2.17/setserial.8.in
+--- a/setserial.8.in
++++ b/setserial.8.in
 @@ -34,7 +34,7 @@
  program should be used.  Typically it is called from an
 -.I rc.serial

diff --git a/sys-apps/setserial/files/setserial-2.17-spelling.patch b/sys-apps/setserial/files/setserial-2.17-spelling.patch
index 49ac5f41e72..5275d4fa44c 100644
--- a/sys-apps/setserial/files/setserial-2.17-spelling.patch
+++ b/sys-apps/setserial/files/setserial-2.17-spelling.patch
@@ -1,7 +1,7 @@
 Ripped from Fedora.
 
---- setserial-2.17/setserial.c
-+++ setserial-2.17/setserial.c
+--- a/setserial.c
++++ b/setserial.c
 @@ -710,1 +710,1 @@
 -	fprintf(stderr, "\t  spd_normal\tuse 38.4kb when a buad rate of 38.4kb is selected\n");
 +	fprintf(stderr, "\t  spd_normal\tuse 38.4kb when a baud rate of 38.4kb is selected\n");

diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
new file mode 100644
index 00000000000..2eaa330900e
--- /dev/null
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Configure your serial ports with it"
+HOMEPAGE="http://setserial.sourceforge.net/"
+SRC_URI="
+	ftp://tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz
+	ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-spelling.patch
+	"${FILESDIR}"/${P}-manpage-updates.patch
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-hayes-esp.patch
+	"${FILESDIR}"/${P}-darwin.patch
+)
+
+src_compile() {
+	tc-export CC
+	emake "${PN}"
+}
+
+src_install() {
+	doman "${PN}.8"
+	into /
+	dobin "${PN}"
+
+	insinto /etc
+	doins serial.conf
+	newinitd "${FILESDIR}"/serial-2.17-r4 serial
+
+	einstalldocs
+	docinto txt
+	dodoc Documentation/*
+}