FreeBSD Bugzilla – Attachment 178251 Details for
Bug 215539
games/diaspora: Improve port (v1.1.1)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch (since 415836 revision)
diaspora.diff (text/plain), 4.57 KB, created by
lightside
on 2016-12-24 17:28:11 UTC
(
hide
)
Description:
Proposed patch (since 415836 revision)
Filename:
MIME Type:
Creator:
lightside
Created:
2016-12-24 17:28:11 UTC
Size:
4.57 KB
patch
obsolete
>--- diaspora.orig/Makefile 2016-05-25 14:43:29 UTC >+++ diaspora/Makefile >@@ -9,20 +9,18 @@ > http://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/:intfiles \ > http://ftp.tw.freebsd.org/distfiles/:twfiles > DISTFILES= Diaspora_R1_Linux.tar.lzma:freespacemods,DEFAULT \ >- Diaspora_R1_Patch_1.1.tar.lzma:intfiles,twfiles \ >+ Diaspora_R1_Patch_1.1.tar.lzma:intfiles,twfiles,DEFAULT \ > Diaspora_R1_Patch_1.1.1.tar.lzma > > MAINTAINER= lightside@gmx.com > COMMENT= Single and multiplayer space fighter combat game > >-LICENSE= CCBYNCSAv3 VOLITION GPLv2 >+LICENSE= CC-BY-NC-SA-3.0 VOLITION GPLv2 > LICENSE_COMB= multi >-LICENSE_NAME_CCBYNCSAv3= Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported license > LICENSE_NAME_VOLITION= Volition license >-LICENSE_FILE_CCBYNCSAv3= ${WRKDIR_DIASPORA}/License.txt >+LICENSE_FILE_CC-BY-NC-SA-3.0= ${WRKDIR_DIASPORA}/License.txt > LICENSE_FILE_VOLITION= ${WRKSRC}/COPYING > LICENSE_FILE_GPLv2= ${WRKDIR_DIASPORA}/wxlauncher/GPLv2.txt >-LICENSE_PERMS_CCBYNCSAv3= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept > LICENSE_PERMS_VOLITION= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept > > LIB_DEPENDS+= libjansson.so:devel/jansson \ >@@ -32,7 +30,7 @@ > libtheora.so:multimedia/libtheora > > USES= autoreconf jpeg lua:51 openal pkgconfig tar:lzma >-USE_GL= yes >+USE_GL= gl glu > USE_SDL= sdl > GNU_CONFIGURE= yes > >@@ -57,39 +55,31 @@ > SPEECH_DESC= Text to speech > SPEECH_CONFIGURE_ENABLE= speech > WXLAUNCHER_DESC= Use wxlauncher to manage application profile >-WXLAUNCHER_RUN_DEPENDS= wxlauncher:games/wxlauncher >- >-.include <bsd.port.options.mk> >- >-.if ${PORT_OPTIONS:MWXLAUNCHER} >-PORTDATA+= resources *.ini *.png *.bmp >-SUB_FILES+= fs2_open_${PORTNAME}_launcher >-PLIST_FILES+= bin/fs2_open_${PORTNAME}_launcher \ >- %%DATADIR%%/fs2_open_${PORTNAME} >- >-DESKTOP_ENTRIES+= "Diaspora Launcher" "${COMMENT}" \ >+WXLAUNCHER_DESKTOP_ENTRIES= "Diaspora Launcher" "${COMMENT}" \ > "${PORTNAME}" "fs2_open_${PORTNAME}_launcher" \ > "Game;Simulation;" false >-.endif >+WXLAUNCHER_PLIST_FILES= bin/fs2_open_${PORTNAME}_launcher \ >+ %%DATADIR%%/fs2_open_${PORTNAME} >+WXLAUNCHER_RUN_DEPENDS= wxlauncher:games/wxlauncher >+WXLAUNCHER_SUB_FILES= fs2_open_${PORTNAME}_launcher >+WXLAUNCHER_VARS= PORTDATA+="resources *.ini *.png *.bmp" >+ >+POST_PLIST+= build-plist-empty > > post-extract: .SILENT > .for v in 1.1 1.1.1 >- (cd ${WRKDIR} && tar -xf Patch_Files.${v}.tar -C ${WRKDIR_DIASPORA} && \ >- ${RM} Patch_Files.${v}.tar) >+ (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ >+ Patch_Files.${v}.tar ${EXTRACT_AFTER_ARGS} -C ${WRKDIR_DIASPORA} \ >+ && ${RM} Patch_Files.${v}.tar) > .endfor >-.if ${PORT_OPTIONS:MWXLAUNCHER} >+ >+post-extract-WXLAUNCHER-on: .SILENT > (cd ${WRKDIR_DIASPORA} && ${CP} -f pro00099.template.ini pro00099.ini) > # Backup data/cmdline_fso.cfg, because executable might merge it with > # user settings > (cd ${WRKDIR_DIASPORA}/data && ${MV} -f cmdline_fso.cfg cmdline_fso.cfg.bak) >-.endif > > post-patch: .SILENT >-.if ${PORT_OPTIONS:MWXLAUNCHER} >- ${REINPLACE_CMD} -e \ >- 's|/PATH/TO/YOUR/DIASPORA/FOLDER/HERE|${DATADIR}|' \ >- ${WRKDIR_DIASPORA}/pro00099.ini >-.endif > ${REINPLACE_CMD} -e '/^AC_INIT/s/3\.7\.1/${PORTNAME}/ ; \ > s/freebsd/${OPSYS:tl}/ ; \ > s/ -m64 -march=athlon64 -ansi// ; \ >@@ -98,6 +88,11 @@ > ${REINPLACE_CMD} -e 's|(640x480)x16|(1024x768)x32|' \ > ${BUILD_WRKSRC}/code/osapi/osapi_unix.cpp > >+post-patch-WXLAUNCHER-on: .SILENT >+ ${REINPLACE_CMD} -e \ >+ 's|/PATH/TO/YOUR/DIASPORA/FOLDER/HERE|${DATADIR}|' \ >+ ${WRKDIR_DIASPORA}/pro00099.ini >+ > do-install: > ${INSTALL_SCRIPT} ${WRKDIR}/fs2_open_${PORTNAME} \ > ${STAGEDIR}${PREFIX}/bin >@@ -105,21 +100,21 @@ > ${STAGEDIR}${PREFIX}/libexec > (cd ${WRKDIR_DIASPORA} && ${COPYTREE_SHARE} "${PORTDATA}" \ > ${STAGEDIR}${DATADIR}) >+ ${INSTALL_DATA} ${WRKDIR_DIASPORA}/resources/modimg.png \ >+ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png >+ >+do-install-DOCS-on: > (cd ${WRKDIR} && ${COPYTREE_SHARE} "README*.txt" ${STAGEDIR}${DOCSDIR}) > (cd ${WRKDIR_DIASPORA} && ${COPYTREE_SHARE} "*.pdf *.rtf README.txt" \ > ${STAGEDIR}${DOCSDIR}) > (cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog" \ > ${STAGEDIR}${DOCSDIR}) >- ${INSTALL_DATA} ${WRKDIR_DIASPORA}/resources/modimg.png \ >- ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png >-.if ${PORT_OPTIONS:MWXLAUNCHER} >+ >+do-install-WXLAUNCHER-on: > ${INSTALL_SCRIPT} ${WRKDIR}/fs2_open_${PORTNAME}_launcher \ > ${STAGEDIR}${PREFIX}/bin > # Create a symbolic link, which used by launcher > ${LN} -sf ${PREFIX}/libexec/fs2_open_${PORTNAME} ${STAGEDIR}${DATADIR} >-.endif >- >-add-plist-post: build-plist-empty > > build-plist-empty: .SILENT > # Add required empty directories to TMPPLIST
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
Flags:
lightside
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 215539
: 178251