--- actx/Makefile	Fri Jan 11 23:54:53 2002
+++ actx/Makefile	Sat May 18 02:23:02 2002
@@ -6,10 +6,9 @@ 
 #
 
 PORTNAME=	actx
-PORTVERSION=	1.21.1
+PORTVERSION=	1.23
 CATEGORIES=	games
 MASTER_SITES=	http://kurumi.sakura.ne.jp/~chimari/ActX/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}p${PORTVERSION:E}
 
 MAINTAINER=	esu@yk.rim.or.jp
 
@@ -20,7 +19,6 @@ 
 MAN1=		actx.1
 MANLANG=	"" ja
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 ACTXDIR=	${PREFIX}/share/examples/actx
 
 post-extract:
--- actx/distinfo	Fri Jan 11 23:54:53 2002
+++ actx/distinfo	Sat May 18 02:22:23 2002
@@ -1, +1, @@ 
-MD5 (actx-1.21p1.tar.gz) = e2e5bd2ff884c06e2fe74214326f1dcb
+MD5 (actx-1.23.tar.gz) = f0ad925132948b2cd344c5057a9a1273
--- actx/files/patch-aa	Tue Jan 30 12:36:17 2001
+++ actx/files/patch-aa	Mon Jul  1 10:19:16 2002
@@ -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
+ 
--- actx/files/patch-ad	Tue Oct 23 12:36:14 2001
+++ actx/files/patch-ad	Sat May 18 02:37:13 2002
@@ -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
+  
+