From owner-freebsd-ports Tue Nov 5 21: 0:13 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C2D1D37B401 for ; Tue, 5 Nov 2002 21:00:10 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D138B43E91 for ; Tue, 5 Nov 2002 21:00:09 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gA6509x3080234 for ; Tue, 5 Nov 2002 21:00:09 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gA6509g7080233; Tue, 5 Nov 2002 21:00:09 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20A6A37B401 for ; Tue, 5 Nov 2002 20:57:30 -0800 (PST) Received: from ns5.sony.co.jp (NS5.Sony.CO.JP [146.215.0.45]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0CF3943E42 for ; Tue, 5 Nov 2002 20:57:29 -0800 (PST) (envelope-from mistral@imasy.or.jp) Received: from mail1.sony.co.jp (mail1.sony.co.jp [43.0.1.201]) by ns5.sony.co.jp (R8/Sony) with ESMTP id gA64vCn59385 for ; Wed, 6 Nov 2002 13:57:12 +0900 (JST) Received: from mail1.sony.co.jp (localhost [127.0.0.1]) by mail1.sony.co.jp (R8/Sony) with ESMTP id gA64vB727178 for ; Wed, 6 Nov 2002 13:57:11 +0900 (JST) Received: from mistral.imasy.or.jp ([43.17.41.105]) by mail1.sony.co.jp (R8/Sony) with ESMTP id gA64vBm27161 for ; Wed, 6 Nov 2002 13:57:11 +0900 (JST) Received: from mistral.imasy.or.jp (localhost [127.0.0.1]) by mistral.imasy.or.jp (8.12.6/8.12.6/mistral) with ESMTP id gA64v8U1079922 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Wed, 6 Nov 2002 13:57:08 +0900 (JST) (envelope-from mistral@imasy.or.jp) Received: (from sarumaru@localhost) by mistral.imasy.or.jp (8.12.6/8.12.6/Submit) id gA64v8C0079921; Wed, 6 Nov 2002 13:57:08 +0900 (JST) (envelope-from sarumaru) Message-Id: <200211060457.gA64v8C0079921@mistral.imasy.or.jp> Date: Wed, 6 Nov 2002 13:57:08 +0900 (JST) From: Yoshihiko Sarumaru Reply-To: Yoshihiko Sarumaru To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/44985: libparanoia: Fix for -current breaks -stable Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 44985 >Category: ports >Synopsis: libparanoia: Fix for -current breaks -stable >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Nov 05 21:00:09 PST 2002 >Closed-Date: >Last-Modified: >Originator: Yoshihiko Sarumaru >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD mistral.imasy.or.jp 4.7-STABLE FreeBSD 4.7-STABLE #14: Mon Nov 4 01:12:10 JST 2002 sarumaru@mistral.imasy.or.jp:/usr/obj/usr/src/sys/Z505VRK i386 >Description: From 20 August, prototype definition for vnsprintf is different between -stable and -current. Original distfile for libparanoia is based on the code before the difference was made, and still same as -stable. So, libparanoia had been couldn't build on -current due to prototype mismatch. On Oct 21, Kris added a patch to fix build on -current, but unfortunately this breaks build on -stable. >How-To-Repeat: build ports/security/libparanoia on -stable >Fix: o modify Makefile (OSVERSION is not the exact day though). o move patch-ac to vsnprintf-current.patch diff -urN libparanoia.bak/Makefile libparanoia/Makefile --- libparanoia.bak/Makefile Tue Aug 6 00:37:20 2002 +++ libparanoia/Makefile Wed Nov 6 13:43:06 2002 @@ -24,4 +24,12 @@ before compiling. .endif -.include +.include + +.if ${OSVERSION} >= 500039 +post-patch: + @(cd ${_DISTDIR}; + ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/vsnprintf-current.patch) +.endif + +.include diff -urN libparanoia.bak/files/current-vsnprintf.patch libparanoia/files/current-vsnprintf.patch --- libparanoia.bak/files/vsnprintf-current.patch Thu Jan 1 09:00:00 1970 +++ libparanoia/files/vsnprintf-current.patch Mon Oct 21 09:22:31 2002 @@ -0,0 +1,11 @@ +--- vsprintf.c.orig Sun Oct 20 17:23:01 2002 ++++ vsprintf.c Sun Oct 20 17:23:32 2002 +@@ -52,7 +52,7 @@ + vsprintf(str, fmt, ap) + char *str; + const char *fmt; +- _BSD_VA_LIST_ ap; ++ va_list ap; + { + int ret; + FILE f; diff -urN libparanoia.bak/files/patch-ac libparanoia/files/patch-ac --- libparanoia.bak/files/patch-ac Mon Oct 21 09:22:31 2002 +++ libparanoia/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- vsprintf.c.orig Sun Oct 20 17:23:01 2002 -+++ vsprintf.c Sun Oct 20 17:23:32 2002 -@@ -52,7 +52,7 @@ - vsprintf(str, fmt, ap) - char *str; - const char *fmt; -- _BSD_VA_LIST_ ap; -+ va_list ap; - { - int ret; - FILE f; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message