8 files changed, 38 insertions, 198 deletions

diff --git a/emulators/quasi88/Makefile b/emulators/quasi88/Makefile
index 45e67bf021b8..af1a9ddc486d 100644
--- a/emulators/quasi88/Makefile
+++ b/emulators/quasi88/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	quasi88
-PORTVERSION=	0.5.5
+PORTVERSION=	0.6.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.117.ne.jp/~show/pc8801/
 EXTRACT_SUFX=	.tgz
@@ -14,36 +14,50 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PC-8801 emulator for X
 
-USE_X_PREFIX=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-DATAFILES=	_quasi88rc
-DOCFILES=	FAQ.TXT FORMAT.TXT GET-IMAGE.TXT HISTORY.TXT MANUAL.TXT QUASI88.TXT
+MAKE_ENV=	DATADIR="${DATADIR}" _CC="${CC}" _CFLAGS="${CFLAGS}" \
+		_CXX="${CXX}" LD="${CXX}"
 
-.if !defined(WITH_SOUND)
-pre-everything::
-	@ ${ECHO_MSG} "===> If you want to enable sound, use \"make WITH_SOUND=yes\"."
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aa
+PORTDOCS=	FAQ.TXT FORMAT.TXT GET-IMAGE.TXT HISTORY.TXT MANUAL.TXT \
+		QUASI88.TXT
+PLIST_FILES=	bin/quasi88 %%EXAMPLESDIR%%/quasi88.rc
+PLIST_DIRS=	%%EXAMPLESDIR%%
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+MAKE_ENV+=	LSB_FIRST=1
 .endif
 
