From 244c8c12e6da77d112c96e94dd051af7559d51f6 Mon Sep 17 00:00:00 2001 From: edwin Date: Sun, 16 Oct 2005 06:34:50 +0000 Subject: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data" Changes: * Rename to "quake3-data" (also rename port directory). * Install Quake III Arena and Quake III Team Arena updates and ask to put the 2 files from the original CDROM to complete the installation. * Has an includable Makefile to set variables for other mods/clients. * Take maintainership (this is a complete rewrite). The PR starts with a diff... and then gets followed up by: Description: This patch has to be applied to the previous patch. Description: This patch replaces the previous one (to be applied to the first one). Description: This patch replaces the 2 previous ones (that have to be applied to the first). PR: ports/86185 Submitted by: Alejandro Pulver --- games/Makefile | 2 +- games/q3-paks/Makefile | 49 ------------------------- games/q3-paks/pkg-descr | 7 ---- games/quake3-data/Makefile | 67 +++++++++++++++++++--------------- games/quake3-data/files/pkg-message.in | 11 ++++++ games/quake3-data/pkg-descr | 6 +-- 6 files changed, 52 insertions(+), 90 deletions(-) delete mode 100644 games/q3-paks/Makefile delete mode 100644 games/q3-paks/pkg-descr create mode 100644 games/quake3-data/files/pkg-message.in (limited to 'games') diff --git a/games/Makefile b/games/Makefile index 929be25d6f84..ff135d7a00eb 100644 --- a/games/Makefile +++ b/games/Makefile @@ -446,7 +446,6 @@ SUBDIR += pysol-music SUBDIR += pythoong SUBDIR += q15 - SUBDIR += q3-paks SUBDIR += q3server SUBDIR += q3server-excessive SUBDIR += q3server-freezetag @@ -470,6 +469,7 @@ SUBDIR += quake2-source SUBDIR += quake2forge SUBDIR += quake2lnx + SUBDIR += quake3-data SUBDIR += quakeforge SUBDIR += quit SUBDIR += qwdtools diff --git a/games/q3-paks/Makefile b/games/q3-paks/Makefile deleted file mode 100644 index 57c9f4396838..000000000000 --- a/games/q3-paks/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: Quake 3 paks -# Date created: 1st March 2003 -# Whom: nik@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= q3-paks -PORTVERSION= 1.0 -CATEGORIES= games linux -MASTER_SITES= # -DISTFILES= pak0.pk3 -DIST_SUBDIR= q3-paks -IGNOREFILES= ${ALLFILES} - -MAINTAINER= alejandro@varnet.biz -COMMENT= Quake 3 for Linux .pk3 files - -# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the -# directory hierarchy for us. -RUN_DEPENDS= ${LINUXBASE}/usr/games/quake3/q3ded:${PORTSDIR}/games/q3server - -PLIST_FILES= usr/games/quake3/baseq3/pak0.pk3 -ONLY_FOR_ARCHS= i386 -USE_LINUX_PREFIX= yes -EXTRACT_ONLY= # Don't extract anything -STRIP= - -GAMEDIR= ${PREFIX}/usr/games/quake3/ - -.include - -.for file in ${DISTFILES} -.if !exists(${DISTDIR}/q3-paks/${file}) -IGNORE=You must manually copy all the .pk3 files from the baseq3/ directory of an installed version of the game to the ${DISTDIR}/q3-paks directory and then run make again. -.endif -.endfor - -# Do nothing for the build. Don't set NO_BUILD because of the earlier -# BUILD_DEPENDS -do-build: - -do-install: - ${MKDIR} ${GAMEDIR}/baseq3 -.for file in ${DISTFILES} - ${INSTALL_DATA} ${DISTDIR}/q3-paks/${file} ${GAMEDIR}/baseq3 -.endfor - -.include diff --git a/games/q3-paks/pkg-descr b/games/q3-paks/pkg-descr deleted file mode 100644 index 058b285ceaf8..000000000000 --- a/games/q3-paks/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Quake 3 for Linux .pk3 files - -This port encapsulates the .pk3 files for Quake 3 that are used to complete -the installation of the game (including the dedicated server). - -You still need to have a legitimate copy of the game in order to obtain -the .pk3 files. diff --git a/games/quake3-data/Makefile b/games/quake3-data/Makefile index 57c9f4396838..1f5023d57890 100644 --- a/games/quake3-data/Makefile +++ b/games/quake3-data/Makefile @@ -1,49 +1,56 @@ -# New ports collection makefile for: Quake 3 paks +# New ports collection makefile for: Quake 3 paks # Date created: 1st March 2003 # Whom: nik@FreeBSD.org # # $FreeBSD$ # -PORTNAME= q3-paks -PORTVERSION= 1.0 -CATEGORIES= games linux -MASTER_SITES= # -DISTFILES= pak0.pk3 -DIST_SUBDIR= q3-paks -IGNOREFILES= ${ALLFILES} +PORTNAME= data +DISTVERSION= 1.32b-3 +CATEGORIES= games +MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/quake3/linux/ +DISTNAME= linuxq3apoint-${DISTVERSION}.x86 +EXTRACT_SUFX= .run MAINTAINER= alejandro@varnet.biz -COMMENT= Quake 3 for Linux .pk3 files +COMMENT= Quake III Arena data files -# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the -# directory hierarchy for us. -RUN_DEPENDS= ${LINUXBASE}/usr/games/quake3/q3ded:${PORTSDIR}/games/q3server +NO_BUILD= yes +NO_WRKSUBDIR= yes -PLIST_FILES= usr/games/quake3/baseq3/pak0.pk3 -ONLY_FOR_ARCHS= i386 -USE_LINUX_PREFIX= yes -EXTRACT_ONLY= # Don't extract anything -STRIP= +OPTIONS= TEAMARENA "Install Quake III Team Arena data files" on -GAMEDIR= ${PREFIX}/usr/games/quake3/ +SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message + +do-extract: + @${RM} -rf ${WRKDIR} + @${MKDIR} ${WRKDIR} + @cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + ${TAR} zxf - >/dev/null + +.include "Makefile.include" .include -.for file in ${DISTFILES} -.if !exists(${DISTDIR}/q3-paks/${file}) -IGNORE=You must manually copy all the .pk3 files from the baseq3/ directory of an installed version of the game to the ${DISTDIR}/q3-paks directory and then run make again. +.if defined(WITH_TEAMARENA) +PLIST_SUB+= TEAMARENA="" +.else +PLIST_SUB+= TEAMARENA="@comment " .endif -.endfor - -# Do nothing for the build. Don't set NO_BUILD because of the earlier -# BUILD_DEPENDS -do-build: do-install: - ${MKDIR} ${GAMEDIR}/baseq3 -.for file in ${DISTFILES} - ${INSTALL_DATA} ${DISTDIR}/q3-paks/${file} ${GAMEDIR}/baseq3 -.endfor + @${MKDIR} ${DATADIR} + @${CP} -R ${WRKSRC}/baseq3 ${DATADIR} + @${MKDIR} ${PREFIX}/share/pixmaps + @${INSTALL_DATA} ${WRKSRC}/quake3.xpm ${PREFIX}/share/pixmaps +.if defined(WITH_TEAMARENA) + @${CP} -R ${WRKSRC}/missionpack ${DATADIR} +.endif + +post-install: + @${ECHO_CMD} + @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} .include diff --git a/games/quake3-data/files/pkg-message.in b/games/quake3-data/files/pkg-message.in new file mode 100644 index 000000000000..43437109811c --- /dev/null +++ b/games/quake3-data/files/pkg-message.in @@ -0,0 +1,11 @@ +==================================================================== + +To complete the installation of this port you need to copy the file +"baseq3/pak0.pk3" from the original Quake III Arena distribution to +"%%DATADIR%%/baseq3". + +If you have the expansion pack then you have to copy the file +"missionpack/pak0.pk3" from the original Quake III Team Arena +distribution to "%%DATADIR%%/missionpack". + +==================================================================== diff --git a/games/quake3-data/pkg-descr b/games/quake3-data/pkg-descr index 058b285ceaf8..580374f166f7 100644 --- a/games/quake3-data/pkg-descr +++ b/games/quake3-data/pkg-descr @@ -1,7 +1,7 @@ -Quake 3 for Linux .pk3 files +Quake III Arena data files. -This port encapsulates the .pk3 files for Quake 3 that are used to complete -the installation of the game (including the dedicated server). +This port installs the data files needed to run Quake III Arena. It also uses +the update, and has an option to install Quake III Team Arena data files. You still need to have a legitimate copy of the game in order to obtain the .pk3 files. -- cgit