6 files changed, 7 insertions, 114 deletions

diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index c512a12dc26d..05da016fca51 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	xsystem35
-PORTVERSION=	1.7.2
-PORTREVISION=	19
+DISTVERSION=	1.7.3-pre5
 CATEGORIES=	emulators games
-MASTER_SITES=	http://8ne.sakura.ne.jp:20008/chika/unitbase/xsys35/down/
+MASTER_SITES=	DEBIAN
+DISTNAME=	${PORTNAME}_${DISTVERSION}.orig
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AliceSoft System 3.5/3.6/3.8/3.9 on X Window System
@@ -32,7 +32,7 @@ SHEBANG_FILES=	contrib/instgame
 USE_GNOME=	gtk12
 USE_XORG=	x11 xext xxf86vm
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-included-gettext \
+CONFIGURE_ARGS=	\
 		--with-cachesize=20 \
 		--disable-static \
 		--enable-audio=oss \
@@ -41,11 +41,11 @@ CONFIGURE_ARGS=	--without-included-gettext \
 		--enable-cdrom=bsd,mp3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 SUB_FILES=	pkg-message
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
 
 post-patch:
diff --git a/emulators/xsystem35/distinfo b/emulators/xsystem35/distinfo
index 0e4bf8f2243a..f034eebbe8a9 100644
--- a/emulators/xsystem35/distinfo
+++ b/emulators/xsystem35/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xsystem35-1.7.2.tar.gz) = e7f3b5f79269f27b59417c25bb97766390e3e6c82314f7f9ab73873e5961010b
-SIZE (xsystem35-1.7.2.tar.gz) = 990167
+SHA256 (xsystem35_1.7.3-pre5.orig.tar.gz) = 412ff3944d8285d7135f8c2fb14a76d84cb56c62add501d80c9f819cc8a5f2c3
+SIZE (xsystem35_1.7.3-pre5.orig.tar.gz) = 1247568
diff --git a/emulators/xsystem35/files/patch-src_cmd2F.c b/emulators/xsystem35/files/patch-src_cmd2F.c
deleted file mode 100644
index 13bbf1481182..000000000000
--- a/emulators/xsystem35/files/patch-src_cmd2F.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/cmd2F.c.orig	Mon Jul 21 02:30:16 2003
-+++ src/cmd2F.c	Thu Jun 14 13:05:15 2007
-@@ -1381,7 +1381,7 @@
- 
- 	for (i = 0; i < eNumof; i++) {
- 		*vData = LittleEndian_getW(nact->datatbl_addr, 0);
--		((WORD *)nact->datatbl_addr)++;
-+		nact->datatbl_addr += sizeof(WORD);
- 		vData++;
- 	}
- 	
-@@ -1397,14 +1397,14 @@
- 	
- 	for (i = 0; i < eNumof; i++) {
- 		v_strcpy(eStrNum + i -1, (const char *)(nact->datatbl_addr));
--		(char *)(nact->datatbl_addr) += (strlen((const char *)nact->datatbl_addr) + 1);
-+		nact->datatbl_addr += (strlen((const char *)nact->datatbl_addr) + 1);
- 	}
- }
- 
- void commands2F83() {
- 	int eNumof  = sys_getCaliValue();
- 
--	((WORD *)nact->datatbl_addr) += eNumof;
-+	nact->datatbl_addr += eNumof * sizeof(WORD);
- 	
- 	DEBUG_COMMAND("dataSkipWORD %d:\n", eNumof);
- }
-@@ -1414,7 +1414,7 @@
- 	int i;
- 	
- 	for (i = 0; i < eNumof; i++) {
--		(char *)(nact->datatbl_addr) += (strlen((const char *)nact->datatbl_addr) + 1);
-+		nact->datatbl_addr += (strlen((const char *)nact->datatbl_addr) + 1);
- 	}
- 	
- 	DEBUG_COMMAND("dataSkipString %d:\n", eNumof);
diff --git a/emulators/xsystem35/files/patch-src_cmdf.c b/emulators/xsystem35/files/patch-src_cmdf.c
deleted file mode 100644
index 88cc4a2e0088..000000000000
--- a/emulators/xsystem35/files/patch-src_cmdf.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/cmdf.c.orig	Sat Dec 21 18:28:35 2002
-+++ src/cmdf.c	Thu Jun 14 13:03:47 2007
-@@ -82,22 +82,22 @@
- 	DEBUG_COMMAND("F1 %d,%d:\n", str_number, skip);
- 	
- 	for (i = 0; i < skip; i++) {
--		(char *)(nact->datatbl_addr) += (strlen((const char *)nact->datatbl_addr) + 1);
-+		nact->datatbl_addr += (strlen((const char *)nact->datatbl_addr) + 1);
- 	}
- 	
- 	v_strcpy(str_number - 1 , (const char *)(nact->datatbl_addr));
--	(char *)(nact->datatbl_addr) += (strlen((const char *)nact->datatbl_addr) + 1);
-+	nact->datatbl_addr += (strlen((const char *)nact->datatbl_addr) + 1);
- }
- 
- static void commandF2() {
- 	int *read_var = sys_getCaliVariable();
- 	int skip      = sys_getCaliValue();
- 	
--	((WORD *)nact->datatbl_addr) += skip;
-+	nact->datatbl_addr += skip * sizeof(WORD);
- 	
- 	*read_var = LittleEndian_getW(nact->datatbl_addr, 0);
- 	
--	((WORD *)nact->datatbl_addr)++;
-+	nact->datatbl_addr += sizeof(WORD);
- 	
- 	DEBUG_COMMAND("F2 %d,%d:\n", *read_var, skip);
- }
-@@ -118,7 +118,7 @@
- 	
- 	for (i = 0; i < count; i++) {
- 		*read_var = LittleEndian_getW(nact->datatbl_addr, 0);
--		((WORD *)nact->datatbl_addr)++;
-+		nact->datatbl_addr += sizeof(WORD);
- 		read_var++;
- 	}
- 	
-@@ -155,7 +155,7 @@
- 	for (i = 0; i < count; i++) {
- 		for (j = 0; j < data_width; j++) {
- 			*(F6Index[j] + i) = LittleEndian_getW(nact->datatbl_addr, 0);
--			((WORD *)nact->datatbl_addr)++;
-+			nact->datatbl_addr += sizeof(WORD);
- 		}
- 	}
- 	
diff --git a/emulators/xsystem35/files/patch-src_font_freetype2.c b/emulators/xsystem35/files/patch-src_font_freetype2.c
deleted file mode 100644
index c2a84ac76885..000000000000
--- a/emulators/xsystem35/files/patch-src_font_freetype2.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/font_freetype2.c.orig	Mon Jul 21 04:30:16 2003
-+++ src/font_freetype2.c	Sat Aug 14 05:11:39 2004
-@@ -26,7 +26,8 @@
- #include <stdio.h>
- #include <string.h>
- #include <glib.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- #include "portab.h"
- #include "system.h"
diff --git a/emulators/xsystem35/files/patch-src_tempname.c b/emulators/xsystem35/files/patch-src_tempname.c
deleted file mode 100644
index ad7ab18f1c0b..000000000000
--- a/emulators/xsystem35/files/patch-src_tempname.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tempname.c.orig	Mon Nov 10 00:06:13 2003
-+++ src/tempname.c	Sun Aug 15 02:36:09 2004
-@@ -112,7 +112,7 @@
-    uintmax_t is only 32 bits lose about 3.725 bits of randomness,
-    which is better than not having mkstemp at all.  */
- #if !defined UINT64_MAX && !defined uint64_t
--# define uint64_t uintmax_t
-+# define uint64_t u_int64_t
- #endif
- 
- /* These are the characters used in temporary filenames.  */