+++ /dev/null
---- minicom-2.3.orig/src/minicom.c 2008-02-02 23:49:53.000000000 +0100
-+++ minicom-2.3/src/minicom.c 2009-06-08 09:42:32.151729441 +0200
-@@ -167,7 +167,7 @@
- #endif /*SIGTSTP*/
-
- /* Get a line from either window or scroll back buffer. */
--static ELM *getline(WIN *w, int no)
-+static ELM *minic_getline(WIN *w, int no)
- {
- int i;
- static ELM outofrange[MAXCOLS] = {{0,0,0}};
-@@ -205,7 +205,7 @@
-
- w->direct = 0;
- for (f = 0; f < w->ys; f++)
-- mc_wdrawelm(w, f, getline(w, y++));
-+ mc_wdrawelm(w, f, minic_getline(w, y++));
- if (r)
- mc_wredraw(w, 1);
- w->direct = 1;
-@@ -227,7 +227,7 @@
- tmp_line[0]='\0';
- w->direct = 0;
- for (f = 0; f < w->ys; f++) {
-- tmp_e = getline(w, y++);
-+ tmp_e = minic_getline(w, y++);
-
- /* First we "accumulate" the line into a variable */
- mc_wdrawelm_var(w, tmp_e, tmp_line);
-@@ -324,7 +324,7 @@
-
- for (next_line = hit_line; next_line <= all_lines; next_line++) {
- /* we do 'something' here... :-) */
-- tmp_e = getline(w_hist, next_line);
-+ tmp_e = minic_getline(w_hist, next_line);
-
- /*
- * First we "accumulate" the line into a variable.
-@@ -379,9 +379,9 @@
- static void drawcite(WIN *w, int y, int citey, int start, int end)
- {
- if (y+citey >= start && y+citey <= end)
-- mc_wdrawelm_inverse(w, y, getline(w, y+citey));
-+ mc_wdrawelm_inverse(w, y, minic_getline(w, y+citey));
- else
-- mc_wdrawelm(w, y, getline(w, y+citey));
-+ mc_wdrawelm(w, y, minic_getline(w, y+citey));
- }
-
- static void drawcite_whole(WIN *w, int y, int start, int end)
-@@ -400,7 +400,7 @@
- for (y=start; y<=end; y++) {
- vt_send('>');
- vt_send(' ');
-- tmp_e = getline(w, y);
-+ tmp_e = minic_getline(w, y);
- mc_wdrawelm_var(w, tmp_e, tmp_line);
- tmp_line[w->xs] = 0;
- for (x = w->xs-1; x >= 0; x--) {
-@@ -600,7 +600,7 @@
- if (citemode) {
- inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
- } else {
-- tmp_e = getline(b_us, y);
-+ tmp_e = minic_getline(b_us, y);
- if (wcslen(look_for) > 1) {
- /* quick scan for pattern match */
- mc_wdrawelm_var(b_us, tmp_e, tmp_line);
-@@ -611,9 +611,9 @@
- }
-
- if (inverse)
-- mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
-+ mc_wdrawelm_inverse(b_us, 0, minic_getline(b_us, y));
- else
-- mc_wdrawelm(b_us, 0, getline(b_us, y));
-+ mc_wdrawelm(b_us, 0, minic_getline(b_us, y));
- if (citemode)
- mc_wlocate(b_us, 0, cite_y);
- mc_wflush();
-@@ -648,7 +648,7 @@
- if (citemode) {
- inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
- } else {
-- tmp_e = getline(b_us, y + b_us->ys - 1);
-+ tmp_e = minic_getline(b_us, y + b_us->ys - 1);
- if (wcslen(look_for) > 1) {
- /* quick scan for pattern match */
- mc_wdrawelm_var(b_us, tmp_e, tmp_line);
-@@ -660,10 +660,10 @@
-
- if (inverse)
- mc_wdrawelm_inverse(b_us, b_us->ys - 1,
-- getline(b_us, y + b_us->ys - 1));
-+ minic_getline(b_us, y + b_us->ys - 1));
- else
- mc_wdrawelm(b_us, b_us->ys - 1,
-- getline(b_us, y + b_us->ys - 1));
-+ minic_getline(b_us, y + b_us->ys - 1));
- if (citemode)
- mc_wlocate(b_us, 0, cite_y);
- mc_wflush();
-@@ -753,7 +753,7 @@
- mc_wlocate(b_st, 0, 0);
- mc_wprintf(b_st, hline);
- mc_wredraw(b_st, 1);
-- mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
-+ mc_wdrawelm_inverse(b_us, cite_y, minic_getline(b_us, cite_ystart));
- mc_wlocate(b_us, 0, cite_y);
- break;
- case K_ESC:
\ No newline at end of file
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.3-r2.ebuild,v 1.5 2009/07/11 20:35:53 josejx Exp $
-
-EAPI="2"
-
-inherit eutils
-
-STUPID_NUM="2332"
-
-DESCRIPTION="Serial Communication Program"
-HOMEPAGE="http://alioth.debian.org/projects/minicom"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls"
-
-COMMON_DEPEND="sys-libs/ncurses"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
- net-dialup/lrzsz"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs da de es fi fr hu ja nb pl pt_BR ro ru rw sv vi zh_TW"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo-runscript.patch
-
- #glibc name conflict
- epatch "${FILESDIR}"/${P}-getline-rename.patch
-}
-
-src_configure() {
- econf --sysconfdir=/etc/${PN} \
- $(use_enable nls) \
- || die "econf failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "einstall failed"
-
- dodoc AUTHORS ChangeLog NEWS README doc/minicom.FAQ
- insinto /etc/minicom
- doins "${FILESDIR}"/minirc.dfl
-}
-
-pkg_preinst() {
- [[ -s ${ROOT}/etc/minicom/minirc.dfl ]] \
- && rm -f "${D}"/etc/minicom/minirc.dfl
-}
projects / gentoo.git / commitdiff