From owner-svn-ports-all@FreeBSD.ORG  Sat Apr 12 21:25:21 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTPS id 5CE88206;
 Sat, 12 Apr 2014 21:25:21 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2F179113D;
 Sat, 12 Apr 2014 21:25:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CLPLp6051544;
 Sat, 12 Apr 2014 21:25:21 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CLPLE7051543;
 Sat, 12 Apr 2014 21:25:21 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201404122125.s3CLPLE7051543@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sat, 12 Apr 2014 21:25:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r351140 - branches/2014Q2/games/xrick
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2014 21:25:21 -0000

Author: pawel
Date: Sat Apr 12 21:25:20 2014
New Revision: 351140
URL: http://svnweb.freebsd.org/changeset/ports/351140
QAT: https://qat.redports.org/buildarchive/r351140/

Log:
  MFH: r351130
  
  - Fix build with clang by respecting CC, CFLAGS
  - Add staging support
  - Remove leading article from COMMENT
  - Convert to new LIB_DEPENDS format, USES=gmake
  - Switch to PLIST_FILES
  
  Approved by:	portmgr (erwin)

Deleted:
  branches/2014Q2/games/xrick/pkg-plist
Modified:
  branches/2014Q2/games/xrick/Makefile
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/games/xrick/Makefile
==============================================================================
--- branches/2014Q2/games/xrick/Makefile	Sat Apr 12 21:23:13 2014	(r351139)
+++ branches/2014Q2/games/xrick/Makefile	Sat Apr 12 21:25:20 2014	(r351140)
@@ -9,25 +9,26 @@ MASTER_SITES=	http://www.bigorno.net/xri
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A clone of Rick Dangerous
+COMMENT=	Clone of Rick Dangerous
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 RESTRICTED=	Copyright status of the graphics and sounds is uncertain
-USE_GMAKE=	yes
+USES=		gmake
 USE_SDL=	sdl
 
-MAN6=		xrick.6
-MANCOMPRESSED=	yes
+PLIST_FILES=	bin/xrick man/man6/xrick.6.gz share/xrick/data.zip
+PLIST_DIRS=	share/xrick
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|sysarg_args_data = NULL|sysarg_args_data = "${PREFIX}/share/xrick/data.zip"|' ${WRKSRC}/src/sysarg.c
+	@${REINPLACE_CMD} 's|gcc|${CC}|; s|-g||; s|-O2|${CFLAGS}|' \
+		${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xrick.6.gz ${PREFIX}/man/man6/xrick.6.gz
-	${MKDIR} ${PREFIX}/share/xrick
-	${INSTALL_DATA} ${WRKSRC}/data.zip ${PREFIX}/share/xrick/data.zip
+	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xrick.6.gz ${STAGEDIR}${PREFIX}/man/man6
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xrick
+	${INSTALL_DATA} ${WRKSRC}/data.zip ${STAGEDIR}${PREFIX}/share/xrick
 
 .include <bsd.port.mk>