Author: qboosh Date: Fri Jul 21 08:07:18 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.9.25
---- Files affected:
SOURCES:
svgalib-pld.patch (1.6 -> 1.7) , svgalib-DESTDIR.patch (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SOURCES/svgalib-pld.patch
diff -u SOURCES/svgalib-pld.patch:1.6 SOURCES/svgalib-pld.patch:1.7
--- SOURCES/svgalib-pld.patch:1.6 Mon Oct 10 14:23:47 2005
+++ SOURCES/svgalib-pld.patch Fri Jul 21 10:07:13 2006
@@ -1,5 +1,5 @@
---- 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
+--- svgalib-1.9.25/Makefile.cfg.orig 2006-07-14 13:38:58.000000000 +0200
++++ svgalib-1.9.25/Makefile.cfg 2006-07-21 09:38:54.084440000 +0200
@@ -44,7 +44,7 @@
# Common prefix for installation directories.
# NOTE: This directory must exist when you start the install.
@@ -9,17 +9,8 @@
exec_prefix = $(prefix)
# Directory where the shared stubs and static library will be installed.
-@@ -63,7 +63,7 @@
- includedir = $(prefix)/include
-
- # Directory where the man files will be installed.
--mandir = $(prefix)/man
-+mandir = $(prefix)/share/man
-
- # Target binary format.
- TARGET_FORMAT = elf
-@@ -93,7 +93,7 @@
- # LIBC_MEMCPY = y
+@@ -96,7 +96,7 @@
+ LIBC_MEMCPY = y
# Uncomment this if you want to compile and install the static libs.
-# INSTALLSTATICLIB = installstaticlib
@@ -27,27 +18,12 @@
# 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'
-@@ -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 @@
+@@ -320,7 +320,7 @@
# Utilites used.
AR = ar
--INSTALL_PROGRAM = install -c -s -m 755 -o root -g bin
--INSTALL_SCRIPT = install -c -m 755 -o root -g bin
--INSTALL_SHLIB = install -c -m 755 -o root -g root
--INSTALL_DATA = install -c -m 644 -o root -g root
-+INSTALL_PROGRAM = install -c -m 755
-+INSTALL_SCRIPT = install -c -m 755
-+INSTALL_SHLIB = install -c -m 755
-+INSTALL_DATA = install -c -m 644
-
- ifneq ($(ARCH),i386)
- NO_ASM = y
+-INSTALL_PROGRAM = install -sm755
++INSTALL_PROGRAM = install -m755
+ INSTALL_SCRIPT = install -m755
+ INSTALL_SHLIB = install -m755
+ INSTALL_DATA = install -m644
================================================================
Index: SOURCES/svgalib-DESTDIR.patch
diff -u SOURCES/svgalib-DESTDIR.patch:1.15 SOURCES/svgalib-DESTDIR.patch:1.16
--- SOURCES/svgalib-DESTDIR.patch:1.15 Mon Oct 10 14:23:47 2005
+++ SOURCES/svgalib-DESTDIR.patch Fri Jul 21 10:07:13 2006
@@ -1,14 +1,10 @@
---- 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 @@
+--- svgalib-1.9.25/Makefile.orig 2006-07-14 13:42:59.000000000 +0200
++++ svgalib-1.9.25/Makefile 2006-07-21 09:49:09.304440000 +0200
+@@ -77,98 +77,77 @@
.PHONY: indent-gnu
installheaders:
- @echo Installing header files in $(includedir).
-- @if [ -f /usr/include/vga.h ]; then \
-- rm -f /usr/include/vga.h /usr/include/vgagl.h; \
-- echo Old header files in /usr/include removed.; \
-- fi
- @mkdir -p $(includedir)
- @cp $(SRCDIR)/src/vga.h $(includedir)/vga.h
- @chmod a+r $(includedir)/vga.h
@@ -21,28 +17,24 @@
- @cp $(SRCDIR)/src/keyboard/vgakeyboard.h $(includedir)/vgakeyboard.h
- @chmod a+r $(includedir)/vgakeyboard.h
+ @echo Installing header files in $(DESTDIR)$(includedir).
-+ @install -d -m755 $(DESTDIR)$(includedir)
-+ @install -m644 $(SRCDIR)/src/vga.h $(DESTDIR)$(includedir)/vga.h
-+ @install -m644 $(SRCDIR)/gl/vgagl.h $(DESTDIR)$(includedir)/vgagl.h
-+ @install -m644 $(SRCDIR)/src/mouse/vgamouse.h
$(DESTDIR)$(includedir)/vgamouse.h
-+ @install -m644 $(SRCDIR)/src/joystick/vgajoystick.h
$(DESTDIR)$(includedir)/vgajoystick.h
-+ @install -m644 $(SRCDIR)/src/keyboard/vgakeyboard.h
$(DESTDIR)$(includedir)/vgakeyboard.h
++ @mkdir -p $(DESTDIR)$(includedir)
++ @cp $(SRCDIR)/src/vga.h $(DESTDIR)$(includedir)/vga.h
++ @chmod a+r $(DESTDIR)$(includedir)/vga.h
++ @cp $(SRCDIR)/gl/vgagl.h $(DESTDIR)$(includedir)/vgagl.h
++ @chmod a+r $(DESTDIR)$(includedir)/vgagl.h
++ @cp $(SRCDIR)/src/mouse/vgamouse.h $(DESTDIR)$(includedir)/vgamouse.h
++ @chmod a+r $(DESTDIR)$(includedir)/vgamouse.h
++ @cp $(SRCDIR)/src/joystick/vgajoystick.h
$(DESTDIR)$(includedir)/vgajoystick.h
++ @chmod a+r $(DESTDIR)$(includedir)/vgajoystick.h
++ @cp $(SRCDIR)/src/keyboard/vgakeyboard.h
$(DESTDIR)$(includedir)/vgakeyboard.h
++ @chmod a+r $(DESTDIR)$(includedir)/vgakeyboard.h
installsharedlib: $(SHAREDLIBS) $(SVGALIBSHAREDSTUBS)
-- @if [ -f /usr/lib/libvga.sa ]; then \
-- rm -f /usr/lib/libvga.sa /usr/lib/libvgagl.sa; \
-- echo Old stubs in /usr/lib removed.; \
-- fi
--ifndef KEEPSHAREDLIBS
-- @echo "Removing shared library images (old & current)..."
-- @for i in $(OBSOLETELDIRS); do \
-- rm -f `echo $(OBSOLETESHAREDIMAGES) | sed s?/lib/?$$i?g`; \
-- done
--endif
@echo Installing shared library image as \
- $(addprefix $(sharedlibdir)/,$(notdir $(SHAREDLIBS))).
+- @mkdir -p ${sharedlibdir};
+ $(addprefix $(DESTDIR)$(sharedlibdir)/,$(notdir $(SHAREDLIBS))).
-+ @install -d -m755 $(DESTDIR)$(sharedlibdir)
++ @mkdir -p $(DESTDIR)${sharedlibdir};
@for foo in $(notdir $(SHAREDLIBS)); do \
- $(INSTALL_SHLIB) sharedlib/$$foo $(sharedlibdir)/$$foo; \
- (cd $(sharedlibdir); \
@@ -51,37 +43,29 @@
ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \
done
- @./fixldsoconf
-- @ldconfig
+- -ldconfig
installstaticlib: static
- @echo Installing static libraries in $(libdir).
- @mkdir -p $(libdir)
-- @rm -f /usr/lib/libvga.a
- @$(INSTALL_DATA) staticlib/libvga.a $(libdir)/libvga.a
- @chmod a+r $(libdir)/libvga.a
-- @rm -f /usr/lib/libvgagl.a
- @$(INSTALL_DATA) staticlib/libvgagl.a $(libdir)/libvgagl.a
- @chmod a+r $(libdir)/libvgagl.a
+ @echo Installing static libraries in $(DESTDIR)$(libdir).
-+ @install -d -m755 $(DESTDIR)$(libdir)
++ @mkdir -p $(DESTDIR)$(libdir)
+ @$(INSTALL_DATA) staticlib/libvga.a $(DESTDIR)$(libdir)/libvga.a
++ @chmod a+r $(DESTDIR)$(libdir)/libvga.a
+ @$(INSTALL_DATA) staticlib/libvgagl.a $(DESTDIR)$(libdir)/libvgagl.a
++ @chmod a+r $(DESTDIR)$(libdir)/libvgagl.a
installutils: textutils $(LRMI)
- @if [ ! -d $(bindir) ]; then \
- echo No $(bindir) directory, creating it.; \
- mkdir -p $(bindir); \
- fi
-- @if [ -f /usr/bin/restorefont ]; then \
-- echo Removing old utilities in /usr/bin.; \
-- for x in $(UTILS); do rm -f /usr/bin/$$x; done; \
-- fi
-- @if [ -f /usr/bin/convfont ]; then \
-- echo Removing inappropriate utilities in /usr/bin.; \
-- rm -f /usr/bin/convfont /usr/bin/setmclk; \
-- fi
- @echo Installing textmode utilities in $(bindir):
-+ @install -d $(DESTDIR)$(bindir)
++ @mkdir -p $(DESTDIR)$(bindir)
+ @echo Installing textmode utilities in $(DESTDIR)$(bindir):
@echo "restorefont: Save/restore textmode font."
- @$(INSTALL_PROGRAM) utils/restorefont $(bindir)
@@ -113,11 +97,7 @@
+ @$(INSTALL_SCRIPT) utils/svgakeymap $(DESTDIR)$(bindir)
installconfig:
-- @if [ ! -d $(datadir) ]; then \
-- echo Creating configuration directory $(datadir).; \
-- mkdir $(datadir); \
-- chmod go-w $(datadir); \
-- fi
+- mkdir -p ${datadir};
- @if [ \( -f /usr/local/lib/libvga.config -a ! -f
$(datadir)/libvga.config \) ]; then \
- echo "Moving old config file /usr/local/lib/libvga.config to
$(datadir)." ; \
- mv -f /usr/local/lib/libvga.config $(datadir)/libvga.config; \
@@ -137,31 +117,28 @@
- @if [ ! -f $(datadir)/libvga.config ]; then \
- echo Installing default configuration file in $(datadir).; \
- cp $(CONFDIR)/libvga.config $(datadir)/libvga.config; \
-- fi
-- @if [ ! -f $(datadir)/libvga.et4000 ]; then \
-- echo Installing dynamically loaded ET4000 registers in
$(datadir).; \
-- cp $(CONFDIR)/et4000.regs $(datadir)/libvga.et4000; \
-- fi
-- @if [ ! -f $(datadir)/default.keymap ]; then \
-- echo Installing default keymap file in $(datadir).; \
-- cp $(CONFDIR)/default.keymap $(datadir)/null.keymap; \
-- fi
-- @if [ ! -f $(datadir)/dvorak-us.keymap ]; then \
-- echo Installing Dvorak keymap file in $(datadir).; \
-- cp $(CONFDIR)/dvorak-us.keymap $(datadir)/dvorak-us.keymap; \
-+ @install -d -m755 $(DESTDIR)$(datadir)
++ mkdir -p $(DESTDIR)${datadir};
+ @if [ ! -f $(DESTDIR)$(datadir)/libvga.config ]; then \
+ echo Installing default configuration file in
$(DESTDIR)$(datadir).; \
+ cp $(CONFDIR)/libvga.config $(DESTDIR)$(datadir)/libvga.config;
\
-+ fi
+ fi
+- @if [ ! -f $(datadir)/libvga.et4000 ]; then \
+- echo Installing dynamically loaded ET4000 registers in
$(datadir).; \
+- cp $(CONFDIR)/et4000.regs $(datadir)/libvga.et4000; \
+ @if [ ! -f $(DESTDIR)$(datadir)/libvga.et4000 ]; then \
+ echo Installing dynamically loaded ET4000 registers in
$(DESTDIR)$(datadir).; \
+ cp $(CONFDIR)/et4000.regs $(DESTDIR)$(datadir)/libvga.et4000; \
-+ fi
+ fi
+- @if [ ! -f $(datadir)/default.keymap ]; then \
+- echo Installing default keymap file in $(datadir).; \
+- cp $(CONFDIR)/default.keymap $(datadir)/null.keymap; \
+ @if [ ! -f $(DESTDIR)$(datadir)/default.keymap ]; then \
+ echo Installing default keymap file in $(DESTDIR)$(datadir).; \
+ cp $(CONFDIR)/default.keymap $(DESTDIR)$(datadir)/null.keymap; \
-+ fi
+ fi
+- @if [ ! -f $(datadir)/dvorak-us.keymap ]; then \
+- echo Installing Dvorak keymap file in $(datadir).; \
+- cp $(CONFDIR)/dvorak-us.keymap $(datadir)/dvorak-us.keymap; \
+ @if [ ! -f $(DESTDIR)$(datadir)/dvorak-us.keymap ]; then \
+ echo Installing Dvorak keymap file in $(DESTDIR)$(datadir).; \
+ cp $(CONFDIR)/dvorak-us.keymap
$(DESTDIR)$(datadir)/dvorak-us.keymap; \
@@ -216,8 +193,8 @@
.PHONY: clean
clean:
---- svgalib-1.9.20/threeDKit/Makefile.orig 2004-09-16 19:54:17.000000000
+0200
-+++ svgalib-1.9.20/threeDKit/Makefile 2005-03-21 23:32:39.444415344 +0100
+--- svgalib-1.9.25/threeDKit/Makefile.orig 2006-07-14 13:30:49.000000000
+0200
++++ svgalib-1.9.25/threeDKit/Makefile 2006-07-21 09:51:39.854440000 +0200
@@ -55,18 +55,17 @@
$(CC) -shared -Wl,-soname,lib3dkit.so.$(MAJOR_VER) \
-o lib3dkit.so.$(VERSION) $(OBJECTS) -lm
@@ -225,7 +202,7 @@
-$(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION)
- $(INSTALL_SHLIB) $< $(sharedlibdir)/$<
- (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo
lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` )
-- ldconfig
+- -ldconfig
+$(DESTDIR)$(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION)
+ $(INSTALL_SHLIB) $< $(DESTDIR)$(sharedlibdir)/$<
+ (cd $(DESTDIR)$(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo
lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` )
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/svgalib-pld.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SOURCES/svgalib-DESTDIR.patch?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
