| 1 |
ulm 08/04/25 14:40:28 |
| 2 |
|
| 3 |
Modified: openmotif-2.3.0-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Depend on virtual/libiconv and fix FreeBSD linking problem, bug 219040. |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 x11-libs/openmotif/openmotif-2.3.0-r2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?rev=1.2&view=markup |
| 12 |
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 |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: openmotif-2.3.0-r2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r2.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- openmotif-2.3.0-r2.ebuild 7 Apr 2008 18:34:50 -0000 1.1 |
| 22 |
+++ openmotif-2.3.0-r2.ebuild 25 Apr 2008 14:40:28 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $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 $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
inherit eutils flag-o-matic multilib autotools |
| 30 |
|
| 31 |
@@ -22,6 +22,7 @@ |
| 32 |
x11-libs/libXmu |
| 33 |
x11-libs/libXaw |
| 34 |
x11-libs/libXp |
| 35 |
+ virtual/libiconv |
| 36 |
xft? ( x11-libs/libXft ) |
| 37 |
jpeg? ( media-libs/jpeg ) |
| 38 |
png? ( media-libs/libpng )" |
| 39 |
@@ -62,9 +63,12 @@ |
| 40 |
cd "${S}" |
| 41 |
epatch "${FILESDIR}/${P}-sensitivity-invisible.patch" |
| 42 |
epatch "${FILESDIR}/${P}-fix-nedit-segfaults.patch" |
| 43 |
+ epatch "${FILESDIR}/${P}-freebsd-libiconv.patch" |
| 44 |
|
| 45 |
# disable compilation of demo binaries |
| 46 |
- sed -i -e 's/^[ \t]*demos//' Makefile.in |
| 47 |
+ sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am |
| 48 |
+ |
| 49 |
+ AT_M4DIR=. eautoreconf |
| 50 |
} |
| 51 |
|
| 52 |
src_compile() { |
| 53 |
@@ -98,16 +102,16 @@ |
| 54 |
insinto /etc/X11/app-defaults |
| 55 |
doins "${FILESDIR}"/Mwm.defaults |
| 56 |
|
| 57 |
+ dodir /etc/X11/mwm |
| 58 |
+ mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm |
| 59 |
+ dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/ |
| 60 |
+ |
| 61 |
local f |
| 62 |
for f in /usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4; do |
| 63 |
dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' ${f} |
| 64 |
dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' ${f} |
| 65 |
done |
| 66 |
|
| 67 |
- dodir /etc/X11/mwm |
| 68 |
- mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm |
| 69 |
- dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/ |
| 70 |
- |
| 71 |
if use examples ; then |
| 72 |
emake -j1 -C demos DESTDIR="${D}" install-data \ |
| 73 |
|| die "installation of demos failed" |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.173 x11-libs/openmotif/ChangeLog |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.173&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.173&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.172&r2=1.173 |
| 82 |
|
| 83 |
Index: ChangeLog |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v |
| 86 |
retrieving revision 1.172 |
| 87 |
retrieving revision 1.173 |
| 88 |
diff -u -r1.172 -r1.173 |
| 89 |
--- ChangeLog 13 Apr 2008 23:16:58 -0000 1.172 |
| 90 |
+++ ChangeLog 25 Apr 2008 14:40:28 -0000 1.173 |
| 91 |
@@ -1,6 +1,10 @@ |
| 92 |
# ChangeLog for x11-libs/openmotif |
| 93 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.172 2008/04/13 23:16:58 ulm Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.173 2008/04/25 14:40:28 ulm Exp $ |
| 96 |
+ |
| 97 |
+ 25 Apr 2008; Ulrich Mueller <ulm@g.o> |
| 98 |
+ +files/openmotif-2.3.0-freebsd-libiconv.patch, openmotif-2.3.0-r2.ebuild: |
| 99 |
+ Depend on virtual/libiconv and fix FreeBSD linking problem, bug 219040. |
| 100 |
|
| 101 |
13 Apr 2008; Ulrich Mueller <ulm@g.o> -openmotif-2.2.3-r9.ebuild: |
| 102 |
Remove old version; no package needs SLOT 2.2 anymore. |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
-- |
| 107 |
gentoo-commits@l.g.o mailing list |
Archives