svn commit: r394908 - head/games/fillets-ng

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Aug 20 19:42:36 2015
New Revision: 394908
URL: https://svnweb.freebsd.org/changeset/ports/394908

Log:
  - Switch to options helpers
  - Add missing options
  - Fix FRIBIDI option

Modified:
  head/games/fillets-ng/Makefile

Modified: head/games/fillets-ng/Makefile
==============================================================================
--- head/games/fillets-ng/Makefile	Thu Aug 20 19:39:18 2015	(r394907)
+++ head/games/fillets-ng/Makefile	Thu Aug 20 19:42:36 2015	(r394908)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fillets-ng
 PORTVERSION=	1.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${PORTVERSION} \
 		SF/fillets/Fish%20Fillets%20-%20Next%20Generation/${DATAVERSION}:data
@@ -14,7 +14,7 @@ MAINTAINER=	amdmi3 at FreeBSD.org
 COMMENT=	Wonderful puzzle game
 
 USE_SDL=	sdl mixer image ttf
-USES=		gmake lua:51
+USES=		gmake lua:51 pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir="${DATADIR}"
 CONFIGURE_ENV=	LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" \
@@ -30,36 +30,42 @@ DATAVERSION=	1.0.0
 ONLY_FOR_ARCHS=	i386 amd64
 
 DESKTOP_ENTRIES="Fish Fillets - Next Generation" \
-		"A wonderful puzzle game" \
+		"" \
 		"${DATADIR}/images/icon.png" \
 		"fillets" \
 		"Game;LogicGame;" \
 		false
 
-OPTIONS_DEFINE=	DOCS FRIBIDI
-OPTIONS_DEFAULT=FRIBIDI
+OPTIONS_DEFINE=	DOCS FRIBIDI SMPEG X11
+OPTIONS_DEFAULT=FRIBIDI SMPEG X11
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MFRIBIDI}
-LIB_DEPENDS+=	libfribidi.so:${PORTSDIR}/converters/fribidi
-.endif
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+SMPEG_DESC=		Video playback support
+SMPEG_LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+X11_DESC=		X11 window manager support
+X11_USE=		xorg=x11
+X11_CONFIGURE_ON=	--with-X=yes
+X11_CONFIGURE_OFF=	--with-X=no
+X11_LDFLAGS=		-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBS/ s|-llualib[50.]*||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^\(AM_CPPFLAGS.*(datadir)\)/.*|\1"\\"|' \
 		${WRKSRC}/src/gengine/Makefile.in
-.if ! ${PORT_OPTIONS:MFRIBIDI}
-	@${REINPLACE_CMD} -e \
-		's|FRIBIDI_CFLAGS=$$pkg_cv_FRIBIDI_CFLAGS||; s|FRIBIDI_LIBS=$$pkg_cv_FRIBIDI_LIBS||; s|have_fribidi="yes"|have_fribidi="no"|' \
-		${WRKSRC}/configure
-.endif
+
+post-patch-FRIBIDI-off:
+	@${REINPLACE_CMD} -e '/have_fribidi="yes"/ s|yes|no|' ${WRKSRC}/configure
+
+post-patch-SMPEG-off:
+	@${REINPLACE_CMD} -e '/have_smpeg="yes"/ s|yes|no|' ${WRKSRC}/configure
 
 post-install:
 	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
 		${COPYTREE_SHARE} "font	images music script sound" ${STAGEDIR}${DATADIR}/
+
+post-install-DOCS-on:
 	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION}/doc && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>