Hi,

This is an update to the patch I posted yesterday.  It should apply
cleanly against what is now in HEAD.

One patch file is removed since it is no longer needed and another one
is added to put the man pages in the same place as the other ones.

Net result is that the man pages are only installed once.

Allan.

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/razor-agents/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile    2005/07/06 23:18:11     1.15
+++ Makefile    2006/08/02 16:12:57
@@ -4,7 +4,7 @@
 
 COMMENT=               "agent for Razor spam filtering networks"
 
-DISTNAME=              razor-agents-2.40
+DISTNAME=              razor-agents-2.82
 CATEGORIES=            mail
 HOMEPAGE=              http://razor.sourceforge.net/
 
@@ -15,6 +15,7 @@
 PERMIT_DISTFILES_FTP=  Yes
 
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=razor/}
+EXTRACT_SUFX=          .tar.bz2
 
 RUN_DEPENDS=           :p5-Digest-SHA1->=1.0:security/p5-Digest-SHA1 \
                        :p5-Net-DNS->=0.23:net/p5-Net-DNS \
@@ -24,12 +25,5 @@
 FAKE_FLAGS=            ${DESTDIRNAME}=${WRKINST} 
PERL5LIB=${WRKINST}/${PREFIX}/${P5ARCH}
 
 CONFIGURE_STYLE=       perl
-
-post-install:
-       @ln -s razor-client ${PREFIX}/bin/razor-check
-       @ln -s razor-client ${PREFIX}/bin/razor-report
-       @ln -s razor-client ${PREFIX}/bin/razor-revoke
-       @ln -s razor-client ${PREFIX}/bin/razor-admin
-       ${INSTALL_MAN} ${WRKSRC}/blib/man5/*.5 ${PREFIX}/man/man5
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/razor-agents/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    2005/01/05 16:58:58     1.7
+++ distinfo    2006/08/02 16:12:57
@@ -1,4 +1,4 @@
-MD5 (razor-agents-2.40.tar.gz) = ca1a340e13464661aa0efebd869fcebc
-RMD160 (razor-agents-2.40.tar.gz) = e35784f91f1bc7ba32e4084e2fd041039a5c5eb4
-SHA1 (razor-agents-2.40.tar.gz) = 90ba50b88d58272282f4a8277c752eabef319873
-SIZE (razor-agents-2.40.tar.gz) = 79800
+MD5 (razor-agents-2.82.tar.bz2) = a79a798e52426261c6a2c4089b33872f
+RMD160 (razor-agents-2.82.tar.bz2) = 4015686818e24084319ae2c13c82bbf74df54035
+SHA1 (razor-agents-2.82.tar.bz2) = 76b9efdd2b09726e68b19ecf8bd98293ac646db8
+SIZE (razor-agents-2.82.tar.bz2) = 79021
Index: patches/patch-Makefile_PL
===================================================================
RCS file: patch-Makefile_PL
diff -N patch-Makefile_PL
--- /dev/null   Sat Aug 30 18:16:59 1997
+++ patch-Makefile_PL   Wed Aug  2 16:12:57 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.PL.orig   Wed Aug  2 10:02:05 2006
++++ Makefile.PL        Wed Aug  2 10:02:20 2006
+@@ -57,7 +57,7 @@ MAN5PODS = docs/razor-agent.conf.pod \
+          docs/razor-whitelist.pod  \
+          docs/razor-agents.pod
+ INST_MAN5DIR = blib/man5
+-INSTALLMAN5DIR = $(DESTDIR)$(PREFIX)/share/man/man5
++INSTALLMAN5DIR = $(DESTDIR)$(PREFIX)/man/man5
+ INSTALLSITEMAN5DIR = $(DESTDIR)$(SITEPREFIX)/share/man/man5
+ INSTALLVENDORMAN5DIR = $(DESTDIR)$(VENDORPREFIX)/share/man/man5
+ MAN5EXT = 5
Index: patches/patch-lib_Razor2_Client_Agent_pm
===================================================================
RCS file: patch-lib_Razor2_Client_Agent_pm
diff -N patch-lib_Razor2_Client_Agent_pm
--- /tmp/cvsCAAa006bt   Wed Aug  2 16:12:57 2006
+++ /dev/null   Sat Aug 30 18:16:59 1997
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_Razor2_Client_Agent_pm,v 1.2 2003/05/24 21:57:32 marcm Exp 
$
---- lib/Razor2/Client/Agent.pm.orig    Tue May  6 17:00:38 2003
-+++ lib/Razor2/Client/Agent.pm Wed May 21 19:28:19 2003
-@@ -48,7 +48,7 @@ sub new {
-     foreach (@valid_program_names) { $breed =~ /$_$/ and $ok = $_; }
-     unless ($ok) {
-         if ($breed =~ /razor-client$/) {
--            create_symlinks(@valid_program_names);
-+            #create_symlinks(@valid_program_names);
-             exit 0;
-         }
-         die "Invalid program name, must be one of: @valid_program_names\n";
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/razor-agents/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST   2004/09/15 09:09:44     1.10
+++ pkg/PLIST   2006/08/02 16:12:57
@@ -7,24 +7,26 @@
 ${P5ARCH}/Razor2/
 ${P5ARCH}/Razor2/Client/
 ${P5ARCH}/Razor2/Client/Agent.pm
[EMAIL PROTECTED] ${P5ARCH}/Razor2/Client/Agent.pm.orig
 ${P5ARCH}/Razor2/Client/Config.pm
 ${P5ARCH}/Razor2/Client/Core.pm
 ${P5ARCH}/Razor2/Client/Engine.pm
 ${P5ARCH}/Razor2/Client/Version.pm
+${P5ARCH}/Razor2/Engine/
+${P5ARCH}/Razor2/Engine/VR8.pm
 ${P5ARCH}/Razor2/Errorhandler.pm
 ${P5ARCH}/Razor2/Logger.pm
 ${P5ARCH}/Razor2/Preproc/
 ${P5ARCH}/Razor2/Preproc/Manager.pm
-${P5ARCH}/Razor2/Preproc/VR1.pm
 ${P5ARCH}/Razor2/Preproc/deBase64.pm
 ${P5ARCH}/Razor2/Preproc/deHTML.pm
+${P5ARCH}/Razor2/Preproc/deHTML_comment.pm
 ${P5ARCH}/Razor2/Preproc/deHTMLxs.pm
 ${P5ARCH}/Razor2/Preproc/deNewline.pm
 ${P5ARCH}/Razor2/Preproc/deQP.pm
 ${P5ARCH}/Razor2/Preproc/enBase64.pm
 ${P5ARCH}/Razor2/Signature/
 ${P5ARCH}/Razor2/Signature/Ephemeral.pm
+${P5ARCH}/Razor2/Signature/Whiplash.pm
 ${P5ARCH}/Razor2/String.pm
 ${P5ARCH}/Razor2/Syslog.pm
 ${P5ARCH}/auto/Razor2/

Reply via email to