From owner-svn-ports-all@FreeBSD.ORG  Tue Jul  8 06:42:23 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BC1D7E5B;
 Tue,  8 Jul 2014 06:42:23 +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 9D6F8212D;
 Tue,  8 Jul 2014 06:42:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s686gNrk077138;
 Tue, 8 Jul 2014 06:42:23 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s686gNgY077137;
 Tue, 8 Jul 2014 06:42:23 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201407080642.s686gNgY077137@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 8 Jul 2014 06:42:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r361184 - head/games/q2pro
X-SVN-Group: ports-head
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.18
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: Tue, 08 Jul 2014 06:42:23 -0000

Author: danfe
Date: Tue Jul  8 06:42:23 2014
New Revision: 361184
URL: http://svnweb.freebsd.org/changeset/ports/361184
QAT: https://qat.redports.org/buildarchive/r361184/

Log:
  Stagify the port, use modern LIB_DEPENDS and MASTER_SITES syntax.

Modified:
  head/games/q2pro/Makefile

Modified: head/games/q2pro/Makefile
==============================================================================
--- head/games/q2pro/Makefile	Tue Jul  8 06:36:03 2014	(r361183)
+++ head/games/q2pro/Makefile	Tue Jul  8 06:42:23 2014	(r361184)
@@ -5,8 +5,7 @@ PORTNAME=	q2pro
 PORTVERSION=	${SVN_REV}
 PORTREVISION=	7
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	alepulver
+MASTER_SITES=	LOCAL/alepulver
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake II engine modification compatible with R1Q2
@@ -18,7 +17,7 @@ ALL_TARGET=	#
 SVN_REV=	142
 
 MAKE_ENV=	LIBDIR="${LIBDIR}"
-PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
+PLIST_SUB=	LIBDIR="${LIBDIR:S|${PREFIX}/||}"
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
 OPTIONS_DEFINE=		GAME GL SOFT UI
@@ -35,7 +34,6 @@ GL_DESC=	Build OpenGL render
 SOFT_DESC=	Build software render
 UI_DESC=	Build user interface (for client menus)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
@@ -61,9 +59,9 @@ PLIST_SUB+=	GAME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGL}
+LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng.so:${PORTSDIR}/graphics/png
 USE_GL=		gl
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png
 ALL_TARGET+=	ref_newgl
 PLIST_SUB+=	GL=""
 .else
@@ -90,28 +88,34 @@ MAKE_ENV+=	USE_X86_ASM=yes
 
 post-patch:
 # Resolve name collision with jpeg-8
-	${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
+	@${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
 		${WRKSRC}/ref_shared/r_images.c
 
 do-install:
-	@${MKDIR} ${LIBDIR}/baseq2
+	@${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2
 .if ${PORT_OPTIONS:MCLIENT}
-	${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2pro ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2pro \
+		${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MDEDICATED}
-	${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2proded ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2proded \
+		${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MGAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/build/release/game.so ${LIBDIR}/baseq2
+	${INSTALL_PROGRAM} ${WRKSRC}/build/release/game.so \
+		${STAGEDIR}${LIBDIR}/baseq2
 .endif
 .if ${PORT_OPTIONS:MGL}
-	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_newgl.so ${LIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_newgl.so \
+		${STAGEDIR}${LIBDIR}
 .endif
 .if ${PORT_OPTIONS:MSOFT}
-	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_soft.so ${LIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_soft.so \
+		${STAGEDIR}${LIBDIR}
 .endif
 .if ${PORT_OPTIONS:MUI}
-	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ui.so ${LIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ui.so \
+		${STAGEDIR}${LIBDIR}
 .endif
 
 generate-distfile: