dosbox-x: remove (available as emulators/dosbox-x)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: dosbox-x: remove (available as emulators/dosbox-x)
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Tue, 01 Oct 2019 18:48:45 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Tue Oct 1 20:48:45 2019 +0200
Changeset:	d26787e1548b794d9e4b90f2c20814e8feb77a35

Modified Files:
	Makefile
Removed Files:
	dosbox-x/DESCR
	dosbox-x/Makefile
	dosbox-x/PLIST
	dosbox-x/distinfo
	dosbox-x/patches/patch-configure.ac
	dosbox-x/patches/patch-include_byteorder.h
	dosbox-x/patches/patch-include_dos__inc.h

Log Message:
dosbox-x: remove (available as emulators/dosbox-x)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d26787e1548b794d9e4b90f2c20814e8feb77a35

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                   |  1 -
 dosbox-x/DESCR                             | 13 ----
 dosbox-x/Makefile                          | 42 -------------
 dosbox-x/PLIST                             |  5 --
 dosbox-x/distinfo                          |  9 ---
 dosbox-x/patches/patch-configure.ac        | 96 ------------------------------
 dosbox-x/patches/patch-include_byteorder.h | 20 -------
 dosbox-x/patches/patch-include_dos__inc.h  | 17 ------
 8 files changed, 203 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 45d96cb2a6..bd6aa0c5fe 100644
--- a/Makefile
+++ b/Makefile
@@ -649,7 +649,6 @@ SUBDIR+=	dolphin5
 SUBDIR+=	doomlegacy-devel
 SUBDIR+=	doorman
 SUBDIR+=	dosbox-svn
-SUBDIR+=	dosbox-x
 SUBDIR+=	dosemu2
 SUBDIR+=	dotclear
 SUBDIR+=	dotproject
