From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 21 17:50:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 A83B6427 for ; Wed, 21 May 2014 17:50:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 849BE2E2B for ; Wed, 21 May 2014 17:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LHo0Cq042161 for ; Wed, 21 May 2014 17:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4LHo0m9042160; Wed, 21 May 2014 17:50:00 GMT (envelope-from gnats) Resent-Date: Wed, 21 May 2014 17:50:00 GMT Resent-Message-Id: <201405211750.s4LHo0m9042160@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthieu Volat 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 89054381 for ; Wed, 21 May 2014 17:42:19 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A5AE2DDF for ; Wed, 21 May 2014 17:42:19 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LHgJLp000717 for ; Wed, 21 May 2014 17:42:19 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4LHgJF3000716; Wed, 21 May 2014 17:42:19 GMT (envelope-from nobody) Message-Id: <201405211742.s4LHgJF3000716@cgiserv.freebsd.org> Date: Wed, 21 May 2014 17:42:19 GMT From: Matthieu Volat To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190081: [patch] add staging support to mupen64plus ports X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 May 2014 17:50:00 -0000 >Number: 190081 >Category: ports >Synopsis: [patch] add staging support to mupen64plus ports >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed May 21 17:50:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Matthieu Volat >Release: 10.0-RELEASE-p3 >Organization: - >Environment: FreeBSD freedom.alkumuna.eu 10.0-RELEASE-p1 FreeBSD 10.0-RELEASE-p1 #0: Tue Apr 8 06:45:06 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: As of today, emulators/mupen64plus* ports do not support staging despite mandatory usage required before end of june 2014. >How-To-Repeat: make stage in any of the emulators/mupen64plus* directories >Fix: Here's a exhaustive patch for all the concerned ports. Index: emulators/mupen64plus-audio-sdl/Makefile =================================================================== --- emulators/mupen64plus-audio-sdl/Makefile (revision 354653) +++ emulators/mupen64plus-audio-sdl/Makefile (working copy) @@ -11,5 +11,4 @@ OPTIONS_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: emulators/mupen64plus-rsp-z64/Makefile =================================================================== --- emulators/mupen64plus-rsp-z64/Makefile (revision 354653) +++ emulators/mupen64plus-rsp-z64/Makefile (working copy) @@ -22,5 +22,4 @@ BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: emulators/mupen64plus-video-glide64/Makefile =================================================================== --- emulators/mupen64plus-video-glide64/Makefile (revision 354653) +++ emulators/mupen64plus-video-glide64/Makefile (working copy) @@ -23,5 +23,4 @@ BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: emulators/mupen64plus-core/Makefile.common =================================================================== --- emulators/mupen64plus-core/Makefile.common (revision 354653) +++ emulators/mupen64plus-core/Makefile.common (working copy) @@ -15,10 +15,6 @@ PLIST= ${WRKDIR}/pkg-plist .endif -.if ${PKGNAMESUFFIX} == "-ui-console" -MAN6= mupen64plus.6 -.endif - .if ${PKGNAMESUFFIX} == "-video-rice" LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png .endif @@ -61,10 +57,18 @@ @${ECHO_CMD} "%%DATADIR%%/InputAutoCfg.ini" >> ${PLIST} . endif +. if ${PKGNAMESUFFIX} == "-ui-console" + @${ECHO_CMD} "man/man6/mupen64plus.6.gz" >> ${PLIST} +. endif + . if ${PKGNAMESUFFIX} != "-ui-console" @${ECHO_CMD} "lib/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}.so" >> ${PLIST} @${ECHO_CMD} "@dirrmtry lib/${PORTNAME}" >> ${PLIST} +. if ${PKGNAMESUFFIX} != "-audio-sdl" \ + && ${PKGNAMESUFFIX} != "-rsp-hle" \ + && ${PKGNAMESUFFIX} != "-rsp-z64" @${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST} +. endif . else @${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST} . endif @@ -78,51 +82,51 @@ .if ${PKGNAMESUFFIX} == "-core" ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmupen64plus.so.2.0.0 \ - ${PREFIX}/lib/libmupen64plus.so.2.0.0 + ${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2.0.0 - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/* \ - ${DATADIR} + ${STAGEDIR}${DATADIR} - @${MKDIR} ${PREFIX}/include/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src/api/m64p_*.h \ - ${PREFIX}/include/${PORTNAME} + ${STAGEDIR}${PREFIX}/include/${PORTNAME} . if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/RELEASE \ - ${DOCSDIR}/RELEASE + ${STAGEDIR}${DOCSDIR}/RELEASE . endif - ${LN} -sf ${PREFIX}/lib/libmupen64plus.so.2.0.0 ${PREFIX}/lib/libmupen64plus.so.2 + ${LN} -sf ${PREFIX}/lib/libmupen64plus.so.2.0.0 ${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2 .else . if ${PKGNAMESUFFIX} == "-ui-console" - ${INSTALL_MAN} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/${MAN6} ${PREFIX}/man/man6/ + ${INSTALL_MAN} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/mupen64plus.6 ${STAGEDIR}${PREFIX}/man/man6/ . endif . if ${PKGNAMESUFFIX} == "-video-rice" - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/RiceVideoLinux.ini ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/RiceVideoLinux.ini ${STAGEDIR}${DATADIR} . endif . if ${PKGNAMESUFFIX} == "-video-glide64" - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64.ini ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64.ini ${STAGEDIR}${DATADIR} . endif . if ${PKGNAMESUFFIX} == "-video-glide64mk2" - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64mk2.ini ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64mk2.ini ${STAGEDIR}${DATADIR} . endif . if ${PKGNAMESUFFIX} == "-input-sdl" - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${STAGEDIR}${DATADIR} . endif . if ${PKGNAMESUFFIX} != "-ui-console" - @${MKDIR} ${PREFIX}/lib/${PORTNAME} - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}.so ${PREFIX}/lib/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME} . else - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin . endif .endif Index: emulators/mupen64plus-core/Makefile =================================================================== --- emulators/mupen64plus-core/Makefile (revision 354653) +++ emulators/mupen64plus-core/Makefile (working copy) @@ -27,7 +27,6 @@ MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" OPTFLAGS="${OPTFLAGS}" OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -NO_STAGE= yes .include .include "${MASTERDIR}/Makefile.common" Index: emulators/mupen64plus/Makefile =================================================================== --- emulators/mupen64plus/Makefile (revision 354653) +++ emulators/mupen64plus/Makefile (working copy) @@ -34,7 +34,6 @@ do-install: # empty -NO_STAGE= yes post-install: @${CAT} ${PKGMESSAGE} Index: emulators/mupen64plus-rsp-hle/Makefile =================================================================== --- emulators/mupen64plus-rsp-hle/Makefile (revision 354653) +++ emulators/mupen64plus-rsp-hle/Makefile (working copy) @@ -9,5 +9,4 @@ OPTIONS_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: emulators/mupen64plus-video-glide64mk2/Makefile =================================================================== --- emulators/mupen64plus-video-glide64mk2/Makefile (revision 354653) +++ emulators/mupen64plus-video-glide64mk2/Makefile (working copy) @@ -18,6 +18,4 @@ CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes - .include "${MASTERDIR}/Makefile" Index: emulators/mupen64plus-ui-console/Makefile =================================================================== --- emulators/mupen64plus-ui-console/Makefile (revision 354653) +++ emulators/mupen64plus-ui-console/Makefile (working copy) @@ -9,5 +9,4 @@ OPTIONS_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: emulators/mupen64plus-plugins/Makefile =================================================================== --- emulators/mupen64plus-plugins/Makefile (revision 354653) +++ emulators/mupen64plus-plugins/Makefile (working copy) @@ -20,7 +20,6 @@ OPTIONS_DEFAULT= VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 -NO_STAGE= yes .include # Graphics plugins Index: emulators/mupen64plus-video-rice/Makefile =================================================================== --- emulators/mupen64plus-video-rice/Makefile (revision 354653) +++ emulators/mupen64plus-video-rice/Makefile (working copy) @@ -11,5 +11,4 @@ OPTIONS_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Index: emulators/mupen64plus-input-sdl/Makefile =================================================================== --- emulators/mupen64plus-input-sdl/Makefile (revision 354653) +++ emulators/mupen64plus-input-sdl/Makefile (working copy) @@ -9,5 +9,4 @@ OPTION_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" >Release-Note: >Audit-Trail: >Unformatted: