zgv/arch.patch

   1 diff -ruN zgv-5.9.orig/Makefile zgv-5.9.neu/Makefile
   2 --- zgv-5.9.orig/Makefile       2008-05-20 21:11:09.000000000 +0200
   3 +++ zgv-5.9.neu/Makefile        2008-05-20 21:14:28.000000000 +0200
   4 @@ -62,19 +62,11 @@
   5         @echo '================================================'
   6
   7
   8 -clean:
   9 -       cd src && $(MAKE) clean
  10 -       cd doc && $(MAKE) clean
  11 -       $(RM) *~ etc/*~
  12
  13  install: all
  14         cd src && $(MAKE) install
  15         cd doc && $(MAKE) install
  16
  17 -uninstall:
  18 -       cd src && $(MAKE) uninstall
  19 -       cd doc && $(MAKE) uninstall
  20 -
  21
  22  # The rest of the file is devoted to making the src/bin distributions.
  23  # The src one is just as-is, but the bin one is pretty fiddly.
  24 @@ -89,37 +81,10 @@
  25  # copy of the zgv src in such a dir before changing things, in case
  26  # I screw it up. :-)
  27  #
  28 -../zgv-$(VERS).tar.gz: info clean
  29 +../zgv-$(VERS).tar.gz: info
  30         $(RM) ../zgv-$(VERS)
  31         @cd ..;ln -s zgv zgv-$(VERS)
  32         cd ..;tar zchvf zgv-$(VERS).tar.gz --exclude='*/sav' zgv-$(VERS)
  33         @cd ..;$(RM) zgv-$(VERS)
  34
  35 -
  36 -# The bin distrib is a bit of a pain though. Correction: it's
  37 -# a *lot* of a pain...
  38 -#
  39 -# The basic idea is to make a temporary zgv-$VERS-bin dir (with a
  40 -# `doc' subdir), stick symlinks in there as needed, make the tar.gz,
  41 -# then blast the dir.
  42 -#
  43 -bin-tgz: ../zgv-$(VERS)-bin.tar.gz
  44
  45 -# Well, and obviously we need to make the binaries too. Duh! :-)
  46 -# `src' makes zgv and install-info.
  47 -#
  48 -../zgv-$(VERS)-bin.tar.gz: src man
  49 -       rm -fr zgv-$(VERS)-bin
  50 -       mkdir zgv-$(VERS)-bin
  51 -       mkdir zgv-$(VERS)-bin/doc
  52 -       cd zgv-$(VERS)-bin; ln -s ../{COPYING,README,README.fonts} .
  53 -       cd zgv-$(VERS)-bin; ln -s ../{TODO,ChangeLog,NEWS,SECURITY} .
  54 -       cd zgv-$(VERS)-bin; ln -s ../etc/bin.makefile Makefile
  55 -       cd zgv-$(VERS)-bin; ln -s ../etc/README.bin .
  56 -       cd zgv-$(VERS)-bin/doc; ln -s ../../doc/sample.zgvrc .
  57 -       cd zgv-$(VERS)-bin/doc; ln -s ../../doc/{zgv,zgv-?,zgv.1} .
  58 -       cd zgv-$(VERS)-bin; ln -s ../src/{zgv,install-info} .
  59 -       strip zgv-$(VERS)-bin/{zgv,install-info}
  60 -       tar zchvf ../zgv-$(VERS)-bin.tar.gz zgv-$(VERS)-bin
  61 -       rm -fr zgv-$(VERS)-bin
  62 -       $(MAKE) clean
  63 diff -ruN zgv-5.9.orig/config.mk zgv-5.9.neu/config.mk
  64 --- zgv-5.9.orig/config.mk      2008-05-20 21:11:09.000000000 +0200
  65 +++ zgv-5.9.neu/config.mk       2008-05-20 21:20:10.000000000 +0200
  66 @@ -26,8 +26,8 @@
  67  # is likely to remain preferable. The SDL backend is now quite
  68  # usable, but tends to be rather slower.
  69  #
  70 -BACKEND=SVGALIB
  71 -#BACKEND=SDL
  72 +#BACKEND=SVGALIB
  73 +BACKEND=SDL
  74
  75
  76  # --------------------- Installation options ----------------------
  77 @@ -37,7 +37,7 @@
  78  # MANDIR to directory for man page.
  79  # Usually it will be simpler to just set PREFIX.
  80  #
  81 -PREFIX=/usr/local
  82 +PREFIX=/usr
  83
  84  # In theory it would be nice to put the info file and man page under
  85  # /usr/local/share. However, it's not clear if this is widely
  86 @@ -50,7 +50,7 @@
  87  #
  88  # If you don't know what to do, leave it as-is.
  89  #
  90 -#SHARE_INFIX=/share
  91 +SHARE_INFIX=/share
  92
  93  BINDIR=$(PREFIX)/bin
  94  INFODIR=$(PREFIX)$(SHARE_INFIX)/info
  95 @@ -59,7 +59,7 @@
  96  # Set the location/filename of the system-wide configuration file. You
  97  # may prefer to have this under /etc, for example.
  98  #
  99 -RCFILE=$(PREFIX)/etc/zgv.conf
 100 +RCFILE=/etc/zgv.conf
 101
 102
 103  # Normally `make install' will update your `dir' file (in INFODIR),
 104 diff -ruN zgv-5.9.orig/doc/Makefile zgv-5.9.neu/doc/Makefile
 105 --- zgv-5.9.orig/doc/Makefile   2008-05-20 21:11:09.000000000 +0200
 106 +++ zgv-5.9.neu/doc/Makefile    2008-05-20 21:26:50.000000000 +0200
 107 @@ -7,8 +7,7 @@
 108  # This gets definitions for INFODIR, MANDIR, etc.
 109  include ../config.mk
 110
 111 -
 112 -all: info man
 113 +all: info man dvi
 114
 115  info: zgv
 116  dvi: zgv.dvi
 117 @@ -38,35 +37,7 @@
 118  #
 119  # I think this one's getting just a tiny bit confusing :-}
 120  #
 121 -ifeq ($(INFO_DIR_UPDATE),no)
 122 +
 123  install:
 124 -else
 125 -install: ../src/install-info
 126 -endif
 127 -       $(RM) /usr/share/man/man1/zgv.1* /usr/share/info/zgv*
 128         install -m 644 zgv.1 $(MANDIR)
 129         install -m 644 zgv zgv-? $(INFODIR)
 130 -# Update info `dir' file.
 131 -# Info always uses a dir file in preference to a dir.gz, so we don't use
 132 -# dir.gz unless it's the only game in town.
 133 -ifneq ($(INFO_DIR_UPDATE),no)
 134 -       if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
 135 -         gzip -d $(INFODIR)/dir.gz; \
 136 -         ../src/install-info zgv $(INFODIR)/dir; \
 137 -         gzip $(INFODIR)/dir; \
 138 -       else \
 139 -         ../src/install-info zgv $(INFODIR)/dir; \
 140 -         chmod a+r $(INFODIR)/dir; \
 141 -       fi
 142 -endif
 143 -
 144 -../src/install-info: ../src/install-info.c
 145 -       cd ../src && $(MAKE) install-info
 146 -
 147 -# can't easily fix dir :-/, but do remove the files.
 148 -uninstall:
 149 -       $(RM) $(MANDIR)/zgv.1*
 150 -       $(RM) $(INFODIR)/zgv*
 151 -
 152 -clean:
 153 -       $(RM) *~ zgv.dvi
 154 diff -ruN zgv-5.9.orig/src/Makefile zgv-5.9.neu/src/Makefile
 155 --- zgv-5.9.orig/src/Makefile   2008-05-20 21:11:09.000000000 +0200
 156 +++ zgv-5.9.neu/src/Makefile    2008-05-20 21:16:13.000000000 +0200
 157 @@ -13,8 +13,8 @@
 158  # having /usr/local/{include,lib} like this is apparently needed for
 159  # FreeBSD, but shouldn't cause problems on Linux.
 160  #
 161 -CFLAGS+=-I/usr/local/include
 162 -ZGV_LIBS=-L/usr/local/lib
 163 +CFLAGS+=-I/usr/include
 164 +ZGV_LIBS=-L/usr/lib
 165
 166  CFLAGS+=-DBACKEND_$(BACKEND)
 167
 168 @@ -36,7 +36,7 @@
 169  # compile when you do `make install'. :-)
 170  # (It would also be weird to have it made by the `doc' Makefile, IMHO.)
 171
 172 -all: zgv install-info
 173 +all: zgv
 174
 175  ZGV_OBJS=zgv.o vgadisp.o font.o 3deffects.o mousecur.o \
 176         readnbkey.o rcfile.o helppage.o gnuhelp.o \
 177 @@ -52,13 +52,6 @@
 178  bdf2h: bdf2h.o
 179         $(CC) $(CFLAGS) -o bdf2h bdf2h.o
 180
 181 -install-info: install-info.c
 182 -       $(CC) $(INFODIRDEF) -o install-info install-info.c
 183 -
 184 -# explicitly removes /usr/bin/{zgv,zgv-sdl} in case of old
 185 -# installation. Not nice to put this in the install target,
 186 -# but it's likely to cause problems if I don't.
 187 -#
 188  install: all
 189         @if [ "$(BACKEND)" = SVGALIB ]; then \
 190           echo $(RM) /usr/bin/zgv; \
 191 @@ -73,13 +66,6 @@
 192           install -m 755 -s zgv $(BINDIR)/zgv-sdl; \
 193         fi
 194
 195 -uninstall:
 196 -       $(RM) $(BINDIR)/zgv $(BINDIR)/zgv-sdl
 197 -
 198 -clean:
 199 -       $(RM) *.o *~ zgv bdf2h fontbmps.h install-info
 200 -       $(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
 201 -
 202  # Dependancies
 203  3deffects.o: 3deffects.c 3deffects.h font.h readnbkey.h zgv.h \
 204   rc_config.h rcfile.h mousecur.h rbmenu.h
 205 diff -ruN zgv-5.9.orig/src/zgv_io.c zgv-5.9.neu/src/zgv_io.c
 206 --- zgv-5.9.orig/src/zgv_io.c   2008-05-20 21:11:09.000000000 +0200
 207 +++ zgv-5.9.neu/src/zgv_io.c    2008-05-20 21:25:49.000000000 +0200
 208 @@ -645,7 +645,7 @@
 209          case SDLK_INSERT:      return(RK_INSERT);
 210          case SDLK_DELETE:      return(RK_DELETE);
 211          case SDLK_RETURN:      return(RK_ENTER);
 212 -        default:
 213 +        default: break;
 214            /* stop complaints */
 215          }
 216