3 files changed, 35 insertions, 51 deletions
diff --git a/games/actx/files/patch-aa b/games/actx/files/patch-aa
index e84a61a14f98..086add0dc2a2 100644
--- a/games/actx/files/patch-aa
+++ b/games/actx/files/patch-aa
@@ -1,54 +1,34 @@
---- Imakefile.orig	Mon Feb 22 12:16:46 1999
-+++ Imakefile	Mon Feb 22 12:19:16 1999
-@@ -18,23 +18,23 @@
- XCOMM  (どうも通常にインストールしただけでは /usr/include/neXtaw に
- XCOMM   ヘッダがインストールされるみたい…→neXtaw-0.5.1)
- 
--#define NEXTAW
-+XCOMM #define NEXTAW
- 
- 
- XCOMM ------------------ C Compiler -----------------------------
- 
--CC = gcc
-+XCOMM CC = gcc
- 
+--- Imakefile.org       Fri Oct  8 00:41:34 1999
++++ Imakefile   Fri Oct  8 00:22:35 1999
+@@ -29,7 +29,7 @@
  
  XCOMM -------------- ActX 本体 Install先 Directory ---------------
  
--BINDIR = ${HOME}/bin
-+BINDIR = ${PREFIX}/bin
- XCOMM BINDIR = /usr/local/bin
+-PREFIX = /usr/local
++XCOMM PREFIX = /usr/local
+ XCOMM PREFIX = ${HOME}
  
+ BINDIR = ${PREFIX}/bin
+@@ -37,9 +37,11 @@
  
  XCOMM -------- ActX マスコットデータ Install先 Directory ----------
  
--#define MASCOTDIR ${HOME}/lib/One
+-#define MASCOTDIR ${PREFIX}/lib/X11/actx
 +#define MASCOTDIR ${PREFIX}/share/examples/actx
- XCOMM #define MASCOTDIR /usr/local/lib/ActX
++XCOMM #define MASCOTDIR ${PREFIX}/lib/X11/actx
+ 
+-DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\"
++DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/share/examples/actx\"
++XCOMM DEFINES_MASCOTDIR = -DMASCOTDIR=\"${PREFIX}/lib/X11/actx\"
+ 
  
  
-@@ -48,9 +48,10 @@
- #endif
- OBJS = actx.o action.o menu.o
- SRCS =  $(OBJS:.o=.c)
--EXTRA_LIBRARIES = -lXpm
--ComplexProgramTarget(actx)
-+XPMLIB = -lXpm
+@@ -59,7 +61,7 @@
+ XPMLIB = -lXpm
  
-+AllTarget(actx)
+ AllTarget(actx)
+-NormalProgramTarget(actx,$(OBJS),,$(LOCAL_LIBRARIES),$(XPMLIB))
 +NormalProgramTarget(actx,$(OBJS),$(LOCAL_LIBRARIES),XawClientLibs,$(XPMLIB))
  
  #ifdef USE_I18N
  DEFINES_I18N = -DI18N
-@@ -117,7 +118,6 @@
- InstallNamedNonExec(mascots/mayu6.xpm,mayu6.xpm,MASCOTDIR/)
- InstallNamedNonExec(mascots/mayu7.xpm,mayu7.xpm,MASCOTDIR/)
- 
--
--
--
--
-+install:: actx
-+	MakeDir($(DESTDIR)$(BINDIR))
-+	$(INSTALL) -c $(INSTPGMFLAGS) actx $(DESTDIR)$(BINDIR)/actx
diff --git a/games/actx/files/patch-ab b/games/actx/files/patch-ab
index 9d3eb7075f0c..9eb09c778e77 100644
--- a/games/actx/files/patch-ab
+++ b/games/actx/files/patch-ab
@@ -1,13 +1,15 @@
---- install.actxrc.org	Mon Feb 22 02:40:57 1999
-+++ install.actxrc	Mon Feb 22 03:02:49 1999
-@@ -6,9 +6,9 @@
+--- install.actxrc.org  Fri Oct  8 00:39:34 1999
++++ install.actxrc      Fri Oct  8 00:40:10 1999
+@@ -8,11 +8,11 @@
  
- Actx*titleOfMenu: ONE  - for Bright Season -
+ Axtx*titleOfMenuE: ONE  - for Bright Season -
  
--Actx*xpmDir: /usr/local/lib/ActX
+-Actx*xpmDir: /usr/local/lib/actx
 +Actx*xpmDir: %%ACTXDIR%%
  
--!Actx*sndDir: /usr/local/lib/ActX/wav
+ Actx*baloonFont: -*-fixed-medium-r-normal--14-*
+ 
+-!Actx*sndDir: /usr/local/lib/actX/wav
 +!Actx*sndDir: %%ACTXDIR%%/wav
  
  !Actx*sndCom: /usr/local/bin/wavplay -q %s
diff --git a/games/actx/files/patch-ad b/games/actx/files/patch-ad
index 2e2a4a9a007f..05e7e0d452b2 100644
--- a/games/actx/files/patch-ad
+++ b/games/actx/files/patch-ad
@@ -1,13 +1,15 @@
---- samples/sample.actxrc.orig	Mon Feb 22 11:57:44 1999
-+++ samples/sample.actxrc	Mon Feb 22 11:58:14 1999
-@@ -6,9 +6,9 @@
+--- samples/sample.actxrc.org   Fri Oct  8 00:44:18 1999
++++ samples/sample.actxrc       Fri Oct  8 00:44:44 1999
+@@ -8,11 +8,11 @@
  
- Actx*titleOfMenu: ONE  - for Bright Season -
+ Axtx*titleOfMenuE: ONE  - for Bright Season -
  
--Actx*xpmDir: /usr/local/lib/ActX
+-Actx*xpmDir: /usr/local/lib/actx
 +Actx*xpmDir: %%ACTXDIR%%
  
--!Actx*sndDir: /usr/local/lib/ActX/wav
+ Actx*baloonFont: -*-fixed-medium-r-normal--14-*
+ 
+-!Actx*sndDir: /usr/local/lib/actX/wav
 +!Actx*sndDir: %%ACTXDIR%%/wav
  
  !Actx*sndCom: /usr/local/bin/wavplay -q %s