ports/77615: Unbreak devel/fpc-gdb

[johans at stack.nl]

The following reply was made to PR ports/77615; it has been noted by GNATS.

From: johans at stack.nl
To: freebsd-gnats-submit at FreeBSD.org, johans at stack.nl
Cc:  
Subject: Re: ports/77615: Unbreak devel/fpc-gdb
Date: Fri, 18 Feb 2005 00:48:57 +0100 (CET)

 While we are here, might as well fix MASTER_SITES and compilation on 4.x
 (as suggested by pav@)
 
 Full patch (against live port):
 
 
 diff -uNr fpc-gdb/Makefile fpc-gdb/Makefile
 --- fpc-gdb/Makefile	Mon Feb 14 03:32:44 2005
 +++ fpc-gdb/Makefile	Thu Feb 17 23:42:20 2005
 @@ -10,25 +10,21 @@
  PORTVERSION=	5.2.1
  CATEGORIES=	devel lang
  MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 -MASTER_SITE_SUBDIR=	gdb/releases
 +MASTER_SITE_SUBDIR=	gdb/old-releases
  PKGNAMEPREFIX=	fpc-
  
 -PATCH_SITES=	ftp://ftp.freepascal.org/fpc/contrib/libgdb/v5.2.1 \
 -		ftp://planetmirror.com/pub/fpc/contrib/libgdb/v5.2.1/ \
 -		ftp://ftp.jp.freepascal.org/mirror/fpc/contrib/libgdb/v5.2.1/ \
 -		ftp://freepascal.stack.nl/pub/fpc/contrib/libgdb/v5.2.1/ \
 -		ftp://ftp.no.freepascal.org/pub/fpc/contrib/libgdb/v5.2.1/ \
 -		ftp://ftp.us.freepascal.org/pub/fpc/contrib/libgdb/v5.2.1/ \
 +PATCH_SITES=	ftp://ftp.freepascal.org/fpc/contrib/libgdb/old/v5.2.1/ \
 +		ftp://planetmirror.com/pub/fpc/contrib/libgdb/old/v5.2.1/ \
 +		ftp://ftp.jp.freepascal.org/mirror/fpc/contrib/libgdb/old/v5.2.1/ \
 +		ftp://freepascal.stack.nl/pub/fpc/contrib/libgdb/old/v5.2.1/ \
 +		ftp://ftp.no.freepascal.org/pub/fpc/contrib/libgdb/old/v5.2.1/ \
 +		ftp://ftp.us.freepascal.org/pub/fpc/contrib/libgdb/old/v5.2.1/ \
  		${MASTER_SITE_LOCAL}
  PATCH_SITE_SUBDIR=	obrien
  PATCHFILES=	gdb521.dif gdb521_xfree-loadmod.diff
  
  MAINTAINER=	ports at FreeBSD.org
  COMMENT=	GNU GDB 5.2.1 modified for Free Pascal
 -
 -BROKEN=		"Does not compile"
 -EXPIRATION_DATE=2005-02-18
 -DEPRECATED=	${BROKEN}
  
  .include <bsd.port.pre.mk>
  
 diff -uNr fpc-gdb/files/patch-bfd_configure fpc-gdb/files/patch-bfd_configure
 --- fpc-gdb/files/patch-bfd_configure	Thu Jan  1 01:00:00 1970
 +++ fpc-gdb/files/patch-bfd_configure	Fri Feb 18 00:31:49 2005
 @@ -0,0 +1,11 @@
 +--- bfd/configure.orig	Fri Feb 18 00:31:38 2005
 ++++ bfd/configure	Fri Feb 18 00:31:40 2005
 +@@ -5059,7 +5059,7 @@
 +   i[3456]86-*-bsdi)
 + 	COREFILE=
 + 	;;
 +-  i[3456]86-*-bsd* | i[34567]86-*-freebsd[123] | i[34567]86-*-freebsd[123]\.* | i[34567]86-*-freebsd4\.[01234]* | i[34567]86-*-freebsd*aout*)
 ++  i[3456]86-*-bsd* | i[34567]86-*-freebsd[123] | i[34567]86-*-freebsd[123]\.* | i[34567]86-*-freebsd4\.[01234] | i[34567]86-*-freebsd*aout*)
 + 	COREFILE=trad-core.lo
 + 	TRAD_HEADER='"hosts/i386bsd.h"'
 + 	;;
 diff -uNr fpc-gdb/files/patch-gdb_kvm-fbsd.c fpc-gdb/files/patch-gdb_kvm-fbsd.c
 --- fpc-gdb/files/patch-gdb_kvm-fbsd.c	Sun Feb 22 02:52:20 2004
 +++ fpc-gdb/files/patch-gdb_kvm-fbsd.c	Fri Feb 18 00:33:00 2005
 @@ -1,6 +1,6 @@
  --- gdb/kvm-fbsd.c	Mon Jun  3 11:32:24 2002
  +++ gdb/kvm-fbsd.c	Mon Jun  3 11:30:35 2002
 -@@ -0,0 +1,1055 @@
 +@@ -0,0 +1,1056 @@
  +/* Live and postmortem kernel debugging functions for FreeBSD.
  +   Copyright 1996 Free Software Foundation, Inc.
  +
 @@ -54,6 +54,7 @@
  +#include <machine/frame.h>
  +
  +#if __FreeBSD_version >= 500032 && defined(i386)
 ++typedef __cpumask_t	cpumask_t;
  +#define _KERNEL
  +#include <sys/pcpu.h>
  +#undef _KERNEL