361
|
1 |
--- zgv-5.9/doc/zgv.texi.orig 2007-07-30 08:34:54.591547847 +0700
|
|
2 |
+++ zgv-5.9/doc/zgv.texi 2007-07-30 08:35:03.798713968 +0700
|
|
3 |
@@ -1,6 +1,6 @@
|
|
4 |
\input texinfo @c -*-texinfo-*-
|
|
5 |
@c %**start of header
|
|
6 |
-@setfilename zgv
|
|
7 |
+@setfilename zgv.info
|
|
8 |
@settitle The zgv manual
|
|
9 |
@setchapternewpage odd
|
|
10 |
@c %**end of header
|
|
11 |
--- zgv-5.9/doc/Makefile.orig 2007-07-30 08:29:39.384942792 +0700
|
|
12 |
+++ zgv-5.9/doc/Makefile 2007-07-30 08:43:47.961479414 +0700
|
|
13 |
@@ -43,22 +43,10 @@
|
|
14 |
else
|
|
15 |
install: ../src/install-info
|
|
16 |
endif
|
|
17 |
- $(RM) /usr/share/man/man1/zgv.1* /usr/share/info/zgv*
|
|
18 |
- install -m 644 zgv.1 $(MANDIR)
|
|
19 |
- install -m 644 zgv zgv-? $(INFODIR)
|
|
20 |
-# Update info `dir' file.
|
|
21 |
-# Info always uses a dir file in preference to a dir.gz, so we don't use
|
|
22 |
-# dir.gz unless it's the only game in town.
|
|
23 |
-ifneq ($(INFO_DIR_UPDATE),no)
|
|
24 |
- if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
|
|
25 |
- gzip -d $(INFODIR)/dir.gz; \
|
|
26 |
- ../src/install-info zgv $(INFODIR)/dir; \
|
|
27 |
- gzip $(INFODIR)/dir; \
|
|
28 |
- else \
|
|
29 |
- ../src/install-info zgv $(INFODIR)/dir; \
|
|
30 |
- chmod a+r $(INFODIR)/dir; \
|
|
31 |
- fi
|
|
32 |
-endif
|
|
33 |
+ mkdir -p $(DESTDIR)$(MANDIR)
|
|
34 |
+ mkdir -p $(DESTDIR)$(INFODIR)
|
|
35 |
+ install -m 644 zgv.1 $(DESTDIR)$(MANDIR)
|
|
36 |
+ install -m 644 zgv.info $(DESTDIR)$(INFODIR)
|
|
37 |
|
|
38 |
../src/install-info: ../src/install-info.c
|
|
39 |
cd ../src && $(MAKE) install-info
|
|
40 |
--- zgv-5.9/src/zgv.h.orig 2007-07-30 08:00:45.255800352 +0700
|
|
41 |
+++ zgv-5.9/src/zgv.h 2007-07-30 08:02:43.109863268 +0700
|
|
42 |
@@ -7,8 +7,10 @@
|
|
43 |
#define ZGV_VER "5.9"
|
|
44 |
|
|
45 |
|
|
46 |
-#ifdef __FreeBSD__
|
|
47 |
+#if defined(__FreeBSD__)
|
|
48 |
#define OSTYPE_FREEBSD 1
|
|
49 |
+#elif defined(sun)
|
|
50 |
+#define OSTYPE_SOLARIS 1
|
|
51 |
#else
|
|
52 |
#define OSTYPE_LINUX 1
|
|
53 |
#endif
|
|
54 |
--- zgv-5.9/src/readnbkey.c.orig 2007-07-30 08:19:35.180788964 +0700
|
|
55 |
+++ zgv-5.9/src/readnbkey.c 2007-07-30 08:20:19.395529133 +0700
|
|
56 |
@@ -270,7 +270,7 @@
|
|
57 |
|
|
58 |
#endif /* OSTYPE_LINUX */
|
|
59 |
|
|
60 |
-#ifdef OSTYPE_FREEBSD
|
|
61 |
+#if defined(OSTYPE_FREEBSD) || defined(OSTYPE_SOLARIS)
|
|
62 |
|
|
63 |
/* version for FreeBSD */
|
|
64 |
int readnbkey(int ttyfd)
|
|
65 |
--- zgv-5.9/src/zgv.c.orig 2007-07-30 08:03:01.777205386 +0700
|
|
66 |
+++ zgv-5.9/src/zgv.c 2007-07-30 08:06:27.555771221 +0700
|
|
67 |
@@ -45,6 +45,10 @@
|
|
68 |
#ifdef OSTYPE_FREEBSD
|
|
69 |
#include <sys/consio.h>
|
|
70 |
#endif
|
|
71 |
+#ifdef OSTYPE_SOLARIS
|
|
72 |
+#include <fcntl.h>
|
|
73 |
+#endif
|
|
74 |
+
|
|
75 |
#include "readgif.h"
|
|
76 |
#include "vgadisp.h"
|
|
77 |
#include "readnbkey.h"
|
|
78 |
@@ -3893,7 +3897,9 @@
|
|
79 |
void wait_for_foreground()
|
|
80 |
{
|
|
81 |
vga_runinbackground(0);
|
|
82 |
+#if !defined(OSTYPE_SOLARIS)
|
|
83 |
ioctl(zgv_ttyfd,VT_WAITACTIVE,zgv_vt);
|
|
84 |
+#endif
|
|
85 |
}
|
|
86 |
|
|
87 |
|
|
88 |
--- zgv-5.9/src/Makefile.orig 2007-07-30 07:54:08.825867888 +0700
|
|
89 |
+++ zgv-5.9/src/Makefile 2007-07-30 08:29:06.589967796 +0700
|
|
90 |
@@ -13,8 +13,8 @@
|
|
91 |
# having /usr/local/{include,lib} like this is apparently needed for
|
|
92 |
# FreeBSD, but shouldn't cause problems on Linux.
|
|
93 |
#
|
|
94 |
-CFLAGS+=-I/usr/local/include
|
|
95 |
-ZGV_LIBS=-L/usr/local/lib
|
|
96 |
+CFLAGS+=-I$(PREFIX)/include
|
|
97 |
+ZGV_LIBS=-L$(PREFIX)/lib
|
|
98 |
|
|
99 |
CFLAGS+=-DBACKEND_$(BACKEND)
|
|
100 |
|
|
101 |
@@ -61,16 +61,14 @@
|
|
102 |
#
|
|
103 |
install: all
|
|
104 |
@if [ "$(BACKEND)" = SVGALIB ]; then \
|
|
105 |
- echo $(RM) /usr/bin/zgv; \
|
|
106 |
- $(RM) /usr/bin/zgv; \
|
|
107 |
echo install -m 4755 -o root -g root -s zgv $(BINDIR); \
|
|
108 |
install -m 4755 -o root -g root -s zgv $(BINDIR); \
|
|
109 |
fi
|
|
110 |
@if [ "$(BACKEND)" = SDL ]; then \
|
|
111 |
- echo $(RM) /usr/bin/zgv-sdl; \
|
|
112 |
- $(RM) /usr/bin/zgv-sdl; \
|
|
113 |
- echo install -m 755 -s zgv $(BINDIR)/zgv-sdl; \
|
|
114 |
- install -m 755 -s zgv $(BINDIR)/zgv-sdl; \
|
|
115 |
+ echo mkdir -p $(DESTDIR)$(BINDIR); \
|
|
116 |
+ mkdir -p $(DESTDIR)$(BINDIR); \
|
|
117 |
+ echo install -m 755 zgv $(DESTDIR)$(BINDIR)/zgv; \
|
|
118 |
+ install -m 755 zgv $(DESTDIR)$(BINDIR)/zgv; \
|
|
119 |
fi
|
|
120 |
|
|
121 |
uninstall:
|