Date: Wed, 6 Nov 2002 13:57:08 +0900 (JST) From: Yoshihiko Sarumaru <mistral@imasy.or.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/44985: libparanoia: Fix for -current breaks -stable Message-ID: <200211060457.gA64v8C0079921@mistral.imasy.or.jp>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500039
+post-patch:
+ @(cd ${_DISTDIR};
+ ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/vsnprintf-current.patch)
+.endif
+
+.include <bsd.port.post.mk>
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211060457.gA64v8C0079921>