Author: qboosh Date: Mon Oct 10 12:23:52 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.9.23
---- Files affected:
SOURCES:
svgalib-DESTDIR.patch (1.14 -> 1.15) , svgalib-pld.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/svgalib-DESTDIR.patch
diff -u SOURCES/svgalib-DESTDIR.patch:1.14 SOURCES/svgalib-DESTDIR.patch:1.15
--- SOURCES/svgalib-DESTDIR.patch:1.14 Tue Mar 22 00:14:45 2005
+++ SOURCES/svgalib-DESTDIR.patch Mon Oct 10 14:23:47 2005
@@ -1,5 +1,5 @@
---- svgalib-1.9.20/Makefile.orig 2005-03-18 14:49:10.000000000 +0100
-+++ svgalib-1.9.20/Makefile 2005-03-21 23:29:01.371567456 +0100
+--- svgalib-1.9.23/Makefile.orig 2005-05-10 14:53:08.000000000 +0200
++++ svgalib-1.9.23/Makefile 2005-10-10 13:36:06.000000000 +0200
@@ -77,125 +77,70 @@
.PHONY: indent-gnu
@@ -168,53 +168,37 @@
fi
installman:
-@@ -213,8 +158,8 @@
- lib3dkit-install:
- (cd threeDKit/; $(MAKE) install)
-
--install: uninstall installheaders $(INSTALLSHAREDLIB) installconfig \
-- $(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) $(INSTALLMODULE)
$(INSTALLDEV) \
-+install: installheaders $(INSTALLSHAREDLIB) installconfig \
-+ $(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) $(INSTALLMODULE) \
- lib3dkit-install
- @echo
- @echo
-diff -Nur svgalib-1.9.14.orig/doc/Makefile svgalib-1.9.14/doc/Makefile
---- svgalib-1.9.14.orig/doc/Makefile Fri Jul 7 14:43:58 2000
-+++ svgalib-1.9.14/doc/Makefile Mon Apr 29 20:16:56 2002
-@@ -65,26 +65,15 @@
+--- svgalib-1.9.23/doc/Makefile.orig 2005-07-02 18:21:57.000000000 +0200
++++ svgalib-1.9.23/doc/Makefile 2005-10-10 13:38:10.000000000 +0200
+@@ -26,7 +26,7 @@
+ SVGALIB=$(subst man,$(srcdir)/doc/man,$(SVGALIB1))
+ VGAGL=$(subst man,$(srcdir)/doc/man,$(VGAGL1))
+ THREED=$(subst man,$(srcdir)/doc/man,$(THREED1))
+-COMPMANPAGES=$(shell cd $(srcdir)/doc; find man? -name "*.gz" -type f -print)
++COMPMANPAGES=$(shell cd $(srcdir)/doc; find man? -name "*.[1-8]" -type f
-print)
+
+ .PHONY: clean ascii dvi ps install gunzip gzip
+
+@@ -63,18 +63,12 @@
cat $(VGAGL) | grep -v '^\.so ' | troff -man -T$@ > vgagl.$@
cat $(THREED) | grep -v '^\.so ' | troff -man -T$@ > 3d.$@
-install: gzip
- mkdir -p $(mandir)/man1 $(mandir)/man3 $(mandir)/man5 \
- $(mandir)/man6 $(mandir)/man7 $(mandir)/man8
-- $(INSTALL_DATA) $(srcdir)/doc/man1/* $(mandir)/man1
-- $(INSTALL_DATA) $(srcdir)/doc/man3/* $(mandir)/man3
-- $(INSTALL_DATA) $(srcdir)/doc/man5/* $(mandir)/man5
-- $(INSTALL_DATA) $(srcdir)/doc/man6/* $(mandir)/man6
-- $(INSTALL_DATA) $(srcdir)/doc/man7/* $(mandir)/man7
-- $(INSTALL_DATA) $(srcdir)/doc/man8/* $(mandir)/man8
-- for dir in man? ; do \
-- echo gunzipping manpages in $$dir;\
-- for file in $$dir/*; do \
-- gunzip $$file; \
-- done; \
-- done
++install:
++ install -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3
$(DESTDIR)$(mandir)/man5 \
++ $(DESTDIR)$(mandir)/man6 $(DESTDIR)$(mandir)/man7
$(DESTDIR)$(mandir)/man8
+ for i in $(COMPMANPAGES); do\
+- $(INSTALL_DATA) $(srcdir)/doc/$$i $(mandir)/$$i; \
++ $(INSTALL_DATA) $(srcdir)/doc/$$i $(DESTDIR)$(mandir)/$$i; \
+ done
+- make gunzip
-ifdef MAKEWHATIS
- @echo "Rebuilding the whatis database (this is slow!)"
- @echo "You can comment this out in Makefile.cfg!"
- $(MAKEWHATIS)
-endif
-+install:
-+ install -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3
$(DESTDIR)$(mandir)/man5\
-+ $(DESTDIR)$(mandir)/man6 $(DESTDIR)$(mandir)/man7
$(DESTDIR)$(mandir)/man8
-+ $(INSTALL_DATA) $(srcdir)/doc/man1/* $(DESTDIR)$(mandir)/man1
-+ $(INSTALL_DATA) $(srcdir)/doc/man3/* $(DESTDIR)$(mandir)/man3
-+ $(INSTALL_DATA) $(srcdir)/doc/man5/* $(DESTDIR)$(mandir)/man5
-+ $(INSTALL_DATA) $(srcdir)/doc/man6/* $(DESTDIR)$(mandir)/man6
-+ $(INSTALL_DATA) $(srcdir)/doc/man7/* $(DESTDIR)$(mandir)/man7
-+ $(INSTALL_DATA) $(srcdir)/doc/man8/* $(DESTDIR)$(mandir)/man8
uninstall:
@echo Removing all svgalib man pages.
@@ -261,9 +245,9 @@
endif
---- svgalib-1.9.20/kernel/svgalib_helper/Makefile.orig 2005-03-18
11:58:21.000000000 +0100
-+++ svgalib-1.9.20/kernel/svgalib_helper/Makefile 2005-03-21
23:33:38.656413752 +0100
-@@ -50,9 +50,9 @@
+--- svgalib-1.9.23/kernel/svgalib_helper/Makefile.orig 2005-08-18
15:08:30.000000000 +0200
++++ svgalib-1.9.23/kernel/svgalib_helper/Makefile 2005-10-10
13:39:11.000000000 +0200
+@@ -56,10 +56,9 @@
mknod -m 666 /dev/svga3 c $(SVGALIB_HELPER_MAJOR) 3
mknod -m 666 /dev/svga4 c $(SVGALIB_HELPER_MAJOR) 4
@@ -273,6 +257,7 @@
modules_install: $(MODNAME)
- mkdir -p /lib/modules/$(VER)/kernel/misc
- install -m 0644 -c $(TARGET).ko /lib/modules/$(VER)/kernel/misc ||
install -m 0644 -c $(TARGET).o /lib/modules/$(VER)/kernel/misc
+- depmod -a $(VER)
+ install -m 0755 -d $(DESTDIR)/lib/modules/$(VER)/kernel/misc
+ install -m 0644 -c $(TARGET).ko
$(DESTDIR)/lib/modules/$(VER)/kernel/misc || install -m 0644 -c $(TARGET).o
$(DESTDIR)/lib/modules/$(VER)/kernel/misc
================================================================
Index: SOURCES/svgalib-pld.patch
diff -u SOURCES/svgalib-pld.patch:1.5 SOURCES/svgalib-pld.patch:1.6
--- SOURCES/svgalib-pld.patch:1.5 Tue Mar 22 00:14:45 2005
+++ SOURCES/svgalib-pld.patch Mon Oct 10 14:23:47 2005
@@ -1,5 +1,5 @@
---- svgalib-1.9.20/Makefile.cfg.orig 2005-02-03 12:29:22.000000000 +0100
-+++ svgalib-1.9.20/Makefile.cfg 2005-03-21 23:13:48.717311992 +0100
+--- svgalib-1.9.23/Makefile.cfg.orig 2005-09-24 09:34:51.000000000 +0200
++++ svgalib-1.9.23/Makefile.cfg 2005-10-10 13:39:32.000000000 +0200
@@ -44,7 +44,7 @@
# Common prefix for installation directories.
# NOTE: This directory must exist when you start the install.
@@ -18,7 +18,7 @@
# Target binary format.
TARGET_FORMAT = elf
-@@ -97,7 +97,7 @@
+@@ -93,7 +93,7 @@
# LIBC_MEMCPY = y
# Uncomment this if you want to compile and install the static libs.
@@ -27,7 +27,16 @@
# Comment this out if you don't want to install the shared libs.
# If you do not install the shared nor the static libs, 'make static'
-@@ -315,10 +315,10 @@
+@@ -126,7 +126,7 @@
+ # MAKEWHATIS = makewhatis # Beware, this will really need a few minutes!
+
+ # Comment this out if you use devfs only and don't want to make svga nodes
+-INSTALLDEV = installdev
++# INSTALLDEV = installdev
+
+ # Select which makefile to use to install the module, or comment both out if
+ # you are going to install the kernel module manually
+@@ -311,10 +311,10 @@
# Utilites used.
AR = ar
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/svgalib-DESTDIR.patch?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/SOURCES/svgalib-pld.patch?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
