Update to version 2.1.1

PR: 24820
Submitted by: Ports Fury

3 files changed, 27 insertions, 38 deletions

diff --git a/games/xinvaders/files/Imakefile b/games/xinvaders/files/Imakefile
deleted file mode 100644
index d4458ac31abf..000000000000
--- a/games/xinvaders/files/Imakefile
+++ /dev/null
@@ -1,37 +0,0 @@
-INVADERDIR=$(LIBDIR)/xinvaders
-
-
-LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-
-OBJS = spacers.o base.o widget.o main.o vaders.o shot.o score.o
-
-SRCS = spacers.c base.c widget.c main.c vaders.c shot.c score.c
-
-ComplexProgramTarget(xinvaders)
-InstallAppDefaults(Vaders)
-MakeDirectories(install,$(INVADERDIR))
-InstallNonExec(base1.bit,$(INVADERDIR))
-InstallNonExec(spacer2.bit,$(INVADERDIR))
-InstallNonExec(vader1a1.bit,$(INVADERDIR))
-InstallNonExec(vader2a2.bit,$(INVADERDIR))
-InstallNonExec(vader3b1.bit,$(INVADERDIR))
-InstallNonExec(base2.bit,$(INVADERDIR))
-InstallNonExec(sperma1.bit,$(INVADERDIR))
-InstallNonExec(vader1a2.bit,$(INVADERDIR))
-InstallNonExec(vader2b1.bit,$(INVADERDIR))
-InstallNonExec(vader3b2.bit,$(INVADERDIR))
-InstallNonExec(explode1.bit,$(INVADERDIR))
-InstallNonExec(sperma2.bit,$(INVADERDIR))
-InstallNonExec(vader1b1.bit,$(INVADERDIR))
-InstallNonExec(vader2b2.bit,$(INVADERDIR))
-InstallNonExec(vexplod1.bit,$(INVADERDIR))
-InstallNonExec(explode2.bit,$(INVADERDIR))
-InstallNonExec(spermb1.bit,$(INVADERDIR))
-InstallNonExec(vader1b2.bit,$(INVADERDIR))
-InstallNonExec(vader3a1.bit,$(INVADERDIR))
-InstallNonExec(vexplod2.bit,$(INVADERDIR))
-InstallNonExec(spacer1.bit,$(INVADERDIR))
-InstallNonExec(spermb2.bit,$(INVADERDIR))
-InstallNonExec(vader2a1.bit,$(INVADERDIR))
-InstallNonExec(vader3a2.bit,$(INVADERDIR))
-MANSUFFIX=6
diff --git a/games/xinvaders/files/Vaders.ad b/games/xinvaders/files/Vaders.ad
index e671af0a082c..e8ad03083d21 100644
--- a/games/xinvaders/files/Vaders.ad
+++ b/games/xinvaders/files/Vaders.ad
@@ -1,4 +1,4 @@
-Vaders*BitmapDirectory:        /usr/X11R6/lib/X11/xinvaders/
+Vaders*font:                   -*-*-*-*-*-sans-14-*-*-*-m-*-*-*
 Vaders*Scale:                  2
 Vaders*defaultfore:            white
 Vaders*defaultback:            black
diff --git a/games/xinvaders/files/patch-aa b/games/xinvaders/files/patch-aa
new file mode 100644
index 000000000000..af50edce9f96
--- /dev/null
+++ b/games/xinvaders/files/patch-aa
@@ -0,0 +1,26 @@
+--- Makefile.am.orig	Sat Sep 16 16:31:29 2000
++++ Makefile.am	Sat Feb  3 11:18:31 2001
+@@ -3,8 +3,7 @@
+ SUBDIRS=intl po
+ EXTRA_DIST=debian Vaders xinvaders.6 icon.xpm xinvaders.lsm
+ 
+-execgamesdir=$(prefix)/games
+-execgames_PROGRAMS = xinvaders
++bin_PROGRAMS = xinvaders
+ 
+ xinvaders_SOURCES = base.c main.c score.c shot.c spacers.c vaders.c \
+ widget.c me.h patchlevel.h vaders.h base1.bit base2.bit explode1.bit \
+@@ -14,13 +13,3 @@
+ vader3b1.bit vader3b2.bit vexplod1.bit vexplod2.bit
+ 
+ man_MANS = xinvaders.6
+-
+-install-data-local:
+-	mkdir -p $(shell dirname $(DESTDIR)$(SCOREFILE) )
+-	echo 0 > $(DESTDIR)$(SCOREFILE)
+-	chgrp games $(DESTDIR)$(SCOREFILE)
+-	chmod 0660 $(DESTDIR)$(SCOREFILE)
+-
+-install-exec-local:
+-	chgrp games $(DESTDIR)$(execgamesdir)/xinvaders
+-	chmod g+s $(DESTDIR)$(execgamesdir)/xinvaders