3 files changed, 217 insertions, 11 deletions

diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 28d866c31219..b69b406c1728 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	macopix
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.2
 PORTREVISION=	0
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/macopix/
-.if defined(WITH_GTK2)
-PKGNAMESUFFIX=	-gtk2
+.if defined(WITH_GTK1)
+PKGNAMESUFFIX=	-gtk1
 .endif
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
 
@@ -32,22 +32,23 @@ 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-euc-ja-2.20.tar.gz
+		macopix-mascot-marimite-euc-ja-2.20.tar.gz \
+		macopix-mascot-HxB-euc-ja-0.10.tar.gz 
 
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-.if defined(WITH_GTK2)
-USE_GNOME=	gtk20
-.else
+.if defined(WITH_GTK1)
 USE_GNOME=	gtk12 gdkpixbuf
+.else
+USE_GNOME=	gtk20
 .endif
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name=""
-.if defined(WITH_GTK2)
-CONFIGURE_ARGS+=	--with-gtk2
+.if defined(WITH_GTK1)
+CONFIGURE_ARGS+=	--with-gtk1
 .endif
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include"
@@ -104,6 +105,10 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.20/*.mcpx ${PREFIX}/share/macopix/
 	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.20/marimite.menu ${PREFIX}/share/macopix/
 	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-marimite-euc-ja-2.20/README.jp ${PREFIX}/share/macopix/README.marimite.jp
+	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-HxB-euc-ja-0.10/*.png ${PREFIX}/share/macopix/pixmap/
+	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-HxB-euc-ja-0.10/*.mcpx ${PREFIX}/share/macopix/
+	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-HxB-euc-ja-0.10/HxB.menu ${PREFIX}/share/macopix/
+	${INSTALL_DATA} ${WRKDIR}/macopix-mascot-HxB-euc-ja-0.10/README.jp ${PREFIX}/share/macopix/README.HxB.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 bc5a7c11b1f5..91a0835e4843 100644
--- a/games/macopix/distinfo
+++ b/games/macopix/distinfo
@@ -1,5 +1,5 @@
-MD5 (macopix-1.2.2.tar.gz) = e4a891adb9a20178a652a9d4a24dafec
-SIZE (macopix-1.2.2.tar.gz) = 477746
+MD5 (macopix-1.3.2.tar.gz) = 5eda89c55f83981acf2666b12ccd5651
+SIZE (macopix-1.3.2.tar.gz) = 561602
 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
@@ -18,3 +18,5 @@ MD5 (macopix-mascot-tsukihime-ja-1.00.tar.gz) = aa41c71fec3b2842ff7699cbfa6dc5dd
 SIZE (macopix-mascot-tsukihime-ja-1.00.tar.gz) = 604261
 MD5 (macopix-mascot-marimite-euc-ja-2.20.tar.gz) = 075b229ca16d7778eddd61c1ff1db29f
 SIZE (macopix-mascot-marimite-euc-ja-2.20.tar.gz) = 916260
+MD5 (macopix-mascot-HxB-euc-ja-0.10.tar.gz) = 946361c9ff87b1d2ac5df2649fb2c3ac
+SIZE (macopix-mascot-HxB-euc-ja-0.10.tar.gz) = 508852
diff --git a/games/macopix/pkg-plist b/games/macopix/pkg-plist
index 35aed31ebf01..4033529e7e1e 100644
--- a/games/macopix/pkg-plist
+++ b/games/macopix/pkg-plist
@@ -1660,6 +1660,205 @@ share/locale/ja/LC_MESSAGES/macopix.mo
 %%DATADIR%%/marimite_kanako.mcpx
 %%DATADIR%%/marimite.menu
 %%DATADIR%%/README.marimite.jp
+%%DATADIR%%/pixmap/HxB_ayana00.png
+%%DATADIR%%/pixmap/HxB_ayana01.png
+%%DATADIR%%/pixmap/HxB_ayana02.png
+%%DATADIR%%/pixmap/HxB_ayana03.png
+%%DATADIR%%/pixmap/HxB_ayana04.png
+%%DATADIR%%/pixmap/HxB_ayana05.png
+%%DATADIR%%/pixmap/HxB_ayana06.png
+%%DATADIR%%/pixmap/HxB_ayana07.png
+%%DATADIR%%/pixmap/HxB_ayana08.png
+%%DATADIR%%/pixmap/HxB_ayana09.png
+%%DATADIR%%/pixmap/HxB_ayana10.png
+%%DATADIR%%/pixmap/HxB_ayana11.png
+%%DATADIR%%/pixmap/HxB_ayana12.png
+%%DATADIR%%/pixmap/HxB_ayana13.png
+%%DATADIR%%/pixmap/HxB_ayana14.png
+%%DATADIR%%/pixmap/HxB_ayana15.png
+%%DATADIR%%/pixmap/HxB_ayana16.png
+%%DATADIR%%/pixmap/HxB_ayana17.png
+%%DATADIR%%/pixmap/HxB_ayana18.png
+%%DATADIR%%/pixmap/HxB_ayana19.png
+%%DATADIR%%/pixmap/HxB_ayana20.png
+%%DATADIR%%/pixmap/HxB_ayana21.png
+%%DATADIR%%/pixmap/HxB_ayana22.png
+%%DATADIR%%/pixmap/HxB_ayana23.png
+%%DATADIR%%/pixmap/HxB_ayana24.png
+%%DATADIR%%/pixmap/HxB_ayana25.png
+%%DATADIR%%/pixmap/HxB_ayana26.png
+%%DATADIR%%/pixmap/HxB_ayana27.png
+%%DATADIR%%/pixmap/HxB_ayana28.png
+%%DATADIR%%/pixmap/HxB_ayana29.png
+%%DATADIR%%/pixmap/HxB_ayana30.png
+%%DATADIR%%/HxB_ayana.mcpx
+%%DATADIR%%/pixmap/HxB_hayate00.png
+%%DATADIR%%/pixmap/HxB_hayate01.png
+%%DATADIR%%/pixmap/HxB_hayate02.png
+%%DATADIR%%/pixmap/HxB_hayate03.png
+%%DATADIR%%/pixmap/HxB_hayate04.png
+%%DATADIR%%/pixmap/HxB_hayate05.png
+%%DATADIR%%/pixmap/HxB_hayate06.png
+%%DATADIR%%/pixmap/HxB_hayate07.png
+%%DATADIR%%/pixmap/HxB_hayate08.png
+%%DATADIR%%/pixmap/HxB_hayate09.png
+%%DATADIR%%/pixmap/HxB_hayate10.png
+%%DATADIR%%/pixmap/HxB_hayate11.png
+%%DATADIR%%/pixmap/HxB_hayate12.png
+%%DATADIR%%/pixmap/HxB_hayate13.png
+%%DATADIR%%/pixmap/HxB_hayate14.png
+%%DATADIR%%/pixmap/HxB_hayate15.png
+%%DATADIR%%/pixmap/HxB_hayate16.png
+%%DATADIR%%/pixmap/HxB_hayate17.png
+%%DATADIR%%/pixmap/HxB_hayate18.png
+%%DATADIR%%/pixmap/HxB_hayate19.png
+%%DATADIR%%/pixmap/HxB_hayate20.png
+%%DATADIR%%/pixmap/HxB_hayate21.png
+%%DATADIR%%/pixmap/HxB_hayate22.png
+%%DATADIR%%/pixmap/HxB_hayate23.png
+%%DATADIR%%/pixmap/HxB_hayate24.png
+%%DATADIR%%/pixmap/HxB_hayate25.png
+%%DATADIR%%/pixmap/HxB_hayate26.png
+%%DATADIR%%/pixmap/HxB_hayate27.png
+%%DATADIR%%/pixmap/HxB_hayate28.png
+%%DATADIR%%/pixmap/HxB_hayate29.png
+%%DATADIR%%/pixmap/HxB_hayate30.png
+%%DATADIR%%/pixmap/HxB_hayate31.png
+%%DATADIR%%/HxB_hayate.mcpx
+%%DATADIR%%/pixmap/HxB_hitsugi00.png
+%%DATADIR%%/pixmap/HxB_hitsugi01.png
+%%DATADIR%%/pixmap/HxB_hitsugi02.png
+%%DATADIR%%/pixmap/HxB_hitsugi03.png
+%%DATADIR%%/pixmap/HxB_hitsugi04.png
+%%DATADIR%%/pixmap/HxB_hitsugi05.png
+%%DATADIR%%/pixmap/HxB_hitsugi06.png
+%%DATADIR%%/pixmap/HxB_hitsugi07.png
+%%DATADIR%%/pixmap/HxB_hitsugi08.png
+%%DATADIR%%/pixmap/HxB_hitsugi09.png
+%%DATADIR%%/pixmap/HxB_hitsugi10.png
+%%DATADIR%%/pixmap/HxB_hitsugi11.png
+%%DATADIR%%/pixmap/HxB_hitsugi12.png
+%%DATADIR%%/pixmap/HxB_hitsugi13.png
+%%DATADIR%%/pixmap/HxB_hitsugi14.png
+%%DATADIR%%/pixmap/HxB_hitsugi15.png
+%%DATADIR%%/pixmap/HxB_hitsugi16.png
+%%DATADIR%%/pixmap/HxB_hitsugi17.png
+%%DATADIR%%/pixmap/HxB_hitsugi18.png
+%%DATADIR%%/pixmap/HxB_hitsugi19.png
+%%DATADIR%%/pixmap/HxB_hitsugi20.png
+%%DATADIR%%/pixmap/HxB_hitsugi21.png
+%%DATADIR%%/pixmap/HxB_hitsugi22.png
+%%DATADIR%%/pixmap/HxB_hitsugi23.png
+%%DATADIR%%/pixmap/HxB_hitsugi24.png
+%%DATADIR%%/pixmap/HxB_hitsugi25.png
+%%DATADIR%%/pixmap/HxB_hitsugi26.png
+%%DATADIR%%/pixmap/HxB_hitsugi27.png
+%%DATADIR%%/pixmap/HxB_hitsugi28.png
+%%DATADIR%%/pixmap/HxB_hitsugi29.png
+%%DATADIR%%/pixmap/HxB_hitsugi30.png
+%%DATADIR%%/pixmap/HxB_hitsugi31.png
+%%DATADIR%%/HxB_hitsugi.mcpx
+%%DATADIR%%/pixmap/HxB_jun00.png
+%%DATADIR%%/pixmap/HxB_jun01.png
+%%DATADIR%%/pixmap/HxB_jun02.png
+%%DATADIR%%/pixmap/HxB_jun03.png
+%%DATADIR%%/pixmap/HxB_jun04.png
+%%DATADIR%%/pixmap/HxB_jun05.png
+%%DATADIR%%/pixmap/HxB_jun06.png
+%%DATADIR%%/pixmap/HxB_jun07.png
+%%DATADIR%%/pixmap/HxB_jun08.png
+%%DATADIR%%/pixmap/HxB_jun09.png
+%%DATADIR%%/pixmap/HxB_jun10.png
+%%DATADIR%%/pixmap/HxB_jun11.png
+%%DATADIR%%/pixmap/HxB_jun12.png
+%%DATADIR%%/pixmap/HxB_jun13.png
+%%DATADIR%%/pixmap/HxB_jun14.png
+%%DATADIR%%/pixmap/HxB_jun15.png
+%%DATADIR%%/pixmap/HxB_jun16.png
+%%DATADIR%%/pixmap/HxB_jun17.png
+%%DATADIR%%/pixmap/HxB_jun18.png
+%%DATADIR%%/pixmap/HxB_jun19.png
+%%DATADIR%%/pixmap/HxB_jun20.png
+%%DATADIR%%/pixmap/HxB_jun21.png
+%%DATADIR%%/pixmap/HxB_jun22.png
+%%DATADIR%%/pixmap/HxB_jun23.png
+%%DATADIR%%/pixmap/HxB_jun24.png
+%%DATADIR%%/pixmap/HxB_jun25.png
+%%DATADIR%%/pixmap/HxB_jun26.png
+%%DATADIR%%/pixmap/HxB_jun27.png
+%%DATADIR%%/pixmap/HxB_jun28.png
+%%DATADIR%%/pixmap/HxB_jun29.png
+%%DATADIR%%/pixmap/HxB_jun30.png
+%%DATADIR%%/pixmap/HxB_jun31.png
+%%DATADIR%%/HxB_jun.mcpx
+%%DATADIR%%/pixmap/HxB_shizuku00.png
+%%DATADIR%%/pixmap/HxB_shizuku01.png
+%%DATADIR%%/pixmap/HxB_shizuku02.png
+%%DATADIR%%/pixmap/HxB_shizuku03.png
+%%DATADIR%%/pixmap/HxB_shizuku04.png
+%%DATADIR%%/pixmap/HxB_shizuku05.png
+%%DATADIR%%/pixmap/HxB_shizuku06.png
+%%DATADIR%%/pixmap/HxB_shizuku07.png
+%%DATADIR%%/pixmap/HxB_shizuku08.png
+%%DATADIR%%/pixmap/HxB_shizuku09.png
+%%DATADIR%%/pixmap/HxB_shizuku10.png
+%%DATADIR%%/pixmap/HxB_shizuku11.png
+%%DATADIR%%/pixmap/HxB_shizuku12.png
+%%DATADIR%%/pixmap/HxB_shizuku13.png
+%%DATADIR%%/pixmap/HxB_shizuku14.png
+%%DATADIR%%/pixmap/HxB_shizuku15.png
+%%DATADIR%%/pixmap/HxB_shizuku16.png
+%%DATADIR%%/pixmap/HxB_shizuku17.png
+%%DATADIR%%/pixmap/HxB_shizuku18.png
+%%DATADIR%%/pixmap/HxB_shizuku19.png
+%%DATADIR%%/pixmap/HxB_shizuku20.png
+%%DATADIR%%/pixmap/HxB_shizuku21.png
+%%DATADIR%%/pixmap/HxB_shizuku22.png
+%%DATADIR%%/pixmap/HxB_shizuku23.png
+%%DATADIR%%/pixmap/HxB_shizuku24.png
+%%DATADIR%%/pixmap/HxB_shizuku25.png
+%%DATADIR%%/pixmap/HxB_shizuku26.png
+%%DATADIR%%/pixmap/HxB_shizuku27.png
+%%DATADIR%%/pixmap/HxB_shizuku28.png
+%%DATADIR%%/pixmap/HxB_shizuku29.png
+%%DATADIR%%/pixmap/HxB_shizuku30.png
+%%DATADIR%%/pixmap/HxB_shizuku31.png
+%%DATADIR%%/HxB_shizuku.mcpx
+%%DATADIR%%/pixmap/HxB_yuho00.png
+%%DATADIR%%/pixmap/HxB_yuho01.png
+%%DATADIR%%/pixmap/HxB_yuho02.png
+%%DATADIR%%/pixmap/HxB_yuho03.png
+%%DATADIR%%/pixmap/HxB_yuho04.png
+%%DATADIR%%/pixmap/HxB_yuho05.png
+%%DATADIR%%/pixmap/HxB_yuho06.png
+%%DATADIR%%/pixmap/HxB_yuho07.png
+%%DATADIR%%/pixmap/HxB_yuho08.png
+%%DATADIR%%/pixmap/HxB_yuho09.png
+%%DATADIR%%/pixmap/HxB_yuho10.png
+%%DATADIR%%/pixmap/HxB_yuho11.png
+%%DATADIR%%/pixmap/HxB_yuho12.png
+%%DATADIR%%/pixmap/HxB_yuho13.png
+%%DATADIR%%/pixmap/HxB_yuho14.png
+%%DATADIR%%/pixmap/HxB_yuho15.png
+%%DATADIR%%/pixmap/HxB_yuho16.png
+%%DATADIR%%/pixmap/HxB_yuho17.png
+%%DATADIR%%/pixmap/HxB_yuho18.png
+%%DATADIR%%/pixmap/HxB_yuho19.png
+%%DATADIR%%/pixmap/HxB_yuho20.png
+%%DATADIR%%/pixmap/HxB_yuho21.png
+%%DATADIR%%/pixmap/HxB_yuho22.png
+%%DATADIR%%/pixmap/HxB_yuho23.png
+%%DATADIR%%/pixmap/HxB_yuho24.png
+%%DATADIR%%/pixmap/HxB_yuho25.png
+%%DATADIR%%/pixmap/HxB_yuho26.png
+%%DATADIR%%/pixmap/HxB_yuho27.png
+%%DATADIR%%/pixmap/HxB_yuho28.png
+%%DATADIR%%/pixmap/HxB_yuho29.png
+%%DATADIR%%/pixmap/HxB_yuho30.png
+%%DATADIR%%/pixmap/HxB_yuho31.png
+%%DATADIR%%/HxB_yuho.mcpx
+%%DATADIR%%/HxB.menu
+%%DATADIR%%/README.HxB.jp
 @dirrm %%DATADIR%%/pixmap
 @dirrm %%DATADIR%%
 %%PORTDOCS%%share/doc/macopix/README