public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: openmotif-2.3.0-r2.ebuild ChangeLog
@ 2008-04-25 19:08 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-04-25 19:08 UTC (permalink / raw
  To: gentoo-commits

ulm         08/04/25 19:08:42

  Modified:             openmotif-2.3.0-r2.ebuild ChangeLog
  Log:
  Remove defunct sed tweaks of man pages. Install app-defaults as "Mwm".
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.3                  x11-libs/openmotif/openmotif-2.3.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?r1=1.2&r2=1.3

Index: openmotif-2.3.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openmotif-2.3.0-r2.ebuild	25 Apr 2008 14:40:28 -0000	1.2
+++ openmotif-2.3.0-r2.ebuild	25 Apr 2008 19:08:42 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.2 2008/04/25 14:40:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.3 2008/04/25 19:08:42 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -100,18 +100,12 @@
 
 	# mwm default configs
 	insinto /etc/X11/app-defaults
-	doins "${FILESDIR}"/Mwm.defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
 
 	dodir /etc/X11/mwm
 	mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm
 	dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/
 
-	local f
-	for f in /usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4; do
-		dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' ${f}
-		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' ${f}
-	done
-
 	if use examples ; then
 		emake -j1 -C demos DESTDIR="${D}" install-data \
 			|| die "installation of demos failed"



1.174                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.174&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.174&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.173&r2=1.174

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- ChangeLog	25 Apr 2008 14:40:28 -0000	1.173
+++ ChangeLog	25 Apr 2008 19:08:42 -0000	1.174
@@ -1,10 +1,11 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.173 2008/04/25 14:40:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.174 2008/04/25 19:08:42 ulm Exp $
 
   25 Apr 2008; Ulrich Mueller <ulm@gentoo.org>
   +files/openmotif-2.3.0-freebsd-libiconv.patch, openmotif-2.3.0-r2.ebuild:
   Depend on virtual/libiconv and fix FreeBSD linking problem, bug 219040.
+  Remove defunct sed tweaks of man pages. Install app-defaults as "Mwm".
 
   13 Apr 2008; Ulrich Mueller <ulm@gentoo.org> -openmotif-2.2.3-r9.ebuild:
   Remove old version; no package needs SLOT 2.2 anymore.



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: openmotif-2.3.0-r2.ebuild ChangeLog
@ 2008-05-07  6:24 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-05-07  6:24 UTC (permalink / raw
  To: gentoo-commits

ulm         08/05/07 06:24:18

  Modified:             openmotif-2.3.0-r2.ebuild ChangeLog
  Log:
  Better fix for libtool-2.2 breakage, bug 220599.
  (Portage version: 2.1.5_rc7)

Revision  Changes    Path
1.8                  x11-libs/openmotif/openmotif-2.3.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?r1=1.7&r2=1.8

Index: openmotif-2.3.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openmotif-2.3.0-r2.ebuild	6 May 2008 20:49:18 -0000	1.7
+++ openmotif-2.3.0-r2.ebuild	7 May 2008 06:24:18 -0000	1.8
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.7 2008/05/06 20:49:18 ulm Exp $
-
-WANT_AUTOMAKE=1.9
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.8 2008/05/07 06:24:18 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -70,11 +68,13 @@
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
 
+	# fix libtool-2.2 breakage, bug 220599
+	sed -i -e 's/LT_HAVE/FINDXFT_HAVE/g' ac_find_xft.m4
+
 	# add X.Org vendor string to aliases for virtual bindings
 	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
 
-	eautoconf
-	eautomake
+	AT_M4DIR=. eautoreconf
 }
 
 src_compile() {



1.178                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.178&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.178&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.177&r2=1.178

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- ChangeLog	6 May 2008 20:49:18 -0000	1.177
+++ ChangeLog	7 May 2008 06:24:18 -0000	1.178
@@ -1,10 +1,9 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.177 2008/05/06 20:49:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.178 2008/05/07 06:24:18 ulm Exp $
 
   06 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
-  Call eautoconf and eautomake explicitely, fixes breakage with libtool-2.2,
-  bug 220599.
+  Fix breakage with libtool-2.2, bug 220599.
 
   04 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
   Add X.Org vendor string to aliases for virtual bindings.



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: openmotif-2.3.0-r2.ebuild ChangeLog
@ 2008-05-06 20:49 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-05-06 20:49 UTC (permalink / raw
  To: gentoo-commits

ulm         08/05/06 20:49:18

  Modified:             openmotif-2.3.0-r2.ebuild ChangeLog
  Log:
  Call eautoconf and eautomake explicitely, bug 220599.
  (Portage version: 2.1.5_rc7)

Revision  Changes    Path
1.7                  x11-libs/openmotif/openmotif-2.3.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?r1=1.6&r2=1.7

Index: openmotif-2.3.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openmotif-2.3.0-r2.ebuild	4 May 2008 11:13:23 -0000	1.6
+++ openmotif-2.3.0-r2.ebuild	6 May 2008 20:49:18 -0000	1.7
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.6 2008/05/04 11:13:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.7 2008/05/06 20:49:18 ulm Exp $
+
+WANT_AUTOMAKE=1.9
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -71,7 +73,8 @@
 	# add X.Org vendor string to aliases for virtual bindings
 	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
 
-	AT_M4DIR=. eautoreconf
+	eautoconf
+	eautomake
 }
 
 src_compile() {
@@ -117,7 +120,6 @@
 	fi
 	rm -rf "${D}"/usr/share/Xm
 
-	# documentation
 	dodoc README RELEASE RELNOTES BUGREPORT TODO
 	use doc && cp "${WORKDIR}"/*.pdf "${D}"/usr/share/doc/${PF}
 }



1.177                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.177&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.177&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.176&r2=1.177

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- ChangeLog	4 May 2008 11:13:23 -0000	1.176
+++ ChangeLog	6 May 2008 20:49:18 -0000	1.177
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.176 2008/05/04 11:13:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.177 2008/05/06 20:49:18 ulm Exp $
+
+  06 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
+  Call eautoconf and eautomake explicitely, fixes breakage with libtool-2.2,
+  bug 220599.
 
   04 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
   Add X.Org vendor string to aliases for virtual bindings.



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: openmotif-2.3.0-r2.ebuild ChangeLog
@ 2008-05-04 11:13 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-05-04 11:13 UTC (permalink / raw
  To: gentoo-commits

ulm         08/05/04 11:13:24

  Modified:             openmotif-2.3.0-r2.ebuild ChangeLog
  Log:
  Add X.Org vendor string to aliases for virtual bindings.
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.6                  x11-libs/openmotif/openmotif-2.3.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?r1=1.5&r2=1.6

Index: openmotif-2.3.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openmotif-2.3.0-r2.ebuild	2 May 2008 15:35:03 -0000	1.5
+++ openmotif-2.3.0-r2.ebuild	4 May 2008 11:13:23 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.5 2008/05/02 15:35:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.6 2008/05/04 11:13:23 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -68,6 +68,9 @@
 	# disable compilation of demo binaries
 	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
 
+	# add X.Org vendor string to aliases for virtual bindings
+	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
 	AT_M4DIR=. eautoreconf
 }
 



1.176                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.175&r2=1.176

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ChangeLog	2 May 2008 15:35:03 -0000	1.175
+++ ChangeLog	4 May 2008 11:13:23 -0000	1.176
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.175 2008/05/02 15:35:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.176 2008/05/04 11:13:23 ulm Exp $
+
+  04 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
+  Add X.Org vendor string to aliases for virtual bindings.
 
   02 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
   Defaults go under /usr/share/X11/ with modular X.



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: openmotif-2.3.0-r2.ebuild ChangeLog
@ 2008-05-02 15:35 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-05-02 15:35 UTC (permalink / raw
  To: gentoo-commits

ulm         08/05/02 15:35:04

  Modified:             openmotif-2.3.0-r2.ebuild ChangeLog
  Log:
  Defaults go under /usr/share/X11/ with modular X.
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.5                  x11-libs/openmotif/openmotif-2.3.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?r1=1.4&r2=1.5

Index: openmotif-2.3.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openmotif-2.3.0-r2.ebuild	27 Apr 2008 21:24:23 -0000	1.4
+++ openmotif-2.3.0-r2.ebuild	2 May 2008 15:35:03 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.4 2008/04/27 21:24:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.5 2008/05/02 15:35:03 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -99,7 +99,7 @@
 	dosed "s:@@LIBDIR@@:$(get_libdir):g" /usr/bin/motif-config
 
 	# mwm default configs
-	insinto /etc/X11/app-defaults
+	insinto /usr/share/X11/app-defaults
 	newins "${FILESDIR}"/Mwm.defaults Mwm
 
 	dodir /etc/X11/mwm



1.175                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.175&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.175&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.174&r2=1.175

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- ChangeLog	25 Apr 2008 19:08:42 -0000	1.174
+++ ChangeLog	2 May 2008 15:35:03 -0000	1.175
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.174 2008/04/25 19:08:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.175 2008/05/02 15:35:03 ulm Exp $
+
+  02 May 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r2.ebuild:
+  Defaults go under /usr/share/X11/ with modular X.
 
   25 Apr 2008; Ulrich Mueller <ulm@gentoo.org>
   +files/openmotif-2.3.0-freebsd-libiconv.patch, openmotif-2.3.0-r2.ebuild:



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: openmotif-2.3.0-r2.ebuild ChangeLog
@ 2008-04-25 14:40 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-04-25 14:40 UTC (permalink / raw
  To: gentoo-commits

ulm         08/04/25 14:40:28

  Modified:             openmotif-2.3.0-r2.ebuild ChangeLog
  Log:
  Depend on virtual/libiconv and fix FreeBSD linking problem, bug 219040.
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.2                  x11-libs/openmotif/openmotif-2.3.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?r1=1.1&r2=1.2

Index: openmotif-2.3.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openmotif-2.3.0-r2.ebuild	7 Apr 2008 18:34:50 -0000	1.1
+++ openmotif-2.3.0-r2.ebuild	25 Apr 2008 14:40:28 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.1 2008/04/07 18:34:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v 1.2 2008/04/25 14:40:28 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -22,6 +22,7 @@
 	x11-libs/libXmu
 	x11-libs/libXaw
 	x11-libs/libXp
+	virtual/libiconv
 	xft? ( x11-libs/libXft )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )"
@@ -62,9 +63,12 @@
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-sensitivity-invisible.patch"
 	epatch "${FILESDIR}/${P}-fix-nedit-segfaults.patch"
+	epatch "${FILESDIR}/${P}-freebsd-libiconv.patch"
 
 	# disable compilation of demo binaries
-	sed -i -e 's/^[ \t]*demos//' Makefile.in
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+	AT_M4DIR=. eautoreconf
 }
 
 src_compile() {
@@ -98,16 +102,16 @@
 	insinto /etc/X11/app-defaults
 	doins "${FILESDIR}"/Mwm.defaults
 
+	dodir /etc/X11/mwm
+	mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm
+	dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/
+
 	local f
 	for f in /usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4; do
 		dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' ${f}
 		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' ${f}
 	done
 
-	dodir /etc/X11/mwm
-	mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm
-	dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/
-
 	if use examples ; then
 		emake -j1 -C demos DESTDIR="${D}" install-data \
 			|| die "installation of demos failed"



1.173                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.173&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.173&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.172&r2=1.173

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- ChangeLog	13 Apr 2008 23:16:58 -0000	1.172
+++ ChangeLog	25 Apr 2008 14:40:28 -0000	1.173
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.172 2008/04/13 23:16:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.173 2008/04/25 14:40:28 ulm Exp $
+
+  25 Apr 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/openmotif-2.3.0-freebsd-libiconv.patch, openmotif-2.3.0-r2.ebuild:
+  Depend on virtual/libiconv and fix FreeBSD linking problem, bug 219040.
 
   13 Apr 2008; Ulrich Mueller <ulm@gentoo.org> -openmotif-2.2.3-r9.ebuild:
   Remove old version; no package needs SLOT 2.2 anymore.



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-05-07  6:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-25 19:08 [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: openmotif-2.3.0-r2.ebuild ChangeLog Ulrich Mueller (ulm)
  -- strict thread matches above, loose matches on Subject: below --
2008-05-07  6:24 Ulrich Mueller (ulm)
2008-05-06 20:49 Ulrich Mueller (ulm)
2008-05-04 11:13 Ulrich Mueller (ulm)
2008-05-02 15:35 Ulrich Mueller (ulm)
2008-04-25 14:40 Ulrich Mueller (ulm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox