svn commit: r455601 - in head/emulators/snes9express: . files

[Dmitry Marakasov]

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 at 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<T>::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<T>::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 <class T>
+ void dimension<T>::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, "-"))
  		{