-.if !defined(WITH_DGA)
-pre-everything::
-	@ ${ECHO_MSG} "===> If you want to enable sound, use \"make WITH_DGA=yes\"."
+.if defined(WITH_SDL)
+USE_SDL=	sdl
+MAKE_ENV+=	SDL_VERSION=1 JOYSTICK="joy_sdl"
 .else
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ab
+MAKE_ENV+=	X11_VERSION=1 JOYSTICK="joy_bsd_usb"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^X11_|# X11_|g ; \
+		 s|~/quasi88|$${DATADIR}|g ; \
+		 s|^LSB_|# LSB_|g ; \
+		 s|^JOY|# JOY|g ; \
+		 s|gcc|$${_CC}|g ; \
+		 s|-O2|$${_CFLAGS}|g ; \
+		 s|/usr/X11R6|$${X11BASE}|g ; \
+		 s|g++|$${_CXX}|g ; \
+		 s|-lstdc++||g ; \
+		 s|^LD|# LD|g' ${WRKSRC}/Makefile
+
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/quasi88 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/quasi88 ${PREFIX}/bin
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/quasi88.rc ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/quasi88
-.for i in ${DATAFILES}
-	@ ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/quasi88/
-.endfor
-.for i in ${DOCFILES}
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/quasi88/
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/document/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/quasi88/distinfo b/emulators/quasi88/distinfo
index 0555d7132ed2..978d3b7459c0 100644
--- a/emulators/quasi88/distinfo
+++ b/emulators/quasi88/distinfo
@@ -1,3 +1,3 @@
-MD5 (quasi88-0.5.5.tgz) = 23e3e09484179031a84550bc6b9d39df
-SHA256 (quasi88-0.5.5.tgz) = 0e85e04fdd17e8a332fa65b6ecf87bb932aa3ad90dd1672332d3288a58501569
-SIZE (quasi88-0.5.5.tgz) = 577091
+MD5 (quasi88-0.6.2.tgz) = 753d64d163eb4bcb4ea2e4db3c38c2f2
+SHA256 (quasi88-0.6.2.tgz) = f3408b673c05af0fa1c9100c5ad61905640ebccbee30d0246bb430071eb19d36
+SIZE (quasi88-0.6.2.tgz) = 696198
diff --git a/emulators/quasi88/files/extra-patch-aa b/emulators/quasi88/files/extra-patch-aa
deleted file mode 100644
index 4f4055738923..000000000000
--- a/emulators/quasi88/files/extra-patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	Fri Sep 26 13:09:01 2003
-+++ Makefile	Tue Oct  7 21:15:28 2003
-@@ -142,7 +142,7 @@
- #	動作確認が取れているのは、freebsd/linux のみです
- 
- #---------------------- FreeBSD
--# OSARCH = freebsd
-+OSARCH = freebsd
- #---------------------- Linux
- # OSARCH = linux
- #---------------------- NetBSD
-@@ -166,7 +166,7 @@
- #---------------------- BeOS on Intel
- # OSARCH = beos
- #---------------------- generic unix, no sound
--OSARCH = generic
-+# OSARCH = generic
- 
- 
- 
diff --git a/emulators/quasi88/files/extra-patch-ab b/emulators/quasi88/files/extra-patch-ab
deleted file mode 100644
index 1ec981f9c6f4..000000000000
--- a/emulators/quasi88/files/extra-patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	Wed Dec 26 13:08:55 2001
-+++ Makefile	Wed Jan  2 08:52:58 2002
-@@ -82,8 +82,8 @@
- # DGA の設定です。興味のある方はどうぞ・・・
- #	DGAを有効にするには、root権限が必要なので、ご注意下さい。
- 
--# MDGA		= -DUSE_DGA
--# DGA_LIB 	= -lXxf86dga
-+MDGA		= -DUSE_DGA
-+DGA_LIB 	= -lXxf86dga
- 
- 
- 
diff --git a/emulators/quasi88/files/patch-Makefile b/emulators/quasi88/files/patch-Makefile
deleted file mode 100644
index 589bb25b8f72..000000000000
--- a/emulators/quasi88/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Fri Nov 24 15:04:26 2006
-+++ Makefile	Fri Nov 24 15:05:24 2006
-@@ -250,8 +250,8 @@
- # X11 関連のディレクトリとライブラリを指定
- # X11INC		= -I/usr/include/X11
- # X11LIB		= -L/usr/lib/X11
--X11INC		= -I/usr/X11R6/include
--X11LIB		= -L/usr/X11R6/lib
-+X11INC		= -I$(X11BASE)/include
-+X11LIB		= -L$(X11BASE)/lib
- 
diff --git a/emulators/quasi88/files/patch-aa b/emulators/quasi88/files/patch-aa
deleted file mode 100644
index c3de34ad5ffa..000000000000
--- a/emulators/quasi88/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	Fri Sep 26 13:09:01 2003
-+++ Makefile	Tue Oct  7 21:12:10 2003
-@@ -17,7 +17,7 @@
- #	しますが、その環境変数が設定されていない時は、ここを検索します。
- #	( ~/ は、QUASI88の起動時にホームディレクトリに展開されます )
- 
--ROMDIR	= ~/quasi88/rom/
-+ROMDIR	= ${PREFIX}/share/quasi88/rom/
- 
- 
- # DISK のありかを設定します
-@@ -28,7 +28,7 @@
- #	( なお、ここで見つからなければカレントディレクトリを検索します )
- #	( ~/ は、QUASI88の起動時にホームディレクトリに展開されます )
- 
--DISKDIR	= ~/quasi88/disk/
-+DISKDIR	= ${PREFIX}/share/quasi88/disk/
- 
- 
- # リトルエンディアンの場合の指定
diff --git a/emulators/quasi88/files/patch-arch b/emulators/quasi88/files/patch-arch
deleted file mode 100644
index 4b9c5eb0b252..000000000000
--- a/emulators/quasi88/files/patch-arch
+++ /dev/null
@@ -1,101 +0,0 @@
---- Makefile.orig	Thu Aug 17 17:58:17 2006
-+++ Makefile	Thu Aug 17 17:59:12 2006
-@@ -142,31 +142,31 @@
- #	動作確認が取れているのは、freebsd/linux のみです
- 
- #---------------------- FreeBSD
--# ARCH = freebsd
-+# OSARCH = freebsd
- #---------------------- Linux
--# ARCH = linux
-+# OSARCH = linux
- #---------------------- NetBSD
--# ARCH = netbsd
-+# OSARCH = netbsd
- #---------------------- OpenBSD
--# ARCH = openbsd
-+# OSARCH = openbsd
- #---------------------- Solaris / SunOS
--# ARCH = solaris
-+# OSARCH = solaris
- #---------------------- QNX Neutrino (QNX4\QNX6)
--# ARCH = nto
-+# OSARCH = nto
- #---------------------- OpenStep on NeXT systems
--# ARCH = next
-+# OSARCH = next
- #---------------------- OpenStep on Apple systems (Cocoa)
--# ARCH = macosx
-+# OSARCH = macosx
- #---------------------- IRIX ( with sound requires the dmedia package ) (*)
--# ARCH = irix
-+# OSARCH = irix
- #---------------------- IRIX ( with sound using the new al package) (*)
--# ARCH = irix_al
-+# OSARCH = irix_al
- #---------------------- aix ( with sound, you'll need the UMS and SOM lpp's installed ( under AIX4 ))
--# ARCH = aix
-+# OSARCH = aix
- #---------------------- BeOS on Intel
--# ARCH = beos
-+# OSARCH = beos
- #---------------------- generic unix, no sound
--ARCH = generic
-+OSARCH = generic
- 
- 
- 
-@@ -306,7 +306,7 @@
- #######################################################################
- # サウンドが有効になっている場合の各種定義
- #######################################################################
--ifneq ($(ARCH),generic)
-+ifneq ($(OSARCH),generic)
- 
- #
- # サウンド有効時の、追加オブジェクト ( OS依存部 + 共用部 )
-@@ -346,7 +346,7 @@
- #these need to be converted to plugins first
- #SOUND_OBJS.aix     = $(DSP_DIR)/aix.o
- 
--SOUND_OBJS	= $(SOUND_OBJS.$(ARCH))	\
-+SOUND_OBJS	= $(SOUND_OBJS.$(OSARCH))	\
- 		  $(DSP_DIR)/esound.o	\
- 		  $(DSP_DIR)/artssound.o\
- 		  $(DSP_DIR)/arts.o 	\
-@@ -391,7 +391,7 @@
- #these need to be converted to plugins first
- #CFLAGS.aix        = -DSYSDEP_DSP_AIX -I/usr/include/UMS -I/usr/lpp/som/include
- 
--SOUND_OPT		= -DUSE_SOUND $(CFLAGS.$(ARCH)) -I$(SRCDIR)/$(QUASI_DIR) -I$(SRCDIR)/$(SRC_DIR) -I$(SRCDIR)/$(UNIX_DIR) -I$(SRCDIR)/$(SOUND_DIR) -I$(SRCDIR)/$(SYSDEP_DIR) -I$(SRCDIR)/$(DSP_DIR) -I$(SRCDIR)/$(MIXER_DIR)
-+SOUND_OPT		= -DUSE_SOUND $(CFLAGS.$(OSARCH)) -I$(SRCDIR)/$(QUASI_DIR) -I$(SRCDIR)/$(SRC_DIR) -I$(SRCDIR)/$(UNIX_DIR) -I$(SRCDIR)/$(SOUND_DIR) -I$(SRCDIR)/$(SYSDEP_DIR) -I$(SRCDIR)/$(DSP_DIR) -I$(SRCDIR)/$(MIXER_DIR)
- 
- 
- #
-@@ -408,7 +408,7 @@
- LIBS.nto	   = -lsocket -lasound
- LIBS.beos          = `$(SDL_CONFIG) --libs`
- 
--SOUND_LIB		= -lm $(LIBS.$(ARCH))
-+SOUND_LIB		= -lm $(LIBS.$(OSARCH))
- 
- 
- #
-@@ -495,7 +495,7 @@
- 	  -DBIT32='$(TYPE_SPECIFIER_OF_32BIT)' $(JOYSTICK) $(IGNORE_OPT) \
- 	  -DQ_TITLE='"$(NAME)"' -DQ_VERSION='"$(VERSION)"' $(SELECT) \
- 	  $(MONITOR) $(SSS_CMD) $(USELOCALE) $(KEYBOARD_BUG) $(USE_FMGEN) \
--	  -D__ARCH_$(ARCH) -DPI=M_PI $(SOUND_OPT) $(CONFIG)
-+	  -D__ARCH_$(OSARCH) -DPI=M_PI $(SOUND_OPT) $(CONFIG)
- 
- CXXFLAGS += -Isrc $(X11INC) $(USEINLINE) \
- 	  -DROM_DIR='"$(ROMDIR)"' -DDISK_DIR='"$(DISKDIR)"' \
-@@ -503,7 +503,7 @@
- 	  -DBIT32='$(TYPE_SPECIFIER_OF_32BIT)' $(JOYSTICK) $(IGNORE_OPT) \
- 	  -DQ_TITLE='"$(NAME)"' -DQ_VERSION='"$(VERSION)"' $(SELECT) \
- 	  $(MONITOR) $(SSS_CMD) $(USELOCALE) $(KEYBOARD_BUG) $(USE_FMGEN) \
--	  -D__ARCH_$(ARCH) -DPI=M_PI $(SOUND_OPT) $(CONFIG)
-+	  -D__ARCH_$(OSARCH) -DPI=M_PI $(SOUND_OPT) $(CONFIG)
- 
- LIBS   = $(X11LIB) -lX11 -lXext $(DGA_LIB) $(READLINELIB) $(SOUND_LIB) $(MY_LIBS)
- 
diff --git a/emulators/quasi88/pkg-plist b/emulators/quasi88/pkg-plist
deleted file mode 100644
index aaf922d1409c..000000000000
--- a/emulators/quasi88/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/quasi88
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.TXT
-%%PORTDOCS%%%%DOCSDIR%%/FORMAT.TXT
-%%PORTDOCS%%%%DOCSDIR%%/GET-IMAGE.TXT
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY.TXT
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL.TXT
-%%PORTDOCS%%%%DOCSDIR%%/QUASI88.TXT
-%%PORTDOCS%%%%DOCSDIR%%/_quasi88rc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%