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