Index: security/nettle/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/nettle/Makefile,v
retrieving revision 1.34
diff -u -d -r1.34 Makefile
--- security/nettle/Makefile	18 Dec 2011 22:47:56 -0000	1.34
+++ security/nettle/Makefile	9 Jul 2012 17:14:01 -0000
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	nettle
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNU} \
-		http://www.lysator.liu.se/~nisse/archive/:liu \
-		ftp://ftp.lysator.liu.se/pub/security/lsh/:liu
+		ftp://ftp.lysator.liu.se/pub/security/lsh/ \
+		http://www.lysator.liu.se/~nisse/archive/ 
 MASTER_SITE_SUBDIR=	${PORTNAME}/:DEFAULT
 
 MAINTAINER=	johans@FreeBSD.org
@@ -38,10 +38,6 @@
 
 INFO=		nettle
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/[[:<:]]sub[[:>:]]/subl/' \
-		${WRKSRC}/x86/camellia-crypt-internal.asm
-
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
Index: security/nettle/distinfo
===================================================================
RCS file: /home/ncvs/ports/security/nettle/distinfo,v
retrieving revision 1.13
diff -u -d -r1.13 distinfo
--- security/nettle/distinfo	4 Sep 2011 15:43:18 -0000	1.13
+++ security/nettle/distinfo	9 Jul 2012 17:14:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (nettle-2.4.tar.gz) = a6009208df6881f75aa1a87081ccfb2ccac1884da10670c53d7b76596f649c3f
-SIZE (nettle-2.4.tar.gz) = 1075789
+SHA256 (nettle-2.5.tar.gz) = 4aa142e908b0053082d7729fc0155dc90dbe71c8ef5f50f30034805ed5c92c72
+SIZE (nettle-2.5.tar.gz) = 1113274
Index: security/nettle/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/nettle/pkg-plist,v
retrieving revision 1.15
diff -u -d -r1.15 pkg-plist
--- security/nettle/pkg-plist	4 Sep 2011 15:43:18 -0000	1.15
+++ security/nettle/pkg-plist	9 Jul 2012 17:14:01 -0000
@@ -36,6 +36,7 @@
 include/nettle/ripemd160.h
 include/nettle/rsa-compat.h
 include/nettle/rsa.h
+include/nettle/salsa20.h
 include/nettle/serpent.h
 include/nettle/sexp.h
 include/nettle/sha.h
@@ -44,11 +45,11 @@
 lib/libhogweed.a
 lib/libhogweed.so
 lib/libhogweed.so.2
-lib/libhogweed.so.2.1
+lib/libhogweed.so.2.2
 lib/libnettle.a
 lib/libnettle.so
 lib/libnettle.so.4
-lib/libnettle.so.4.3
+lib/libnettle.so.4.4
 libdata/pkgconfig/nettle.pc
 libdata/pkgconfig/hogweed.pc
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -56,10 +57,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/nettle.html
 %%PORTDOCS%%%%DOCSDIR%%/nettle.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base16dec.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base16enc.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base64dec.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/base64enc.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eratosthenes.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getopt1.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/io.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nettle-benchmark.c