Attachment 154946 Details for Bug 196735 – Updated patch to clean up options and fix license

[patch] Updated patch to clean up options and fix license

snes9x-gtk.diff.txt (text/plain), 3.59 KB, created by Thomas Zander on 2015-03-29 04:39:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2015-03-29 04:39:00 UTC

Size: 3.59 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 382565)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	snes9x
> PORTVERSION=	1.53r81
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	emulators
> MASTER_SITES=	http://snes9x-gtk.googlecode.com/files/
> PKGNAMESUFFIX=	-gtk
>@@ -12,67 +12,56 @@
> MAINTAINER=	root@cooltrainer.org
> COMMENT=	Super Nintendo Entertainment System(SNES) Emulator
> 
>+LICENSE=	Snes9x
>+LICENSE_NAME=	Snes9x License
>+LICENSE_FILE=	${WRKDIR}/${DISTNAME}/docs/snes9x-license.txt
>+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
>+
> LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
> 
> USE_XORG=	x11 sm ice xext
>-USES=		gettext gmake perl5 desktop-file-utils pkgconfig tar:bzip2
>+USES=		gettext gmake perl5 desktop-file-utils pkgconfig tar:bzip2 desktop-file-utils
> USE_GNOME=	gtk20 intltool libglade2 libxml2
> GNU_CONFIGURE=	yes
>-USE_SDL=	sdl
>+USE_SDL=	sdl2
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>-CONFIGURE_ARGS+=	--without-alsa
> 
> WRKSRC=		${WRKDIR}/${DISTNAME}/gtk
>+NO_CDROM=	Commercial users must seek permission from copyright holders.
> 
>-OPTIONS_DEFINE=	DEBUG OPENGL JMA NETPLAY XV XRANDR
>+OPTIONS_DEFINE=	DEBUG OPENGL JMA NETPLAY XV XRANDR ALSA PORTAUDIO PULSEAUDIO
> OPTIONS_DEFAULT=	JMA NETPLAY XV XRANDR
> JMA_DESC=	Enable JMA archive decompression support
> NETPLAY_DESC=	Enable network support
> XV_DESC=	Enable XVideo output on GTK
> XRANDR_DESC=	Enable XRandR support on GTK
>+PORTAUDIO_DESC=	Enable PortAudio support
>+GTK2_DESC=	Use GTK 2.x interface toolkit
> 
>-.include <bsd.port.pre.mk>
>+DEBUG_CONFIGURE_WITH=	debug
>+OPENGL_CONFIGURE_WITH=	opengl
>+OPENGL_USE=	GL=glu
>+JMA_CONFIGURE_WITH=	jma-decomp
>+NETPLAY_CONFIGURE_WITH=	netplay
>+XV_CONFIGURE_WITH=	xv
>+XV_USE=	XORG=xv
>+XRANDR_CONFIGURE_WITH=	xrandr
>+XRANDR_USE=	XORG=xrandr
>+ALSA_CONFIGURE_WITH=	alsa
>+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
>+ALSA_USES=	compiler:c++11-lang
>+PORTAUDIO_CONFIGURE_WITH=	portaudio
>+PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
>+PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
>+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
> 
>-.if ${PORT_OPTIONS:MDEBUG}
>-CONFIGURE_ARGS+=	--with-debug
>-.else
>-CONFIGURE_ARGS+=	--without-debug
>-.endif
>+PLIST_FILES=	bin/snes9x-gtk \
>+		share/pixmaps/snes9x.svg \
>+		share/applications/snes9x.desktop
> 
>-.if ${PORT_OPTIONS:MOPENGL}
>-CONFIGURE_ARGS+=	--with-opengl
>-USE_GL=	glu
>-.else
>-CONFIGURE_ARGS+=	--without-opengl
>-.endif
>+.include <bsd.port.pre.mk>
> 
>-.if ${PORT_OPTIONS:MJMA}
>-CONFIGURE_ARGS+=	--with-jma-decomp
>-.else
>-CONFIGURE_ARGS+=	--without-jma-decomp
>-.endif
>-
>-.if ${PORT_OPTIONS:MNETPLAY}
>-CONFIGURE_ARGS+=	--with-netplay
>-.else
>-CONFIGURE_ARGS+=	--without-netplay
>-.endif
>-
>-.if ${PORT_OPTIONS:MXV}
>-CONFIGURE_ARGS+=	--with-xv
>-USE_XORG+=	xv
>-.else
>-CONFIGURE_ARGS+=	--without-xv
>-.endif
>-
>-.if ${PORT_OPTIONS:MXRANDR}
>-CONFIGURE_ARGS+=	--with-xrandr
>-USE_XORG+=	xrandr
>-.else
>-CONFIGURE_ARGS+=	--without-xrandr
>-.endif
>-
> .if exists(/usr/lib/libusbhid.a)
> CONFIGURE_ARGS+=	--with-joystick
> .else
>@@ -87,7 +76,4 @@
> 	${INSTALL_DATA} ${WRKSRC}/data/snes9x.desktop \
> 		${STAGEDIR}${PREFIX}/share/applications
> 
>-post-install:
>-	-@update-desktop-database
>-
> .include <bsd.port.post.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 382565)
>+++ pkg-plist	(working copy)
>@@ -1,5 +0,0 @@
>-bin/snes9x-gtk
>-share/pixmaps/snes9x.svg
>-share/applications/snes9x.desktop
>-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Flags:

riggs: maintainer-approval? (root)

Actions: View | Diff

Attachments on bug 196735: 151642 | 151643 | 151646 | 154179 | 154180 | 154181 | 154182 | 154939 | 154940 | 154946