Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2013 14:58:34 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r314359 - head/games/fuhquake
Message-ID:  <201303161458.r2GEwYAj094305@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sat Mar 16 14:58:33 2013
New Revision: 314359
URL: http://svnweb.freebsd.org/changeset/ports/314359

Log:
  - Trim old-school Makefile header
  - Convert to contemporary OPTIONS framework and cleanup Makefile
  - Drop shlib ABI version from LIB_DEPENDS
  - Relinquish control and add deprecation note

Modified:
  head/games/fuhquake/Makefile

Modified: head/games/fuhquake/Makefile
==============================================================================
--- head/games/fuhquake/Makefile	Sat Mar 16 14:24:04 2013	(r314358)
+++ head/games/fuhquake/Makefile	Sat Mar 16 14:58:33 2013	(r314359)
@@ -1,52 +1,48 @@
-# New ports collection makefile for:	FuhQuake
-# Date created:				01 Jun 2003
-# Whom:					Alexey Dokuchaev <danfe@regency.nsu.ru>
-#
+# Created by: Alexey Dokuchaev <danfe@regency.nsu.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	fuhquake
 PORTVERSION=	0.31
 PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \
-		ftp://gibbage.mine.nu/clients/fuhquake/releases/v${PORTVERSION}/ \
-		http://gamefiles.blueyonder.co.uk/blueyondergames/quake/quakeworld/clients/fuhquake/source/ \
 		http://www.fuhquake.net/files/misc/:misc
 DISTNAME=	${PORTNAME}-source-v${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	An excellent QuakeWorld client
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Excellent and feature-rich QuakeWorld client
+
+DEPRECATED=	Upstream disappeared; no more distfiles
 
 USE_ZIP=	yes
 MAKEFILE=	${FILESDIR}/Makefile
 WRKSRC=		${WRKDIR}/source
 
-OPTIONS=	GLX "Build GLX client" on \
-		HUD "High quality HUD images" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		X11 "Build X11 client" on \
-		X86_ASM "Enable x86 assembly code" on \
-		XMMS "Enable MP3 Player feature" off
-
 DATADIR=	${Q1DIR}
 MAKE_ENV=	DATADIR="${DATADIR}"
 
-.include "${.CURDIR}/../quake-data/Makefile.include"
+OPTIONS_MULTI=		CLIENT
+OPTIONS_MULTI_CLIENT=	GLX X11
+OPTIONS_DEFINE_i386=	ASM
+OPTIONS_DEFINE=		HUD OPTIMIZED_CFLAGS XMMS DOCS
+OPTIONS_DEFAULT=	GLX OPTIMIZED_CFLAGS X11 DOCS
+OPTIONS_DEFAULT_i386=	ASM
+
+GLX_DESC=	Build GLX client
+X11_DESC=	Build X11 client
+HUD_DESC=	Install high quality HUD images
+XMMS_DESC=	Enable MP3 player feature
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITH_GLX) && !defined(WITH_X11)
-IGNORE=		needs at least one client (GLX or X11)
-.endif
+.include "${.CURDIR}/../quake-data/Makefile.include"
+.include <bsd.port.options.mk>
 
-.if defined(WITH_GLX)
+.if ${PORT_OPTIONS:MGLX}
 USE_GL=		yes
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+		jpeg:${PORTSDIR}/graphics/jpeg
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
 PLIST_SUB+=	GLX=""
 CLIENTS+=	glx
@@ -54,32 +50,31 @@ CLIENTS+=	glx
 PLIST_SUB+=	GLX="@comment "
 .endif
 
-.if defined(WITH_HUD)
+.if ${PORT_OPTIONS:MX11}
+USE_XORG=	x11 xxf86dga
+PLIST_SUB+=	X11=""
+CLIENTS+=	x11
+.else
+PLIST_SUB+=	X11="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MHUD}
 DISTFILES+=	fuh-hud${EXTRACT_SUFX}:misc
 PLIST_SUB+=	HUD=""
 .else
 PLIST_SUB+=	HUD="@comment "
 .endif
 
-.for f in OPTIMIZED_CFLAGS X86_ASM
-.   if defined(WITH_${f})
-MAKE_ARGS+=	-DWITH_${f}
-.   else
-MAKE_ARGS+=	-DWITHOUT_${f}
-.   endif
-.endfor
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+MAKE_ARGS+=	-DWITH_OPTIMIZED_CFLAGS
+.endif
 
-.if defined(WITH_X11)
-USE_XORG=	x11 xxf86dga
-PLIST_SUB+=	X11=""
-CLIENTS+=	x11
-.else
-PLIST_SUB+=	X11="@comment "
+.if ! ${PORT_OPTIONS:MASM}
+MAKE_ARGS+=	-DWITHOUT_X86_ASM
 .endif
 
-.if (defined(WITH_XMMS) || exists(${LOCALBASE}/lib/libxmms.so.4)) && \
-    defined(CLIENTS)
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+.if ${PORT_OPTIONS:MXMMS} || exists(${LOCALBASE}/lib/libxmms.so.4)
+LIB_DEPENDS+=	xmms:${PORTSDIR}/multimedia/xmms
 MAKE_ARGS+=	-DWITH_XMMS \
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 		PTHREAD_LIBS=${PTHREAD_LIBS}
@@ -98,20 +93,19 @@ do-install:
 .for f in ${CLIENTS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${f} ${PREFIX}/bin
 .endfor
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${DATADIR}/${PORTNAME}
+	@${MKDIR} ${DATADIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKDIR}/qw/*.dat ${DATADIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak ${DATADIR}/${PORTNAME}
-.if defined(WITH_HUD)
-	${MKDIR} ${DATADIR}/${PORTNAME}/textures/wad
+.if ${PORT_OPTIONS:MHUD}
+	@${MKDIR} ${DATADIR}/${PORTNAME}/textures/wad
 	${INSTALL_DATA} ${WRKDIR}/qw/charset.png ${DATADIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKDIR}/qw/textures/wad/* \
 		${DATADIR}/${PORTNAME}/textures/wad
 .endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303161458.r2GEwYAj094305>