From owner-svn-ports-head@freebsd.org Tue Feb 25 12:12:10 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D21F725A26F; Tue, 25 Feb 2020 12:12:10 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Rd8m6zyXz4QWD; Tue, 25 Feb 2020 12:12:08 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 210E6E3F4; Tue, 25 Feb 2020 12:12:08 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01PCC75K042638; Tue, 25 Feb 2020 12:12:07 GMT (envelope-from salvadore@FreeBSD.org) Received: (from salvadore@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01PCC7EV042637; Tue, 25 Feb 2020 12:12:07 GMT (envelope-from salvadore@FreeBSD.org) Message-Id: <202002251212.01PCC7EV042637@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: salvadore set sender to salvadore@FreeBSD.org using -f From: Lorenzo Salvadore Date: Tue, 25 Feb 2020 12:12:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527076 - head/emulators/wine-devel X-SVN-Group: ports-head X-SVN-Commit-Author: salvadore X-SVN-Commit-Paths: head/emulators/wine-devel X-SVN-Commit-Revision: 527076 X-SVN-Commit-Repository: ports 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.29 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: Tue, 25 Feb 2020 12:12:11 -0000 Author: salvadore Date: Tue Feb 25 12:12:07 2020 New Revision: 527076 URL: https://svnweb.freebsd.org/changeset/ports/527076 Log: Migrate the STAGING option to use option helpers This is the right thing to do in general and prepares for forthcoming changes to emulators/i386-wine-devel. Approved by: gerald (mentor) Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Tue Feb 25 12:04:18 2020 (r527075) +++ head/emulators/wine-devel/Makefile Tue Feb 25 12:12:07 2020 (r527076) @@ -98,6 +98,14 @@ MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal +STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging +COMP_DIST= v${DISTVERSION}.tar.gz +STAGING_DISTFILES= ${COMP_DIST}:staging +STAGING_EXTRACT_DEPENDS= bash:shells/bash \ + git:devel/git \ + autoconf>0:devel/autoconf +STAGING_LIB_DEPENDS= libtxc_dxtn.so:graphics/s2tc + V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l @@ -146,20 +154,9 @@ post-patch: PLIST_SUB+= WINE32="" WINE64="@comment " .endif -.if ${PORT_OPTIONS:MSTAGING} -MASTER_SITES+= https://github.com/wine-staging/wine-staging/archive/:cho -COMP_DIST= v${DISTVERSION}.tar.gz -DISTFILES+= ${COMP_DIST}:cho - -EXTRACT_DEPENDS=bash:shells/bash \ - git:devel/git \ - autoconf>0:devel/autoconf -LIB_DEPENDS+= libtxc_dxtn.so:graphics/s2tc - -post-extract: fix-shebang +post-extract-STAGING-on: fix-shebang cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${COMP_DIST} --strip-components 1 cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all -.endif pre-build: cd ${WRKSRC} && ${MAKE_CMD} depend