From owner-svn-ports-head@FreeBSD.ORG Thu Aug 14 22:05:57 2014 Return-Path: Delivered-To: svn-ports-head@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 8EB084C2; Thu, 14 Aug 2014 22:05:57 +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 77BF14877; Thu, 14 Aug 2014 22:05:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7EM5vYF037489; Thu, 14 Aug 2014 22:05:57 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7EM5sjR037475; Thu, 14 Aug 2014 22:05:54 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201408142205.s7EM5sjR037475@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 14 Aug 2014 22:05:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364872 - in head/emulators: mupen64plus mupen64plus-audio-sdl mupen64plus-core mupen64plus-input-sdl mupen64plus-plugins mupen64plus-rsp-hle mupen64plus-rsp-z64 mupen64plus-ui-console ... 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.18-1 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: Thu, 14 Aug 2014 22:05:57 -0000 Author: marino Date: Thu Aug 14 22:05:53 2014 New Revision: 364872 URL: http://svnweb.freebsd.org/changeset/ports/364872 QAT: https://qat.redports.org/buildarchive/r364872/ Log: Stage all emulators/mupen64plus ports PR: 190081 Submitted by: Matthieu Volat Tweaks by: marino Modified: head/emulators/mupen64plus-audio-sdl/Makefile head/emulators/mupen64plus-core/Makefile head/emulators/mupen64plus-core/Makefile.common head/emulators/mupen64plus-core/pkg-descr head/emulators/mupen64plus-input-sdl/Makefile head/emulators/mupen64plus-plugins/Makefile head/emulators/mupen64plus-rsp-hle/Makefile head/emulators/mupen64plus-rsp-z64/Makefile head/emulators/mupen64plus-ui-console/Makefile head/emulators/mupen64plus-video-arachnoid/Makefile head/emulators/mupen64plus-video-glide64/Makefile head/emulators/mupen64plus-video-glide64mk2/Makefile head/emulators/mupen64plus-video-rice/Makefile head/emulators/mupen64plus/Makefile Modified: head/emulators/mupen64plus-audio-sdl/Makefile ============================================================================== --- head/emulators/mupen64plus-audio-sdl/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-audio-sdl/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -11,5 +11,4 @@ MASTERDIR= ${.CURDIR}/../mupen64plus-cor OPTIONS_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-core/Makefile ============================================================================== --- head/emulators/mupen64plus-core/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-core/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -13,7 +13,7 @@ PKGNAMESUFFIX?= -core DIST_SUBDIR= ${PORTNAME} MAINTAINER?= ports@FreeBSD.org -COMMENT?= A fork of Mupen64 Nintendo 64 emulator +COMMENT?= Fork of Mupen64 Nintendo 64 emulator #PROJECTHOST= bsdistfiles USES= gmake pkgconfig @@ -27,9 +27,5 @@ OPTFLAGS= # MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" OPTFLAGS="${OPTFLAGS}" OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -NO_STAGE= yes -.include - -.include "${MASTERDIR}/Makefile.common" - -.include +.include "${.CURDIR}/../mupen64plus-core/Makefile.common" +.include Modified: head/emulators/mupen64plus-core/Makefile.common ============================================================================== --- head/emulators/mupen64plus-core/Makefile.common Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-core/Makefile.common Thu Aug 14 22:05:53 2014 (r364872) @@ -16,10 +16,6 @@ LIB_DEPENDS+= libfreetype.so:${PORTSDIR 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 @@ -62,13 +58,17 @@ pre-install: @${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} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST} . else @${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST} . endif + @${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST} .else post-patch: @cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \ @@ -76,54 +76,48 @@ post-patch: .endif do-install: + @${MKDIR} ${STAGEDIR}${DATADIR} .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} ${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} - ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/RELEASE \ - ${DOCSDIR}/RELEASE -. endif - ${LN} -sf ${PREFIX}/lib/libmupen64plus.so.2.0.0 ${PREFIX}/lib/libmupen64plus.so.2 + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/RELEASE \ + ${STAGEDIR}${DOCSDIR}/RELEASE + ${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} + ${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} + ${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} + ${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} + ${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 Modified: head/emulators/mupen64plus-core/pkg-descr ============================================================================== --- head/emulators/mupen64plus-core/pkg-descr Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-core/pkg-descr Thu Aug 14 22:05:53 2014 (r364872) @@ -5,4 +5,4 @@ amd64 systems, and necessary plugins for signal co-processor (RSP), and input. There are 3 OpenGL video plugins included: glN64, RiceVideoLinux, and Glide64. -WWW: http://code.google.com/p/mupen64plus/ +WWW: http://code.google.com/p/mupen64plus/ Modified: head/emulators/mupen64plus-input-sdl/Makefile ============================================================================== --- head/emulators/mupen64plus-input-sdl/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-input-sdl/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -9,5 +9,4 @@ MASTERDIR= ${.CURDIR}/../mupen64plus-cor OPTION_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-plugins/Makefile ============================================================================== --- head/emulators/mupen64plus-plugins/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-plugins/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -20,7 +20,6 @@ RSP_Z64_DESC= z64 RSP plugin OPTIONS_DEFAULT= VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 -NO_STAGE= yes .include # Graphics plugins Modified: head/emulators/mupen64plus-rsp-hle/Makefile ============================================================================== --- head/emulators/mupen64plus-rsp-hle/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-rsp-hle/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -9,5 +9,4 @@ MASTERDIR= ${.CURDIR}/../mupen64plus-cor OPTIONS_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-rsp-z64/Makefile ============================================================================== --- head/emulators/mupen64plus-rsp-z64/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-rsp-z64/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -22,5 +22,4 @@ EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-ui-console/Makefile ============================================================================== --- head/emulators/mupen64plus-ui-console/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-ui-console/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -9,5 +9,4 @@ MASTERDIR= ${.CURDIR}/../mupen64plus-cor OPTIONS_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-video-arachnoid/Makefile ============================================================================== --- head/emulators/mupen64plus-video-arachnoid/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-video-arachnoid/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -22,5 +22,4 @@ EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-video-glide64/Makefile ============================================================================== --- head/emulators/mupen64plus-video-glide64/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-video-glide64/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -23,5 +23,4 @@ EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-video-glide64mk2/Makefile ============================================================================== --- head/emulators/mupen64plus-video-glide64mk2/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-video-glide64mk2/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -18,6 +18,4 @@ OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes - .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus-video-rice/Makefile ============================================================================== --- head/emulators/mupen64plus-video-rice/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus-video-rice/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -11,5 +11,4 @@ MASTERDIR= ${.CURDIR}/../mupen64plus-cor OPTIONS_DEFINE= # -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/emulators/mupen64plus/Makefile ============================================================================== --- head/emulators/mupen64plus/Makefile Thu Aug 14 21:54:15 2014 (r364871) +++ head/emulators/mupen64plus/Makefile Thu Aug 14 22:05:53 2014 (r364872) @@ -34,7 +34,6 @@ SUB_FILES= pkg-message do-install: # empty -NO_STAGE= yes post-install: @${CAT} ${PKGMESSAGE}