Date: Mon, 24 Jun 2002 10:07:02 +0200 (CEST) From: Stijn Hoop <stijn@win.tue.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39767: [MAINTAINER UPDATE]: emulators/zsnes Message-ID: <200206240807.g5O872VC065432@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 39767
>Category: ports
>Synopsis: [MAINTAINER UPDATE]: emulators/zsnes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 24 01:50:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Stijn Hoop
>Release: FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD pcwin002.win.tue.nl 4.6-STABLE FreeBSD 4.6-STABLE #0: Mon Jun 17 04:35:36 CEST 2002 src@pcwin002.win.tue.nl:/usr/obj/usr/src/sys/PCWIN002 i386
>Description:
- Update to 1.35
- Bump portepoch because pkg_version -t 1.337 1.35 equals '>'
>How-To-Repeat:
N/A
>Fix:
- Apply the following patch
- cvs rm -f files/patch-src::Makefile.in files/patch-src::linux::sdllink.c
diff -urN --exclude=CVS /usr/ports/emulators/zsnes/Makefile zsnes/Makefile
--- /usr/ports/emulators/zsnes/Makefile Thu Apr 18 05:33:41 2002
+++ zsnes/Makefile Mon Jun 24 09:57:11 2002
@@ -6,7 +6,8 @@
#
PORTNAME= zsnes
-PORTVERSION= 1.337
+PORTVERSION= 1.35
+PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,14 +16,12 @@
MAINTAINER= stijn@win.tue.nl
# This must be >= 0.98!
-BUILD_DEPENDS= nasm-0.98:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS= nasm-0.98.33:${PORTSDIR}/devel/nasm
LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
png.5:${PORTSDIR}/graphics/png
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_ZIP= yes
-EXTRACT_BEFORE_ARGS= -q -a
MAN1= zsnes.1
@@ -32,12 +31,9 @@
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG}
-WRKSRC= ${WRKDIR}/zsnes/src
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
GNU_CONFIGURE= yes
-ALL_TARGET=
-
-pre-configure:
- cd ${WRKSRC} && chmod +x configure
+ALL_TARGET= ALL
.include <bsd.port.mk>
diff -urN --exclude=CVS /usr/ports/emulators/zsnes/distinfo zsnes/distinfo
--- /usr/ports/emulators/zsnes/distinfo Mon Oct 29 16:17:33 2001
+++ zsnes/distinfo Mon Jun 24 09:32:49 2002
@@ -1 +1 @@
-MD5 (zsnes1337src.zip) = 0d52bb1015d8cea39effd83951423139
+MD5 (zsnes135src.tar.gz) = 669ec6ad2709f2f04e0bd5003c915cb1
diff -urN --exclude=CVS /usr/ports/emulators/zsnes/files/patch-src::Makefile.in zsnes/files/patch-src::Makefile.in
--- /usr/ports/emulators/zsnes/files/patch-src::Makefile.in Mon Oct 29 16:17:33 2001
+++ zsnes/files/patch-src::Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig Mon Oct 29 15:11:59 2001
-+++ Makefile.in Mon Oct 29 15:12:11 2001
-@@ -170,7 +170,7 @@
-
- install:
- @INSTALL@ -m 0755 @ZSNESEXE@ @prefix@/bin
-- @INSTALL@ -m 0644 linux/zsnes.man @prefix@/man
-+ @INSTALL@ -m 0644 linux/zsnes.man @prefix@/man/man1/zsnes.1
-
- clean:
- rm -f ${CHIPDIR}/*.o ${CPUDIR}/*.o ${VIDEODIR}/*.o ${GUIDIR}/*.o ${DOSDIR}/*.o ${WINDIR}/*.o ${ZIPDIR}/*.o *.o @ZSNESEXE@
diff -urN --exclude=CVS /usr/ports/emulators/zsnes/files/patch-src::linux::sdllink.c zsnes/files/patch-src::linux::sdllink.c
--- /usr/ports/emulators/zsnes/files/patch-src::linux::sdllink.c Tue May 7 22:13:42 2002
+++ zsnes/files/patch-src::linux::sdllink.c Thu Jan 1 01:00:00 1970
@@ -1,35 +0,0 @@
---- linux/sdllink.c.orig Sun Sep 23 17:42:52 2001
-+++ linux/sdllink.c Tue May 7 13:16:21 2002
-@@ -536,6 +536,11 @@
-
- for (i = 0; i < 5; i++)
- JoystickInput[i] = NULL;
-+#if 1
-+ printf("ZSNES could not find any joysticks.\n");
-+ SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-+ return FALSE;
-+#else
- // If it is possible to use SDL_NumJoysticks
- // before initialising SDL_INIT_JOYSTICK then
- // this call can be replaced with SDL_InitSubSystem
-@@ -557,6 +562,7 @@
- }
-
- return TRUE;
-+#endif
- }
-
- BOOL InitInput()
-@@ -572,7 +578,11 @@
- if (!sdl_inited)
- {
- if (SDL_Init(SDL_INIT_AUDIO | SDL_INIT_TIMER |
-- SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0)
-+ SDL_INIT_VIDEO
-+#if 0
-+| SDL_INIT_JOYSTICK
-+#endif
-+ ) < 0)
- {
- fprintf(stderr, "Could not initialize SDL!\n");
- return FALSE;
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206240807.g5O872VC065432>