ports/160539: [PATCH] security/botan: update to 1.10.1

[Bert JW Regeer]

>Number:         160539
>Category:       ports
>Synopsis:       [PATCH] security/botan: update to 1.10.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 07 10:10:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Bert JW Regeer
>Release:        FreeBSD 8.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD iguana.osnn.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:36:49 UTC 2010
>Description:
- Update to 1.10.1

Port maintainer (lapo at lapo.it) is cc'd.

I am not sure if this is the right way to go about updating this port. There are a lot of differences
between 1.8.x and 1.10.x which is causing older code I've written to not compile on 1.10.x and code
written for 1.10.x won't compile on 1.8.x. Should my updated port be renamed to botan110 or something
along those lines much like the apache ports?

Feel free to contact me at xistence at 0x58.com (Bert JW Regeer).

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- botan-1.10.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/botan/Makefile /usr/home/xistence/botan/Makefile
--- /usr/ports/security/botan/Makefile	2010-11-03 20:03:29.000000000 -0500
+++ /usr/home/xistence/botan/Makefile	2011-09-02 15:16:10.000000000 -0500
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	botan
-PORTVERSION=	1.8.11
+PORTVERSION=	1.10.1
 CATEGORIES=	security
-MASTER_SITES=	http://files.randombit.net/botan/v1.8/
+MASTER_SITES=	http://files.randombit.net/botan/v1.10/
 DISTNAME=	Botan-${PORTVERSION}
 EXTRACT_SUFX=	.tbz
 
@@ -19,7 +19,7 @@
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
-OPTIONS=	SSL "Enable OpenSSL engine" on \
+OPTIONS=	SSL "Enable OpenSSL engine (experimental)" off \
 		GMP "Enable GMP engine" on \
 		ECC "Enable ECC support" on
 
@@ -32,9 +32,12 @@
 USE_GMAKE=	yes
 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
+PLIST_FILES=	bin/botan-config-${MAJORVERSION} lib/libbotan-${MAJORVERSION}.a lib/libbotan-${MAJORVERSION}.so.0.${MINORVERSION} lib/libbotan-${MAJORVERSION}.so.0 lib/libbotan-${MAJORVERSION}.so libdata/pkgconfig/botan-${MAJORVERSION}.pc
 
+DOCSDIR=	${PREFIX}/share/doc/botan-${PORTVERSION}
 PORTDOCS=	*
+MAJORVERSION=	1.10
+MINORVERSION=	1
 
 .include <bsd.port.options.mk>
 
@@ -65,7 +68,8 @@
 .endif
 
 post-install:
-	@(cd ${PREFIX}; ${FIND} -s include/botan -not -type d) >> ${TMPPLIST}
-	@${ECHO_CMD} @dirrm include/botan >> ${TMPPLIST}
+	@(cd ${PREFIX}; ${FIND} -s include/botan-${MAJORVERSION}/ -not -type d) >> ${TMPPLIST}
+	@${ECHO_CMD} @dirrm include/botan-${MAJORVERSION}/botan >> ${TMPPLIST}
+	@${ECHO_CMD} @dirrm include/botan-${MAJORVERSION} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/security/botan/distinfo /usr/home/xistence/botan/distinfo
--- /usr/ports/security/botan/distinfo	2010-11-03 20:03:29.000000000 -0500
+++ /usr/home/xistence/botan/distinfo	2011-09-02 12:44:27.000000000 -0500
@@ -1,2 +1,2 @@
-SHA256 (Botan-1.8.11.tbz) = c3b60a2c3dfcbe7b21626e8459e5134d3cbabe45b6d94f454860b99798739ba4
-SIZE (Botan-1.8.11.tbz) = 2808114
+SHA256 (Botan-1.10.1.tbz) = 205a3c011391d01ca3e4f127a2ffbf993a4f59788ffa45a6df06ef4ff382a89e
+SIZE (Botan-1.10.1.tbz) = 2195784
diff -ruN --exclude=CVS /usr/ports/security/botan/files/patch-src_build_data_makefile_unix_shr.in /usr/home/xistence/botan/files/patch-src_build_data_makefile_unix_shr.in
--- /usr/ports/security/botan/files/patch-src_build_data_makefile_unix_shr.in	2009-10-27 08:37:59.000000000 -0500
+++ /usr/home/xistence/botan/files/patch-src_build_data_makefile_unix_shr.in	2011-09-02 14:38:28.000000000 -0500
@@ -1,24 +1,11 @@
---- 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
+--- src/build-data/makefile/unix_shr.in.orig	2011-09-02 19:36:47.671575619 +0000
++++ src/build-data/makefile/unix_shr.in	2011-09-02 19:37:32.341486166 +0000
+@@ -20,7 +20,7 @@
  LIBDIR        = $(DESTDIR)/%{libdir}
- HEADERDIR     = $(DESTDIR)/%{includedir}/botan
--DOCDIR        = $(DESTDIR)/%{docdir}/Botan-$(VERSION)
+ HEADERDIR     = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan
+ DOCDIR        = $(DESTDIR)/%{docdir}/botan-$(VERSION)
 -PKGCONF_DIR   = $(LIBDIR)/pkgconfig
-+DOCDIR        = $(DESTDIR)/%{docdir}/botan
 +PKGCONF_DIR   = $(DESTDIR)/libdata/pkgconfig
  
  CONFIG_SCRIPT = %{botan_config}
  PKGCONFIG     = %{botan_pkgconfig}
-@@ -67,8 +67,8 @@
- LIBNAME       = %{lib_prefix}libbotan
- STATIC_LIB    = $(LIBNAME).a
- 
--SHARED_LIB    = $(LIBNAME)-$(SO_VERSION).%{so_suffix}
--SONAME        = $(LIBNAME)-$(SO_VERSION).%{so_suffix}
-+SHARED_LIB    = $(LIBNAME).%{so_suffix}.0
-+SONAME        = $(LIBNAME).%{so_suffix}.0
- 
- SYMLINK       = libbotan.%{so_suffix}
- 
--- botan-1.10.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: