apply the Makefile.alt patch to 1.9.19 since people are still using old kernels #54881

3 files changed, 39 insertions, 6 deletions

diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 44ca33a77315..7c24ffd46108 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 MD5 0a4a24f09c3b6dc7b86b5a207a4575e5 ChangeLog 6988
 MD5 7ba8eaf0cdcf0f73a2efad41d746af03 svgalib-1.9.17-r3.ebuild 3051
-MD5 f83aa01b1049450c03bb86b4ad7b246c svgalib-1.4.3-r4.ebuild 2406
+MD5 81485c053e836bac932adb33c0f05566 svgalib-1.4.3-r4.ebuild 2406
 MD5 b836eed4dd55d7a70d005f21a6629ce1 svgalib-1.9.18-r1.ebuild 4545
 MD5 f6009974ec671bffddc518f734910304 svgalib-1.9.19.ebuild 4234
 MD5 ae00198d9110c4de5bc6dd4d6424ab26 files/digest-svgalib-1.4.3-r4 132
@@ -24,11 +24,11 @@ MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 41
 MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.patch 269
 MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19 66
 MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
-MD5 baea15e66edd16dd61a78329b4c4a4c5 files/svgalib-1.9.19-linux2.6.patch 6284
+MD5 a15e1ecf4906da3388435ed8fabfc9d4 files/svgalib-1.9.19-linux2.6.patch 7395
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.8 (GNU/Linux)
 
-iD8DBQFA2PFlHTu7gpaalycRAmydAJ9MITyLXFQQ4PSNYakfEyM4+irJtQCeL6C8
-y0Hl6dsWrq2gZVMHw5n94Qo=
-=9lx9
+iD8DBQFA2cdyHTu7gpaalycRAuw5AJ4iDxyhTIp0XCCAoTJfjk0prTrMyACfduHk
+idGnTvYGbEMuu2MTZPO4xUo=
+=euXy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/svgalib/files/svgalib-1.9.19-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.19-linux2.6.patch
index 9c1008616c14..979d1f87f35f 100644
--- a/media-libs/svgalib/files/svgalib-1.9.19-linux2.6.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.19-linux2.6.patch
@@ -1,3 +1,36 @@
+diff -urpwN svgalib-1.9.18/kernel/svgalib_helper/Makefile.alt svgalib-1.9.18.kernel2.6/kernel/svgalib_helper/Makefile.alt
+--- svgalib-1.9.18/kernel/svgalib_helper/Makefile.alt   2002-10-28 18:25:47.000000000 +0200
++++ svgalib-1.9.18.kernel2.6/kernel/svgalib_helper/Makefile.alt 2003-08-03 14:34:40.000000000 +0200
+@@ -37,7 +37,7 @@
+ CFLAGS += -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
+ 
+ ifeq (1,$(findstring 1,$(MODVER)))
+-	CFLAGS += -DMODVERSIONS -include $(INCLUDEDIR)/linux/modversions.h
++	CFLAGS += -DMODVERSIONS -DCONFIG_MODVERSIONS=1
+ endif
+ 
+ TARGET = svgalib_helper
+@@ -50,7 +50,8 @@
+ 	endif
+ endif
+ 
+-all: .depend $(OBJS)
++modules: $(OBJS)
++all: .depend modules
+ 
+ $(TARGET).o: $(SRC:.c=.o)
+ 	$(LD) -r $^ -o $@
+@@ -61,8 +62,8 @@
+ install: device modules_install
+ 
+ modules_install: $(OBJS)
+-	mkdir -p /lib/modules/$(VER)/kernel/misc 
+-	install -m 0644 -c $(OBJS) /lib/modules/$(VER)/kernel/misc
++	mkdir -p $(TOPDIR)/lib/modules/$(VER)/kernel/misc
++	install -m 0644 -c $(OBJS) $(TOPDIR)/lib/modules/$(VER)/kernel/misc
+ 
+ device:
+ 	rm -f /dev/svgalib_helper* /dev/svga_helper* /dev/svga /dev/svga?
 diff -urpN svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h
 --- svgalib-1.9.18/kernel/svgalib_helper/kernel26compat.h	2003-10-04 15:42:01.000000000 +0200
 +++ svgalib-1.9.18.new/kernel/svgalib_helper/kernel26compat.h	2004-02-23 00:41:03.176196576 +0200
diff --git a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
index 9a4af2f5915e..720f26c50bc5 100644
--- a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.15 2004/05/12 12:30:06 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.16 2004/06/23 18:09:15 vapier Exp $
 
 inherit eutils flag-o-matic