From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 17 10:20:13 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D67A16A41F for ; Wed, 17 Aug 2005 10:20:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CCC643D48 for ; Wed, 17 Aug 2005 10:20:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7HAKCgY003637 for ; Wed, 17 Aug 2005 10:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7HAKCBi003636; Wed, 17 Aug 2005 10:20:12 GMT (envelope-from gnats) Resent-Date: Wed, 17 Aug 2005 10:20:12 GMT Resent-Message-Id: <200508171020.j7HAKCBi003636@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, vd@datamax.bg Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E92116A41F; Wed, 17 Aug 2005 10:13:42 +0000 (GMT) (envelope-from vd@datamax.bg) Received: from jengal.datamax.bg (jengal.datamax.bg [82.103.104.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ED7043D46; Wed, 17 Aug 2005 10:13:41 +0000 (GMT) (envelope-from vd@datamax.bg) Received: from sinanica.bg.datamax (sinanica.bg.datamax [192.168.10.1]) by jengal.datamax.bg (Postfix) with QMQP id 9C2BA87CD; Wed, 17 Aug 2005 13:13:40 +0300 (EEST) Received: (nullmailer pid 79776 invoked by uid 1004); Wed, 17 Aug 2005 10:13:40 -0000 Message-Id: <20050817101340.GA79734@sinanica.bg.datamax> Date: Wed, 17 Aug 2005 13:13:40 +0300 From: Vasil Dimov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jdp@FreeBSD.org Subject: ports/85038: Unbreak port: lang/pm3-base X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: vd@datamax.bg List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2005 10:20:13 -0000 >Number: 85038 >Category: ports >Synopsis: Unbreak port: lang/pm3-base >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Aug 17 10:20:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Vasil Dimov >Release: FreeBSD 5.4-STABLE i386 >Organization: DataMax >Environment: >Description: Unbreak pm3-base: * extend files/patch-l1 and files/patch-l2 to match gethostname(3) prototype on 5.x and above * add patch for language/modula3/m3compiler/m3cc/gcc/m3.c to make it use stdarg.h instead of varargs.h >How-To-Repeat: >Fix: --- pm3-base.diff begins here --- diff -urN --exclude=CVS pm3-base.orig/Makefile pm3-base/Makefile --- pm3-base.orig/Makefile Wed Feb 4 07:21:42 2004 +++ pm3-base/Makefile Wed Aug 17 13:03:48 2005 @@ -7,7 +7,7 @@ PORTNAME= pm3-base PORTVERSION= 1.1.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR=jdp/pm3 @@ -43,10 +43,6 @@ SOVERSION= 7 .include - -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif .if ${PORTOBJFORMAT} == "aout" TARGET= FreeBSD2 diff -urN --exclude=CVS pm3-base.orig/files/patch-l1 pm3-base/files/patch-l1 --- pm3-base.orig/files/patch-l1 Sun Apr 20 22:34:29 2003 +++ pm3-base/files/patch-l1 Wed Aug 17 12:00:09 2005 @@ -1,5 +1,5 @@ ---- libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c.orig Wed May 31 13:54:33 2000 -+++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c Tue Feb 18 09:33:53 2003 +--- libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c.orig Wed May 31 20:54:33 2000 ++++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c Wed Aug 17 11:59:31 2005 @@ -98,7 +98,11 @@ #include #include @@ -12,7 +12,19 @@ #include #endif -@@ -693,7 +697,9 @@ +@@ -451,7 +455,11 @@ + + int gethostname(name, namelen) /* ok */ + char *name; ++#if __FreeBSD__ >= 5 ++size_t namelen; ++#else + int namelen; ++#endif + { int result; + #if __FreeBSD__ >= 2 + int mib[2]; +@@ -693,7 +701,9 @@ void *data; { int result; struct ufs_args *u_data; @@ -22,7 +34,7 @@ struct nfs_args *n_data; ENTER_CRITICAL; -@@ -704,11 +710,13 @@ +@@ -704,11 +714,13 @@ MAKE_READABLE(u_data); MAKE_READABLE(u_data->fspec); result = syscall(SYS_mount, type, dir, flags, data); @@ -36,7 +48,7 @@ } else if (strcmp(type, "nfs") == 0) { n_data = (struct nfs_args*) data; MAKE_READABLE(n_data); -@@ -805,7 +813,11 @@ +@@ -805,7 +817,11 @@ int msgsnd(msqid, msgp, msgsz, msgflg) /* ok */ int msqid; diff -urN --exclude=CVS pm3-base.orig/files/patch-l2 pm3-base/files/patch-l2 --- pm3-base.orig/files/patch-l2 Sun Apr 20 22:34:29 2003 +++ pm3-base/files/patch-l2 Wed Aug 17 12:24:07 2005 @@ -1,5 +1,5 @@ ---- libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c.orig Wed May 31 10:54:24 2000 -+++ libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c Sun Apr 20 12:21:15 2003 +--- libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c.orig Wed May 31 20:54:24 2000 ++++ libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c Wed Aug 17 12:23:04 2005 @@ -98,7 +98,11 @@ #include #include @@ -12,7 +12,19 @@ #include #endif -@@ -693,7 +697,9 @@ +@@ -451,7 +455,11 @@ + + int gethostname(name, namelen) /* ok */ + char *name; ++#if __FreeBSD__ >= 5 ++size_t namelen; ++#else + int namelen; ++#endif + { int result; + #if __FreeBSD__ >= 2 + int mib[2]; +@@ -693,7 +701,9 @@ void *data; { int result; struct ufs_args *u_data; @@ -22,7 +34,7 @@ struct nfs_args *n_data; ENTER_CRITICAL; -@@ -704,11 +710,13 @@ +@@ -704,11 +714,13 @@ MAKE_READABLE(u_data); MAKE_READABLE(u_data->fspec); result = syscall(SYS_mount, type, dir, flags, data); @@ -36,7 +48,7 @@ } else if (strcmp(type, "nfs") == 0) { n_data = (struct nfs_args*) data; MAKE_READABLE(n_data); -@@ -805,7 +813,11 @@ +@@ -805,7 +817,11 @@ int msgsnd(msqid, msgp, msgsz, msgflg) /* ok */ int msqid; diff -urN --exclude=CVS pm3-base.orig/files/patch-m3.c.diff pm3-base/files/patch-m3.c.diff --- pm3-base.orig/files/patch-m3.c.diff Thu Jan 1 02:00:00 1970 +++ pm3-base/files/patch-m3.c.diff Wed Aug 17 12:55:05 2005 @@ -0,0 +1,48 @@ +--- language/modula3/m3compiler/m3cc/gcc/m3.c.orig Wed Aug 17 12:34:10 2005 ++++ language/modula3/m3compiler/m3cc/gcc/m3.c Wed Aug 17 12:52:49 2005 +@@ -27,7 +27,7 @@ + + + +-#include ++#include + #include + #include + #include +@@ -991,15 +991,12 @@ + static int current_dbg_type_count2; + static int current_dbg_type_count3; + +-static void debug_tag (kind, id, va_alist) +- char kind; +- char *id; +- va_dcl ++static void debug_tag (char kind, char *id, ...) + { + va_list args; + char *fmt; + +- va_start (args); ++ va_start (args, id); + current_dbg_type_tag [0] = 'M'; + current_dbg_type_tag [1] = kind; + current_dbg_type_tag [2] = '_'; +@@ -1031,16 +1028,14 @@ + + #define debug_field_id debug_field + +-static void debug_field_fmt (id, va_alist) +- char *id; +- va_dcl ++static void debug_field_fmt (char *id, ...) + { + va_list args; + char name [100]; + char *fmt; + + memcpy (name, id, UID_SIZE); +- va_start (args); ++ va_start (args, id); + fmt = va_arg (args, char *); + vsprintf (name + UID_SIZE, fmt, args); + va_end (args); --- pm3-base.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: