5 files changed, 56 insertions, 12 deletions

diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 9b3e23fa1ff4..d5649d43654b 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	macopix
-PORTVERSION=	1.0.4
+PORTVERSION=	1.2.1
 PORTREVISION=	0
 CATEGORIES=	games
-MASTER_SITES=	http://kurumi.sakura.ne.jp/~chimari/macopix/
+MASTER_SITES=	http://rosegray.sakura.ne.jp/macopix/
 .if defined(WITH_GTK2)
 PKGNAMESUFFIX=	-gtk2
 .endif
@@ -32,7 +32,7 @@ RESTRICTED_FILES= \
 		macopix-mascot-pia2-ja-1.00.tar.gz \
 		macopix-mascot-triangle_heart-ja-1.00.tar.gz \
 		macopix-mascot-tsukihime-ja-1.00.tar.gz \
-		macopix-mascot-marimite-ja-1.20.tar.gz
+		macopix-mascot-marimite-euc-ja-2.10.tar.gz
 
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
@@ -100,10 +100,10 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-tsukihime-ja/*.mcpx ${PREFIX}/share/macopix/
 	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-tsukihime-ja/tsuki.menu ${PREFIX}/share/macopix/
 	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-tsukihime-ja/README.jp ${PREFIX}/share/macopix/README.tsuki.jp
-	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-ja/*.png ${PREFIX}/share/macopix/pixmap/
-	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-ja/*.mcpx ${PREFIX}/share/macopix/
-	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-ja/marimite.menu ${PREFIX}/share/macopix/
-	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-ja/README.jp ${PREFIX}/share/macopix/README.marimite.jp
+	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.10/*.png ${PREFIX}/share/macopix/pixmap/
+	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.10/*.mcpx ${PREFIX}/share/macopix/
+	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.10/marimite.menu ${PREFIX}/share/macopix/
+	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.10/README.jp ${PREFIX}/share/macopix/README.marimite.jp
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/macopix
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/macopix
diff --git a/games/macopix/distinfo b/games/macopix/distinfo
index da7f9ba9bcfb..94aef435b4ab 100644
--- a/games/macopix/distinfo
+++ b/games/macopix/distinfo
@@ -1,5 +1,5 @@
-MD5 (macopix-1.0.4.tar.gz) = 0b834213d050eaea3b42cb7c6b0ee729
-SIZE (macopix-1.0.4.tar.gz) = 590115
+MD5 (macopix-1.2.1.tar.gz) = 4449578d92d720d6d88ee82c81b7d2a4
+SIZE (macopix-1.2.1.tar.gz) = 602975
 MD5 (macopix-mascot-comic_party-ja-1.00.tar.gz) = 5d201590edec5ddaef30c55565c3dfed
 SIZE (macopix-mascot-comic_party-ja-1.00.tar.gz) = 19101
 MD5 (macopix-mascot-cosmos-ja-1.00.tar.gz) = ae1aefbd5f6135a9273311e299ff2055
@@ -16,5 +16,5 @@ MD5 (macopix-mascot-triangle_heart-ja-1.00.tar.gz) = 67248bb1836a29b760bc4297a5e
 SIZE (macopix-mascot-triangle_heart-ja-1.00.tar.gz) = 304526
 MD5 (macopix-mascot-tsukihime-ja-1.00.tar.gz) = aa41c71fec3b2842ff7699cbfa6dc5dd
 SIZE (macopix-mascot-tsukihime-ja-1.00.tar.gz) = 604261
-MD5 (macopix-mascot-marimite-ja-1.20.tar.gz) = 4d62ed211e1cbd1b7e99b8d167609f9c
-SIZE (macopix-mascot-marimite-ja-1.20.tar.gz) = 788828
+MD5 (macopix-mascot-marimite-euc-ja-2.10.tar.gz) = 92d536afbb08e07f33d8cb85d8c3de93
+SIZE (macopix-mascot-marimite-euc-ja-2.10.tar.gz) = 856124
diff --git a/games/macopix/files/patch-src::sockmsg.c b/games/macopix/files/patch-src::sockmsg.c
new file mode 100644
index 000000000000..396c7b20ae87
--- /dev/null
+++ b/games/macopix/files/patch-src::sockmsg.c
@@ -0,0 +1,10 @@
+--- src/sockmsg.c.orig	Tue Sep 28 09:51:53 2004
++++ src/sockmsg.c	Sun Oct 17 23:49:27 2004
+@@ -1,5 +1,7 @@
+ #include <glib.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <sys/un.h>
+ #include <netdb.h>
+ 
diff --git a/games/macopix/pkg-descr b/games/macopix/pkg-descr
index 7379f7964cd4..100b77a2efee 100644
--- a/games/macopix/pkg-descr
+++ b/games/macopix/pkg-descr
@@ -2,7 +2,7 @@ macopix - Mascot Constructive Pilot for X
 
 a window sitter program for X11
 
-WWW: http://kurumi.sakura.ne.jp/~chimari/macopix/index-e.html
+WWW: http://rosegray.sakura.ne.jp/macopix/index-e.html
 
 Shinya Esu
 esu@yk.rim.or.jp
diff --git a/games/macopix/pkg-plist b/games/macopix/pkg-plist
index 1d87660955bc..a91ee13a19c6 100644
--- a/games/macopix/pkg-plist
+++ b/games/macopix/pkg-plist
@@ -1335,6 +1335,11 @@ share/locale/ja/LC_MESSAGES/macopix.mo
 %%DATADIR%%/pixmap/marimite_youko21.png
 %%DATADIR%%/pixmap/marimite_youko22.png
 %%DATADIR%%/pixmap/marimite_youko23.png
+%%DATADIR%%/pixmap/marimite_youko24.png
+%%DATADIR%%/pixmap/marimite_youko25.png
+%%DATADIR%%/pixmap/marimite_youko26.png
+%%DATADIR%%/pixmap/marimite_youko27.png
+%%DATADIR%%/pixmap/marimite_youko28.png
 %%DATADIR%%/marimite_youko.mcpx
 %%DATADIR%%/marimite_rei.mcpx
 %%DATADIR%%/pixmap/marimite_rei00.png
@@ -1594,6 +1599,35 @@ share/locale/ja/LC_MESSAGES/macopix.mo
 %%DATADIR%%/pixmap/marimite_touko25.png
 %%DATADIR%%/pixmap/marimite_touko26.png
 %%DATADIR%%/pixmap/marimite_touko27.png
+%%DATADIR%%/pixmap/marimite_srg00.png
+%%DATADIR%%/pixmap/marimite_srg01.png
+%%DATADIR%%/pixmap/marimite_srg02.png
+%%DATADIR%%/pixmap/marimite_srg03.png
+%%DATADIR%%/pixmap/marimite_srg04.png
+%%DATADIR%%/pixmap/marimite_srg05.png
+%%DATADIR%%/pixmap/marimite_srg06.png
+%%DATADIR%%/pixmap/marimite_srg07.png
+%%DATADIR%%/pixmap/marimite_srg08.png
+%%DATADIR%%/pixmap/marimite_srg09.png
+%%DATADIR%%/pixmap/marimite_srg10.png
+%%DATADIR%%/pixmap/marimite_srg11.png
+%%DATADIR%%/pixmap/marimite_srg12.png
+%%DATADIR%%/pixmap/marimite_srg13.png
+%%DATADIR%%/pixmap/marimite_srg14.png
+%%DATADIR%%/pixmap/marimite_srg15.png
+%%DATADIR%%/pixmap/marimite_srg16.png
+%%DATADIR%%/pixmap/marimite_srg17.png
+%%DATADIR%%/pixmap/marimite_srg18.png
+%%DATADIR%%/pixmap/marimite_srg19.png
+%%DATADIR%%/pixmap/marimite_srg20.png
+%%DATADIR%%/pixmap/marimite_srg21.png
+%%DATADIR%%/pixmap/marimite_srg22.png
+%%DATADIR%%/pixmap/marimite_srg23.png
+%%DATADIR%%/pixmap/marimite_srg24.png
+%%DATADIR%%/pixmap/marimite_srg25.png
+%%DATADIR%%/pixmap/marimite_srg26.png
+%%DATADIR%%/pixmap/marimite_srg27.png
+%%DATADIR%%/marimite_srg.mcpx
 %%DATADIR%%/marimite.menu
 %%DATADIR%%/README.marimite.jp
 @dirrm %%DATADIR%%/pixmap