Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Oct 2013 08:03:09 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r331235 - head/games/jigzo
Message-ID:  <201310220803.r9M839TW021531@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Oct 22 08:03:09 2013
New Revision: 331235
URL: http://svnweb.freebsd.org/changeset/ports/331235

Log:
  - Support staging
  - Convert USE_GMAKE to USES
  - Use new LIB_DEPENDS syntax

Deleted:
  head/games/jigzo/pkg-plist
Modified:
  head/games/jigzo/Makefile

Modified: head/games/jigzo/Makefile
==============================================================================
--- head/games/jigzo/Makefile	Tue Oct 22 08:03:00 2013	(r331234)
+++ head/games/jigzo/Makefile	Tue Oct 22 08:03:09 2013	(r331235)
@@ -12,14 +12,16 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	An OpenGL jigsaw puzzle game
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
+USES=		gmake
 USE_SDL=	sdl mixer
 USE_GL=		gl
-USE_GMAKE=	yes
 MAKE_ARGS=	CXX=${CXX}
 
+PLIST_FILES=	bin/${PORTNAME}
+PORTDATA=	*
 PORTDOCS=	*
 
 DESKTOP_ENTRIES="Jigzo" \
@@ -29,7 +31,9 @@ DESKTOP_ENTRIES="Jigzo" \
 		"Game;LogicGame;KidsGame;" \
 		false
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
+
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -42,15 +46,10 @@ post-patch:
 	@${FIND} ${WRKSRC} -name .thumbnails | ${XARGS} ${RM} -rf
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "font image puzzles sound" \
-		${DATADIR}/
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+		${STAGEDIR}${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310220803.r9M839TW021531>