Date: Sun, 25 Jan 2004 20:10:47 +0100 (CET) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61902: [MAINTAINER] games/QuakeForge: Fix Vorbis detection; Fix network bug Message-ID: <200401251910.i0PJAlFr099434@roadrunner.q.local> Resent-Message-ID: <200401251920.i0PJK7fP059595@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61902
>Category: ports
>Synopsis: [MAINTAINER] games/QuakeForge: Fix Vorbis detection; Fix network bug
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 25 11:20:06 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 5.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD roadrunner 5.2-RELEASE FreeBSD 5.2-RELEASE #3: Tue Jan 20 18:06:57 CET 2004
>Description:
o Fix the detection of libvorbis (broken, due to version bump)
o Fix a bug in the network code, found by Vladimir Machulsky
o Use DOCSDIR
o Bump PORTREVISION
Add the new patch: patch-netmain.h
>How-To-Repeat:
>Fix:
--- QuakeForge-0.5.4_1.patch begins here ---
? files/patch-netmain.h
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/quakeforge/Makefile,v
retrieving revision 1.40
diff -u -u -r1.40 Makefile
--- Makefile 20 Jan 2004 21:18:11 -0000 1.40
+++ Makefile 25 Jan 2004 19:07:43 -0000
@@ -7,6 +7,7 @@
PORTNAME= QuakeForge
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:qf/} \
ftp://ftp.idsoftware.com/idstuff/quakeworld/unix/:qw
@@ -67,7 +68,7 @@
WITH_XMMS= yes
.endif
-.if exists(${LOCALBASE}/lib/libvorbis.so.2)
+.if exists(${LOCALBASE}/lib/libvorbis.so.3)
WITH_VORBIS= yes
.endif
@@ -184,7 +185,6 @@
do-install:
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-
.if !defined(NO_WAD)
${MKDIR} ${PREFIX}/share/quakeforge/id1 && \
${TAR} xzf ${DISTDIR}/${WADFILE} -C ${PREFIX}/share/quakeforge --no-same-owner id1/pak0.pak
@@ -199,15 +199,13 @@
@cd ${PREFIX}/share/quakeforge/qw/skins && ./fixskins.sh *
.endif
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/quakeforge/config
- ${MKDIR} ${PREFIX}/share/doc/quakeforge/data/docs
- ${MKDIR} ${PREFIX}/share/doc/quakeforge/ideas
+ ${MKDIR} ${DOCSDIR}/config ${DOCSDIR}/data/docs ${DOCSDIR}/ideas
cd ${WRKSRC}/doc && \
- ${INSTALL_MAN} *.txt *.q1 *.q2 *.ico *.gif *.fig *.h CodingStyle ${PREFIX}/share/doc/quakeforge && \
- ${INSTALL_MAN} config/*.cfg ${PREFIX}/share/doc/quakeforge/config && \
- ${INSTALL_MAN} data/*.txt ${PREFIX}/share/doc/quakeforge/data && \
- ${INSTALL_MAN} data/docs/* ${PREFIX}/share/doc/quakeforge/data/docs && \
- ${INSTALL_MAN} ideas/*.txt ${PREFIX}/share/doc/quakeforge/ideas
+ ${INSTALL_MAN} *.txt *.q1 *.q2 *.ico *.gif *.fig *.h CodingStyle ${DOCSDIR} && \
+ ${INSTALL_MAN} config/*.cfg ${DOCSDIR}/config && \
+ ${INSTALL_MAN} data/*.txt ${DOCSDIR}/data && \
+ ${INSTALL_MAN} data/docs/* ${DOCSDIR}/data/docs && \
+ ${INSTALL_MAN} ideas/*.txt ${DOCSDIR}/ideas
.endif
post-install:
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/games/quakeforge/pkg-plist,v
retrieving revision 1.5
diff -u -u -r1.5 pkg-plist
--- pkg-plist 8 Aug 2003 13:23:07 -0000 1.5
+++ pkg-plist 25 Jan 2004 19:07:43 -0000
@@ -422,57 +422,57 @@
include/QF/ruamoko/hash.h
include/QF/ruamoko/plist.h
include/QF/ruamoko/Array.h
-%%PORTDOCS%%share/doc/quakeforge/3dfx.txt
-%%PORTDOCS%%share/doc/quakeforge/CodingStyle
-%%PORTDOCS%%share/doc/quakeforge/config/glspeed-v1.cfg
-%%PORTDOCS%%share/doc/quakeforge/config/glspeed-v3.cfg
-%%PORTDOCS%%share/doc/quakeforge/config/swspeed.cfg
-%%PORTDOCS%%share/doc/quakeforge/data/comexp.txt
-%%PORTDOCS%%share/doc/quakeforge/data/docs/install
-%%PORTDOCS%%share/doc/quakeforge/data/docs/install.q2mission
-%%PORTDOCS%%share/doc/quakeforge/data/docs/install.quake
-%%PORTDOCS%%share/doc/quakeforge/data/docs/install.quake2
-%%PORTDOCS%%share/doc/quakeforge/data/docs/readme
-%%PORTDOCS%%share/doc/quakeforge/data/docs/readme.glquake
-%%PORTDOCS%%share/doc/quakeforge/data/docs/readme.squake
-%%PORTDOCS%%share/doc/quakeforge/data/docs/readme.x11
-%%PORTDOCS%%share/doc/quakeforge/data/help.txt
-%%PORTDOCS%%share/doc/quakeforge/data/licinfo.txt
-%%PORTDOCS%%share/doc/quakeforge/data/manual.txt
-%%PORTDOCS%%share/doc/quakeforge/data/order.txt
-%%PORTDOCS%%share/doc/quakeforge/data/readme.txt
-%%PORTDOCS%%share/doc/quakeforge/data/rlicnse.txt
-%%PORTDOCS%%share/doc/quakeforge/data/slicnse.txt
-%%PORTDOCS%%share/doc/quakeforge/data/techinfo.txt
-%%PORTDOCS%%share/doc/quakeforge/glqnotes.txt
-%%PORTDOCS%%share/doc/quakeforge/ideas/quakedownload.txt
-%%PORTDOCS%%share/doc/quakeforge/ideas/rhamph.txt
-%%PORTDOCS%%share/doc/quakeforge/ideas/serverlist.txt
-%%PORTDOCS%%share/doc/quakeforge/net_DoS_protection.txt
-%%PORTDOCS%%share/doc/quakeforge/progdefs.q1
-%%PORTDOCS%%share/doc/quakeforge/progdefs.q2
-%%PORTDOCS%%share/doc/quakeforge/qe3.ico
-%%PORTDOCS%%share/doc/quakeforge/qf-client-3dfx-cvar.txt
-%%PORTDOCS%%share/doc/quakeforge/qf-client-glx-cvar.txt
-%%PORTDOCS%%share/doc/quakeforge/qf-client-sdl-cvar.txt
-%%PORTDOCS%%share/doc/quakeforge/qf-client-sgl-cvar.txt
-%%PORTDOCS%%share/doc/quakeforge/qf-client-svga-cvar.txt
-%%PORTDOCS%%share/doc/quakeforge/qf-client-x11-cmd.txt
-%%PORTDOCS%%share/doc/quakeforge/qf-client-x11-cvar.txt
-%%PORTDOCS%%share/doc/quakeforge/qf-server-cmd.txt
-%%PORTDOCS%%share/doc/quakeforge/qf-server-cvar.txt
-%%PORTDOCS%%share/doc/quakeforge/quake.gif
-%%PORTDOCS%%share/doc/quakeforge/quake.ico
-%%PORTDOCS%%share/doc/quakeforge/readme.txt
-%%PORTDOCS%%share/doc/quakeforge/skybox.fig
-%%PORTDOCS%%share/doc/quakeforge/template.h
-%%PORTDOCS%%share/doc/quakeforge/timestamps.txt
-%%PORTDOCS%%share/doc/quakeforge/wqreadme.txt
-%%PORTDOCS%%@dirrm share/doc/quakeforge/ideas
-%%PORTDOCS%%@dirrm share/doc/quakeforge/config
-%%PORTDOCS%%@dirrm share/doc/quakeforge/data/docs
-%%PORTDOCS%%@dirrm share/doc/quakeforge/data
-%%PORTDOCS%%@dirrm share/doc/quakeforge/
+%%PORTDOCS%%%%DOCSDIR%%/3dfx.txt
+%%PORTDOCS%%%%DOCSDIR%%/CodingStyle
+%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v1.cfg
+%%PORTDOCS%%%%DOCSDIR%%/config/glspeed-v3.cfg
+%%PORTDOCS%%%%DOCSDIR%%/config/swspeed.cfg
+%%PORTDOCS%%%%DOCSDIR%%/data/comexp.txt
+%%PORTDOCS%%%%DOCSDIR%%/data/docs/install
+%%PORTDOCS%%%%DOCSDIR%%/data/docs/install.q2mission
+%%PORTDOCS%%%%DOCSDIR%%/data/docs/install.quake
+%%PORTDOCS%%%%DOCSDIR%%/data/docs/install.quake2
+%%PORTDOCS%%%%DOCSDIR%%/data/docs/readme
+%%PORTDOCS%%%%DOCSDIR%%/data/docs/readme.glquake
+%%PORTDOCS%%%%DOCSDIR%%/data/docs/readme.squake
+%%PORTDOCS%%%%DOCSDIR%%/data/docs/readme.x11
+%%PORTDOCS%%%%DOCSDIR%%/data/help.txt
+%%PORTDOCS%%%%DOCSDIR%%/data/licinfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/data/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/data/order.txt
+%%PORTDOCS%%%%DOCSDIR%%/data/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/data/rlicnse.txt
+%%PORTDOCS%%%%DOCSDIR%%/data/slicnse.txt
+%%PORTDOCS%%%%DOCSDIR%%/data/techinfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/glqnotes.txt
+%%PORTDOCS%%%%DOCSDIR%%/ideas/quakedownload.txt
+%%PORTDOCS%%%%DOCSDIR%%/ideas/rhamph.txt
+%%PORTDOCS%%%%DOCSDIR%%/ideas/serverlist.txt
+%%PORTDOCS%%%%DOCSDIR%%/net_DoS_protection.txt
+%%PORTDOCS%%%%DOCSDIR%%/progdefs.q1
+%%PORTDOCS%%%%DOCSDIR%%/progdefs.q2
+%%PORTDOCS%%%%DOCSDIR%%/qe3.ico
+%%PORTDOCS%%%%DOCSDIR%%/qf-client-3dfx-cvar.txt
+%%PORTDOCS%%%%DOCSDIR%%/qf-client-glx-cvar.txt
+%%PORTDOCS%%%%DOCSDIR%%/qf-client-sdl-cvar.txt
+%%PORTDOCS%%%%DOCSDIR%%/qf-client-sgl-cvar.txt
+%%PORTDOCS%%%%DOCSDIR%%/qf-client-svga-cvar.txt
+%%PORTDOCS%%%%DOCSDIR%%/qf-client-x11-cmd.txt
+%%PORTDOCS%%%%DOCSDIR%%/qf-client-x11-cvar.txt
+%%PORTDOCS%%%%DOCSDIR%%/qf-server-cmd.txt
+%%PORTDOCS%%%%DOCSDIR%%/qf-server-cvar.txt
+%%PORTDOCS%%%%DOCSDIR%%/quake.gif
+%%PORTDOCS%%%%DOCSDIR%%/quake.ico
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/skybox.fig
+%%PORTDOCS%%%%DOCSDIR%%/template.h
+%%PORTDOCS%%%%DOCSDIR%%/timestamps.txt
+%%PORTDOCS%%%%DOCSDIR%%/wqreadme.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ideas
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/config
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/data/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/data
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/QF/GL
@dirrm include/QF/plugin
@dirrm include/QF/ruamoko
--- QuakeForge-0.5.4_1.patch ends here ---
patch-netmain.h:
--- include/netmain.h.orig Wed Feb 12 22:08:55 2003
+++ include/netmain.h Thu Jan 22 17:33:55 2004
@@ -34,7 +34,8 @@
struct qsockaddr
{
- short qsa_family;
+ unsigned char dummy;
+ unsigned char qsa_family;
unsigned char qsa_data[14];
};
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401251910.i0PJAlFr099434>