From owner-svn-ports-all@freebsd.org Tue Dec 5 18:27:32 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7534EE73BD0; Tue, 5 Dec 2017 18:27:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 4CD676745E; Tue, 5 Dec 2017 18:27:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB5IRVd4040784; Tue, 5 Dec 2017 18:27:31 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB5IRVG5040782; Tue, 5 Dec 2017 18:27:31 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712051827.vB5IRVG5040782@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 5 Dec 2017 18:27:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455601 - in head/emulators/snes9express: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/emulators/snes9express: . files X-SVN-Commit-Revision: 455601 X-SVN-Commit-Repository: ports 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.25 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: Tue, 05 Dec 2017 18:27:32 -0000 Author: amdmi3 Date: Tue Dec 5 18:27:31 2017 New Revision: 455601 URL: https://svnweb.freebsd.org/changeset/ports/455601 Log: - Add LICENSE_FILE - Pet portlint - Switch to options helpers - Fix return-type warnings and remove dangerous -Wno-return-type Modified: head/emulators/snes9express/Makefile head/emulators/snes9express/files/patch-frend.cc Modified: head/emulators/snes9express/Makefile ============================================================================== --- head/emulators/snes9express/Makefile Tue Dec 5 18:25:59 2017 (r455600) +++ head/emulators/snes9express/Makefile Tue Dec 5 18:27:31 2017 (r455601) @@ -11,22 +11,22 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK interface for snes9x LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_sparc64= does not compile on sparc64 + RUN_DEPENDS= snes9x:emulators/snes9x -USE_GNOME= gtk20 USES= gettext pkgconfig +USE_GNOME= gtk20 GNU_CONFIGURE= yes -BROKEN_sparc64= does not compile on sparc64 - PORTDOCS= AUTHORS ChangeLog NEWS README PLIST_FILES= bin/${PORTNAME} \ %%DATADIR%%/snes.s9xskin \ %%DATADIR%%/snsp.s9xskin -# fix build with clang -CFLAGS+= -Wno-return-type +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|(gzFile\*)||' \ @@ -38,6 +38,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.s9xskin ${STAGEDIR}${DATADIR} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/emulators/snes9express/files/patch-frend.cc ============================================================================== --- head/emulators/snes9express/files/patch-frend.cc Tue Dec 5 18:25:59 2017 (r455600) +++ head/emulators/snes9express/files/patch-frend.cc Tue Dec 5 18:27:31 2017 (r455601) @@ -1,6 +1,30 @@ --- frend.cc.orig 2009-12-21 22:38:54 UTC +++ frend.cc -@@ -2527,7 +2527,7 @@ void Window::addMenu(const char*label, M +@@ -379,7 +379,7 @@ void dimension::input(std::istream& i + i >> buf; + unsigned int l = buf.size(), xpos = 0, ypos = 0; + if(l < 3) +- return i; ++ return; + if(buf[0]=='(') + xpos++; + if(buf[l-1]==',') +@@ -400,13 +400,12 @@ void dimension::input(std::istream& i + const char*buf3 = buf.c_str(); + _x = strtol(&(buf[xpos]), NULL, 0); + _y = strtol(&(buf[ypos]), NULL, 0); +- return i; + } + + template + void dimension::print(std::ostream& o) const + { +- return o << "(" << _x << ", " << _y << ")"; ++ o << "(" << _x << ", " << _y << ")"; + } + + /* ############################## Color ################################ */ +@@ -2527,7 +2526,7 @@ void Window::addMenu(const char*label, M { if(strcmp(items[i].label, "-")) {