[gentoo-commits] gentoo-x86 commit in app-editors/nedit: ChangeLog nedit-5.5_p20110116.ebuild

[Jeremy Olexa (darkside)]

darkside    11/02/21 06:17:02

  Modified:             ChangeLog nedit-5.5_p20110116.ebuild
  Log:
  Fixes for macos, bug 352991 by Johan Hattne
  
  (Portage version: 2.1.9.40/cvs/Linux x86_64)

Revision  Changes    Path
1.64                 app-editors/nedit/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nedit/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nedit/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nedit/ChangeLog?r1=1.63&r2=1.64

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog	16 Jan 2011 20:20:46 -0000	1.63
+++ ChangeLog	21 Feb 2011 06:17:02 -0000	1.64
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nedit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.63 2011/01/16 20:20:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.64 2011/02/21 06:17:02 darkside Exp $
+
+  21 Feb 2011; Jeremy Olexa <darkside@g.o>
+  nedit-5.5_p20110116.ebuild:
+  Fixes for macos, bug 352991 by Johan Hattne
 
 *nedit-5.5_p20110116 (16 Jan 2011)
 



1.2                  app-editors/nedit/nedit-5.5_p20110116.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild?r1=1.1&r2=1.2

Index: nedit-5.5_p20110116.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nedit-5.5_p20110116.ebuild	16 Jan 2011 20:20:47 -0000	1.1
+++ nedit-5.5_p20110116.ebuild	21 Feb 2011 06:17:02 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild,v 1.1 2011/01/16 20:20:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild,v 1.2 2011/02/21 06:17:02 darkside Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="spell"
 
 RDEPEND="spell? ( virtual/aspell-dict )
@@ -40,10 +40,22 @@
 src_configure() {
 	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
 		makefiles/Makefile.linux || die
+	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
+		   -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
+		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
+		   -e "s:check_tif_rule::"                             \
+		makefiles/Makefile.macosx || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" linux || die
+	case ${CHOST} in
+		*-darwin*)
+			emake CC="$(tc-getCC)" macosx || die
+			;;
+		*-linux*)
+			emake CC="$(tc-getCC)" linux || die
+			;;
+	esac
 	emake VERSION="NEdit ${PV}" -j1 -C doc all || die
 }