From owner-svn-ports-head@FreeBSD.ORG Fri Jan 17 18:21:43 2014 Return-Path: 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 ESMTPS id E890E169; Fri, 17 Jan 2014 18:21:42 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D48D61D72; Fri, 17 Jan 2014 18:21:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HILglf014210; Fri, 17 Jan 2014 18:21:42 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HILgu6014209; Fri, 17 Jan 2014 18:21:42 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201401171821.s0HILgu6014209@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 17 Jan 2014 18:21:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340093 - head/games/fuhquake 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.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 18:21:43 -0000 Author: danfe Date: Fri Jan 17 18:21:42 2014 New Revision: 340093 URL: http://svnweb.freebsd.org/changeset/ports/340093 QAT: https://qat.redports.org/buildarchive/r340093/ Log: - Set EXTRACT_SUFX and dismiss USE_ZIP - Augment DEPRECATED notice text a bit - Make USE_GL more specific (gl) instead of umbrella `yes' - Remove references to PTHREAD_CFLAGS (long-time empty) and PTHREAD_LIBS (replace with just `-pthread'); it also allows to shave off two lines - Modernize LIB_DEPENDS syntax and stagify Modified: head/games/fuhquake/Makefile Modified: head/games/fuhquake/Makefile ============================================================================== --- head/games/fuhquake/Makefile Fri Jan 17 18:09:49 2014 (r340092) +++ head/games/fuhquake/Makefile Fri Jan 17 18:21:42 2014 (r340093) @@ -8,6 +8,7 @@ CATEGORIES= games MASTER_SITES= http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \ http://www.fuhquake.net/files/misc/:misc DISTNAME= ${PORTNAME}-source-v${PORTVERSION} +EXTRACT_SUFX= .zip DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} @@ -15,9 +16,8 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Excellent and feature-rich QuakeWorld client -DEPRECATED= Upstream disappeared; no more distfiles +DEPRECATED= Upstream disappeared; no more public distfiles; unmaintained -USE_ZIP= yes MAKEFILE= ${FILESDIR}/Makefile WRKSRC= ${WRKDIR}/source @@ -37,14 +37,13 @@ X11_DESC= Build X11 client HUD_DESC= Install high quality HUD images XMMS_DESC= Enable MP3 player feature -NO_STAGE= yes .include "${.CURDIR}/../quake-data/Makefile.include" .include .if ${PORT_OPTIONS:MGLX} -USE_GL= yes -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ - jpeg:${PORTSDIR}/graphics/jpeg +USE_GL= gl +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg CFLAGS+= -I${LOCALBASE}/include/libpng15 PLIST_SUB+= GLX="" CLIENTS+= glx @@ -75,11 +74,9 @@ MAKE_ARGS+= -DWITH_OPTIMIZED_CFLAGS MAKE_ARGS+= -DWITHOUT_X86_ASM .endif -.if ${PORT_OPTIONS:MXMMS} || exists(${LOCALBASE}/lib/libxmms.so.4) -LIB_DEPENDS+= xmms:${PORTSDIR}/multimedia/xmms -MAKE_ARGS+= -DWITH_XMMS \ - PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} +.if ${PORT_OPTIONS:MXMMS} || exists(${LOCALBASE}/lib/libxmms.so) +LIB_DEPENDS+= libxmms.so:${PORTSDIR}/multimedia/xmms +MAKE_ARGS+= -DWITH_XMMS PTHREAD_LIBS=-pthread .endif post-patch: @@ -93,21 +90,21 @@ do-build: do-install: .for f in ${CLIENTS} - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${f} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${f} ${STAGEDIR}${PREFIX}/bin .endfor - @${MKDIR} ${DATADIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKDIR}/qw/*.dat ${DATADIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak ${DATADIR}/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKDIR}/qw/*.dat ${STAGEDIR}${DATADIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak \ + ${STAGEDIR}${DATADIR}/${PORTNAME} .if ${PORT_OPTIONS:MHUD} - @${MKDIR} ${DATADIR}/${PORTNAME}/textures/wad - ${INSTALL_DATA} ${WRKDIR}/qw/charset.png ${DATADIR}/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME}/textures/wad + ${INSTALL_DATA} ${WRKDIR}/qw/charset.png \ + ${STAGEDIR}${DATADIR}/${PORTNAME} ${INSTALL_DATA} ${WRKDIR}/qw/textures/wad/* \ - ${DATADIR}/${PORTNAME}/textures/wad -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${DOCSDIR} + ${STAGEDIR}${DATADIR}/${PORTNAME}/textures/wad .endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${STAGEDIR}${DOCSDIR} .include