From owner-svn-ports-all@FreeBSD.ORG Sat Aug 23 16:58:27 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18B884FA; Sat, 23 Aug 2014 16:58:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 031C236D1; Sat, 23 Aug 2014 16:58:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7NGwQMg018173; Sat, 23 Aug 2014 16:58:26 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7NGwPOR018162; Sat, 23 Aug 2014 16:58:25 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201408231658.s7NGwPOR018162@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 23 Aug 2014 16:58:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365758 - in head/emulators/raine: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 16:58:27 -0000 Author: riggs Date: Sat Aug 23 16:58:25 2014 New Revision: 365758 URL: http://svnweb.freebsd.org/changeset/ports/365758 QAT: https://qat.redports.org/buildarchive/r365758/ Log: - Update to version 0.51.9 - Update WWW in pkg-descr - Pet portlint PR: 192790 Submitted by: tkato432@yahoo.com Approved by: mentors (implicit) Added: head/emulators/raine/files/patch-source__alleg__png__loadpng.c (contents, props changed) head/emulators/raine/files/patch-source__savepng.c (contents, props changed) head/emulators/raine/files/patch-source__sdl__compat.h (contents, props changed) Deleted: head/emulators/raine/files/patch-makefile head/emulators/raine/files/patch-patch-source_png_savepng.c head/emulators/raine/files/patch-source__alleg__blit.c head/emulators/raine/files/patch-source__emumain.c head/emulators/raine/files/patch-source__gui__rgui.c head/emulators/raine/files/patch-source_bezel.c head/emulators/raine/files/patch-source_png_loadpng.c Modified: head/emulators/raine/Makefile head/emulators/raine/distinfo head/emulators/raine/pkg-descr head/emulators/raine/pkg-plist Modified: head/emulators/raine/Makefile ============================================================================== --- head/emulators/raine/Makefile Sat Aug 23 16:44:16 2014 (r365757) +++ head/emulators/raine/Makefile Sat Aug 23 16:58:25 2014 (r365758) @@ -2,41 +2,56 @@ # $FreeBSD$ PORTNAME= raine -PORTVERSION= 0.43.3 -PORTREVISION= 9 +PORTVERSION= 0.51.9 CATEGORIES= emulators games -MASTER_SITES= http://www.rainemu.com/html/archive/ +MASTER_SITES= GENTOO/distfiles DISTNAME= ${PORTNAME}s-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= Arcade Emulator for M68000, M68020, and Z80 based hardware +COMMENT= Arcade Emulator for M68000| M68020| and Z80 based hardware -BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm -LIB_DEPENDS= liballeg.so:${PORTSDIR}/devel/allegro \ - libpng15.so:${PORTSDIR}/graphics/png \ - libvga.so:${PORTSDIR}/graphics/svgalib +LICENSE= ART10 + +BUILD_DEPENDS= nasm>0:${PORTSDIR}/devel/nasm +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= gmake tar:bzip2 -USE_SDL= sdl -USE_GNOME= gnomehier +USES= gmake perl5 shebangfix tar:bzip2 +SHEBANG_FILES= makedep +USE_PERL5= build +USE_SDL= image ttf sdl +USE_GCC= any MAKEFILE= makefile +MAKE_ARGS= NEO="" VERBOSE=1 HAS_CONSOLE="" ONLY_FOR_ARCHS= i386 -NO_STAGE= yes -.include - post-patch: - @${REINPLACE_CMD} -e "s, [$$]_mcpu,,g" ${WRKSRC}/detect-cpu - @${REINPLACE_CMD} -e "s,sdl-config,${SDL_CONFIG},g" -e "s,/usr/share/,/share/,g" \ - ${WRKSRC}/makefile - @${REINPLACE_CMD} -e "s,/usr/share/games/raine,${DATADIR},g" \ - ${WRKSRC}/source/raine.c - @${REINPLACE_CMD} -e "s,^#ifdef GFX_SVGA,#ifdef GFX_SVGALIB,g" \ - ${WRKSRC}/source/gui/rgui.c \ - ${WRKSRC}/source/alleg/display.c \ - ${WRKSRC}/source/config.c + @${REINPLACE_CMD} -e \ + 's| [$$]_mcpu||g' ${WRKSRC}/detect-cpu + @${REINPLACE_CMD} -e \ + 's|CC=|CC?=| ; \ + s|CXX=|CXX?=| ; \ + /LD/s|gcc|$$(CXX)| ; \ + s|$$(DESTDIR)/usr|$$(DESTDIR)$$(PREFIX)| ; \ + s|$$(prefix)/games|$$(prefix)/bin| ; \ + s|$$(prefix)/share/games|$$(prefix)/share| ; \ + s|-I.*/muParser|-I$${LOCALBASE}/include| ; \ + s|^CFLAGS =|CFLAGS ?=| ; \ + s|sdl-config|$${SDL_CONFIG}|g ; \ + /LFLAGS/s|-g || ; \ + /LFLAGS/s|-lstdc++|$$(LDFLAGS)|' ${WRKSRC}/makefile + @${REINPLACE_CMD} -e \ + '/^Icon/s|=.*|=${PREFIX}/share/pixmaps/raine.png|' \ + ${WRKSRC}/raine.desktop + @${REINPLACE_CMD} -e \ + 's|/usr/share/games/raine|${DATADIR}|' ${WRKSRC}/source/raine.c + +post-install: +.for i in artwork emudx roms scripts/raine + @${ECHO_CMD} -n > ${STAGEDIR}${DATADIR}/${i}/.keep_me +.endfor + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/raine -.include +.include Modified: head/emulators/raine/distinfo ============================================================================== --- head/emulators/raine/distinfo Sat Aug 23 16:44:16 2014 (r365757) +++ head/emulators/raine/distinfo Sat Aug 23 16:58:25 2014 (r365758) @@ -1,2 +1,2 @@ -SHA256 (raines-0.43.3.tar.bz2) = ab9d38e1a5a2e73b3ef914d780015a16cddea8194f479f65236a0f4ca088c4a9 -SIZE (raines-0.43.3.tar.bz2) = 1740971 +SHA256 (raines-0.51.9.tar.bz2) = 6d58f36790025e53aa0897f21cef845b9355081fd75c9a5ce4ef96f275dd0427 +SIZE (raines-0.51.9.tar.bz2) = 2095980 Added: head/emulators/raine/files/patch-source__alleg__png__loadpng.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/raine/files/patch-source__alleg__png__loadpng.c Sat Aug 23 16:58:25 2014 (r365758) @@ -0,0 +1,29 @@ +--- source/alleg/png/loadpng.c.orig ++++ source/alleg/png/loadpng.c +@@ -322,7 +322,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + fclose(fp); +@@ -384,7 +384,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + /* If we get here, we had a problem reading the file */ +@@ -482,7 +482,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + /* If we get here, we had a problem reading the file */ Added: head/emulators/raine/files/patch-source__savepng.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/raine/files/patch-source__savepng.c Sat Aug 23 16:58:25 2014 (r365758) @@ -0,0 +1,11 @@ +--- source/savepng.c.orig ++++ source/savepng.c +@@ -203,7 +203,7 @@ + goto Error; + + /* Set error handling. */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file. */ + goto Error; + } Added: head/emulators/raine/files/patch-source__sdl__compat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/raine/files/patch-source__sdl__compat.h Sat Aug 23 16:58:25 2014 (r365758) @@ -0,0 +1,11 @@ +--- source/sdl/compat.h.orig ++++ source/sdl/compat.h +@@ -61,7 +61,7 @@ + #define stricmp strcasecmp + #define strnicmp strncasecmp + #endif +-#elif defined(DARWIN) ++#elif defined(DARWIN) || defined(__FreeBSD__) + #define stricmp strcasecmp + #define strnicmp strncasecmp + #endif Modified: head/emulators/raine/pkg-descr ============================================================================== --- head/emulators/raine/pkg-descr Sat Aug 23 16:44:16 2014 (r365757) +++ head/emulators/raine/pkg-descr Sat Aug 23 16:58:25 2014 (r365758) @@ -1,3 +1,3 @@ Arcade Emulator for M68000, M68020 and Z80 based hardware. -WWW: http://www.rainemu.com/ +WWW: http://rainemu.swishparty.co.uk/ Modified: head/emulators/raine/pkg-plist ============================================================================== --- head/emulators/raine/pkg-plist Sat Aug 23 16:44:16 2014 (r365757) +++ head/emulators/raine/pkg-plist Sat Aug 23 16:58:25 2014 (r365758) @@ -1,33 +1,22 @@ bin/raine -%%DATADIR%%/cheats.cfg -%%DATADIR%%/hiscore.dat -%%DATADIR%%/languages/brasil.cfg -%%DATADIR%%/languages/czech.cfg -%%DATADIR%%/languages/catala.cfg -%%DATADIR%%/languages/dansk.cfg -%%DATADIR%%/languages/dutch.cfg -%%DATADIR%%/languages/english.cfg -%%DATADIR%%/languages/espanol.cfg -%%DATADIR%%/languages/euskera.cfg -%%DATADIR%%/languages/finnish.cfg -%%DATADIR%%/languages/french.cfg -%%DATADIR%%/languages/french2.cfg -%%DATADIR%%/languages/german.cfg -%%DATADIR%%/languages/german2.cfg -%%DATADIR%%/languages/italian.cfg -%%DATADIR%%/languages/japanese.cfg -%%DATADIR%%/languages/polish.cfg -%%DATADIR%%/languages/portugal.cfg -%%DATADIR%%/languages/spanish.cfg -%%DATADIR%%/languages/svenska.cfg -%%DATADIR%%/languages/template.cfg -%%DATADIR%%/languages/turkish.cfg -%%DATADIR%%/languages/galego.cfg -%%DATADIR%%/raine.dat share/applications/raine.desktop share/pixmaps/raine.png -@dirrmtry %%DATADIR%%/roms -@dirrmtry %%DATADIR%%/emudx -@dirrmtry %%DATADIR%%/artwork -@dirrm %%DATADIR%%/languages -@dirrmtry %%DATADIR%% +%%DATADIR%%/artwork/.keep_me +%%DATADIR%%/bitmaps/cursor.png +%%DATADIR%%/bitmaps/raine_logo.png +%%DATADIR%%/cheats.cfg +%%DATADIR%%/emudx/.keep_me +%%DATADIR%%/fonts/Vera.ttf +%%DATADIR%%/fonts/VeraMono.ttf +%%DATADIR%%/fonts/font6x8.bin +%%DATADIR%%/hiscore.dat +%%DATADIR%%/roms/.keep_me +%%DATADIR%%/scripts/raine/.keep_me +@dirrm %%DATADIR%%/scripts/raine +@dirrm %%DATADIR%%/scripts +@dirrm %%DATADIR%%/roms +@dirrm %%DATADIR%%/fonts +@dirrm %%DATADIR%%/emudx +@dirrm %%DATADIR%%/bitmaps +@dirrm %%DATADIR%%/artwork +@dirrm %%DATADIR%%