5 files changed, 28 insertions, 20 deletions

diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index a576f15581d6..77044f1b5dd4 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -3,11 +3,11 @@
 # Date created:		24 Oct 1998
 # Whom:			FUJISHIMA Satsuki
 #
-# $Id: Makefile,v 1.7 1998/12/27 16:12:02 flathill Exp $
+# $Id: Makefile,v 1.8 1999/01/10 18:31:20 steve Exp $
 #
 
-DISTNAME=	xsystem35-1.0pre1
-PKGNAME=	xsystem-3.5-1.0p1
+DISTNAME=	xsystem35-1.0
+PKGNAME=	xsystem-3.5-1.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/
 
@@ -18,36 +18,29 @@ MAINTAINER=	k5@respo.or.jp
 
 LIB_DEPENDS+=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
-USE_X_PREFIX=	YES
+USE_IMAKE=	YES
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 DOC_FILES=	BUGS ChangeLog FAQ GRFMT.TXT INSTALL README README.midi \
-		README.miko THANKS
+		README.miko THANKS TODO
 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
 
-pre-build:
-.if !defined(CDROM_NO_TRKIND)
-	@${ECHO_MSG} "if your CD-ROM drive complains like 'CDIOCPLAYTRACKS: Invalid argument'"
-	@${ECHO_MSG} "at playing CDDA, try: make CDROM_NO_TRKIND=yes"
-	@${ECHO_MSG} "this may workaround problem."
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xsystem35 ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin
 
 post-install:
 	strip ${PREFIX}/bin/xsystem35
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/ja/xsystem35
-	@(cd ${WRKDIR}/${DISTNAME}/doc;\
+	@(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
-	@(cd ${WRKDIR}/${DISTNAME}/contrib; \
-		${INSTALL_SCRIPT} instgame ${PREFIX}/share/examples/xsystem35; \
+	@(cd ${WRKSRC}/../contrib; \
 		${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/xsystem35)
 .endif
 	${CAT} ${PKGDIR}/MESSAGE
diff --git a/emulators/xsystem35/distinfo b/emulators/xsystem35/distinfo
index e47e9aeaed44..63bd94d7ca18 100644
--- a/emulators/xsystem35/distinfo
+++ b/emulators/xsystem35/distinfo
@@ -1 +1 @@
-MD5 (xsystem35-1.0pre1.tar.gz) = 9b733e4718d8fd23aa2adc26302de149
+MD5 (xsystem35-1.0.tar.gz) = 2c3bc8a7bba2048e698e3e0eff271ae5
diff --git a/emulators/xsystem35/files/patch-af b/emulators/xsystem35/files/patch-af
new file mode 100644
index 000000000000..51e148112822
--- /dev/null
+++ b/emulators/xsystem35/files/patch-af
@@ -0,0 +1,14 @@
+--- Imakefile.orig	Sat Jan 16 05:16:18 1999
++++ Imakefile	Sat Jan 23 01:21:39 1999
+@@ -114,9 +114,9 @@
+ /*
+  * include / library / definition
+  */
+-SYS_LIBRARIES   = -lm `gtk-config --libs`
++SYS_LIBRARIES   = -lm `gtk11-config --libs`
+ EXTRA_LIBRARIES = $(OSDEPLIB)
+-EXTRA_INCLUDES  = `gtk-config --cflags` $(OSDEPINC)
++EXTRA_INCLUDES  = `gtk11-config --cflags` $(OSDEPINC)
+ EXTRA_DEFINES   = $(OSDEPDEF)
+ 
+ /*
diff --git a/emulators/xsystem35/pkg-message b/emulators/xsystem35/pkg-message
index d9fc74eaff2b..717b47a0cbb9 100644
--- a/emulators/xsystem35/pkg-message
+++ b/emulators/xsystem35/pkg-message
@@ -4,12 +4,12 @@ o 1st, copy /usr/X11R6/share/example/xsystem35/xsys35rc.sample
 e.g.)
 cdrom_device: /dev/cd0c
 
-o 2nd, install data from cdrom with
-	/usr/X11R6/share/example/xsystem35/instgame.
+o 2nd, install game data from AliceSoft's cdrom with
+	/usr/X11R6/bin/instgame.
 
 o 3rd, install X-tt for your real pleasure(optional).
 
-o and, play it!
+o and, enjoy!
 
 ********************* IMPORTANT *********************
 If you use over 16bpp mode, you must add
diff --git a/emulators/xsystem35/pkg-plist b/emulators/xsystem35/pkg-plist
index de8dba8d7666..c432d5982b0c 100644
--- a/emulators/xsystem35/pkg-plist
+++ b/emulators/xsystem35/pkg-plist
@@ -1,4 +1,5 @@
 bin/xsystem35
+bin/instgame
 share/doc/ja/xsystem35/BUGS
 share/doc/ja/xsystem35/ChangeLog
 share/doc/ja/xsystem35/FAQ
@@ -8,13 +9,13 @@ share/doc/ja/xsystem35/README
 share/doc/ja/xsystem35/README.midi
 share/doc/ja/xsystem35/README.miko
 share/doc/ja/xsystem35/THANKS
+share/doc/ja/xsystem35/TODO
 share/examples/xsystem35/xsys35rc.sample
 share/examples/xsystem35/README.TXT
 share/examples/xsystem35/atlach.inf
 share/examples/xsystem35/dalk.inf
 share/examples/xsystem35/diabo.inf
 share/examples/xsystem35/drstop.inf
-share/examples/xsystem35/instgame
 share/examples/xsystem35/katsumi.inf
 share/examples/xsystem35/kichiku.inf
 share/examples/xsystem35/miko.inf