Date: Sun, 12 Jan 2003 14:57:50 +0100 (CET) From: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46989: fix -CURRENT build: security/bjorb Message-ID: <200301121357.h0CDvow4003660@terrorfish.uni.stoert.net>
next in thread | raw e-mail | index | archive | help
>Number: 46989
>Category: ports
>Synopsis: fix -CURRENT build: security/bjorb
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 12 06:00:14 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Simon 'corecode' Schubert
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD terrorfish.uni.stoert.net 5.0-CURRENT FreeBSD 5.0-CURRENT #39: Sun Jan 12 01:07:37 CET 2003 corecode@terrorfish.uni.stoert.net:/usr/obj/athlon/usr/src/sys/TERRORFISH i386
>Description:
o make this compile on -CURRENT
o add several patch- files
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/bjorb/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile 10 Nov 2002 16:47:48 -0000 1.19
+++ Makefile 12 Jan 2003 13:53:09 -0000
@@ -39,10 +39,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 500035
-BROKEN= "Does not compile on 5.0"
-.endif
-
post-install:
@${INSTALL_SCRIPT} ${DOCSRC}/doc/sample/bjorb.sh ${PREFIX}/etc/rc.d/bjorb.sh.sample
.if !defined(NOPORTDOCS)
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/security/bjorb/files/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- files/patch-aa 2 Jun 1999 07:21:49 -0000 1.4
+++ files/patch-aa 12 Jan 2003 13:48:52 -0000
@@ -1,5 +1,5 @@
--- Makefile.in.orig Mon Feb 22 05:01:20 1999
-+++ Makefile.in Wed Mar 24 20:52:03 1999
++++ Makefile.in Sun Jan 12 14:46:10 2003
@@ -29,7 +29,7 @@
LDFLAGS =
LIBS = @LIBS@
@@ -9,6 +9,31 @@
exec_prefix = $(PREFIX)
sbindir = $(exec_prefix)/sbin
etcdir = $(exec_prefix)/etc
+@@ -81,7 +81,7 @@
+ $(INSTALL_DATA) ../doc/sample/bjorb.conf.sample $(etcdir)/bjorb.conf.sample
+
+ $(TARGET): $(OBJS)
+- $(CC) -o $(TARGET) $(ALL_LDFLAGS) $(OBJS) $(ALL_LIBS)
++ $(CXX) -o $(TARGET) $(ALL_LDFLAGS) $(OBJS) $(ALL_LIBS)
+
+ debug::
+ $(MAKE) CFLAGS="-g -DDEBUG"
+@@ -116,13 +116,13 @@
+ $(CC) -c $(ALL_CFLAGS) $<
+
+ .cc.o: Makefile
+- $(CC) -c $(ALL_CFLAGS) $<
++ $(CXX) -c $(ALL_CFLAGS) $<
+
+ Makefile: Makefile.in
+ CONFIG_FILES=./$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+ cmd.o: cmd.cc cmd-def.h
+- $(CC) -c $(ALL_CFLAGS) $<
++ $(CXX) -c $(ALL_CFLAGS) $<
+ cmd.cc: cmd.list
+ gperf -aptCT -N in_word_set_cmdlist $? > $@
+ bool.cc:bool.list
@@ -135,9 +135,13 @@
autoconf
Index: files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/security/bjorb/files/patch-ad,v
retrieving revision 1.1
diff -u -r1.1 patch-ad
--- files/patch-ad 27 Dec 1999 00:40:15 -0000 1.1
+++ files/patch-ad 12 Jan 2003 13:48:52 -0000
@@ -1,5 +1,5 @@
---- Config.cc.orig Sun Dec 26 11:25:39 1999
-+++ Config.cc Sun Dec 26 11:25:57 1999
+--- Config.cc.orig Mon Feb 22 04:07:51 1999
++++ Config.cc Sun Jan 12 14:34:28 2003
@@ -334,7 +334,7 @@
int retval = 1;
@@ -9,3 +9,21 @@
#ifndef NO_DEBUG
PUTERR(2, ("::accept() begin\n"));
+@@ -574,7 +574,7 @@
+ if (accept_port.getPortinfo()->isVerify()) {
+ _SSL_set_verify(ssl,
+ SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+- (int (*)(...))BjorbSSLVerifyCallback);
++ BjorbSSLVerifyCallback);
+ } else {
+ _SSL_set_verify(ssl, SSL_VERIFY_NONE, 0);
+ }
+@@ -620,7 +620,7 @@
+ } else {
+ _SSL_CTX_set_verify(ctx_connect,
+ SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+- (int (*)(...))BjorbSSLVerifyCallback);
++ BjorbSSLVerifyCallback);
+ }
+
+ ssl = _SSL_new(ctx_connect);
Index: files/patch-ae
===================================================================
RCS file: files/patch-ae
diff -N files/patch-ae
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-ae 12 Jan 2003 13:48:52 -0000
@@ -0,0 +1,14 @@
+--- bool.cc.orig Mon Feb 22 03:40:47 1999
++++ bool.cc Sun Jan 12 14:42:05 2003
+@@ -1,6 +1,11 @@
+ /* C code produced by gperf version 2.1 (K&R C version) */
+ /* Command-line: gperf -aptCT -N in_word_set_boollist bool.list */
+
++#include "config.h"
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif /* HAVE_STRING_H */
+
+ #include "common.h"
+ #include "bool.h"
Index: files/patch-af
===================================================================
RCS file: files/patch-af
diff -N files/patch-af
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-af 12 Jan 2003 13:48:52 -0000
@@ -0,0 +1,14 @@
+--- cmd.cc.orig Mon Feb 22 03:40:47 1999
++++ cmd.cc Sun Jan 12 14:40:41 2003
+@@ -3,6 +3,11 @@
+
+
+ #include "config.h"
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif /* HAVE_STRING_H */
++
+ #include "cmd.h"
+ #include "Config.h"
+ #include "cmd-def.h"
Index: files/patch-ag
===================================================================
RCS file: files/patch-ag
diff -N files/patch-ag
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-ag 12 Jan 2003 13:48:52 -0000
@@ -0,0 +1,12 @@
+--- portinfo.cc.orig Mon Feb 22 03:40:47 1999
++++ portinfo.cc Sun Jan 12 14:40:05 2003
+@@ -1,3 +1,9 @@
++#include "config.h"
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif /* HAVE_STRING_H */
++
+ #include "common.h"
+ #include "portinfo.h"
+ #include "token.h"
Index: files/patch-ah
===================================================================
RCS file: files/patch-ah
diff -N files/patch-ah
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-ah 12 Jan 2003 13:48:52 -0000
@@ -0,0 +1,14 @@
+--- portoption.cc.orig Mon Feb 22 03:40:47 1999
++++ portoption.cc Sun Jan 12 14:41:00 2003
+@@ -3,6 +3,11 @@
+
+
+ #include "config.h"
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif /* HAVE_STRING_H */
++
+ #include "Config.h"
+
+ #define MIN_WORD_LENGTH 3
>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?200301121357.h0CDvow4003660>