- Fix the detection of libvorbis (broken, due to version bump)

- Fix a bug in the network code, found by Vladimir Machulsky
- Use DOCSDIR
- Bump PORTREVISION

PR:		ports/61902
Submitted by:	Ulrich Spoerlein <q@uni.de> (maintainer)

3 files changed, 73 insertions, 61 deletions

diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 2c26feb2c678..2928db3de7f8 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -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_SVGALIB=	yes
 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 @@ post-patch:
 
 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 @@ do-install:
 	@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:
diff --git a/games/quakeforge/files/patch-include-netmain.h b/games/quakeforge/files/patch-include-netmain.h
new file mode 100644
index 000000000000..4bce735cb597
--- /dev/null
+++ b/games/quakeforge/files/patch-include-netmain.h
@@ -0,0 +1,11 @@
+--- 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];
+ };
diff --git a/games/quakeforge/pkg-plist b/games/quakeforge/pkg-plist
index 692a8231d115..ebd2662abaf4 100644
--- a/games/quakeforge/pkg-plist
+++ b/games/quakeforge/pkg-plist
@@ -48,6 +48,7 @@ lib/libQFgamecode_builtins.so
 lib/libQFgamecode_builtins.la
 lib/libQFgamecode_builtins.a
 lib/libQFgib.so.1
+lib/libQFgib.so
 lib/libQFgib.la
 lib/libQFgib.a
 lib/libQFcsqc.so.1
@@ -422,61 +423,63 @@ include/QF/ruamoko/gib.h
 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
 @dirrm include/QF
+%%TOOL:%%@dirrm lib/ruamoko
+@dirrm lib/quakeforge
 @unexec rmdir %D/share/quakeforge/QFplugins/ 2>/dev/null || true
 @unexec rmdir %D/share/quakeforge/id1/ 2>/dev/null || true
 @unexec rmdir %D/share/quakeforge/qw/skins/ 2>/dev/null || true