FreeBSD Bugzilla – Attachment 142970 Details for
Bug 190081
[stage] add staging support to emulators/mupen64plus ports
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 7.97 KB, created by
Matthieu Volat
on 2014-05-21 18:50:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Matthieu Volat
Created:
2014-05-21 18:50:00 UTC
Size:
7.97 KB
patch
obsolete
>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 <bsd.port.pre.mk> > > .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 <bsd.port.pre.mk> > > # 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"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 190081
: 142970