diff --git a/dosbox-x/DESCR b/dosbox-x/DESCR
deleted file mode 100644
index 81829da7dd..0000000000
--- a/dosbox-x/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-As a fork of DOSBox, it retains compatibility with the wide base
-of DOS games and DOS gaming DOSBox was designed for. DOSBox-X
-however goes further, with a focus on accurate emulation of the
-hardware and many more ways to tweak and configure the DOS virtual
-machine! We believe that a better way to emulate the legacy PC
-platform is to give the user all the options they need to emulate
-everything from original IBM PC hardware with 64KB of RAM all the
-way up to late 90's hardware, whatever it takes to get that game
-or software package to run. Our goal is to eventually make DOSBox-X
-a complete emulation package that covers all pre-2000 DOS and
-Windows 9x based hardware scenarios, including peripherals,
-motherboards, CPUs, and all manner of hardware that was made for
-PC hardware of that time.
diff --git a/dosbox-x/Makefile b/dosbox-x/Makefile
deleted file mode 100644
index 36a691d785..0000000000
--- a/dosbox-x/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD$
-
-GITHUB_PROJECT=	dosbox-x
-PKGNAME=	dosbox-x-0.82.21
-DISTNAME=	${GITHUB_TAG}
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_GITHUB:=joncampbell123/}
-GITHUB_TAG=	dosbox-x-v${PKGVERSION_NOREV}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://dosbox-x.com/
-COMMENT=	DOSBox with accurate emulation and wide testing
-LICENSE=	gnu-gpl-v2
-
-WRKSRC=			${WRKDIR}/dosbox-x-${GITHUB_TAG}
-GNU_CONFIGURE=		yes
-# dosbox-x uses a modified SDL1 or system SDL2
-CONFIGURE_ARGS+=	--enable-sdl2
-USE_TOOLS+=		autoconf automake pkg-config
-USE_LANGUAGES=		c c++
-LIBS.NetBSD+=		-lcompat
-
-PKGCONFIG_OVERRIDE+=	vs2015/libpng/libpng.pc.in
-PKGCONFIG_OVERRIDE+=	vs2015/sdl/sdl.pc.in
-PKGCONFIG_OVERRIDE+=	vs2015/sdl2/sdl2.pc.in
-PKGCONFIG_OVERRIDE+=	vs2015/sdlnet/SDL_net.pc.in
-PKGCONFIG_OVERRIDE+=	vs2015/zlib/zlib.pc.in
-
-CHECK_PORTABILITY_SKIP+=	vs2015/sdl2/build-scripts/androidbuildlibs.sh
-CHECK_PORTABILITY_SKIP+=	vs2015/sdl2/build-scripts/iosbuild.sh
-
-NOT_PAX_MPROTECT_SAFE=	bin/dosbox-x
-
-pre-configure:
-	cd ${WRKSRC} && ${SH} autogen.sh
-
-.include "../../audio/fluidsynth/buildlink3.mk"
-.include "../../devel/SDL2/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
-#.include "../../net/SDL2_net/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/dosbox-x/PLIST b/dosbox-x/PLIST
deleted file mode 100644
index 82fbb25f62..0000000000
--- a/dosbox-x/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD$
-bin/dosbox-x
-share/dosbox-x/CHANGELOG
-share/dosbox-x/FREECG98.BMP
-share/dosbox-x/dosbox.reference.conf
diff --git a/dosbox-x/distinfo b/dosbox-x/distinfo
deleted file mode 100644
index e76d62e518..0000000000
--- a/dosbox-x/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-SHA1 (dosbox-x-v0.82.21.tar.gz) = 9d772be915a2f39f8fc3f6a184d8837244f1fb0c
-RMD160 (dosbox-x-v0.82.21.tar.gz) = 21a77015f91850f3620b6f4ae6951af0c65bbcba
-SHA512 (dosbox-x-v0.82.21.tar.gz) = 0e1327334a7c88bc8ea6abdad006fd8d244a0aa35993411be8a85dc9de973c61d93d2d3b071ff4380fe30694ac8f5e3e69351c8ae2be816c2e5e5fb382897179
-Size (dosbox-x-v0.82.21.tar.gz) = 36366797 bytes
-SHA1 (patch-configure.ac) = 12028b528aa1f4b4d13a25c144954d9f69755e6b
-SHA1 (patch-include_byteorder.h) = 86eccfbc2318ddc8d71a6de8723947a48d98a126
-SHA1 (patch-include_dos__inc.h) = 26ba2b11dcfa923085f3745b0f8aca542f5dc692
diff --git a/dosbox-x/patches/patch-configure.ac b/dosbox-x/patches/patch-configure.ac
deleted file mode 100644
index cbe13fe0a8..0000000000
--- a/dosbox-x/patches/patch-configure.ac
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD$
-
-Fix == test in configure script.
-
---- configure.ac.orig	2019-06-01 03:37:41.000000000 +0000
-+++ configure.ac
-@@ -171,7 +171,7 @@ CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-O
- CXXFLAGS=["`echo $CXXFLAGS' ' | sed -e 's/-O[^ ]* //g'`"]
- 
- if test x$enable_optimize != xno; then
--    if test x$enable_emscripten == xyes; then
-+    if test x$enable_emscripten = xyes; then
- 	    CFLAGS="$CFLAGS -Os"
- 	    CXXFLAGS="$CXXFLAGS -Os"
-     else
-@@ -180,21 +180,21 @@ if test x$enable_optimize != xno; then
-     fi
- fi
- 
--if test x$enable_emscripten == xyes; then
-+if test x$enable_emscripten = xyes; then
- 	AC_DEFINE(C_EMSCRIPTEN,1,[Targeting Emscripten])
- fi
- 
- dnl Some stuff for the icon.
- case "$host" in
-     *-*-cygwin* | *-*-mingw32*)
--    if test x$enable_hx == xyes; then
-+    if test x$enable_hx = xyes; then
-         CXXFLAGS="$CXXFLAGS -DHX_DOS"
-         AC_DEFINE(C_HX_DOS,1,[Targeting HX DOS extender])
-     fi
-     ;;
- esac
- 
--if test x$enable_force_menu_sdldraw == xyes; then
-+if test x$enable_force_menu_sdldraw = xyes; then
-     CXXFLAGS="$CXXFLAGS -DFORCE_SDLDRAW"
-     AC_DEFINE(C_FORCE_MENU_SDLDRAW,1,[Force SDL drawn menus])
- fi
-@@ -297,7 +297,7 @@ case "$host" in
-        ;;
- esac
- 
--if test x$enable_emscripten == xyes; then
-+if test x$enable_emscripten = xyes; then
-     CXXFLAGS="$CXXFLAGS"
- else
-     dnl Some default CPU flags
-@@ -419,8 +419,8 @@ case "$host" in
- esac
- fi
- 
--AM_CONDITIONAL(MACOSX, test x"$macosx" == x"1")
--AM_CONDITIONAL(EMSCRIPTEN, test x"$enable_emscripten" == x"yes")
-+AM_CONDITIONAL(MACOSX, test x"$macosx" = x"1")
-+AM_CONDITIONAL(EMSCRIPTEN, test x"$enable_emscripten" = x"yes")
- 
- dnl The target cpu checks for dynamic cores
- AH_TEMPLATE(C_TARGETCPU,[The type of cpu this target has])
-@@ -611,7 +611,7 @@ fi
- dnl FEATURE: xBRZ
- AH_TEMPLATE(C_XBRZ,[Define to 1 to enable XBRZ scaler])
- AC_ARG_ENABLE(xbrz,AC_HELP_STRING([--enable-xbrz],[compile with xBRZ scaler (default yes)]),enable_xbrz=$enableval,enable_xbrz=yes)
--AM_CONDITIONAL(C_XBRZ, test "x$enable_xbrz" == "xyes")
-+AM_CONDITIONAL(C_XBRZ, test "x$enable_xbrz" = "xyes")
- if test x$enable_emscripten != xyes; then
-   if test x$enable_xbrz = xyes; then
-     AC_DEFINE(C_XBRZ,1)
-@@ -621,7 +621,7 @@ fi
- dnl FEATURE: xBRZ
- AH_TEMPLATE(C_SCALER_FULL_LINE,[Define to 1 to alter the simpler render scalers to operate only on the full scanline instead of detecting differences. This is a performance adjustment for slow or embedded systems])
- AC_ARG_ENABLE(scaler-full-line,AC_HELP_STRING([--enable-scaler-full-line],[scaler render full line instead of detecting changes, for slower systems]),enable_scaler_full_line=$enableval,enable_scaler_full_line=no)
--AM_CONDITIONAL(C_SCALER_FULL_LINE, test "x$enable_scaler_full_line" == "xyes")
-+AM_CONDITIONAL(C_SCALER_FULL_LINE, test "x$enable_scaler_full_line" = "xyes")
- if test x$enable_scaler_full_line = xyes; then
-   AC_DEFINE(C_SCALER_FULL_LINE,1)
- fi
-@@ -663,7 +663,7 @@ else
-   enable_mt32=no
-   AC_MSG_RESULT(no)
- fi 
--AM_CONDITIONAL(C_MT32, test "x$enable_mt32" == "xyes")
-+AM_CONDITIONAL(C_MT32, test "x$enable_mt32" = "xyes")
- 
- dnl NASM (Netwide Assembler)
- AC_PATH_PROG([NASM], [nasm])
-@@ -993,7 +993,7 @@ else
-   AC_MSG_RESULT(no)
- fi
- 
--AM_CONDITIONAL(C_DIRECT3D, test x"$do_d3d" == x"1")
-+AM_CONDITIONAL(C_DIRECT3D, test x"$do_d3d" = x"1")
- 
- AH_TEMPLATE(C_ICONV,[Define to 1 to use GNU libiconv])
- if test x$have_iconv_h = xyes; then
diff --git a/dosbox-x/patches/patch-include_byteorder.h b/dosbox-x/patches/patch-include_byteorder.h
deleted file mode 100644
index 329aedfa0b..0000000000
--- a/dosbox-x/patches/patch-include_byteorder.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Include the correct endian.h on NetBSD.
-
---- include/byteorder.h.orig	2018-11-22 06:17:27.000000000 +0000
-+++ include/byteorder.h
-@@ -115,11 +115,11 @@
- #define _BSD_SOURCE
- #include <endian.h>
- 
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || defined(__NetBSD__)
- 
- #include <sys/endian.h>
- 
--#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 
- #include <sys/endian.h>
- 
diff --git a/dosbox-x/patches/patch-include_dos__inc.h b/dosbox-x/patches/patch-include_dos__inc.h
deleted file mode 100644
index c2c46f7166..0000000000
--- a/dosbox-x/patches/patch-include_dos__inc.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Use ftello and fseeko on NetBSD.
-
---- include/dos_inc.h.orig	2019-04-06 04:12:19.000000000 +0000
-+++ include/dos_inc.h
-@@ -290,6 +290,10 @@ static INLINE Bit16u DOS_PackDate(Bit16u
-  #define fopen64 fopen
-  #define ftello64 ftello
-  #define fseeko64 fseeko
-+#elif defined (__NetBSD__)
-+ #define fopen64 fopen
-+ #define ftello64 ftello
-+ #define fseeko64 fseeko
- #elif defined (_MSC_VER)
-  #define fopen64 fopen
-  #if (_MSC_VER >= 1400)
Prev by Date: py-iniparse: python3-compatible py-iniparse (textproc/py-iniparse + patches from Fedora).
Next by Date: lapack: style fix (tabs for spaces)
Previous by Thread: py-iniparse: python3-compatible py-iniparse (textproc/py-iniparse + patches from Fedora).
Next by Thread: lapack: style fix (tabs for spaces)
Indexes:
Home | Main Index | Thread Index | Old Index