Attachment 171109 Details for Bug 210081 – Proposed patch (since 416324 revision)

[patch] Proposed patch (since 416324 revision)

imaze.diff (text/plain), 4.25 KB, created by lightside on 2016-06-06 23:28:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-06-06 23:28:22 UTC

Size: 4.25 KB

patch

obsolete

>diff -ruN imaze.orig/Makefile imaze/Makefile
>--- imaze.orig/Makefile	2016-06-03 20:44:58.000000000 +0400
>+++ imaze/Makefile	2016-06-07 00:33:49.169561000 +0400
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	imaze
> PORTVERSION=	1.4
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	games
> MASTER_SITES=	TUCOWS/x11/entertain/ \
> 		http://www.sourcefiles.org/Games/Arcade/
>@@ -15,49 +15,31 @@
> LICENSE=	BSD4CLAUSE
> LICENSE_FILE=	${WRKSRC}/Copyright
> 
>-BROKEN=		unfetchable
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2016-07-04
> OPTIONS_DEFINE=	AUDIO JOYSTICK
>-OPTIONS_RADIO=	GUI
>-OPTIONS_RADIO_GUI=	XVIEW MOTIF
>-OPTIONS_DEFAULT=	AUDIO JOYSTICK XVIEW
>+OPTIONS_SINGLE=	GUI
>+OPTIONS_SINGLE_GUI=	ATHENA MOTIF XVIEW
>+OPTIONS_DEFAULT=	ATHENA AUDIO JOYSTICK
>+
>+ATHENA_DESC=	Athena widget library support
>+ATHENA_VARS=	TOOLKIT=athena
> AUDIO_DESC=	Audio support
>+AUDIO_CONFIGURE_OFF=	noaudio
> JOYSTICK_DESC=	Joystick support
>+JOYSTICK_CONFIGURE_OFF=	nojoystick
>+MOTIF_USES=	motif
>+MOTIF_VARS=	MOTIFLIB="-L${LOCALBASE}/lib -lXm -lXt" TOOLKIT=motif
> XVIEW_DESC=	XView widget library support
>+XVIEW_LIB_DEPENDS=	libxview.so:x11-toolkits/xview
>+XVIEW_VARS=	TOOLKIT=xview
> 
> CONFIGURE_WRKSRC=${WRKSRC}/source
> BUILD_WRKSRC=	${WRKSRC}/source
> 
>-USE_XORG=	x11 xaw xt
>+USE_XORG=	x11 xaw xmu xt
> HAS_CONFIGURE=	yes
> CONFIGURE_ARGS=	${TOOLKIT} X11Dir="${LOCALBASE}" CFlags="${CFLAGS}"
> MAKE_ENV=	SOUNDDIR="${DATADIR}/sounds"
> 
>-.include <bsd.port.options.mk>
>-
>-.if empty(PORT_OPTIONS:MAUDIO)
>-CONFIGURE_ARGS+=noaudio
>-.endif
>-
>-.if empty(PORT_OPTIONS:MJOYSTICK)
>-CONFIGURE_ARGS+=nojoystick
>-.endif
>-
>-.if empty(PORT_OPTIONS:MMOTIF) && empty(PORT_OPTIONS:MXVIEW)
>-TOOLKIT=	athena
>-.endif
>-
>-.if ${PORT_OPTIONS:MMOTIF}
>-USES+=		motif
>-TOOLKIT=	motif
>-.endif
>-
>-.if ${PORT_OPTIONS:MXVIEW}
>-LIB_DEPENDS+=	libxview.so:x11-toolkits/xview
>-TOOLKIT=	xview
>-.endif
>-
> do-install:
> .for i in genlab imaze imazesrv imazestat ninja xlabed
> 	(cd ${WRKSRC}/source && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
>diff -ruN imaze.orig/files/patch-source_Makefile.in imaze/files/patch-source_Makefile.in
>--- imaze.orig/files/patch-source_Makefile.in	2014-07-28 23:39:50.000000000 +0400
>+++ imaze/files/patch-source_Makefile.in	2016-06-06 22:56:20.441444000 +0400
>@@ -1,6 +1,6 @@
>---- source/Makefile.in.orig	Thu Dec 13 10:50:40 2001
>-+++ source/Makefile.in	Thu Dec 13 10:56:34 2001
>-@@ -43,7 +43,7 @@
>+--- source/Makefile.in.orig	2001-12-10 00:47:32 UTC
>++++ source/Makefile.in
>+@@ -43,7 +43,7 @@ Unconfigured:
>  	@echo "run ./configure first, don't use this makefile"
>  #END configure output
>  
>@@ -9,7 +9,7 @@
>  #
>  # possible values:
>  #
>-@@ -66,7 +66,7 @@
>+@@ -66,7 +66,7 @@ INSTALL=install -s -m 755
>  X11Libs=-lX11
>  #AthenaLibs=-lXaw -lXt
>  AthenaLibs=-lXaw -lXt -lXmu
>diff -ruN imaze.orig/files/patch-source_configure imaze/files/patch-source_configure
>--- imaze.orig/files/patch-source_configure	2014-07-28 23:39:50.000000000 +0400
>+++ imaze/files/patch-source_configure	2016-06-06 22:56:20.445797000 +0400
>@@ -1,6 +1,6 @@
>---- source/configure.orig	Thu Jul 24 22:06:46 2003
>-+++ source/configure	Thu Jul 24 22:10:31 2003
>-@@ -54,7 +54,7 @@
>+--- source/configure.orig	2001-12-10 00:47:37 UTC
>++++ source/configure
>+@@ -54,7 +54,7 @@ LibpathTmpl=-L@
>  MakefileIn=Makefile.in
>  MakefileOut=Makefile
>  
>diff -ruN imaze.orig/files/patch-source_fbsd_joystick.c imaze/files/patch-source_fbsd_joystick.c
>--- imaze.orig/files/patch-source_fbsd_joystick.c	2014-07-28 23:39:50.000000000 +0400
>+++ imaze/files/patch-source_fbsd_joystick.c	2016-06-06 22:56:20.450267000 +0400
>@@ -1,5 +1,5 @@
>---- source/fbsd_joystick.c.orig	Sat Jun 28 15:55:30 2003
>-+++ source/fbsd_joystick.c	Sat Jun 28 15:56:01 2003
>+--- source/fbsd_joystick.c.orig	2001-12-10 00:47:38 UTC
>++++ source/fbsd_joystick.c
> @@ -44,7 +44,7 @@
>  #include <errno.h>
>  #include <fcntl.h>
>diff -ruN imaze.orig/files/patch-source_voxware_audio.c imaze/files/patch-source_voxware_audio.c
>--- imaze.orig/files/patch-source_voxware_audio.c	2014-07-28 23:39:50.000000000 +0400
>+++ imaze/files/patch-source_voxware_audio.c	2016-06-06 22:56:20.455124000 +0400
>@@ -1,5 +1,5 @@
>---- source/voxware_audio.c.orig	Sat Jun 28 15:55:41 2003
>-+++ source/voxware_audio.c	Sat Jun 28 15:56:08 2003
>+--- source/voxware_audio.c.orig	2001-12-10 00:47:46 UTC
>++++ source/voxware_audio.c
> @@ -50,7 +50,7 @@
>  #ifdef linux
>  #include <linux/soundcard.h>

Flags:

vlad-fbsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 210081: 171109 | 171110 | 171111 | 171112 | 171394