Update to 0.99.1

PR: ports/14184
Submitted by: esu@yk.rim.or.jp

8 files changed, 124 insertions, 87 deletions

diff --git a/games/actx/Makefile b/games/actx/Makefile
index ced09f66eefc..664c5fb49513 100644
--- a/games/actx/Makefile
+++ b/games/actx/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   actx
-# Version required:    0.98pre4
+# Version required:    0.99.1
 # Date created:        19 Feb 1999
 # Whom:                Shinya Esu <esu@yk.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	actx-0.98pre4
-PKGNAME=	actx-0.98p4
+DISTNAME=	actx-0.99.1
+PKGNAME=	actx-0.99.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.astr.tohoku.ac.jp/~taji/ActX/
 
@@ -25,13 +25,13 @@ post-extract:
 	@ ${CP} ${WRKSRC}/samples/sample.actxrc ${WRKSRC}/install.actxrc
 
 post-patch:
-.for i in install.actxrc samples/sample.actxrc samples/sample.actxrc-jp
+.for i in install.actxrc samples/sample.actxrc
 	@ ${MV} ${WRKSRC}/$i ${WRKSRC}/$i.old
 	@ ${SED} -e "s#%%ACTXDIR%%#${ACTXDIR}#" ${WRKSRC}/$i.old > ${WRKSRC}/$i
 .endfor
 
 post-install:
-.for i in sample.Xdefaults sample.actxrc sample.actxrc-jp
+.for i in sample.Xdefaults sample.actxrc
 	@ ${INSTALL_DATA} ${WRKSRC}/samples/$i ${ACTXDIR}
 .endfor
 .if !defined(NOPORTDOCS)
diff --git a/games/actx/distinfo b/games/actx/distinfo
index 870ebdaac5ff..5efd686c6be5 100644
--- a/games/actx/distinfo
+++ b/games/actx/distinfo
@@ -1 +1 @@
-MD5 (actx-0.98pre4.tar.gz) = 6baafa5802eb46d55b5de633cfcb5e12
+MD5 (actx-0.99.1.tar.gz) = 72e2fd1e6fd54cda747b0050dd0708e1
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
diff --git a/games/actx/pkg-comment b/games/actx/pkg-comment
index 767a4f373cfb..9d454b6a0897 100644
--- a/games/actx/pkg-comment
+++ b/games/actx/pkg-comment
@@ -1 +1 @@
-A window sitter for X11
+a window sitter for X11
diff --git a/games/actx/pkg-message b/games/actx/pkg-message
index ab0ca6febfc2..7b92860f5e71 100644
--- a/games/actx/pkg-message
+++ b/games/actx/pkg-message
@@ -3,6 +3,6 @@ To run this program, you must have your own configuration file, do as simply
 
  % cp /usr/X11R6/share/examples/actx/sample.actxrc ~/.actxrc
 
-if you want japanese menu, use sample.actxrc-jp instead.
-then edit your ~/.Xdefaults to configure fonts.
+if you want japanese menu, 
+edit your ~/.Xdefaults to "Actx*international: true" and configure fonts.
 /usr/X11R6/share/examples/actx/sample.Xdefaults is for its reference.
diff --git a/games/actx/pkg-plist b/games/actx/pkg-plist
index 4f16f78a1693..9505a3061d0e 100644
--- a/games/actx/pkg-plist
+++ b/games/actx/pkg-plist
@@ -1,30 +1,17 @@
 bin/actx
-share/examples/actx/akane0.xpm
-share/examples/actx/akane1.xpm
-share/examples/actx/akane2.xpm
-share/examples/actx/akane3.xpm
-share/examples/actx/akane4.xpm
-share/examples/actx/akane5.xpm
-share/examples/actx/mayu0.xpm
-share/examples/actx/mayu1.xpm
-share/examples/actx/mayu2.xpm
-share/examples/actx/mayu3.xpm
-share/examples/actx/mayu4.xpm
-share/examples/actx/mayu5.xpm
-share/examples/actx/mayu6.xpm
-share/examples/actx/mayu7.xpm
-share/examples/actx/mio0.xpm
-share/examples/actx/mio1.xpm
-share/examples/actx/mio2.xpm
-share/examples/actx/mio3.xpm
-share/examples/actx/mio4.xpm
-share/examples/actx/misaki0.xpm
-share/examples/actx/misaki1.xpm
-share/examples/actx/misaki2.xpm
-share/examples/actx/misaki3.xpm
-share/examples/actx/misaki4.xpm
-share/examples/actx/misaki5.xpm
-share/examples/actx/misaki6.xpm
+share/examples/actx/mizuka.actx
+share/examples/actx/mmizuka.actx
+share/examples/actx/akane.actx
+share/examples/actx/eakane.actx
+share/examples/actx/rumi.actx
+share/examples/actx/erumi.actx
+share/examples/actx/misaki.actx
+share/examples/actx/emisaki.actx
+share/examples/actx/mio.actx
+share/examples/actx/emio.actx
+share/examples/actx/mayu.actx
+share/examples/actx/pmayu.actx
+share/examples/actx/siiko.actx
 share/examples/actx/mizuka0.xpm
 share/examples/actx/mizuka1.xpm
 share/examples/actx/mizuka2.xpm
