ports/184111: [UPDATE] emulators/desmume to v0.9.9

[Alex Kozlov]

The following reply was made to PR ports/184111; it has been noted by GNATS.

From: Alex Kozlov <spam at rm-rf.kiev.ua>
To: Hardy Schumacher <hardy.schumacher at gmx.de>, llc2w at virginia.edu
Cc: bug-followup at FreeBSD.org
Subject: Re: ports/184111: [UPDATE] emulators/desmume to v0.9.9
Date: Fri, 24 Jan 2014 06:34:10 +0200

 --HcAYCG3uE/tztfnV
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi, Hardy
 
 Please check the attached patch.
 
 P.S. I can also re-assign this port to you, if you want to
 maintain it.  
 
 
 -- 
 Alex
 
 --HcAYCG3uE/tztfnV
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 - Update to 0.9.10
 - Fix build with clang
 - Convert to USES= dos2unix
 - Support STAGEDIR
 - Remove support for FreeBSD 7.x
 - Remove standard license file
 Index: emulators/desmume/Makefile
 @@ -1,8 +1,8 @@
  # Created by: Stefan Sperling <stsp at stsp.in-berlin.de>
 -# $FreeBSD: emulators/desmume/Makefile 327721 2013-09-20 16:43:52Z bapt $
 +# $FreeBSD: head/emulators/desmume/Makefile 327721 2013-09-20 16:43:52Z bapt $
  
  PORTNAME=	desmume
 -PORTVERSION=	0.9.8
 +PORTVERSION=	0.9.10
  CATEGORIES=	emulators
  MASTER_SITES=	SF
  
 @@ -10,16 +10,19 @@
  COMMENT=	Nintendo DS emulator
  
  LICENSE=	GPLv2
 -LICENSE_FILE=	${WRKSRC}/COPYING
  
 -LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 +LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
 +		libSoundTouch.so:${PORTSDIR}/audio/soundtouch
  
  USE_GL=		gl
  USE_SDL=	sdl
  USE_GNOME=	gtk20 libglade2
 -USES=		gettext gmake pkgconfig
 +USES=		dos2unix gettext gmake pkgconfig
 +DOS2UNIX_FILES=	src/utils/task.cpp
 +
  GNU_CONFIGURE=	yes
  CONFIGURE_ENV=	GMSGFMT=msgfmt DATADIRNAME=share
 +CONFIGURE_ARGS=	--enable-glade
  
  USE_AUTOTOOLS=	aclocal autoconf
  ACLOCAL_ARGS=
 @@ -29,23 +32,6 @@
  		-DHAVE_LIBGDKGLEXT_X11_1_0 -DHAVE_GL_GL_H -DHAVE_GL_GLU_H
  CXXFLAGS+=	${CFLAGS}
  
 -MAN1=		desmume-cli.1 \
 -		desmume-glade.1 \
 -		desmume.1
 -
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 -
 -.if ${ARCH} == "ia64"
 -BROKEN=		Does not compile on ia64
 -.endif
 -
 -post-patch:
 -# FreeBSD 7.x is missing strnlen(), adjusting this enables a builtin version of strnlen()
 -.if ${OSVERSION} < 800000
 -	@${REINPLACE_CMD} -e 's|#ifdef __APPLE__|#if 1|g; \
 -			/AvailabilityMacros\.h/d' \
 -		${WRKSRC}/src/utils/libfat/directory.cpp
 -.endif
 +BROKEN_ia64=	Does not compile on ia64
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: emulators/desmume/distinfo
 @@ -1,2 +1,2 @@
 -SHA256 (desmume-0.9.8.tar.gz) = 78363468a2d5efba95de57739a9c81a3757ecd76c2a183ec68336e30d47a5e01
 -SIZE (desmume-0.9.8.tar.gz) = 3677290
 +SHA256 (desmume-0.9.10.tar.gz) = 8900a7a1fc849fdd33b014748dd97a6cda4c32548b8d2e06511e6ed8d5ba7445
 +SIZE (desmume-0.9.10.tar.gz) = 4141586
 Index: emulators/desmume/files/patch-src_gtk_glx_3Demu.cpp
 @@ -0,0 +1,14 @@
 +--- src/gtk/glx_3Demu.cpp.orig	2013-11-28 01:36:53.712615000 +0100
 ++++ src/gtk/glx_3Demu.cpp	2013-12-14 20:08:01.000000000 +0100
 +@@ -41,11 +41,7 @@
 +         glXDestroyContext(dpy, ctx);
 + 
 +         XCloseDisplay(dpy);
 +-
 +-        return true;
 +     }
 +-
 +-    return false;
 + }
 + 
 + int init_glx_3Demu(void) 
 Index: emulators/desmume/files/patch-src_utils_task.cpp
 @@ -0,0 +1,22 @@
 +--- src/utils/task.cpp.orig	2013-11-28 01:37:27.373159000 +0100
 ++++ src/utils/task.cpp	2013-12-14 19:49:02.000000000 +0100
 +@@ -26,6 +26,7 @@
 + #if defined HOST_LINUX || defined HOST_DARWIN
 + #include <unistd.h>
 + #elif defined HOST_BSD
 ++#include <iostream>
 + #include <sys/sysctl.h>
 + #endif
 + #endif // HOST_WINDOWS
 +@@ -41,9 +42,8 @@
 + 	return sysconf(_SC_NPROCESSORS_ONLN);
 + #elif defined HOST_BSD
 + 	int cores;
 +-	const int mib[4] = { CTL_HW, HW_NCPU, 0, 0 };
 +-	const size_t len = sizeof(cores);
 +-	sysctl(mib, 2, &cores, &len, NULL, 0);
 ++	size_t len = sizeof(cores);
 ++	sysctlbyname("hw.ncpu", &cores, &len, NULL, 0);
 + 	return (cores < 1) ? 1 : cores;
 + #else
 + 	return 1;
 Index: emulators/desmume/pkg-plist
 @@ -1,6 +1,9 @@
  bin/desmume
  bin/desmume-cli
  bin/desmume-glade
 +man/man1/desmume-cli.1.gz
 +man/man1/desmume-glade.1.gz
 +man/man1/desmume.1.gz
  share/applications/desmume-glade.desktop
  share/applications/desmume.desktop
  %%DATADIR%%/glade/DeSmuME.xpm
 
 --HcAYCG3uE/tztfnV--