Update to version 0.5.4p4.

PR:		7739
Submitted by:	maintainer

5 files changed, 43 insertions, 44 deletions

diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index e03b5d9c930b..c72c21f8e65d 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -1,17 +1,29 @@
 # New ports collection makefile for:	bjorb
-# Version required:	0.5.3p1
+# Version required:	0.5.4p4
 # Date created:		May 16, 1998
-# Whom:			issei@t-cnet.or.jp
+# Whom:			issei@jp.FreeBSD.ORG
+#
+# $Id: Makefile,v 1.1.1.1 1998/07/20 02:39:04 steve Exp $
 #
-# $Id$
 
-DISTNAME=	bjorb-0.5.3p1
-PKGNAME=	bjorb-0.5.3.1
+DISTNAME=	bjorb-0.5.4p4
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.hitachi-ms.co.jp/pub/bjorb/
 
-MAINTAINER=	issei@t-cnet.or.jp
+MAINTAINER=	issei@jp.FreeBSD.ORG
 
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
+pre-fetch:
+	@${ECHO}
+	@${ECHO} You must set variable USA_RESIDENT to YES, if you are USA resident
+	@${ECHO} or to NO, if you aren\'t USA resident to build this package.
+	@${ECHO} You must also have installed RSAREF if you are USA resident.
+	@${FALSE}
+.elif defined(USA_RESIDENT)
+.if ${USA_RESIDENT} == YES
+LIB_DEPENDS=		rsaref\\.2\\.:${PORTSDIR}/security/rsaref
+.endif
+.endif
 BUILD_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
 RUN_DEPENDS=	ssleay:${PORTSDIR}/security/SSLeay
 
@@ -22,19 +34,20 @@ INSTALL_TARGET=		install certificate
 .endif
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-ssltop=${PREFIX}
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 DOCSRC=		${WRKDIR}/${DISTNAME}
-DOCS=		COPYRIGHT \
+DOCS=		ChangeLog \
+		COPYRIGHT \
+		INSTALL \
 		README \
+		ChangeLog.jp \
 		COPYRIGHT.jp \
 		INSTALL.jp \
 		README.jp \
 		doc/bjorb.conf.5.jp.txt \
 		doc/features.jp
-EXAMPLES=	doc/sample/mail-server.conf \
-		doc/sample/mail-client.conf \
-		doc/sample/telnet-server.conf \
-		doc/sample/telnet-client.conf
+EXAMPLES=	doc/sample/bjorb.conf.doc
 
 post-install:
 	@${INSTALL_SCRIPT} ${DOCSRC}/doc/sample/bjorb.sh ${PREFIX}/etc/rc.d/bjorb.sh.sample
diff --git a/security/bjorb/distinfo b/security/bjorb/distinfo
index e34d4641507c..7c46a0abedfa 100644
--- a/security/bjorb/distinfo
+++ b/security/bjorb/distinfo
@@ -1 +1 @@
-MD5 (bjorb-0.5.3p1.tar.gz) = 3b6a03837d616981633a3f7ad8539163
+MD5 (bjorb-0.5.4p4.tar.gz) = 478abe1aff88cd68ccee194ae9d0548f
diff --git a/security/bjorb/files/patch-aa b/security/bjorb/files/patch-aa
index df981902ea23..16dab5a269e1 100644
--- a/security/bjorb/files/patch-aa
+++ b/security/bjorb/files/patch-aa
@@ -1,6 +1,6 @@
---- ../../bjorb-0.5.3p1/src/Makefile.in	Tue May 26 19:35:33 1998
-+++ src/Makefile.in	Sun Jul 19 19:32:48 1998
-@@ -27,7 +27,7 @@
+--- Makefile.in.orig	Fri Jul 24 10:53:37 1998
++++ Makefile.in	Tue Aug 25 14:17:09 1998
+@@ -29,7 +29,7 @@
  LDFLAGS =
  LIBS = @LIBS@
  
@@ -9,20 +9,7 @@
  exec_prefix = $(PREFIX)
  sbindir = $(exec_prefix)/sbin
  etcdir = $(exec_prefix)/etc
