From 55923938e0af54880ac44d12c203dfb3418bfcf3 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Fri, 17 Jan 2014 18:21:42 +0000 Subject: [PATCH] - Set EXTRACT_SUFX and dismiss USE_ZIP - Augment DEPRECATED notice text a bit - Make USE_GL more specific (gl) instead of umbrella `yes' - Remove references to PTHREAD_CFLAGS (long-time empty) and PTHREAD_LIBS (replace with just `-pthread'); it also allows to shave off two lines - Modernize LIB_DEPENDS syntax and stagify --- games/fuhquake/Makefile | 43 +++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/games/fuhquake/Makefile b/games/fuhquake/Makefile index 12e52376dd45..b2f7c57b4ebb 100644 --- a/games/fuhquake/Makefile +++ b/games/fuhquake/Makefile @@ -8,6 +8,7 @@ CATEGORIES= games MASTER_SITES= http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \ http://www.fuhquake.net/files/misc/:misc DISTNAME= ${PORTNAME}-source-v${PORTVERSION} +EXTRACT_SUFX= .zip DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} @@ -15,9 +16,8 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Excellent and feature-rich QuakeWorld client -DEPRECATED= Upstream disappeared; no more distfiles +DEPRECATED= Upstream disappeared; no more public distfiles; unmaintained -USE_ZIP= yes MAKEFILE= ${FILESDIR}/Makefile WRKSRC= ${WRKDIR}/source @@ -37,14 +37,13 @@ X11_DESC= Build X11 client HUD_DESC= Install high quality HUD images XMMS_DESC= Enable MP3 player feature -NO_STAGE= yes .include "${.CURDIR}/../quake-data/Makefile.include" .include .if ${PORT_OPTIONS:MGLX} -USE_GL= yes -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ - jpeg:${PORTSDIR}/graphics/jpeg +USE_GL= gl +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg CFLAGS+= -I${LOCALBASE}/include/libpng15 PLIST_SUB+= GLX="" CLIENTS+= glx @@ -75,11 +74,9 @@ MAKE_ARGS+= -DWITH_OPTIMIZED_CFLAGS MAKE_ARGS+= -DWITHOUT_X86_ASM .endif -.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} +.if ${PORT_OPTIONS:MXMMS} || exists(${LOCALBASE}/lib/libxmms.so) +LIB_DEPENDS+= libxmms.so:${PORTSDIR}/multimedia/xmms +MAKE_ARGS+= -DWITH_XMMS PTHREAD_LIBS=-pthread .endif post-patch: @@ -93,21 +90,21 @@ do-build: do-install: .for f in ${CLIENTS} - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${f} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${f} ${STAGEDIR}${PREFIX}/bin .endfor - @${MKDIR} ${DATADIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKDIR}/qw/*.dat ${DATADIR}/${PORTNAME} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak ${DATADIR}/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKDIR}/qw/*.dat ${STAGEDIR}${DATADIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak \ + ${STAGEDIR}${DATADIR}/${PORTNAME} .if ${PORT_OPTIONS:MHUD} - @${MKDIR} ${DATADIR}/${PORTNAME}/textures/wad - ${INSTALL_DATA} ${WRKDIR}/qw/charset.png ${DATADIR}/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DATADIR}/${PORTNAME}/textures/wad + ${INSTALL_DATA} ${WRKDIR}/qw/charset.png \ + ${STAGEDIR}${DATADIR}/${PORTNAME} ${INSTALL_DATA} ${WRKDIR}/qw/textures/wad/* \ - ${DATADIR}/${PORTNAME}/textures/wad -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${DOCSDIR} + ${STAGEDIR}${DATADIR}/${PORTNAME}/textures/wad .endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${STAGEDIR}${DOCSDIR} .include