cleaned up version of the ebuild

5 files changed, 90 insertions, 48 deletions

diff --git a/media-video/alevt/ChangeLog b/media-video/alevt/ChangeLog
index ce34e6b360f4..0e38419cd040 100644
--- a/media-video/alevt/ChangeLog
+++ b/media-video/alevt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/alevt
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.2 2002/06/29 02:40:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.3 2002/07/03 17:00:36 seemant Exp $
+
+*alevt-1.6.0-r2 (03 Jul 2002)
+
+  03 Jul 2002; Seemant Kulleen <seemant@gentoo.org> alevt-1.6.0-r2.ebuild
+  files/digest-alevt-1.6.0-r2 :
+
+  twanger@bluetwanger.de (Markus Bertheau) submitted this a loooong time ago
+  in bug #1657.  This is actually a cleaner ebuild, and he patched it to
+  work with emake.
 
 *alevt-1.6.0-r1 (28 Jun 2002)
 
diff --git a/media-video/alevt/alevt-1.6.0-r2.ebuild b/media-video/alevt/alevt-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..2f0c4db10d18
--- /dev/null
+++ b/media-video/alevt/alevt-1.6.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.0-r2.ebuild,v 1.1 2002/07/03 17:00:36 seemant Exp $ 
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="Teletext viewer for X11"
+SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz"
+HOMEPAGE="http://www.goron.de/~froese/"
+SLOT="0"
+
+DEPEND="virtual/glibc
+	>=media-libs/libpng-1.0.12
+	>=x11-base/xfree-4.0.1"
+
+LICENSE="GPL-2"
+
+src_unpack() {
+
+	unpack ${P}.tar.gz
+	cd ${WORKDIR}
+
+	# Parallel make patch
+	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+
+}
+
+src_compile() {
+	
+	emake || die
+
+}
+
+src_install () {
+
+	dobin alevt alevt-cap alevt-date
+	doman alevt.1x alevt-date.1 alevt-cap.1
+	dodoc CHANGELOG COPYRIGHT README
+}
diff --git a/media-video/alevt/alevt-1.6.0.ebuild b/media-video/alevt/alevt-1.6.0.ebuild
deleted file mode 100644
index b3953854d00a..000000000000
--- a/media-video/alevt/alevt-1.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# Maintainer: First Last <your email>
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.0.ebuild,v 1.1 2002/04/23 15:52:01 verwilst Exp $ 
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Teletext viewer for X11"
-SRC_URI="http://www.ibiblio.org/pub/Linux/apps/video/${P}.tar.gz"
-HOMEPAGE="http://"
-SLOT="0"
-DEPEND="virtual/glibc
-    >=media-libs/libpng-1.0.12
-    >=x11-base/xfree-4.0.1"
-
-src_unpack() {
-
-    unpack ${P}.tar.gz
-    cd ${S}
-    patch -p1 < ${FILESDIR}/${PF}-alevt-date.diff
-    patch -p1 < ${FILESDIR}/${PF}-makefile.diff
-
-}
-
-src_compile() {
-
-    emake || die
-
-}
-
-src_install () {
-
-	mkdir -p ${D}/usr/bin
-	mkdir -p ${D}/usr/man/man1
-	mkdir -p ${D}/usr/include/X11/pixmaps
-
-	install -m 0755 alevt           ${D}/usr/bin
-        install -m 0755 alevt-date      ${D}/usr/bin
-        install -m 0755 alevt-cap       ${D}/usr/bin
-        install -m 0644 alevt.1x        ${D}/usr/man/man1
-        install -m 0644 alevt-date.1    ${D}/usr/man/man1
-        install -m 0644 alevt-cap.1     ${D}/usr/man/man1
-        install -m 0644 contrib/mini-alevt.xpm ${D}/usr/include/X11/pixmaps
-
-        sync	
-
-}
diff --git a/media-video/alevt/files/alevt-1.6.0-gentoo.diff b/media-video/alevt/files/alevt-1.6.0-gentoo.diff
new file mode 100644
index 000000000000..06abd4e907f4
--- /dev/null
+++ b/media-video/alevt/files/alevt-1.6.0-gentoo.diff
@@ -0,0 +1,40 @@
+diff -ru alevt-1.6.0.orig/Makefile alevt-1.6.0/Makefile
+--- alevt-1.6.0.orig/Makefile	Wed Oct 11 20:08:29 2000
++++ alevt-1.6.0/Makefile	Thu Apr 11 19:56:50 2002
+@@ -126,3 +126,5 @@
+ ui.o: search.h export.h ui.h
+ vbi.o: os.h vt.h misc.h vbi.h dllist.h cache.h lang.h fdset.h hamm.h
+ xio.o: vt.h misc.h dllist.h xio.h fdset.h lang.h icon.xbm font.h
++font.o: font1.xbm font2.xbm
++
+diff -ru alevt-1.6.0.orig/alevt-date.c alevt-1.6.0/alevt-date.c
+--- alevt-1.6.0.orig/alevt-date.c	Sat Sep 16 23:34:42 2000
++++ alevt-1.6.0/alevt-date.c	Wed Apr 10 21:48:09 2002
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <time.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <signal.h>
+diff -ru alevt-1.6.0.orig/main.c alevt-1.6.0/main.c
+--- alevt-1.6.0.orig/main.c	Sat Sep 16 23:34:18 2000
++++ alevt-1.6.0/main.c	Wed Apr 10 23:09:40 2002
+@@ -15,7 +15,7 @@
+ /* current args for next start() */
+ static char *geometry;
+ static char *dpy_name;
+-static char *vbi_name = "/dev/vbi";
++static char *vbi_name = "/dev/v4l/vbi0";
+ static struct xio *xio;
+ static struct vbi *vbi;
+ static int fine_tune = 1; // auto = 999;
+@@ -32,7 +32,7 @@
+ 	    "  Valid options:\t\tDefault:\n"
+ 	    "    --help\n"
+ 	    "    --version\n"
+-	    "    -vbi <vbidev>\t\t/dev/vbi\n"
++	    "    -vbi <vbidev>\t\t/dev/v4l/vbi0\n"
+ 	    "    -display <dpy>\t\t$DISPLAY\n"
+ 	    "    -geometry <geo>\t\t41x25\n"
+ 	    "    -finetune <-4..4|auto>\t0\n"
diff --git a/media-video/alevt/files/digest-alevt-1.6.0-r2 b/media-video/alevt/files/digest-alevt-1.6.0-r2
new file mode 100644
index 000000000000..c585bc06765a
--- /dev/null
+++ b/media-video/alevt/files/digest-alevt-1.6.0-r2
@@ -0,0 +1 @@
+MD5 3826d99d14d0a8f70f8d3625b2d06d03 alevt-1.6.0.tar.gz 116646