-@@ -43,10 +43,10 @@
- 
- ### SSL Configuration
- 
--SSLTOP      = /usr/local/ssl
-+SSLTOP      = $(PREFIX)
- SSL_CFLAGS  = -I$(SSLTOP)/include
- SSL_LDFLAGS = -L$(SSLTOP)/lib
--SSL_LIBS    = -lssl -lcrypto
-+SSL_LIBS    = -lssl -lcrypto -lRSAglue -lrsaref
- 
- ###
- # %EXPORT%
-@@ -132,9 +132,13 @@
+@@ -135,9 +135,13 @@
  	autoconf
  
  certificate::
@@ -37,5 +24,5 @@
 +	chmod 644 $(PREFIX)/certs/bjorb.pem; \
 +	)
  
- install-freebsd::
- 	cp ../doc/sample/bjorb.sh /usr/local/etc/rc.d/bjorb.sh
+ install-bsd::
+ 	@if test -f /etc/rc.bjorb ; then chmod +w /etc/rc.bjorb; fi
diff --git a/security/bjorb/files/patch-ab b/security/bjorb/files/patch-ab
index 81ffc306b7e3..24000248cb5e 100644
--- a/security/bjorb/files/patch-ab
+++ b/security/bjorb/files/patch-ab
@@ -1,14 +1,13 @@
---- ../../bjorb-0.5.3p1/doc/sample/bjorb.conf.sample	Thu May 21 10:16:37 1998
-+++ doc/sample/bjorb.conf.sample	Wed Jun  3 02:29:29 1998
-@@ -55,8 +55,9 @@
- spare_servers   2
+--- ../doc/sample/bjorb.conf.sample.orig	Tue Jul  7 22:39:16 1998
++++ ../doc/sample/bjorb.conf.sample	Tue Aug 25 14:17:58 1998
+@@ -5,8 +5,8 @@
+ error_log	/var/log/bjorb-err.log
  do_fork	        true
  deny_wait       0
 -CA_cert_file    /usr/local/etc/bjorb.pem
 -CA_cert_path    /usr/local/etc/CA
-+#CA_cert_file    /usr/local/certs/bjorb.pem
-+#CA_cert_path    /usr/local/etc/CA
-+CA_make		"FreeBSD Bjorb", 365, 1024
++CA_cert_file    /usr/local/certs/bjorb.pem
++CA_cert_path    /usr/local/certs/CA
+ max_connection  100
+ spare_servers   1
  
- # TAG: accept [<interface>:]<port> [with <options>]
- #      options := SSL, VERIFY
diff --git a/security/bjorb/pkg-plist b/security/bjorb/pkg-plist
index 397ddff04c72..303e1bec4a47 100644
--- a/security/bjorb/pkg-plist
+++ b/security/bjorb/pkg-plist
@@ -1,17 +1,17 @@
 etc/bjorb.conf.sample
 etc/rc.d/bjorb.sh.sample
 sbin/bjorb
+share/doc/bjorb/ChangeLog
 share/doc/bjorb/COPYRIGHT
+share/doc/bjorb/INSTALL
 share/doc/bjorb/README
+share/doc/bjorb/ChangeLog.jp
 share/doc/bjorb/COPYRIGHT.jp
 share/doc/bjorb/INSTALL.jp
 share/doc/bjorb/README.jp
 share/doc/bjorb/bjorb.conf.5.jp.txt
 share/doc/bjorb/features.jp
 @dirrm share/doc/bjorb
-share/examples/bjorb/mail-client.conf
-share/examples/bjorb/mail-server.conf
-share/examples/bjorb/telnet-client.conf
-share/examples/bjorb/telnet-server.conf
+share/examples/bjorb/bjorb.conf.doc
 @dirrm share/examples/bjorb
 @exec ( [ -f %D/certs/bjorb.pem ] && exit ; echo "Making certificate files" ; cd %D/certs ; ssleay req -new -x509 -nodes -days 365 -out bjorb.pem -keyout bjorb.pem; ln -s bjorb.pem `ssleay x509 -noout -hash < bjorb.pem`.0 ; chmod 644 %D/certs/bjorb.pem )