From owner-svn-ports-all@FreeBSD.ORG Thu Jan 16 20:34:08 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 212CE88E; Thu, 16 Jan 2014 20:34:08 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 019351633; Thu, 16 Jan 2014 20:34:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GKY7sC087339; Thu, 16 Jan 2014 20:34:07 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GKY6JP087330; Thu, 16 Jan 2014 20:34:06 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201401162034.s0GKY6JP087330@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Thu, 16 Jan 2014 20:34:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339980 - in head/emulators/gens: . 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.17 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: Thu, 16 Jan 2014 20:34:08 -0000 Author: danilo Date: Thu Jan 16 20:34:06 2014 New Revision: 339980 URL: http://svnweb.freebsd.org/changeset/ports/339980 QAT: https://qat.redports.org/buildarchive/r339980/ Log: - Update from 2.12a to 2.15.5 - Add LICENSE - Convert USE_GMAKE to USES PR: ports/185343 Submitted by: KATO Tsuguru Added: head/emulators/gens/files/patch-src__gens__segacd__cd_aspi.c (contents, props changed) Deleted: head/emulators/gens/files/gens.in head/emulators/gens/files/patch-Makefile Modified: head/emulators/gens/Makefile (contents, props changed) head/emulators/gens/distinfo (contents, props changed) head/emulators/gens/pkg-descr (contents, props changed) head/emulators/gens/pkg-plist (contents, props changed) Modified: head/emulators/gens/Makefile ============================================================================== --- head/emulators/gens/Makefile Thu Jan 16 20:23:30 2014 (r339979) +++ head/emulators/gens/Makefile Thu Jan 16 20:34:06 2014 (r339980) @@ -2,42 +2,44 @@ # $FreeBSD$ PORTNAME= gens -PORTVERSION= 2.12a -PORTREVISION= 10 +PORTVERSION= 2.15.5 CATEGORIES= emulators -MASTER_SITES= SF/${PORTNAME}/Gens%20Source%20Code/Gens%20WIP%20linux -DISTNAME= Gens212a1SrcL +MASTER_SITES= SF/${PORTNAME}/Gens%20Source%20Code/Gens%20${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Sega Genesis/CD/32X emulator +LICENSE= GPLv2 + BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -WRKSRC= ${WRKDIR}/${PORTNAME}_linux/${PORTNAME} -USE_ZIP= yes -USE_SDL= sdl -USE_GNOME= gtk20 -USE_GMAKE= yes +OPTIONS_DEFINE= DOCS ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS_REASON= uses i386 assembly code + +USES= gmake pkgconfig +USE_GNOME= gtk20 +USE_GL= gl +USE_SDL= sdl +GNU_CONFIGURE= yes + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +DESKTOP_ENTRIES="Gens" "" "${DATADIR}/gens_small.png" "${PORTNAME}" "" "" + +.include -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|%%LDFLAGS%%|${LDFLAGS}|' ${WRKSRC}/Makefile - @${CAT} ${FILESDIR}/gens.in | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' > ${WRKDIR}/gens - -do-install: - ${MKDIR} ${PREFIX}/share/gens - ${MKDIR} ${PREFIX}/share/gens/resource - ${INSTALL_SCRIPT} ${WRKDIR}/gens ${PREFIX}/bin/gens - ${INSTALL_PROGRAM} ${WRKSRC}/gens ${PREFIX}/share/gens/gens - ${INSTALL_DATA} ${WRKSRC}/resource/* ${PREFIX}/share/gens/resource -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_linux/README ${DOCSDIR}/README -.endif +.for i in gens_core/sound/ym2612.h mp3_dec/mpg123.h + @${REINPLACE_CMD} -e \ + 's|\(^#define INLINE\).*|\1 static inline|' \ + ${WRKSRC}/src/gens/${i} +.endfor + +post-install: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) .include Modified: head/emulators/gens/distinfo ============================================================================== --- head/emulators/gens/distinfo Thu Jan 16 20:23:30 2014 (r339979) +++ head/emulators/gens/distinfo Thu Jan 16 20:34:06 2014 (r339980) @@ -1,2 +1,3 @@ -SHA256 (Gens212a1SrcL.zip) = 49a745afab2c2d7c4c7cc7cffd025cb934e1c34011a0b3e41ec4b538d77e5338 -SIZE (Gens212a1SrcL.zip) = 572647 +MD5 (gens-2.15.5.tar.gz) = 1496a49be056d65bf76b52de62e932d7 +SHA256 (gens-2.15.5.tar.gz) = 51910d3056da9ffbb2c01cfec064998c9a4cad0cb379d703ec1b93c83dba305a +SIZE (gens-2.15.5.tar.gz) = 741852 Added: head/emulators/gens/files/patch-src__gens__segacd__cd_aspi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/gens/files/patch-src__gens__segacd__cd_aspi.c Thu Jan 16 20:34:06 2014 (r339980) @@ -0,0 +1,116 @@ +--- src/gens/segacd/cd_aspi.c.orig ++++ src/gens/segacd/cd_aspi.c +@@ -8,6 +8,8 @@ + #include "cd_aspi.h" + #include "mem_s68k.h" + ++#ifdef linux ++ + #define HIBYTE(x) x >> 8 + #define LOBYTE(x) x & 0xff + void Sleep (int i); +@@ -760,3 +762,104 @@ + + CD_Present = 0; + } ++ ++#else ++ ++int CUR_DEV; ++int Num_CD_Drive; ++ ++int ++ASPI_Close_Tray_CDD_cC_COMP (SRB_ExecSCSICmd * s) ++{ ++ return -1; ++} ++ ++int ++ASPI_End (void) ++{ ++ return 1; ++} ++ ++int ++ASPI_Fast_Seek_COMP (SRB_ExecSCSICmd * s) ++{ ++ return 0; ++} ++ ++void ++ASPI_Flush_Cache_CDC (void) ++{ ++ return; ++} ++ ++int ++ASPI_Init (void) ++{ ++ Num_CD_Drive = 0; ++ return 0; ++} ++ ++int ++ASPI_Lock (int flock) ++{ ++ return 5; ++} ++ ++int ++ASPI_Open_Tray_CDD_cD_COMP (SRB_ExecSCSICmd * s) ++{ ++ return -1; ++} ++ ++void ++ASPI_Read_One_LBA_CDC (void) ++{ ++ return; ++} ++ ++void ++ASPI_Reset_Drive (char *buf) ++{ ++ return; ++} ++ ++int ++ASPI_Seek (int pos, int async, ++ int (*PostProc) (struct tagSRB32_ExecSCSICmd *)) ++{ ++ return 5; ++} ++ ++int ++ASPI_Seek_CDD_c4_COMP (SRB_ExecSCSICmd * s) ++{ ++ return -1; ++} ++ ++int ++ASPI_Star_Stop_Unit (int op, ++ int (*PostProc) (struct tagSRB32_ExecSCSICmd *)) ++{ ++ return 5; ++} ++ ++int ++ASPI_Stop_CDD_c1_COMP (SRB_ExecSCSICmd * s) ++{ ++ return 0; ++} ++ ++int ++ASPI_Stop_Play_Scan (int async, ++ int (*PostProc) (struct tagSRB32_ExecSCSICmd *)) ++{ ++ return 5; ++} ++ ++void ++Wait_Read_Complete (void) ++{ ++ return; ++} ++ ++#endif Modified: head/emulators/gens/pkg-descr ============================================================================== --- head/emulators/gens/pkg-descr Thu Jan 16 20:23:30 2014 (r339979) +++ head/emulators/gens/pkg-descr Thu Jan 16 20:34:06 2014 (r339980) @@ -1,11 +1,4 @@ A Sega Genesis/CD/32X emulator that uses the SDL library and has a GTK user interface. -Note: This is not the latest version of gens available for *nix. The -latest version makes use of the Linux-specific header file 'linux/cdrom.h' -which causes the build to fail. - -Patches to get the latest version working on FreeBSD are more than -welcome! - -WWW: http://gens.consolemul.com/ +WWW: http://www.gens.me/ Modified: head/emulators/gens/pkg-plist ============================================================================== --- head/emulators/gens/pkg-plist Thu Jan 16 20:23:30 2014 (r339979) +++ head/emulators/gens/pkg-plist Thu Jan 16 20:34:06 2014 (r339980) @@ -1,20 +1,38 @@ bin/gens -%%DATADIR%%/gens -%%DATADIR%%/resource/Gens2.ico -%%DATADIR%%/resource/bitmap1.bmp -%%DATADIR%%/resource/bmp00000.bmp -%%DATADIR%%/resource/bmp00001.bmp -%%DATADIR%%/resource/bmp00002.bmp -%%DATADIR%%/resource/bmp00003.bmp -%%DATADIR%%/resource/bmp00004.bmp -%%DATADIR%%/resource/bmp00005.bmp -%%DATADIR%%/resource/bmp00006.bmp -%%DATADIR%%/resource/gens.ico -%%DATADIR%%/resource/gens_big.bmp -%%DATADIR%%/resource/gens_small.bmp -%%DATADIR%%/resource/sonic.ico -%%DATADIR%%/resource/sonic2.ico %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/resource +%%DATADIR%%/2rightarrow.png +%%DATADIR%%/Gens2.ico +%%DATADIR%%/Modem.png +%%DATADIR%%/binary.png +%%DATADIR%%/bitmap1.png +%%DATADIR%%/bmp00000.png +%%DATADIR%%/bmp00001.png +%%DATADIR%%/bmp00002.png +%%DATADIR%%/bmp00003.png +%%DATADIR%%/bmp00004.png +%%DATADIR%%/bmp00005.png +%%DATADIR%%/bmp00006.png +%%DATADIR%%/cdrom2_unmount.png +%%DATADIR%%/editcopy.png +%%DATADIR%%/file_text.png +%%DATADIR%%/filleclose.png +%%DATADIR%%/folder_slin_open.png +%%DATADIR%%/gens.ico +%%DATADIR%%/gens_big.bmp +%%DATADIR%%/gens_small.png +%%DATADIR%%/history.png +%%DATADIR%%/kmix.png +%%DATADIR%%/ksysguard.png +%%DATADIR%%/memory.png +%%DATADIR%%/package_games.png +%%DATADIR%%/package_settings.png +%%DATADIR%%/password.png +%%DATADIR%%/reload.png +%%DATADIR%%/resource.png +%%DATADIR%%/sonic.ico +%%DATADIR%%/sonic2.ico +%%DATADIR%%/viewmag.png +%%DATADIR%%/viewmag1.png +%%DATADIR%%/xpaint.png @dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%