Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Feb 2014 13:56:20 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342137 - in head/security/botan: . files
Message-ID:  <201402011356.s11DuK3a091583@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Feb  1 13:56:20 2014
New Revision: 342137
URL: http://svnweb.freebsd.org/changeset/ports/342137
QAT: https://qat.redports.org/buildarchive/r342137/

Log:
  - Update to 1.8.14
  - Deprecate and set expiration date
  - Fix LICENSE
  - Convert to USES=gmake
  - Convert to staging
  - Use new LIB_DEPENDS format
  
  PR:		ports/186279
  Submitted by:	Lapo Luchini <lapo@lapo.it> (maintainer)

Deleted:
  head/security/botan/files/patch-configure.py
Modified:
  head/security/botan/Makefile
  head/security/botan/distinfo
  head/security/botan/files/patch-src_build_data_makefile_unix_shr.in

Modified: head/security/botan/Makefile
==============================================================================
--- head/security/botan/Makefile	Sat Feb  1 13:49:09 2014	(r342136)
+++ head/security/botan/Makefile	Sat Feb  1 13:56:20 2014	(r342137)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	botan
-PORTVERSION=	1.8.13
+PORTVERSION=	1.8.14
 CATEGORIES=	security
 MASTER_SITES=	http://files.randombit.net/botan/v1.8/
 DISTNAME=	Botan-${PORTVERSION}
@@ -11,9 +11,12 @@ EXTRACT_SUFX=	.tbz
 MAINTAINER=	lapo@lapo.it
 COMMENT=	Portable, easy to use, and efficient C++ crypto library
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
+DEPRECATED=	Botan 1.8 have known bugs and is no longer supported upstream, migrate to security/botan110
+EXPIRATION_DATE=	2014-06-30
+
 OPTIONS_DEFINE=		SSL GMP ECC
 OPTIONS_DEFAULT=	SSL GMP ECC
 ECC_DESC=	ECC support
@@ -22,16 +25,14 @@ USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.py
-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-tr1-implementation=boost \
-		--with-bzip2 --with-zlib
-USE_GMAKE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --with-bzip2 --with-zlib
+USES=		gmake
 MAKE_ARGS=	CXX="${CXX}" LIB_OPT="${CXXFLAGS}"
 USE_LDCONFIG=	yes
 PLIST_FILES=	bin/botan-config lib/libbotan.a lib/libbotan.so lib/libbotan.so.0 libdata/pkgconfig/botan-1.8.pc
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
@@ -40,7 +41,7 @@ CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 CONFIGURE_ARGS+=--with-gnump
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
@@ -63,7 +64,7 @@ post-patch:
 .endif
 
 post-install:
-	@(cd ${PREFIX}; ${FIND} -s include/botan -not -type d) >> ${TMPPLIST}
+	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s include/botan -not -type d) >> ${TMPPLIST}
 	@${ECHO_CMD} @dirrm include/botan >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/security/botan/distinfo
==============================================================================
--- head/security/botan/distinfo	Sat Feb  1 13:49:09 2014	(r342136)
+++ head/security/botan/distinfo	Sat Feb  1 13:56:20 2014	(r342137)
@@ -1,2 +1,2 @@
-SHA256 (Botan-1.8.13.tbz) = 5593ce257d753c305ecf6f4d16e2f516f647bd6494f823fe9766a816ac439dba
-SIZE (Botan-1.8.13.tbz) = 2811686
+SHA256 (Botan-1.8.14.tbz) = a67be92c38a221b4dff180e8721a763cb97a717cd93722b23900680bd4e49d7c
+SIZE (Botan-1.8.14.tbz) = 2397499

Modified: head/security/botan/files/patch-src_build_data_makefile_unix_shr.in
==============================================================================
--- head/security/botan/files/patch-src_build_data_makefile_unix_shr.in	Sat Feb  1 13:49:09 2014	(r342136)
+++ head/security/botan/files/patch-src_build_data_makefile_unix_shr.in	Sat Feb  1 13:56:20 2014	(r342137)
@@ -1,13 +1,22 @@
---- src/build-data/makefile/unix_shr.in.orig	2009-09-10 02:29:34.000000000 +0200
-+++ src/build-data/makefile/unix_shr.in	2009-10-27 14:30:46.000000000 +0100
-@@ -25,8 +25,8 @@
- BINDIR        = $(DESTDIR)/bin
- LIBDIR        = $(DESTDIR)/%{libdir}
- HEADERDIR     = $(DESTDIR)/%{includedir}/botan
+--- src/build-data/makefile/unix_shr.in.orig	2012-07-18 21:59:04.000000000 +0200
++++ src/build-data/makefile/unix_shr.in	2014-01-30 21:16:16.957275654 +0100
+@@ -20,13 +20,13 @@
+ ##################################################
+ # Installation Settings                          #
+ ##################################################
+-DESTDIR       = %{prefix}
++PREFIX       = %{prefix}
+ 
+-BINDIR        = $(DESTDIR)/bin
+-LIBDIR        = $(DESTDIR)/%{libdir}
+-HEADERDIR     = $(DESTDIR)/%{includedir}/botan
 -DOCDIR        = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
 -PKGCONF_DIR   = $(LIBDIR)/pkgconfig
-+DOCDIR        = $(DESTDIR)/%{docdir}/botan
-+PKGCONF_DIR   = $(DESTDIR)/libdata/pkgconfig
++BINDIR        = $(DESTDIR)$(PREFIX)/bin
++LIBDIR        = $(DESTDIR)$(PREFIX)/%{libdir}
++HEADERDIR     = $(DESTDIR)$(PREFIX)/%{includedir}/botan
++DOCDIR        = $(DESTDIR)$(PREFIX)/%{docdir}/botan
++PKGCONF_DIR   = $(DESTDIR)$(PREFIX)/libdata/pkgconfig
  
  CONFIG_SCRIPT = %{botan_config}
  PKGCONFIG     = %{botan_pkgconfig}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402011356.s11DuK3a091583>