Date: Wed, 24 Jul 2002 01:09:19 +0100 (BST) From: Gavin Atkinson <gavin@ury.york.ac.uk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gavin@ury.york.ac.uk, jmz@FreeBSD.org Subject: ports/40949: port games/doom no longer compiles under -STABLE or -CURRENT Message-ID: <200207240009.g6O09Jwx000663@endor.bu.nker.net>
next in thread | raw e-mail | index | archive | help
>Number: 40949 >Category: ports >Synopsis: port games/doom no longer compiles under -STABLE or -CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Jul 24 03:40:08 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Gavin Atkinson >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD epsilon.ury.york.ac.uk 5.0-CURRENT FreeBSD 5.0-CURRENT #8: Tue Jul 23 12:09:23 BST 2002 root@epsilon.ury.york.ac.uk:/usr/obj/usr/src/sys/EPSILON i386 >Description: games/doom no longer compiles under -STABLE or -CURRENT. It relies on IPPORT_USERRESERVED which was removed from netinet/in.h version 1.66 (HEAD) and 1.48.2.27 (RELENG_4) over 3 months ago. Additionally, under -CURRENT, the removal of machine/soundcard.h also prevents compilation. >How-To-Repeat: cd /usr/ports/games/doom && make all >Fix: I have hardcoded the result of the calculation that was based on IPPORT_USERRESERVED in the below patch. The changes to use sys/soundcard.h over machine/soundcard.h is done unconditionally, as the file has existed in sys/ since 4.0 diff -u /root/doom/files/patch-aa /usr/ports/games/doom/files/patch-aa --- /root/doom/files/patch-aa Fri Jan 15 02:54:20 1999 +++ /usr/ports/games/doom/files/patch-aa Mon Jul 22 09:50:29 2002 @@ -5,7 +5,7 @@ #include <unistd.h> -#include <linux/soundcard.h> -+#include <machine/soundcard.h> ++#include <sys/soundcard.h> #include "soundsrv.h" diff -u /root/doom/files/patch-ac /usr/ports/games/doom/files/patch-ac --- /root/doom/files/patch-ac Wed Feb 10 03:53:31 1999 +++ /usr/ports/games/doom/files/patch-ac Mon Jul 22 09:50:48 2002 @@ -5,7 +5,7 @@ // Linux voxware output. -#include <linux/soundcard.h> -+#include <machine/soundcard.h> ++#include <sys/soundcard.h> // Timer stuff. Experimental. #include <time.h> diff -u /root/doom/files/patch-ae /usr/ports/games/doom/files/patch-ae --- /root/doom/files/patch-ae Fri Jan 15 02:54:20 1999 +++ /usr/ports/games/doom/files/patch-ae Tue Jul 23 12:22:51 2002 @@ -1,5 +1,5 @@ --- linuxdoom-1.10/i_net.c~ Mon Dec 22 21:37:46 1997 -+++ linuxdoom-1.10/i_net.c Mon Dec 14 03:26:41 1998 ++++ linuxdoom-1.10/i_net.c Mon Jul 22 10:06:25 2002 @@ -23,6 +23,7 @@ static const char rcsid[] = "$Id: patch-ae,v 1.1.1.1 1998/12/14 21:18:25 jmz Exp $"; @@ -24,3 +24,12 @@ void NetSend (void); boolean NetListen (void); +@@ -73,7 +76,7 @@ + // NETWORKING + // + +-int DOOMPORT = (IPPORT_USERRESERVED +0x1d ); ++int DOOMPORT = 5029; + + int sendsocket; + int insocket; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207240009.g6O09Jwx000663>