Update to latest version

PR:		40082
Submitted by:	umeno@rr.iij4u.or.jp
Approved by:	maintainer

2 files changed, 67 insertions, 38 deletions

diff --git a/games/actx/files/patch-aa b/games/actx/files/patch-aa
index 4581928a94fd..668ac42e4a3f 100644
--- a/games/actx/files/patch-aa
+++ b/games/actx/files/patch-aa
@@ -1,29 +1,27 @@
---- Imakefile.orig	Mon Jan 29 09:27:25 2001
-+++ Imakefile	Mon Jan 29 09:29:06 2001
-@@ -42,7 +42,7 @@
+--- Imakefile.orig	Mon Jul  1 10:14:46 2002
++++ Imakefile	Mon Jul  1 10:18:21 2002
+@@ -6,13 +6,16 @@
  
- XCOMM -------------- ActX 本体 Install先 Directory ---------------
+ #undef USE_VOODOO
  
--PREFIX = /usr/local
-+XCOMM PREFIX = /usr/local
- XCOMM PREFIX = ${HOME}
+-BINDIR = /usr/local/bin
++BINDIR = ${PREFIX}/bin
++XCOMM BINDIR = /usr/local/bin
  
- BINDIR = ${PREFIX}/bin
-@@ -50,9 +50,11 @@
+-#define MASCOTDIR /usr/local/lib/ActX
++XCOMM #define MASCOTDIR /usr/local/lib/ActX
  
- XCOMM -------- ActX マスコットデータ Install先 Directory ----------
+-MASCOTDIR = /usr/local/lib/ActX
++MASCOTDIR = ${PREFIX}/share/examples/actx
++XCOMM MASCOTDIR = /usr/local/lib/ActX
  
--#define MASCOTDIR ${PREFIX}/lib/X11/actx
-+#define MASCOTDIR ${PREFIX}/share/examples/actx
-+XCOMM #define MASCOTDIR ${PREFIX}/lib/X11/actx
- 
--DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\"
+-DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\"
 +DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/share/examples/actx\"
-+XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\"
- 
++XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"/usr/local/lib/ActX\"
  
+ #define INSTALL_DEFAULTMENU
  
-@@ -72,7 +74,7 @@
+@@ -34,7 +37,7 @@
  EXTRA_LIBRARIES += -lXpm
  
  AllTarget(actx)
@@ -31,3 +29,18 @@
 +NormalProgramTarget(actx,$(OBJS),$(LOCAL_LIBRARIES),XawClientLibs,$(XPMLIB))
  
  InstallManPage(actx,$(MANDIR))
+ 
+@@ -69,11 +72,11 @@
+ 
+ DEFINES = $(DEFINES_I18N) $(DEFINES_VOODOO) $(DEFINES_XAW5) $(DEFINES_AW) $(DEFINES_MASCOTDIR)
+ 
+-InstallNamedNonExec(biff.xpm,biff.xpm,MASCOTDIR)
++InstallNamedNonExec(biff.xpm,biff.xpm,$(MASCOTDIR))
+ 
+ #ifdef INSTALL_DEFAULTMENU
+ 	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc-sp
++XCOMM	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc $(MASCOTDIR)/sample.actxrc-sp
+ 	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) install.actxrc-one $(MASCOTDIR)/sample.actxrc-one
+ #endif
+ 
diff --git a/games/actx/files/patch-ad b/games/actx/files/patch-ad
index a4c220fd01b1..6643e583258e 100644
--- a/games/actx/files/patch-ad
+++ b/games/actx/files/patch-ad
@@ -1,20 +1,36 @@
---- samples/sample.actxrc.orig	Tue Sep 25 22:46:27 2001
-+++ samples/sample.actxrc	Sat Oct  6 14:02:56 2001
-@@ -10,7 +10,7 @@
- Actx*titleOfMenuE: ONE - for Bright Season -
- 
- 
--Actx*xpmDir: /usr/local/lib/actx
-+Actx*xpmDir: %%ACTXDIR%%
- 
- !Actx*balloon.font: -alias-fixed-bold-*-*-*-12-*-*-*-*-*-*-*
- 
-@@ -24,7 +24,7 @@
- 
- Actx*balloon.style: wmaker
- 
--!Actx*sndDir: /usr/local/lib/actx/wav
-+!Actx*sndDir: %%ACTXDIR%%/wav
- 
- !Actx*sndCom: /usr/local/bin/wavplay -q %s
- 
+*** samples/sample.actxrc.orig	Sat Apr 13 01:36:55 2002
+--- samples/sample.actxrc	Sat May 18 02:36:40 2002
+***************
+*** 5,11 ****
+  Actx*numsOfMenu: 16
+  Actx*titleOfMenuJ: ONE 〜輝く季節へ〜
+  Actx*titleOfMenuE: ONE - for Bright Season -
+! Actx*xpmDir: /usr/local/lib/ActX
+  
+  !!!!!!!! Home Position
+  Actx*homeX: -1
+--- 5,11 ----
+  Actx*numsOfMenu: 16
+  Actx*titleOfMenuJ: ONE 〜輝く季節へ〜
+  Actx*titleOfMenuE: ONE - for Bright Season -
+! Actx*xpmDir: %%ACTXDIR%%
+  
+  !!!!!!!! Home Position
+  Actx*homeX: -1
+***************
+*** 28,34 ****
+  Actx*balloon.style: wmaker
+  
+  !!!!!!!! Sound Configuration
+! !Actx*sndDir: /usr/local/lib/actx/wav
+  !Actx*sndCom: /usr/local/bin/wavplay -q %s
+  
+  
+--- 28,34 ----
+  Actx*balloon.style: wmaker
+  
+  !!!!!!!! Sound Configuration
+! !Actx*sndDir: %%ACTXDIR%%/wav
+  !Actx*sndCom: /usr/local/bin/wavplay -q %s
+  
+