diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2012-08-18 15:57:43 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2012-08-18 15:57:43 +0000 |
| commit | ebfb01e9d768020e8c06e72d95e0d6e7da9944dc (patch) | |
| tree | a22165da2deb5a241869ad5bab86ccb949d38759 /app-i18n/fbiterm | |
| parent | Revert wrong perl change. (diff) | |
| download | gentoo-2-ebfb01e9d768020e8c06e72d95e0d6e7da9944dc.tar.gz gentoo-2-ebfb01e9d768020e8c06e72d95e0d6e7da9944dc.tar.bz2 gentoo-2-ebfb01e9d768020e8c06e72d95e0d6e7da9944dc.zip | |
Respect CFLAGS. #431110
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n/fbiterm')
| -rw-r--r-- | app-i18n/fbiterm/ChangeLog | 9 | ||||
| -rw-r--r-- | app-i18n/fbiterm/fbiterm-0.5-r2.ebuild | 37 | ||||
| -rw-r--r-- | app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch | 13 |
3 files changed, 37 insertions, 22 deletions
diff --git a/app-i18n/fbiterm/ChangeLog b/app-i18n/fbiterm/ChangeLog index 408bd3beb501..f8a6d97548fa 100644 --- a/app-i18n/fbiterm/ChangeLog +++ b/app-i18n/fbiterm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/fbiterm -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/ChangeLog,v 1.10 2008/11/24 16:52:22 matsuu Exp $ +# Copyright 2000-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/ChangeLog,v 1.11 2012/08/18 15:57:43 naota Exp $ + + 18 Aug 2012; Naohiro Aota <naota@gentoo.org> +files/fbiterm-0.5-cflags.patch, + fbiterm-0.5-r2.ebuild: + Respect CFLAGS. #431110 *fbiterm-0.5-r2 (24 Nov 2008) @@ -37,4 +41,3 @@ files/fbiterm-0.5-gentoo.diff: Initial import. Ebuild submitted by Zhen Lin <lowzl@hotmail.com>. See bug #27700. - diff --git a/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild b/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild index 04cf6852e859..83121d032991 100644 --- a/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild +++ b/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild,v 1.1 2008/11/24 16:52:22 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/fbiterm/fbiterm-0.5-r2.ebuild,v 1.2 2012/08/18 15:57:43 naota Exp $ -inherit autotools eutils multilib +EAPI=4 + +inherit autotools-utils eutils multilib IUSE="" @@ -22,24 +24,21 @@ RDEPEND="${DEPEND} media-fonts/font-sony-misc media-fonts/unifont" -S="${WORKDIR}/iterm/unix/fbiterm" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PF}-gentoo.diff" - eautoreconf -} +PATCHES=( + "${FILESDIR}"/${PF}-gentoo.diff + "${FILESDIR}"/${P}-cflags.patch +) +DOCS=( AUTHORS ChangeLog README{,.jp,.zh_CN} ) +AUTOTOOLS_AUTORECONF=1 -src_compile() { - econf --x-includes=/usr/include \ - --x-libraries=/usr/$(get_libdir) || die - emake || die -} +S="${WORKDIR}/iterm/unix/fbiterm" -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog README* +src_configure() { + local myeconfargs=( + --x-includes=/usr/include + --x-libraries=/usr/$(get_libdir) + ) + autotools-utils_src_configure } pkg_postinst() { diff --git a/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch b/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch new file mode 100644 index 000000000000..ae738c814202 --- /dev/null +++ b/app-i18n/fbiterm/files/fbiterm-0.5-cflags.patch @@ -0,0 +1,13 @@ +diff --git a/unix/fbiterm/src/Makefile.am b/unix/fbiterm/src/Makefile.am +index 4ffe3da..53f12f4 100644 +--- a/unix/fbiterm/src/Makefile.am ++++ b/unix/fbiterm/src/Makefile.am +@@ -17,7 +17,7 @@ fbiterm_SOURCES = \ + fbiterm_LDADD = \ + -L$(libdir) @X_LIBS@ -lm -lXfont -literm -lfreetype + +-CFLAGS = -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS) ++CFLAGS += -I$(includedir) @X_CFLAGS@ -I$(top_srcdir)/include -I/usr/local/include $(EXTRA_CFLAGS) + + install-exec-hook: + chmod u+s $(DESTDIR)$(bindir)/fbiterm |