Date: Sun, 22 Jun 1997 00:11:11 -0400 (EDT) From: deischen@iworks.InterWorks.org To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: randy@zyzzyva.com Subject: ports/3923: build fails for plan-1.6.1 Message-ID: <199706220411.AAA03688@rigel.vigrid.com> Resent-Message-ID: <199706220420.VAA06968@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 3923
>Category: ports
>Synopsis: bad patch file causes plan-1.6.1 to fail build
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 21 21:20:01 PDT 1997
>Last-Modified:
>Originator: Daniel M. Eischen
>Organization:
Vigrid Systems
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
FreeBSD 3.0-current
>Description:
There is a bad patch file in the port for plan-1.6.1
>How-To-Repeat:
Try building plan-1.6.1
>Fix:
New patch file (patch-ac) follows:
*** src/daemon.c.orig Tue Apr 1 13:40:28 1997
--- src/daemon.c Sat Jun 21 10:46:32 1997
***************
*** 68,73 ****
--- 68,81 ----
void *toplevel = 0; /* dummy for formfile.c */
#endif
+ #if (defined BSD && !defined OSF)
+ typedef union wait wait_type;
+ #define WAIT_STATUS(x) (x.w_status)
+ #else
+ typedef int wait_type;
+ #define WAIT_STATUS(x) (x)
+ #endif
+
static void popup_window(), send_mail(), write_script(), exec_program();
static char *get_subject(), *get_subtitle(), *get_icontitle();
#ifdef MIPS
***************
*** 210,215 ****
--- 218,224 ----
sleep(twait);
#endif
refresh_lock(LOCK_PATH);
+ #ifndef RABBITS
#ifdef SUN
if (pw) {
struct utmp ut;
***************
*** 259,264 ****
--- 268,274 ----
}
}
#endif
+ #endif
total_wait -= twait;
}
}
***************
*** 411,422 ****
int sig;
{
char path[40]; /* script to delete */
! #if (defined BSD && !defined OSF)
! union wait dummy;
! #else
! int dummy;
! #endif
! sprintf(path, "/tmp/pland%d", wait(&dummy));
if (debug)
printf("%s: deleting script \"%s\"\n", progname, path);
(void)unlink(path);
--- 421,429 ----
int sig;
{
char path[40]; /* script to delete */
! wait_type dummy;
!
! sprintf(path, "/tmp/pland%d", wait(&WAIT_STATUS(dummy)));
if (debug)
printf("%s: deleting script \"%s\"\n", progname, path);
(void)unlink(path);
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199706220411.AAA03688>