Attachment 57089 Details for Bug 86170 – fuhquake.diff

[patch] fuhquake.diff

fuhquake.diff (text/plain), 13.21 KB, created by Alejandro Pulver on 2005-09-15 18:50:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro Pulver

Created: 2005-09-15 18:50:08 UTC

Size: 13.21 KB

patch

obsolete

>diff -urN /usr/ports/games/fuhquake/Makefile fuhquake/Makefile
>--- /usr/ports/games/fuhquake/Makefile	Wed Jul 27 18:15:26 2005
>+++ fuhquake/Makefile	Wed Sep 14 21:06:53 2005
>@@ -13,11 +13,8 @@
> 		http://www.fuhquake.net/files/extras/:s \
> 		ftp://gibbage.mine.nu/clients/fuhquake/releases/v${PORTVERSION}/:q \
> 		http://gamefiles.blueyonder.co.uk/blueyondergames/quake/quakeworld/clients/fuhquake/source/:q \
>-		http://gamefiles.blueyonder.co.uk/blueyondergames/quake/quakeworld/clients/fuhquake/addons/:s \
>-		http://danfe.machos.ru/distfiles/qw/:p \
>-		http://freebsd.nsu.ru/distfiles/qw/:p
>+		http://gamefiles.blueyonder.co.uk/blueyondergames/quake/quakeworld/clients/fuhquake/addons/:s
> DISTNAME=	${PORTNAME}-source-v${PORTVERSION}
>-
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:q \
> 		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}:q
> DIST_SUBDIR=	${PORTNAME}
>@@ -27,99 +24,81 @@
> MAINTAINER=	danfe@FreeBSD.org
> COMMENT=	An excellent QuakeWorld client
> 
>-.if defined(WITH_SHAREWARE_DATA)
>-DISTFILES+=	q1-shareware-pak0.pak:p
>-PLIST_SUB+=	SHAREWARE=""
>-.else
>-PLIST_SUB+=	SHAREWARE="@comment "
>-.endif
>+WRKSRC=		${WRKDIR}/source
> 
>-.if defined(WITH_SKYBOXES)
>-DISTFILES+=	${PORTNAME}-skyboxes${EXTRACT_SUFX}:s
>-EXTRACT_ONLY+=	${PORTNAME}-skyboxes${EXTRACT_SUFX}
>-PLIST_SUB+=	SKYBOXES=""
>-.else
>-PLIST_SUB+=	SKYBOXES="@comment "
>-.endif
>+USE_ZIP=	yes
>+USE_REINPLACE=	yes
> 
>-.if exists(${LOCALBASE}/lib/libvga.so.1)
>-WITH_SVGA=	yes
>-.endif
>+MAKEFILE=	${FILESDIR}/Makefile
> 
>-.if exists(${X11BASE}/lib/libxmms.so.4)
>-WITH_XMMS=	yes
>-.endif
>+OPTIONS=	GLX "Build GLX client" on \
>+		LITS "Enable coloured lighting" off \
>+		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
>+		SKYBOXES "Install skyboxes pak" off \
>+		X11 "Build X11 client" on \
>+		X86_ASM "Enable x86 assembly code" on \
>+		XMMS "Enable MP3 Player feature" off
> 
>-USE_ZIP=	yes
>+.include "${.CURDIR}/../quake-data/Makefile.include"
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "i386" && !defined(WITHOUT_SVGA) && defined(WITH_SVGA)
>-LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
>-END_TARGETS+=	${PORTNAME}-svga
>-PLIST_SUB+=	SVGA=""
>-.else
>-PLIST_SUB+=	SVGA="@comment "
>-.endif
>-
>-.if !defined(WITHOUT_X11)
>-USE_XLIB=	yes
>-END_TARGETS+=	${PORTNAME}-x11
>-PLIST_SUB+=	X11=""
>-.else
>-PLIST_SUB+=	X11="@comment "
>-.endif
>-
>-.if !defined(WITHOUT_GLX)
>+.if defined(WITH_GLX)
> USE_GL=		yes
> LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
> 		jpeg.9:${PORTSDIR}/graphics/jpeg
>-END_TARGETS+=	${PORTNAME}-glx
> PLIST_SUB+=	GLX=""
>+CLIENTS+=	glx
> .else
> PLIST_SUB+=	GLX="@comment "
> .endif
> 
>-.if !defined(WITHOUT_XMMS) && defined(WITH_XMMS) && !(defined(WITHOUT_X11) && defined(WITHOUT_GLX))
>-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
>-MAKE_ARGS+=	-DWITH_XMMS PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
>+.if defined(WITH_LITS)
>+DISTFILES+=	${PORTNAME}-lits.rar:s
>+BUILD_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
>+PLIST_SUB+=	LITS=""
>+.else
>+PLIST_SUB+=	LITS="@comment "
> .endif
> 
>-PKGMESSAGE=	${WRKDIR}/pkg-message
>+.for f in OPTIMIZED_CFLAGS X86_ASM
>+.   if defined(WITH_${f})
>+MAKE_ARGS+=	-DWITH_${f}
>+.   else
>+MAKE_ARGS+=	-DWITHOUT_${f}
>+.   endif
>+.endfor
> 
>-pre-everything::
>-.if ${ARCH} == "i386" && !defined(WITH_SVGA)
>-	@${ECHO_MSG} "Define WITH_SVGA to build SVGA client"
>-.elif !defined(WITHOUT_SVGA)
>-	@${ECHO_MSG} "Define WITHOUT_SVGA to disable building of SVGA client"
>-.endif
>-.if !defined(WITH_XMMS)
>-	@${ECHO_MSG} "Define WITH_XMMS to enable \`\`MP3 Player'' feature"
>-.elif !defined(WITHOUT_XMMS)
>-	@${ECHO_MSG} "Define WITHOUT_XMMS to build without \`\`MP3 Player'' feature"
>-.endif
>-.if !defined(WITHOUT_X11)
>-	@${ECHO_MSG} "Define WITHOUT_X11 to disable building of X11 client"
>-.endif
>-.if !defined(WITHOUT_GLX)
>-	@${ECHO_MSG} "Define WITHOUT_GLX to disable building of GLX client"
>-.endif
>-.if !defined(WITH_SHAREWARE_DATA)
>-	@${ECHO_MSG} "Define WITH_SHAREWARE_DATA to install demo version game data"
>-.endif
>-.if !defined(WITH_SKYBOXES)
>-	@${ECHO_MSG} "Define WITH_SKYBOXES to install additional skyboxes pak"
>+.if defined(WITH_SKYBOXES)
>+DISTFILES+=	${PORTNAME}-skyboxes${EXTRACT_SUFX}:s
>+EXTRACT_ONLY+=	${PORTNAME}-skyboxes${EXTRACT_SUFX}
>+PLIST_SUB+=	SKYBOXES=""
>+.else
>+PLIST_SUB+=	SKYBOXES="@comment "
> .endif
>-.if !defined(WITH_OPTIMIZED_CFLAGS)
>-	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options"
>+
>+.if defined(WITH_X11)
>+USE_XLIB=	yes
>+PLIST_SUB+=	X11=""
>+CLIENTS+=	x11
>+.else
>+PLIST_SUB+=	X11="@comment "
> .endif
>-.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
>-	@${ECHO_MSG} "Define WITHOUT_X86_ASM to disable x86 assembly code"
>+
>+.if (defined(WITH_XMMS) || exists(${X11BASE}/lib/libxmms.so.4)) && \
>+    defined(CLIENTS)
>+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
>+MAKE_ARGS+=	-DWITH_XMMS \
>+		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
>+		PTHREAD_LIBS=${PTHREAD_LIBS}
> .endif
> 
>-MAKEFILE=	${FILESDIR}/Makefile
>-USE_REINPLACE=	yes
>-WRKSRC=		${WRKDIR}/source
>+.if defined(WITH_LITS)
>+post-extract:
>+	@${MKDIR} ${WRKDIR}/lits
>+	@unrar x -inul ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-lits.rar \
>+		${WRKDIR}/lits
>+.endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%BASEDIR%%|${DATADIR}|' ${WRKSRC}/common.c
>@@ -127,46 +106,29 @@
> 	@${CP} ${FILESDIR}/*.c ${WRKSRC}
> 
> do-build:
>-.if !defined(WITHOUT_X11)
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean x11)
>-.endif
>-
>-.if !defined(WITHOUT_GLX)
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean glx)
>-.endif
>-
>-.if ${ARCH} == "i386" && defined(WITH_SVGA)
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean svga)
>-.endif
>+.for f in ${CLIENTS}
>+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
>+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean ${f})
>+.endfor
> 
> do-install:
>-.for tgt in ${END_TARGETS}
>-	${INSTALL_PROGRAM} ${WRKSRC}/${tgt} ${PREFIX}/bin
>+.for f in ${CLIENTS}
>+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${f} ${PREFIX}/bin
> .endfor
>-	@${MKDIR} ${DATADIR}/qw ${DATADIR}/${PORTNAME}
>-	${INSTALL_DATA} ${WRKDIR}/qw/fragfile.dat ${DATADIR}/qw
>-	${INSTALL_DATA} ${WRKDIR}/qw/qwprogs.dat ${DATADIR}/qw
>-	${INSTALL_DATA} ${WRKDIR}/qw/spprogs.dat ${DATADIR}/qw
>+	${MKDIR} ${DATADIR}
>+	${MKDIR} ${DATADIR}/${PORTNAME}
>+	${INSTALL_DATA} ${WRKDIR}/qw/*.dat ${DATADIR}/${PORTNAME}
> 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak ${DATADIR}/${PORTNAME}
>-.if defined(WITH_SHAREWARE_DATA)
>-	@${MKDIR} ${DATADIR}/id1
>-	${INSTALL_DATA} ${_DISTDIR}/q1-shareware-pak0.pak \
>-		${DATADIR}/id1/pak0.pak
>+.if defined(WITH_LITS)
>+	${CP} -R ${WRKDIR}/lits ${DATADIR}/${PORTNAME}
> .endif
> .if defined(WITH_SKYBOXES)
>-	${INSTALL_DATA} ${WRKDIR}/pakX.pak ${DATADIR}/qw/pak0.pak
>+	${INSTALL_DATA} ${WRKDIR}/pakX.pak ${DATADIR}/${PORTNAME}/pak1.pak
> .endif
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>-. for txt in FAQ-v0.30-b585 FuhQuake-v0.31-FAQ benchmark config_manager crosshairs \
>-	linux logitech match_tools mp3 particles pointing rulesets track
>-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/${txt}.txt ${DOCSDIR}
>-. endfor
>+	${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${DOCSDIR}
> .endif
>-
>-post-install:
>-	@${SED} -e 's|$${DATADIR}|${DATADIR}|g' ${.CURDIR}/pkg-message >${PKGMESSAGE}
>-	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/games/fuhquake/distinfo fuhquake/distinfo
>--- /usr/ports/games/fuhquake/distinfo	Tue Aug 31 04:33:46 2004
>+++ fuhquake/distinfo	Wed Sep 14 16:09:36 2005
>@@ -2,7 +2,7 @@
> SIZE (fuhquake/fuhquake-source-v0.31.zip) = 789610
> MD5 (fuhquake/fuhquake-linux-v0.31.zip) = 479a6f8dad1174333819e850b3aca8c1
> SIZE (fuhquake/fuhquake-linux-v0.31.zip) = 4520020
>-MD5 (fuhquake/q1-shareware-pak0.pak) = 5906e5998fc3d896ddaf5e6a62e03abb
>-SIZE (fuhquake/q1-shareware-pak0.pak) = 18689235
>+MD5 (fuhquake/fuhquake-lits.rar) = 9e345bee7f331652c2e926e705d25b19
>+SIZE (fuhquake/fuhquake-lits.rar) = 8388829
> MD5 (fuhquake/fuhquake-skyboxes.zip) = 9360d7902e24e8b89d74600ce5d61b81
> SIZE (fuhquake/fuhquake-skyboxes.zip) = 3258479
>diff -urN /usr/ports/games/fuhquake/files/Makefile fuhquake/files/Makefile
>--- /usr/ports/games/fuhquake/files/Makefile	Wed Jul 27 18:15:26 2005
>+++ fuhquake/files/Makefile	Wed Sep 14 21:07:04 2005
>@@ -13,11 +13,6 @@
> 
> DO_CFLAGS =	${CFLAGS} -funsigned-char -I${LOCALBASE}/include -I${X11BASE}/include
> 
>-.if make(svga)
>-DO_CFLAGS +=	-DNO_WINDOWED_MOUSE
>-.undef WITHOUT_X86_ASM
>-.endif
>-
> .if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
> DO_CFLAGS +=	-Did386
> .endif
>@@ -27,10 +22,10 @@
> .endif
> 
> .if defined(WITH_OPTIMIZED_CFLAGS)
>-DO_CFLAGS +=	-O9 -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
>+DO_CFLAGS +=	-O3 -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
> .endif
> 
>-.if defined(WITH_XMMS) && !make(svga)
>+.if defined(WITH_XMMS)
> XMMS_CFLAGS !=	glib-config --cflags
> DO_CFLAGS +=	-D__XMMS__ ${XMMS_CFLAGS} ${PTHREAD_CFLAGS}
> XMMS_LIBS = -L${X11BASE}/lib -lxmms ${PTHREAD_LIBS}
>@@ -190,15 +185,8 @@
> 		vid_common_gl.o \
> 		vid_glx.o
> 
>-CL_SVGA_OBJS = vid_svgalib.o
>-
>-.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
>-CL_SVGA_AS_OBJS = d_copy.o
>-.endif
>-
> CL_COMMON_LIBS = -lm
> CL_X11_LIBS = -L${X11BASE}/lib -lX11 -lXext
>-CL_SVGA_LIBS = -L${LOCALBASE}/lib -lvga
> CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${X11BASE}/lib -lGL -lXxf86dga -lXxf86vm
> 
> .c.o:
>@@ -218,13 +206,6 @@
> 		${CC} ${CFLAGS} -o fuhquake-glx \
> 			${CL_COMMON_OBJS} ${CL_COMMON_AS_OBJS} ${CL_GLX_OBJS} \
> 			${CL_COMMON_LIBS} ${CL_GLX_LIBS} ${XMMS_LIBS}
>-
>-svga:	${CL_COMMON_OBJS} ${CL_COMMON_AS_OBJS} \
>-	${CL_SOFT_OBJS} ${CL_SOFT_AS_OBJS} ${CL_SVGA_OBJS} ${CL_SVGA_AS_OBJS}
>-		${CC} ${DO_CFLAGS} -o fuhquake-svga \
>-			${CL_COMMON_OBJS} ${CL_COMMON_AS_OBJS} ${CL_SOFT_OBJS} \
>-			${CL_SOFT_AS_OBJS} ${CL_SVGA_OBJS} ${CL_SVGA_AS_OBJS} \
>-			${CL_COMMON_LIBS} ${CL_SVGA_LIBS} ${XMMS_LIBS}
> 
> clean:
> 		-rm -f *.o *.core
>diff -urN /usr/ports/games/fuhquake/pkg-message fuhquake/pkg-message
>--- /usr/ports/games/fuhquake/pkg-message	Fri Jun 18 05:16:22 2004
>+++ fuhquake/pkg-message	Wed Dec 31 21:00:00 1969
>@@ -1,15 +0,0 @@
>-================================================
>-
>-    Install models, skins, maps, and mods in
>-    ${DATADIR}/ directory.
>-
>-    You must also have registered version of
>-    Quake per to be able to legally copy the
>-    PAK files (pak*.pak) from id1/ directory
>-    to ${DATADIR}/id1/ from a
>-    Windows installation or CDROM.  If it is
>-    not an option, you can still rebuild the
>-    port with WITH_SHAREWARE_DATA knob so to
>-    install shareware version data files.
>-
>-================================================
>diff -urN /usr/ports/games/fuhquake/pkg-plist fuhquake/pkg-plist
>--- /usr/ports/games/fuhquake/pkg-plist	Tue Aug 31 04:33:46 2004
>+++ fuhquake/pkg-plist	Wed Sep 14 16:18:47 2005
>@@ -1,6 +1,5 @@
>-%%X11%%bin/fuhquake-x11
> %%GLX%%bin/fuhquake-glx
>-%%SVGA%%bin/fuhquake-svga
>+%%X11%%bin/fuhquake-x11
> %%PORTDOCS%%%%DOCSDIR%%/FAQ-v0.30-b585.txt
> %%PORTDOCS%%%%DOCSDIR%%/FuhQuake-v0.31-FAQ.txt
> %%PORTDOCS%%%%DOCSDIR%%/benchmark.txt
>@@ -15,14 +14,49 @@
> %%PORTDOCS%%%%DOCSDIR%%/pointing.txt
> %%PORTDOCS%%%%DOCSDIR%%/rulesets.txt
> %%PORTDOCS%%%%DOCSDIR%%/track.txt
>+%%DATADIR%%/fuhquake/fragfile.dat
>+%%LITS%%%%DATADIR%%/fuhquake/lits/dm1.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/dm2.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/dm3.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/dm4.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/dm5.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/dm6.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e1m1.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e1m2.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e1m3.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e1m4.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e1m5.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e1m6.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e1m7.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e2m1.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e2m2.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e2m3.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e2m4.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e2m5.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e2m6.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e2m7.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e3m1.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e3m2.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e3m3.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e3m4.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e3m5.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e3m6.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e3m7.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e4m1.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e4m2.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e4m3.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e4m4.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e4m5.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e4m6.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e4m7.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/e4m8.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/end.lit
>+%%LITS%%%%DATADIR%%/fuhquake/lits/start.lit
>+%%DATADIR%%/fuhquake/pak0.pak
>+%%SKYBOXES%%%%DATADIR%%/fuhquake/pak1.pak
>+%%DATADIR%%/fuhquake/qwprogs.dat
>+%%DATADIR%%/fuhquake/spprogs.dat
>+%%LITS%%@dirrm %%DATADIR%%/fuhquake/lits
>+@dirrm %%DATADIR%%/fuhquake
>+@dirrm %%DATADIR%%
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-share/fuhquake/fuhquake/pak0.pak
>-%%SHAREWARE%%share/fuhquake/id1/pak0.pak
>-share/fuhquake/qw/fragfile.dat
>-share/fuhquake/qw/qwprogs.dat
>-share/fuhquake/qw/spprogs.dat
>-%%SKYBOXES%%share/fuhquake/qw/pak0.pak
>-@dirrm share/fuhquake/qw
>-%%SHAREWARE%%@dirrm share/fuhquake/id1
>-@dirrm share/fuhquake/fuhquake
>-@dirrm share/fuhquake

Actions: View | Diff

Attachments on bug 86170: 57089