@@ -33,6 +20,25 @@ share/examples/actx/mizuka4.xpm
 share/examples/actx/mizuka5.xpm
 share/examples/actx/mizuka6.xpm
 share/examples/actx/mizuka7.xpm
+share/examples/actx/mmizuka0.xpm
+share/examples/actx/mmizuka1.xpm
+share/examples/actx/mmizuka2.xpm
+share/examples/actx/mmizuka3.xpm
+share/examples/actx/mmizuka4.xpm
+share/examples/actx/mmizuka5.xpm
+share/examples/actx/mmizuka6.xpm
+share/examples/actx/mmizuka7.xpm
+share/examples/actx/akane0.xpm
+share/examples/actx/akane1.xpm
+share/examples/actx/akane2.xpm
+share/examples/actx/akane3.xpm
+share/examples/actx/akane4.xpm
+share/examples/actx/akane5.xpm
+share/examples/actx/eakane0.xpm
+share/examples/actx/eakane1.xpm
+share/examples/actx/eakane2.xpm
+share/examples/actx/eakane3.xpm
+share/examples/actx/eakane4.xpm
 share/examples/actx/rumi0.xpm
 share/examples/actx/rumi1.xpm
 share/examples/actx/rumi2.xpm
@@ -43,8 +49,55 @@ share/examples/actx/rumi6.xpm
 share/examples/actx/rumi7.xpm
 share/examples/actx/rumi8.xpm
 share/examples/actx/rumi9.xpm
+share/examples/actx/erumi0.xpm
+share/examples/actx/erumi1.xpm
+share/examples/actx/erumi2.xpm
+share/examples/actx/erumi3.xpm
+share/examples/actx/erumi4.xpm
+share/examples/actx/misaki0.xpm
+share/examples/actx/misaki1.xpm
+share/examples/actx/misaki2.xpm
+share/examples/actx/misaki3.xpm
+share/examples/actx/misaki4.xpm
+share/examples/actx/misaki5.xpm
+share/examples/actx/misaki6.xpm
+share/examples/actx/emisaki0.xpm
+share/examples/actx/emisaki1.xpm
+share/examples/actx/emisaki2.xpm
+share/examples/actx/emisaki3.xpm
+share/examples/actx/emisaki4.xpm
+share/examples/actx/emisaki5.xpm
+share/examples/actx/mio0.xpm
+share/examples/actx/mio1.xpm
+share/examples/actx/mio2.xpm
+share/examples/actx/mio3.xpm
+share/examples/actx/mio4.xpm
+share/examples/actx/emio0.xpm
+share/examples/actx/emio1.xpm
+share/examples/actx/emio2.xpm
+share/examples/actx/emio3.xpm
+share/examples/actx/emio4.xpm
+share/examples/actx/mayu0.xpm
+share/examples/actx/mayu1.xpm
+share/examples/actx/mayu2.xpm
+share/examples/actx/mayu3.xpm
+share/examples/actx/mayu4.xpm
+share/examples/actx/mayu5.xpm
+share/examples/actx/mayu6.xpm
+share/examples/actx/mayu7.xpm
+share/examples/actx/pmayu0.xpm
+share/examples/actx/pmayu1.xpm
+share/examples/actx/pmayu2.xpm
+share/examples/actx/pmayu3.xpm
+share/examples/actx/pmayu4.xpm
+share/examples/actx/pmayu5.xpm
+share/examples/actx/siiko0.xpm
+share/examples/actx/siiko1.xpm
+share/examples/actx/siiko2.xpm
+share/examples/actx/siiko3.xpm
+share/examples/actx/siiko4.xpm
+share/examples/actx/siiko5.xpm
 share/examples/actx/sample.actxrc
-share/examples/actx/sample.actxrc-jp
 share/examples/actx/sample.Xdefaults
 @dirrm share/examples/actx
 share/doc/ja/actx/README.jis