6 files changed, 67 insertions, 42 deletions

diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index c4bd60ccdd73..0c7edafa21e8 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -6,38 +6,52 @@
 # $FreeBSD$
 #
 
-DISTNAME=	xsystem35-1.0.7
+DISTNAME=	xsystem35-1.2.4
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/
 
-MAINTAINER=	k5@respo.or.jp
+MAINTAINER=	k5@cheerful.com
 
-LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+.if defined(WITH_ESOUND)
+LIB_DEPENDS+=	esd.2:${PORTSDIR}/audio/esound
+.endif
 
 USE_IMAKE=	YES
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
-DOC_FILES=	BUGS ChangeLog FAQ GRFMT.TXT INSTALL README README.midi \
-		README.miko THANKS TODO MISCGAME.TXT
-EXAMPLES=	README.TXT atlach.inf dalk.inf diabo.inf drstop.inf \
-		katsumi.inf kichiku.inf miko.inf ningen.inf oudou.inf \
-		panyo.inf rance1.inf rance2.inf rance3.inf rance4.inf \
-		toushin.inf toushin2.inf zero.inf
+PKGMESSAGE=	${WRKSRC}/MESSAGE
+
+DOC_FILES=	BUGS ChangeLog FAQ GRFMT.TXT INSTALL MISCGAME.TXT README \
+		README.color README.miko README.music README.pastel THANKS \
+		TODO
+EXAMPLES=	README.TXT ambi.inf atlach.inf dalk.inf darcrows.inf \
+		diabo.inf drstop.inf hushaby.inf katsumi.inf kichiku.inf \
+		mamatoto.inf mamori.inf miko.inf mugen.inf ningen.inf \
+		oudou.inf panyo.inf pascha.inf progood.inf rance1.inf \
+		rance2.inf rance3.inf rance4.inf toushin.inf toushin2.inf \
+		zero.inf
+
+pre-configure:
+.if defined(WITH_ESOUND)
+	${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.orig
+	${SED} -e 43,43d -e 45,45d ${WRKSRC}/config.h.orig > ${WRKSRC}/config.h
+.endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xsystem35 ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/xsystem35 ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ja/xsystem35
+	@${MKDIR} ${PREFIX}/share/doc/ja/xsystem35
 	@(cd ${WRKSRC}/../doc;\
 		${INSTALL_MAN} ${DOC_FILES} ${PREFIX}/share/doc/ja/xsystem35)
-	${MKDIR} ${PREFIX}/share/examples/xsystem35
-	${INSTALL_DATA} ${WRKSRC}/xsys35rc.sample ${PREFIX}/share/examples/xsystem35
+	@${MKDIR} ${PREFIX}/share/examples/xsystem35
+	@${INSTALL_DATA} ${WRKSRC}/xsys35rc.sample ${PREFIX}/share/examples/xsystem35
 	@(cd ${WRKSRC}/../contrib; \
 		${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/xsystem35)
+	@${SED} -e s,PREFIX,${PREFIX}, ${PKGDIR}/MESSAGE > ${WRKSRC}/MESSAGE
+	@${CAT} ${WRKSRC}/MESSAGE
 .endif
-	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/emulators/xsystem35/distinfo b/emulators/xsystem35/distinfo
index b1e9ccf3e178..71653055fcd4 100644
--- a/emulators/xsystem35/distinfo
+++ b/emulators/xsystem35/distinfo
@@ -1 +1 @@
-MD5 (xsystem35-1.0.7.tar.gz) = 7fc0160761dd59be553be1c19d9c5f66
+MD5 (xsystem35-1.2.4.tar.gz) = 8bfbba73437b735277356aeb43dc174a
diff --git a/emulators/xsystem35/files/patch-af b/emulators/xsystem35/files/patch-af
index 8c7f00f8ea49..b57a61abae69 100644
--- a/emulators/xsystem35/files/patch-af
+++ b/emulators/xsystem35/files/patch-af
@@ -1,12 +1,16 @@
---- Imakefile.orig	Sat Jan 16 05:16:18 1999
-+++ Imakefile	Sat Jan 23 01:21:39 1999
-@@ -114,9 +114,9 @@
+--- Imakefile	Tue Aug  3 05:22:37 1999
++++ Imakefile	Wed Oct 27 02:02:13 1999
+@@ -148,13 +148,13 @@
  /*
   * include / library / definition
   */
 -SYS_LIBRARIES   = -lm `gtk-config --libs`
 +SYS_LIBRARIES   = -lm `gtk12-config --libs`
+ #ifdef ENABLE_ESD
+ EXTRA_LIBRARIES = $(OSDEPLIB) -lesd
+ #else
  EXTRA_LIBRARIES = $(OSDEPLIB)
+ #endif
 -EXTRA_INCLUDES  = `gtk-config --cflags` $(OSDEPINC)
 +EXTRA_INCLUDES  = `gtk12-config --cflags` $(OSDEPINC)
  EXTRA_DEFINES   = $(OSDEPDEF)
diff --git a/emulators/xsystem35/pkg-descr b/emulators/xsystem35/pkg-descr
index aba52e4f063b..512656d24166 100644
--- a/emulators/xsystem35/pkg-descr
+++ b/emulators/xsystem35/pkg-descr
@@ -1,7 +1,6 @@
-Xsystem35 is AliceSoft System 3.5 emulator on X Window System
+Xsystem35 is AliceSoft System 3.5 implementation on X Window System
 
-See also /usr/X11R6/share/doc/ja/xsystem35 and
-http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/index.html
+WWW: http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/index.html
 
 - FUJISHIMA Satsuki
-k5@respo.or.jp
+k5@cheerful.com
diff --git a/emulators/xsystem35/pkg-message b/emulators/xsystem35/pkg-message
index 717b47a0cbb9..4791deceb0ec 100644
--- a/emulators/xsystem35/pkg-message
+++ b/emulators/xsystem35/pkg-message
@@ -1,19 +1,17 @@
------
-o 1st, copy /usr/X11R6/share/example/xsystem35/xsys35rc.sample
-	to ~/.xsys35rc and fit it to your environment.
-e.g.)
-cdrom_device: /dev/cd0c
 
-o 2nd, install game data from AliceSoft's cdrom with
-	/usr/X11R6/bin/instgame.
+o make sure your kernel has been configured with options SHMMAXPGS=4096
+  when you run on display 16bpp or deeper color.
 
-o 3rd, install X-tt for your real pleasure(optional).
+o copy PREFIX/share/example/xsystem35/xsys35rc.sample
+  to ~/.xsys35rc and fit it to your environment.
 
-o and, enjoy!
+o install game data from AliceSoft's cdrom with
+  PREFIX/bin/instgame.
 
-********************* IMPORTANT *********************
-If you use over 16bpp mode, you must add
-	options	SHMMAXPGS=4096
-to your kernel configuration file and rebuild kernel.
-*****************************************************
------
+o install X-TT for your real pleasure(optional).
+
+o pcm0 sound device doesn't work well with this program for now.
+  Try snd0 instead, OSS commercial product or
+  -devdsp none commandline option as the last resort.
+
+enjoy!
diff --git a/emulators/xsystem35/pkg-plist b/emulators/xsystem35/pkg-plist
index b86fc8b36d95..037b28ca7a3e 100644
--- a/emulators/xsystem35/pkg-plist
+++ b/emulators/xsystem35/pkg-plist
@@ -1,5 +1,5 @@
-bin/xsystem35
 bin/instgame
+bin/xsystem35
 share/doc/ja/xsystem35/BUGS
 share/doc/ja/xsystem35/ChangeLog
 share/doc/ja/xsystem35/FAQ
@@ -7,28 +7,38 @@ share/doc/ja/xsystem35/GRFMT.TXT
 share/doc/ja/xsystem35/INSTALL
 share/doc/ja/xsystem35/MISCGAME.TXT
 share/doc/ja/xsystem35/README
-share/doc/ja/xsystem35/README.midi
+share/doc/ja/xsystem35/README.color
 share/doc/ja/xsystem35/README.miko
+share/doc/ja/xsystem35/README.music
+share/doc/ja/xsystem35/README.pastel
 share/doc/ja/xsystem35/THANKS
 share/doc/ja/xsystem35/TODO
-share/examples/xsystem35/xsys35rc.sample
 share/examples/xsystem35/README.TXT
+share/examples/xsystem35/ambi.inf
 share/examples/xsystem35/atlach.inf
 share/examples/xsystem35/dalk.inf
+share/examples/xsystem35/darcrows.inf
 share/examples/xsystem35/diabo.inf
 share/examples/xsystem35/drstop.inf
+share/examples/xsystem35/hushaby.inf
 share/examples/xsystem35/katsumi.inf
 share/examples/xsystem35/kichiku.inf
+share/examples/xsystem35/mamatoto.inf
+share/examples/xsystem35/mamori.inf
 share/examples/xsystem35/miko.inf
+share/examples/xsystem35/mugen.inf
 share/examples/xsystem35/ningen.inf
 share/examples/xsystem35/oudou.inf
 share/examples/xsystem35/panyo.inf
+share/examples/xsystem35/pascha.inf
+share/examples/xsystem35/progood.inf
 share/examples/xsystem35/rance1.inf
 share/examples/xsystem35/rance2.inf
 share/examples/xsystem35/rance3.inf
 share/examples/xsystem35/rance4.inf
 share/examples/xsystem35/toushin.inf
 share/examples/xsystem35/toushin2.inf
+share/examples/xsystem35/xsys35rc.sample
 share/examples/xsystem35/zero.inf
 @dirrm share/doc/ja/xsystem35
 @dirrm share/examples/xsystem35