From owner-svn-ports-head@FreeBSD.ORG  Tue Oct 22 08:03:10 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3E4457FF;
 Tue, 22 Oct 2013 08:03:10 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 13BA02690;
 Tue, 22 Oct 2013 08:03:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9M839Na021532;
 Tue, 22 Oct 2013 08:03:09 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9M839TW021531;
 Tue, 22 Oct 2013 08:03:09 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201310220803.r9M839TW021531@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 22 Oct 2013 08:03:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331235 - head/games/jigzo
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 08:03:10 -0000

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>