Date: Mon, 6 Apr 2015 00:11:19 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383398 - head/games/linux-ut Message-ID: <201504060011.t360BJb7049486@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Apr 6 00:11:19 2015 New Revision: 383398 URL: https://svnweb.freebsd.org/changeset/ports/383398 Log: - OPTIONize port, use OPTIONS_SUB - Make CDROM checks set IGNORE instead of failing the installation - Remove @dirrm* from plist PR: 198000 Submitted by: amdmi3 Approved by: maintainer timeout (scf, 5 weeks) Modified: head/games/linux-ut/Makefile head/games/linux-ut/pkg-plist Modified: head/games/linux-ut/Makefile ============================================================================== --- head/games/linux-ut/Makefile Mon Apr 6 00:08:33 2015 (r383397) +++ head/games/linux-ut/Makefile Mon Apr 6 00:11:19 2015 (r383398) @@ -30,18 +30,19 @@ CONFLICTS_INSTALL= exult-[0-9]* ucc-[0-9 # Patch files. PATCH436FILES= unreal.tournament_436-multilanguage.run:p436 \ unreal.tournament.official.bonus.pack.collection.run:p436 -.if defined(WITH_451PATCH) -PATCH451FILES= UTPGPatch451.tar.bz2:p451 -UTVERSION= 451 -PLIST_SUB+= 451PATCH="" -.else -PATCH451FILES= # Empty -UTVERSION= 436 -PLIST_SUB+= 451PATCH="@comment " -.endif CDDIRS= Help Logs Maps Music Sounds System Textures Web +# Checks +# - Verify path to CD content. +# - Verify CD was correctly mounted by checking for incorrect NetGamesUSA.com. +# -b option may be needed to mount it. +.if !defined(CDROM_MOUNT) +IGNORE= requires CDROM_MOUNT set to mount point of CD +.elif exists(${CDROM_MOUNT}/netgam~1.com) +IGNORE= requires CD mounting with -b option +.endif + # Anthology install. .if exists(${CDROM_MOUNT}/Disk1/data1.cab) ANTHOLOGY= yes @@ -55,14 +56,29 @@ RELEASE_MSG= "original/GOTY" PLIST_SUB+= ANTHOLOGY="@comment " ORIGINAL="" .endif -# Maps. -.if defined(WITHOUT_MAPS) -PLIST_SUB+= MAPS="@comment " +OPTIONS_DEFINE= MAPS V451PATCH +OPTIONS_DEFAULT=MAPS +OPTIONS_SUB= yes +MAPS_DES= Install additional maps +V451PATCH= With version 451 patch + +.include <bsd.port.options.mk> + +# Maps +.if ${PORT_OPTIONS:MMAPS} +MAPS_EXCLUDE= # Empty +.else MAPS_EXCLUDE= --exclude 'AS*' --exclude 'CTF*' --exclude 'DM*'\ --exclude 'DOM*' --exclude 'EOL*' +.endif + +# Patch +.if ${PORT_OPTIONS:MV451PATCH} +PATCH451FILES= UTPGPatch451.tar.bz2:p451 +UTVERSION= 451 .else -PLIST_SUB+= MAPS="" -MAPS_EXCLUDE= # Empty +PATCH451FILES= # Empty +UTVERSION= 436 .endif do-extract: @@ -82,9 +98,6 @@ post-patch: -e "/ll=/{N;d;}" ${WRKSRC}/bin/ut # Installation steps performed: -# - Verify path to CD content. -# - Verify CD was correctly mounted by checking for incorrect NetGamesUSA.com. -# -b option may be needed to mount it. # - Copy desired content off of CD to drive. Windows files left behind. # - Extract files from Linux patch minus various language files (necessary?). # - Extract bonus pack. @@ -94,15 +107,6 @@ post-patch: # - Install scripts and README's. # - Set permissions on files and directories. do-install: -.if !defined(CDROM_MOUNT) - @${ECHO_CMD} "${PKGNAME} requires CDROM_MOUNT set to mount point of CD" - @${FALSE} -.endif -.if exists(${CDROM_MOUNT}/netgam~1.com) - @${ECHO_CMD} \ - "This CD requires mounting with the -b option" - @${FALSE} -.endif @${ECHO_CMD} "Detected ${RELEASE_MSG} release" @${ECHO_CMD} "Installing data from CD" @${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/games/linux-ut/pkg-plist ============================================================================== --- head/games/linux-ut/pkg-plist Mon Apr 6 00:08:33 2015 (r383397) +++ head/games/linux-ut/pkg-plist Mon Apr 6 00:11:19 2015 (r383398) @@ -208,7 +208,7 @@ bin/ut %%DATADIR%%/System/MultiMesh.int %%DATADIR%%/System/MultiMesh.u %%DATADIR%%/System/NullDrv.so -%%451PATCH%%%%DATADIR%%/System/NullNetDriver.so +%%V451PATCH%%%%DATADIR%%/System/NullNetDriver.so %%DATADIR%%/System/NullRender.so %%DATADIR%%/System/OpenGLDrv.so %%DATADIR%%/System/OpenGlDrv.ini @@ -422,14 +422,14 @@ bin/ut %%DATADIR%%/Web/images/m3-1.gif %%DATADIR%%/Web/images/m3-2.gif %%DATADIR%%/Web/images/right.gif -%%451PATCH%%%%DATADIR%%/Web/inc/content_footer_tables.inc -%%451PATCH%%%%DATADIR%%/Web/inc/content_header_tables.inc -%%451PATCH%%%%DATADIR%%/Web/inc/footer.inc -%%451PATCH%%%%DATADIR%%/Web/inc/header.inc -%%451PATCH%%%%DATADIR%%/Web/inc/menu_footer.inc -%%451PATCH%%%%DATADIR%%/Web/inc/menu_header.inc -%%451PATCH%%%%DATADIR%%/Web/inc/top_begin.inc -%%451PATCH%%%%DATADIR%%/Web/inc/top_end.inc +%%V451PATCH%%%%DATADIR%%/Web/inc/content_footer_tables.inc +%%V451PATCH%%%%DATADIR%%/Web/inc/content_header_tables.inc +%%V451PATCH%%%%DATADIR%%/Web/inc/footer.inc +%%V451PATCH%%%%DATADIR%%/Web/inc/header.inc +%%V451PATCH%%%%DATADIR%%/Web/inc/menu_footer.inc +%%V451PATCH%%%%DATADIR%%/Web/inc/menu_header.inc +%%V451PATCH%%%%DATADIR%%/Web/inc/top_begin.inc +%%V451PATCH%%%%DATADIR%%/Web/inc/top_end.inc %%DATADIR%%/Web/menu.uhtm %%DATADIR%%/Web/message.uhtm %%DATADIR%%/Web/plaintext/current.uhtm @@ -450,23 +450,10 @@ bin/ut %%DATADIR%%/Web/plaintext/defaults_rules.uhtm %%DATADIR%%/Web/plaintext/defaults_server.uhtm %%DATADIR%%/Web/plaintext/defaults_settings.uhtm -%%451PATCH%%%%DATADIR%%/Web/plaintext/inc/footer.inc -%%451PATCH%%%%DATADIR%%/Web/plaintext/inc/header.inc -%%451PATCH%%%%DATADIR%%/Web/plaintext/inc/whiteheader.inc +%%V451PATCH%%%%DATADIR%%/Web/plaintext/inc/footer.inc +%%V451PATCH%%%%DATADIR%%/Web/plaintext/inc/header.inc +%%V451PATCH%%%%DATADIR%%/Web/plaintext/inc/whiteheader.inc %%DATADIR%%/Web/plaintext/menu.uhtm %%DATADIR%%/Web/plaintext/message.uhtm %%DATADIR%%/Web/plaintext/root.uhtm %%DATADIR%%/Web/root.uhtm -@dirrm %%DATADIR%%/Help -%%ANTHOLOGY%%@dirrm %%DATADIR%%/Manual -@dirrm %%DATADIR%%/Maps -@dirrm %%DATADIR%%/Music -@dirrm %%DATADIR%%/Sounds -@dirrm %%DATADIR%%/System -@dirrm %%DATADIR%%/Textures -@dirrm %%DATADIR%%/Web/images -%%451PATCH%%@dirrm %%DATADIR%%/Web/inc -%%451PATCH%%@dirrm %%DATADIR%%/Web/plaintext/inc -@dirrm %%DATADIR%%/Web/plaintext -@dirrm %%DATADIR%%/Web -@dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504060011.t360BJb7049486>