summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-text/tofrodos/ChangeLog6
-rw-r--r--app-text/tofrodos/Manifest5
-rw-r--r--app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch17
-rw-r--r--app-text/tofrodos/tofrodos-1.7.8.ebuild16
4 files changed, 37 insertions, 7 deletions
diff --git a/app-text/tofrodos/ChangeLog b/app-text/tofrodos/ChangeLog
index 027c76704f0b..d715c33c9016 100644
--- a/app-text/tofrodos/ChangeLog
+++ b/app-text/tofrodos/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/tofrodos
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tofrodos/ChangeLog,v 1.1 2009/03/07 15:46:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tofrodos/ChangeLog,v 1.2 2009/07/17 14:34:31 vostorga Exp $
+
+ 17 Jul 2009; VĂ­ctor Ostorga <vostorga@gentoo.org>
+ +files/tofrodos-1.7.8-CFLAGS.patch, tofrodos-1.7.8.ebuild:
+ Respecting CFLAGS and LDFLAGS. Closes bug 262213
*tofrodos-1.7.8 (07 Mar 2009)
diff --git a/app-text/tofrodos/Manifest b/app-text/tofrodos/Manifest
index 2aa059812233..3002c4ff08ae 100644
--- a/app-text/tofrodos/Manifest
+++ b/app-text/tofrodos/Manifest
@@ -1,4 +1,5 @@
+AUX tofrodos-1.7.8-CFLAGS.patch 306 RMD160 c1a64fac0c24a736dfe8fe8ebbaa3c6298eb3970 SHA1 a8bd02c2f9c4de0e298c061e11f051406720abda SHA256 9447cde65dc487905d50ab34b549d79e0dd6cd995d8538afcd9e70ee5798be4b
DIST tofrodos-1.7.8.tar.gz 90006 RMD160 d295f0c953d94e8784ef2c5dc544927f743316ca SHA1 d73b0bd45aafc0a99430d3c0cf5ba669a8c4ff08 SHA256 e1d78226c5b54c0ce8e1c7de8bdd025aec6bf684960d5cee28310cf8dce48bb9
-EBUILD tofrodos-1.7.8.ebuild 696 RMD160 2a6c5b705453924adf7aeae5cbe8ccb5ab4fe38a SHA1 e2023a54655c66dacddd69ccf1cfc5555ec1b0bf SHA256 0db2bf894666b0de7aa669d1b9fc1549810b35ac8f2f5d922f89dca32647b239
-MISC ChangeLog 390 RMD160 732812e509ee1d0b24031be86a84ffb582f06835 SHA1 ac202d2baaf69caee9ea97df5a6209bf055429e8 SHA256 bceeee8eb7d3b3d450e2489f4894a064191a6c26ee6b80c1d1b71bc730f27dee
+EBUILD tofrodos-1.7.8.ebuild 849 RMD160 2c3b447f6bd38686213f687c91c9a3a9d48c55b8 SHA1 cacc0f63d25b1916f9d95f9294d850bb747dd060 SHA256 5b34ee9c7795a6805d461d04268dce04702b69b3cc95085e8ab695bb1385faae
+MISC ChangeLog 557 RMD160 c83feb3fb614fab464c980c947414b493ded85a2 SHA1 4d91b72932870fc1ef006e52936786356f883f78 SHA256 8f2902ba895cda4e19f226bfc78bd51cba16d4e862350915ba5e5ddeb12d8109
MISC metadata.xml 255 RMD160 dbe77cd804a4411e8445c05f6e632fdc2f72d082 SHA1 94e7a8d2d43907279488b984c3dcd9fd1888ce25 SHA256 28c7b0445a5f2eb0d524ff3afcef712ecbf345592d26142f71a3ef9bca653d4b
diff --git a/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch b/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch
new file mode 100644
index 000000000000..5aa0e8358565
--- /dev/null
+++ b/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch
@@ -0,0 +1,17 @@
+--- Makefile.original 2009-04-11 22:46:08.000000000 -0600
++++ Makefile 2009-04-12 14:30:55.000000000 -0600
+@@ -92,14 +92,10 @@
+ OBJS = emsg.o \
+ init.o \
+ tofrodos.o \
+ utility.o
+
+-# implicit rules
+-.c.o:
+- $(CC) $(CFLAGS) $<
+-
+ # user visible rules
+ all: $(FROMDOS) $(TODOS)
+
+ clean:
+ $(RM) $(OBJS)
diff --git a/app-text/tofrodos/tofrodos-1.7.8.ebuild b/app-text/tofrodos/tofrodos-1.7.8.ebuild
index a28f89bbfb48..1204b178993d 100644
--- a/app-text/tofrodos/tofrodos-1.7.8.ebuild
+++ b/app-text/tofrodos/tofrodos-1.7.8.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tofrodos/tofrodos-1.7.8.ebuild,v 1.1 2009/03/07 15:46:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tofrodos/tofrodos-1.7.8.ebuild,v 1.2 2009/07/17 14:34:31 vostorga Exp $
+
+inherit eutils
DESCRIPTION="text file conversion utility that converts ASCII files between the
MSDOS format and the Unix format"
@@ -17,12 +19,18 @@ RDEPEND=""
S="${WORKDIR}/${PN}/src"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-CFLAGS.patch
+}
+
src_compile() {
- emake DEBUG=1 || die "Compile failed."
+ emake DEBUG=1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "Compile failed."
}
src_install() {
dobin fromdos || die
- dosym fromdos /usr/bin/todos
- doman fromdos.1
+ dosym fromdos /usr/bin/todos || die
+ doman fromdos.1 || die
}