Attachment 44757 Details for Bug 69194 – file.diff

[patch] file.diff

file.diff (text/plain), 7.09 KB, created by Cheng-Lung Sung on 2004-07-17 16:20:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cheng-Lung Sung

Created: 2004-07-17 16:20:25 UTC

Size: 7.09 KB

patch

obsolete

>diff -ruN /usr/ports/security/botan/Makefile ./botan/Makefile
>--- /usr/ports/security/botan/Makefile	Thu Feb  5 11:42:41 2004
>+++ ./botan/Makefile	Sat Jul 17 17:42:20 2004
>@@ -7,18 +7,17 @@
> #
> 
> PORTNAME=	botan
>-PORTVERSION=	1.2.8
>-PORTREVISION=	1
>+PORTVERSION=	1.4.0
>+PORTREVISION=	0
> CATEGORIES=	security
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	opencl
>+MASTER_SITES=	http://botan.randombit.net/
>+MASTER_SITE_SUBDIR=	files
> DISTNAME=	Botan-${PORTVERSION}
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	clsung@dragon2.net
> COMMENT=	A portable, easy to use, and efficient C++ crypto library
> 
>-USE_REINPLACE=	yes
> USE_PERL5=	yes
> HAS_CONFIGURE=	yes
> CONFIGURE_SCRIPT=	configure.pl
>@@ -29,6 +28,7 @@
> INSTALLS_SHLIB=	yes
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
>+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
> 
> .include <bsd.port.pre.mk>
> 
>@@ -36,9 +36,5 @@
> BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
> RUN_DEPENDS=	${BUILD_DEPENDS}
> .endif
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g ; \
>-		s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/${CONFIGURE_SCRIPT}
> 
> .include <bsd.port.post.mk>
>diff -ruN /usr/ports/security/botan/distinfo ./botan/distinfo
>--- /usr/ports/security/botan/distinfo	Thu Apr  1 16:40:43 2004
>+++ ./botan/distinfo	Fri Jul 16 01:34:31 2004
>@@ -1,2 +1,2 @@
>-MD5 (Botan-1.2.8.tgz) = dc84a09cad3e354bc21427b2baf3bb24
>-SIZE (Botan-1.2.8.tgz) = 1249358
>+MD5 (Botan-1.4.0.tgz) = 3154cdeecd2f65fa221cd9b5848b1fb2
>+SIZE (Botan-1.4.0.tgz) = 1403507
>diff -ruN /usr/ports/security/botan/files/patch-configure.pl ./botan/files/patch-configure.pl
>--- /usr/ports/security/botan/files/patch-configure.pl	Fri May 10 10:32:18 2002
>+++ ./botan/files/patch-configure.pl	Fri Jul 16 16:54:00 2004
>@@ -1,11 +1,24 @@
>---- configure.pl.orig	Fri May 10 10:03:25 2002
>-+++ configure.pl	Fri May 10 10:03:35 2002
>-@@ -1705,7 +1705,7 @@
>- DOCDIR        = \$(INSTALLROOT)/$doc_dir/OpenCL-\$(VERSION)
>+--- configure.pl.orig	Sat Jun 26 14:32:52 2004
>++++ configure.pl	Fri Jul 16 16:53:50 2004
>+@@ -2007,7 +2007,11 @@
>+    my $link_to = "-lm";
>+    foreach my $lib (@{ $lib_list })
>+    {
>+-       $link_to .= " -l" . $lib;
>++       if ($lib =~ m/pthread/) {
>++	    $link_to .= " -" . $lib;
>++       } else {
>++	    $link_to .= " -l" . $lib;
>++       }
>+    }
>  
>- OWNER         = root
>--GROUP         = root
>-+GROUP         = wheel
>- DATA_MODE     = 644
>- EXEC_MODE     = 755
>+    ##################################################
>+@@ -2465,7 +2469,7 @@
>+     my $link_to = "-lm";
>+     foreach my $lib (@libs)
>+     {
>+-        $link_to .= " -l" . $lib;
>++	$link_to .= " -l" . $lib;
>+     }
>  
>+     my $VERSION = $major . "." . $minor . "." . $patch;
>diff -ruN /usr/ports/security/botan/files/patch-modules::tm_posix.cpp ./botan/files/patch-modules::tm_posix.cpp
>--- /usr/ports/security/botan/files/patch-modules::tm_posix.cpp	Thu Jan  1 08:00:00 1970
>+++ ./botan/files/patch-modules::tm_posix.cpp	Fri Jul 16 16:33:07 2004
>@@ -0,0 +1,11 @@
>+--- modules/tm_posix/tm_posix.cpp.orig	Sat Jun 26 14:32:53 2004
>++++ modules/tm_posix/tm_posix.cpp	Fri Jul 16 16:32:28 2004
>+@@ -6,7 +6,7 @@
>+ #define _POSIX_C_SOURCE 199309
>+ #include <botan/tm_posix.h>
>+ #include <botan/util.h>
>+-#include <time.h>
>++#include <sys/time.h>
>+ 
>+ #ifndef CLOCK_REALTIME
>+   #define CLOCK_REALTIME 0
>diff -ruN /usr/ports/security/botan/pkg-plist ./botan/pkg-plist
>--- /usr/ports/security/botan/pkg-plist	Thu Jan  1 09:49:33 2004
>+++ ./botan/pkg-plist	Sat Jul 17 17:27:03 2004
>@@ -28,7 +28,6 @@
> include/botan/crc24.h
> include/botan/crc32.h
> include/botan/crl_ent.h
>-include/botan/cscipher.h
> include/botan/ctr.h
> include/botan/cts.h
> include/botan/data_snk.h
>@@ -44,14 +43,21 @@
> include/botan/eax.h
> include/botan/ecb.h
> include/botan/elgamal.h
>-include/botan/emac.h
> include/botan/eme.h
> include/botan/emsa.h
>+include/botan/eng_def.h
>+include/botan/engine.h
> include/botan/enums.h
>+include/botan/es_egd.h
> include/botan/es_file.h
>+include/botan/es_ftw.h
>+include/botan/es_unix.h
> include/botan/exceptn.h
>+include/botan/fd_unix.h
> include/botan/filter.h
> include/botan/filters.h
>+include/botan/fips140.h
>+include/botan/fips_rng.h
> include/botan/gost.h
> include/botan/has160.h
> include/botan/haval.h
>@@ -71,24 +77,25 @@
> include/botan/md2.h
> include/botan/md4.h
> include/botan/md5.h
>-include/botan/md5mac.h
> include/botan/mdx_hash.h
> include/botan/mem_ops.h
> include/botan/mgf1.h
> include/botan/misty1.h
>+include/botan/mmap_mem.h
> include/botan/mod_exp.h
> include/botan/mode_pad.h
> include/botan/modebase.h
> include/botan/mp_core.h
>-include/botan/mp_impl.h
>-include/botan/mp_mul.h
>+include/botan/mp_madd.h
> include/botan/mp_types.h
> include/botan/mutex.h
>+include/botan/mux_pthr.h
> include/botan/nr.h
> include/botan/numthry.h
> include/botan/ofb.h
> include/botan/oids.h
> include/botan/omac.h
>+include/botan/openpgp.h
> include/botan/par_hash.h
> include/botan/pbe.h
> include/botan/pbe_pkcs.h
>@@ -96,8 +103,10 @@
> include/botan/pgp_s2k.h
> include/botan/pipe.h
> include/botan/pk_algs.h
>+include/botan/pk_core.h
> include/botan/pk_filts.h
> include/botan/pk_keys.h
>+include/botan/pk_ops.h
> include/botan/pk_util.h
> include/botan/pkcs10.h
> include/botan/pkcs5.h
>@@ -123,17 +132,19 @@
> include/botan/sha160.h
> include/botan/sha256.h
> include/botan/sha_64.h
>-include/botan/shark.h
> include/botan/skipjack.h
> include/botan/square.h
> include/botan/ssl3_mac.h
> include/botan/symkey.h
> include/botan/tea.h
>-include/botan/threeway.h
> include/botan/tiger.h
> include/botan/timers.h
>+include/botan/tm_posix.h
>+include/botan/tm_unix.h
> include/botan/twofish.h
> include/botan/types.h
>+include/botan/ui.h
>+include/botan/unix_cmd.h
> include/botan/util.h
> include/botan/version.h
> include/botan/whrlpool.h
>@@ -148,25 +159,27 @@
> include/botan/x917_rng.h
> include/botan/x919_mac.h
> include/botan/xtea.h
>-lib/libbotan-1.2.8.so
>-lib/libbotan-1.2.so
>+lib/libbotan-1.4.0.so
>+lib/libbotan-1.4.so
> lib/libbotan-1.so
> lib/libbotan.a
> lib/libbotan.so
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/api.pdf
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/api.tex
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/botan.rc
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/authors.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/bugs.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/deprecated.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/license.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/log.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/pgpkeys.asc
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/readme.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/rngs.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/thanks.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/todo.txt
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/tutorial.pdf
>-%%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%/tutorial.tex
>+%%DOCSDIR%%/api.pdf
>+%%DOCSDIR%%/api.tex
>+%%DOCSDIR%%/authors.txt
>+%%DOCSDIR%%/botan.rc
>+%%DOCSDIR%%/bugs.txt
>+%%DOCSDIR%%/deprecated.txt
>+%%DOCSDIR%%/fips140.pdf
>+%%DOCSDIR%%/fips140.tex
>+%%DOCSDIR%%/license.txt
>+%%DOCSDIR%%/log.txt
>+%%DOCSDIR%%/pgpkeys.asc
>+%%DOCSDIR%%/readme.txt
>+%%DOCSDIR%%/rngs.txt
>+%%DOCSDIR%%/thanks.txt
>+%%DOCSDIR%%/todo.txt
>+%%DOCSDIR%%/tutorial.pdf
>+%%DOCSDIR%%/tutorial.tex
> @dirrm include/botan
>-@dirrm %%PORTDOCS%%share/doc/Botan-%%PORTVERSION%%
>+@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 69194: 44757