diff options
author | Michele Noberasco <s4t4n@gentoo.org> | 2008-02-12 16:10:44 +0000 |
---|---|---|
committer | Michele Noberasco <s4t4n@gentoo.org> | 2008-02-12 16:10:44 +0000 |
commit | 8dd555a230242b25c081bfac312437f2a96c61e4 (patch) | |
tree | 2b14a05547268ab7b6cd33b8f57b2776bdd01bea /x11-plugins/wmSMPmon | |
parent | Version bump. (diff) | |
download | gentoo-2-8dd555a230242b25c081bfac312437f2a96c61e4.tar.gz gentoo-2-8dd555a230242b25c081bfac312437f2a96c61e4.tar.bz2 gentoo-2-8dd555a230242b25c081bfac312437f2a96c61e4.zip |
Revision bump, see bug #207804.
(Portage version: 2.1.3.19)
Diffstat (limited to 'x11-plugins/wmSMPmon')
-rw-r--r-- | x11-plugins/wmSMPmon/ChangeLog | 7 | ||||
-rw-r--r-- | x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch | 45 | ||||
-rw-r--r-- | x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild | 37 |
3 files changed, 88 insertions, 1 deletions
diff --git a/x11-plugins/wmSMPmon/ChangeLog b/x11-plugins/wmSMPmon/ChangeLog index ba4e2672864a..776bfbc024cf 100644 --- a/x11-plugins/wmSMPmon/ChangeLog +++ b/x11-plugins/wmSMPmon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-plugins/wmSMPmon # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/ChangeLog,v 1.15 2007/07/22 05:33:14 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/ChangeLog,v 1.16 2008/02/12 16:10:43 s4t4n Exp $ + +*wmSMPmon-3.1-r1 (12 Feb 2008) + + 12 Feb 2008; Michele Noberasco <s4t4n@gentoo.org> +wmSMPmon-3.1-r1.ebuild: + Revision bump, see bug #207804. 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmSMPmon-2.3.ebuild, wmSMPmon-3.1.ebuild: diff --git a/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch new file mode 100644 index 000000000000..1bd27f47c0f1 --- /dev/null +++ b/x11-plugins/wmSMPmon/files/wmSMPmon-3.1-makefile.patch @@ -0,0 +1,45 @@ +--- Makefile.orig 2005-02-22 23:24:23.000000000 +0100 ++++ Makefile 2008-01-28 00:12:33.000000000 +0100 +@@ -2,22 +2,24 @@ + # Adapted for wmSMPmon 2.9.x and higher: Thomas Ribbrock + + # Change the following two to determine installation location +-BINDIR=/usr/local/bin/ +-MANDIR=/usr/local/share/man/ ++PREFIX=/usr ++BINDIR=$(PREFIX)/bin ++MANDIR=$(PREFIX)/share/man + + SRC = general.c sysinfo-linux.c ../wmgeneral/wmgeneral.c wmSMPmon.c + EXE = wmSMPmon + MAN = wmSMPmon.1 + OBJ = $(SRC:.c=.o) + INSTALL = /usr/bin/install +-INSTALLEXEFLAGS = -m 755 -s ++INSTALLEXEFLAGS = -m 755 + INSTALLMANFLAGS = -m 644 +-CC = gcc +-CFLAGS = -Wall -O2 -g +-LIB = -L/usr/X11R6/lib -lXpm -lXext -lX11 ++CC ?= gcc ++CFLAGS += -Wall ++LIBDIR ?= /usr/lib ++LIBS= -lXpm -lXext -lX11 + + all: $(OBJ) +- $(CC) -o $(EXE) $(OBJ) $(LIB) ++ $(CC) $(CFLAGS) -o $(EXE) $(OBJ) -L$(LIBDIR) $(LDFLAGS) $(LIBS) + + $(OBJ): %.o : %.c + $(CC) $(CFLAGS) -c -o $@ $< +@@ -28,6 +31,7 @@ + rm -rf ../wmgeneral/*.o + + install: +- $(INSTALL) $(INSTALLEXEFLAGS) $(EXE) $(BINDIR) +- $(INSTALL) -d $(MANDIR)/man1 +- $(INSTALL) $(INSTALLMANFLAGS) $(MAN) $(MANDIR)/man1 ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) $(INSTALLEXEFLAGS) $(EXE) $(DESTDIR)$(BINDIR) ++ $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1 ++ $(INSTALL) $(INSTALLMANFLAGS) $(MAN) $(DESTDIR)$(MANDIR)/man1 diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild new file mode 100644 index 000000000000..d79e2989f798 --- /dev/null +++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild,v 1.1 2008/02/12 16:10:43 s4t4n Exp $ + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="SMP system monitor dockapp" +HOMEPAGE="http://lancre.ribbrock.org/binabit/wmSMPmon/" +SRC_URI="http://lancre.ribbrock.org/binabit/wmSMPmon/src/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-libs/libXext + x11-libs/libXpm" +DEPEND="${RDEPEND} + x11-proto/xextproto" + +S="${WORKDIR}/${P}/${PN}" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-makefile.patch +} + +src_compile() { + emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + dodoc ../Changelog +} |