small fix0rs

5 files changed, 44 insertions, 34 deletions

diff --git a/x11-misc/wmpager/ChangeLog b/x11-misc/wmpager/ChangeLog
index 42a4756e56e2..8de74b6c3fcf 100644
--- a/x11-misc/wmpager/ChangeLog
+++ b/x11-misc/wmpager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/wmpager
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmpager/ChangeLog,v 1.2 2003/02/12 09:32:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmpager/ChangeLog,v 1.3 2003/11/02 23:34:50 seemant Exp $
+
+*wmpager-1.2-r1 (02 Nov 2003)
+
+  02 Nov 2003; Seemant Kulleen <seemant@gentoo.org> wmpager-1.2-r1.ebuild,
+  wmpager-1.2.ebuild:
+  changed ebuild to get rid of superfluous sed statement. Also, the Makefile
+  installs the .1x man page into /usr/man, so use doman instead. Also the DEPEND
+  on x11-base/xfree is now an RDEPEND on virtual/X11. The last thanks to Ciaran
+  McReesh <ciaranm@firedrop.org.uk> in #gentoo-sparc
 
 *wmpager-1.2 (27 Oct 2002)
 
diff --git a/x11-misc/wmpager/Manifest b/x11-misc/wmpager/Manifest
index 597ff5c5aa4a..bceba6c062c3 100644
--- a/x11-misc/wmpager/Manifest
+++ b/x11-misc/wmpager/Manifest
@@ -1,3 +1,3 @@
-MD5 7b5cde7cbf9053e8edd51d73e9130d1c wmpager-1.2-r1.ebuild 761
-MD5 29bd436c5a1a4bea79447570c3ce9a87 ChangeLog 773
+MD5 6c403516d2c7fba23093d15e5c4e1e90 wmpager-1.2-r1.ebuild 763
+MD5 24c42355fb0577509df4153ef4922b3f ChangeLog 774
 MD5 1dd5012756a79572f3f42486bc0500ba files/digest-wmpager-1.2-r1 62
diff --git a/x11-misc/wmpager/files/digest-wmpager-1.2 b/x11-misc/wmpager/files/digest-wmpager-1.2-r1
index 06c4c03f924d..06c4c03f924d 100644
--- a/x11-misc/wmpager/files/digest-wmpager-1.2
+++ b/x11-misc/wmpager/files/digest-wmpager-1.2-r1
diff --git a/x11-misc/wmpager/wmpager-1.2-r1.ebuild b/x11-misc/wmpager/wmpager-1.2-r1.ebuild
new file mode 100644
index 000000000000..8590cfe24d10
--- /dev/null
+++ b/x11-misc/wmpager/wmpager-1.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmpager/wmpager-1.2-r1.ebuild,v 1.1 2003/11/02 23:34:50 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A simple pager docklet for the WindowMaker window manager."
+HOMEPAGE="http://wmpager.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wmpager/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="virtual/x11
+	virtual/glibc"
+
+src_compile() {
+	sed -i "s:\(WMPAGER_DEFAULT_INSTALL_DIR \).*:\1\"/usr/share/wmpager\":" \
+		src/wmpager.c
+
+	emake || die
+}
+
+src_install() {
+	make INSTALLDIR=${D}/usr install || die
+
+	rm -rf ${D}/usr/man
+	doman man/man1/*.1x
+	dodoc README
+}
diff --git a/x11-misc/wmpager/wmpager-1.2.ebuild b/x11-misc/wmpager/wmpager-1.2.ebuild
deleted file mode 100644
index 906c94b77863..000000000000
--- a/x11-misc/wmpager/wmpager-1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmpager/wmpager-1.2.ebuild,v 1.6 2003/09/05 23:29:05 msterret Exp $
-
-S=${WORKDIR}/${P}
-HOMEPAGE="http://wmpager.sourceforge.net/"
-DESCRIPTION="wmpager is a simple pager docklet for the Window Maker."
-SRC_URI="mirror://sourceforge/wmpager/wmpager-${PV}.tar.gz"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~x86"
-DEPEND="x11-base/xfree
-		virtual/glibc"
-RDEPEND=""
-
-src_compile() {
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:INSTALLDIR = .*:INSTALLDIR=${D}/usr:" Makefile.orig > Makefile
-	cd src
-	mv wmpager.c wmpager.c.orig
-	sed -e "s:WMPAGER_DEFAULT_INSTALL_DIR .*:WMPAGER_DEFAULT_INSTALL_DIR \"/usr/share/wmpager\":" wmpager.c.orig > wmpager.c
-	cd ..
-	emake || die
-}
-
-src_install() {
-	cd ${S}
-	emake install || die
-	dodoc README
-}