From owner-svn-ports-all@FreeBSD.ORG Fri Mar 7 14:36:04 2014 Return-Path: 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 83586512; Fri, 7 Mar 2014 14:36:04 +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 6F7EF798; Fri, 7 Mar 2014 14:36:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27Ea4sD083488; Fri, 7 Mar 2014 14:36:04 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27Ea3Xr083484; Fri, 7 Mar 2014 14:36:03 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201403071436.s27Ea3Xr083484@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 7 Mar 2014 14:36:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347390 - in head: Mk/Uses games/legends games/linux-rtcw games/worldofpadman 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 14:36:04 -0000 Author: bapt Date: Fri Mar 7 14:36:03 2014 New Revision: 347390 URL: http://svnweb.freebsd.org/changeset/ports/347390 QAT: https://qat.redports.org/buildarchive/r347390/ Log: Create a makeself uses to handle makeself archives Added: head/Mk/Uses/makeself.mk (contents, props changed) Modified: head/games/legends/Makefile head/games/linux-rtcw/Makefile head/games/worldofpadman/Makefile Added: head/Mk/Uses/makeself.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/makeself.mk Fri Mar 7 14:36:03 2014 (r347390) @@ -0,0 +1,23 @@ +# $FreeBSD$ +# +# handle makeself archives +# +# MAINTAINER: portmgr@FreeBSD.org +# +# Feature: makeself +# Usage: USES=makeself +# +.if !defined(_INCLUDE_USES_MAKESELF_Mk) +_INCLUDE_USES_MAKESELF_MK= yes + +.if defined(gmake_ARGS) +IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments +.endif + +EXTRACT_DEPENDS= ${UNMAKESELF_CMD}:${PORTSDIR}/archivers/unmakeself + +EXTRACT_CMD= ${UNMAKESELF_CMD} +EXTRACT_BEFORE_ARGS= +EXTRACT_AFTER_ARGS= + +.endif Modified: head/games/legends/Makefile ============================================================================== --- head/games/legends/Makefile Fri Mar 7 14:27:12 2014 (r347389) +++ head/games/legends/Makefile Fri Mar 7 14:36:03 2014 (r347390) @@ -11,13 +11,16 @@ DISTNAME= ${PORTNAME}_linux_gui-${PORTVE DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:game \ ${MAP_PACK}:maps EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +EXTRACT_SUFX= .run MAINTAINER= ports@FreeBSD.org COMMENT= Fast-paced first-person-perspective online multiplayer game +OPTIONS_DEFINE= DOCS + RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USE_MAKESELF= yes +USES= makeself USE_LINUX= yes USE_LINUX_APPS+=dri NO_BUILD= yes @@ -28,7 +31,6 @@ DATADIR= ${PREFIX}/lib/${PORTNAME} MAP_PACK= BTMappack-1.05.unf PLIST_SUB= MAP_PACK="${MAP_PACK}" -NO_STAGE= yes post-extract: @cd ${WRKDIR} && ${TAR} xf legends.tar @@ -38,19 +40,17 @@ post-patch: ${WRKSRC}/bin/runlegends do-install: - ${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} LinLegends lindedicated *.so* ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/runlegends ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/legends.ico ${PREFIX}/share/pixmaps - ${LN} -sf ${DATADIR}/runlegends ${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} LinLegends lindedicated *.so* ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/bin/runlegends ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/legends.ico ${STAGEDIR}${PREFIX}/share/pixmaps + ${LN} -sf ${DATADIR}/runlegends ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .for f in common legends main.cs show - ${CP} -r ${WRKSRC}/${f} ${DATADIR} + ${CP} -r ${WRKSRC}/${f} ${STAGEDIR}${DATADIR} .endfor - ${INSTALL_DATA} ${DISTDIR}/${MAP_PACK} ${DATADIR}/legends -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR} -.endif + ${INSTALL_DATA} ${DISTDIR}/${MAP_PACK} ${STAGEDIR}${DATADIR}/legends + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR} .include Modified: head/games/linux-rtcw/Makefile ============================================================================== --- head/games/linux-rtcw/Makefile Fri Mar 7 14:27:12 2014 (r347389) +++ head/games/linux-rtcw/Makefile Fri Mar 7 14:36:03 2014 (r347390) @@ -8,11 +8,12 @@ MASTER_SITES= ${MASTER_SITE_IDSOFTWARE} MASTER_SITE_SUBDIR= wolf/linux PKGNAMEPREFIX= linux- DISTNAME= wolf-linux-${DISTVERSION}.x86 +EXTRACT_SUFX= .run MAINTAINER= ports@FreeBSD.org COMMENT= Return to Castle Wolfenstein (Linux version) -USE_MAKESELF= yes +USES= makeself USE_LINUX= yes USE_LINUX_APPS= dri xorglibs NO_WRKSUBDIR= yes Modified: head/games/worldofpadman/Makefile ============================================================================== --- head/games/worldofpadman/Makefile Fri Mar 7 14:27:12 2014 (r347389) +++ head/games/worldofpadman/Makefile Fri Mar 7 14:36:03 2014 (r347390) @@ -18,8 +18,7 @@ COMMENT= Open source FPS game inspired b NO_PACKAGE= package will be ~600MB; set FORCE_PACKAGE if you really want it -USES= gmake -USE_MAKESELF= yes +USES= gmake makeself MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" ALL_TARGET= release