1 files changed, 13 insertions, 31 deletions

diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 73e3926bfbf1..b02c80478ac9 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -3,26 +3,25 @@
 
 PORTNAME=	fceux
 PORTVERSION=	2.2.3
-DISTVERSIONSUFFIX=	.src
 PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fceultra/Source%20Code/${PORTVERSION}%20src/
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable NES/Famicom emulator based on Bero's original FCE
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	zenity:x11/zenity
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		compiler:c++0x desktop-file-utils dos2unix pkgconfig scons
+USES=		compiler:c++0x desktop-file-utils dos2unix localbase:ldflags pkgconfig scons
 USE_SDL=	sdl
 USE_XORG=	x11
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 OPTIONS_DEFINE=		CREATE_AVI DEBUG DOCS FRAMESKIP LOGO LUA OPENGL
 OPTIONS_SINGLE=		GUI
 OPTIONS_SINGLE_GUI=	GTK2 GTK3
@@ -46,6 +45,7 @@ LOGO_DESC=		Enable a logoscreen when creating avis
 LOGO_LIB_DEPENDS=	libgd.so:graphics/gd
 LOGO_MAKE_ARGS=		LOGO=1
 LOGO_MAKE_ARG_OFF=	LOGO=0
+LOGO_IMPLIES=		CREATE_AVI
 LUA_USES=		lua:51
 LUA_MAKE_ARGS=		LUA=1 SYSTEM_LUA=1
 LUA_MAKE_ARGS_OFF=	LUA=0
@@ -53,12 +53,6 @@ OPENGL_USE=		GL=gl
 OPENGL_MAKE_ARGS=	OPENGL=1
 OPENGL_MAKE_ARGS_OFF=	OPENGL=0
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLOGO} && empty(PORT_OPTIONS:MCREATE_AVI)
-IGNORE=		LOGO support requires CREATE_AVI support
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/PUBLIC/s|^|#| ; \
@@ -73,31 +67,19 @@ post-patch:
 
 do-install:
 .for i in fceux fceux-net-server
-	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} ${i} \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC}/documentation && ${INSTALL_MAN} ${i}.6 \
-		${STAGEDIR}${MANPREFIX}/man/man6)
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${i} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/documentation/${i}.6 ${STAGEDIR}${MANPREFIX}/man/man6
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC}/bin && ${INSTALL_DATA} *.lua \
-		${STAGEDIR}${DATADIR})
-.for i in luaScripts palettes tools
-	@(cd ${WRKSRC}/output && ${COPYTREE_SHARE} ${i} \
+	${INSTALL_DATA} ${WRKSRC}/bin/*.lua ${STAGEDIR}${DATADIR}
+	@(cd ${WRKSRC}/output && ${COPYTREE_SHARE} "luaScripts palettes tools" \
 		${STAGEDIR}${DATADIR})
-.endfor
-	(cd ${WRKSRC} && ${INSTALL_DATA} *.desktop \
-		${STAGEDIR}${DESKTOPDIR})
-	(cd ${WRKSRC} && ${INSTALL_DATA} *.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps)
+	${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.png ${STAGEDIR}${PREFIX}/share/pixmaps
 
 do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in TODO-PROJECT Videolog.txt cheat.html faq fcs.txt fm2.txt \
-	protocol.txt snes9x-lua.html
-	(cd ${WRKSRC}/documentation && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DOCSDIR})
-.endfor
-	@(cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} tech \
+	@(cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} "TODO-PROJECT Videolog.txt \
+		cheat.html faq fcs.txt fm2.txt protocol.txt snes9x-lua.html tech" \
 		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>