From owner-svn-ports-all@freebsd.org Mon Dec 26 11:12:54 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83211C0BFF6; Mon, 26 Dec 2016 11:12:54 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 5C96E1A3B; Mon, 26 Dec 2016 11:12:54 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQBCr1b060026; Mon, 26 Dec 2016 11:12:53 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQBCr0T060025; Mon, 26 Dec 2016 11:12:53 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201612261112.uBQBCr0T060025@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 26 Dec 2016 11:12:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429491 - head/games/diaspora X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Dec 2016 11:12:54 -0000 Author: amdmi3 Date: Mon Dec 26 11:12:53 2016 New Revision: 429491 URL: https://svnweb.freebsd.org/changeset/ports/429491 Log: - Add mirror for distfile - Use standard CC-BY-NC-SA-3.0 license - Add gl to USE_GL - Remove bsd.port.options.mk include - Use new options helpers - Use EXTRACT_* variables for post-extract target - Use POST_PLIST for build-plist-empty target PR: 215539 Submitted by: lightside@gmx.com (maintainer) Modified: head/games/diaspora/Makefile Modified: head/games/diaspora/Makefile ============================================================================== --- head/games/diaspora/Makefile Mon Dec 26 10:36:41 2016 (r429490) +++ head/games/diaspora/Makefile Mon Dec 26 11:12:53 2016 (r429491) @@ -9,87 +9,77 @@ MASTER_SITES= http://diaspora.fs2downloa 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 \ +LIB_DEPENDS= libjansson.so:devel/jansson \ libpng.so:graphics/png \ libogg.so:audio/libogg \ libvorbisfile.so:audio/libvorbis \ libtheora.so:multimedia/libtheora -USES= autoreconf jpeg lua:51 openal pkgconfig tar:lzma -USE_GL= yes +USES= autoreconf jpeg lua:51 openal pkgconfig tar:lzma +USE_GL= gl glu USE_SDL= sdl GNU_CONFIGURE= yes -WRKDIR_DIASPORA= ${WRKDIR}/Diaspora_R1_Linux/Diaspora -WRKSRC= ${WRKDIR_DIASPORA}/fs2_open +WRKDIR_DIASPORA=${WRKDIR}/Diaspora_R1_Linux/Diaspora +WRKSRC= ${WRKDIR_DIASPORA}/fs2_open PORTDATA= data *.vp PORTDOCS= * SUB_FILES= fs2_open_${PORTNAME} -PLIST_FILES+= bin/fs2_open_${PORTNAME} \ +PLIST_FILES= bin/fs2_open_${PORTNAME} \ libexec/fs2_open_${PORTNAME} \ share/pixmaps/${PORTNAME}.png -DESKTOP_ENTRIES= "Diaspora" "${COMMENT}" \ - "${PORTNAME}" "fs2_open_${PORTNAME}" \ - "Game;Simulation;" false +DESKTOP_ENTRIES="Diaspora" "${COMMENT}" \ + "${PORTNAME}" "fs2_open_${PORTNAME}" \ + "Game;Simulation;" false -OPTIONS_DEFINE= DOCS INCJOYBTNS SPEECH WXLAUNCHER +OPTIONS_DEFINE= DOCS INCJOYBTNS SPEECH WXLAUNCHER OPTIONS_DEFAULT= SPEECH WXLAUNCHER INCJOYBTNS_DESC= Increase a number of joystick buttons from 32 to 98 INCJOYBTNS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-increase_joy_buttons_fixed.patch -SPEECH_DESC= Text to speech +SPEECH_DESC= Text to speech SPEECH_CONFIGURE_ENABLE= speech WXLAUNCHER_DESC= Use wxlauncher to manage application profile +WXLAUNCHER_DESKTOP_ENTRIES= "Diaspora Launcher" "${COMMENT}" \ + "${PORTNAME}" "fs2_open_${PORTNAME}_launcher" \ + "Game;Simulation;" false +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" -.include - -.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}" \ - "${PORTNAME}" "fs2_open_${PORTNAME}_launcher" \ - "Game;Simulation;" false -.endif +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 @@ post-patch: .SILENT ${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 @@ do-install: ${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