- Update to 1.2.3

- Assume maintainership

Changes:	https://raw.github.com/polarssl/polarssl/fb1ba781b398d39f4444515381babcc9e5a8dcd2/ChangeLog

Feature safe:	yes

5 files changed, 38 insertions, 33 deletions

diff --git a/security/polarssl/Makefile b/security/polarssl/Makefile
index dad667ead5ab..46fd6a60b511 100644
--- a/security/polarssl/Makefile
+++ b/security/polarssl/Makefile
@@ -1,18 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	polarssl
-PORTVERSION=	1.1.4
+PORTVERSION=	1.2.3
 DISTVERSIONSUFFIX=	-gpl
 CATEGORIES=	security devel
-MASTER_SITES=	http://polarssl.org/code/download/
+MASTER_SITES=	http://polarssl.org/download/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jase@FreeBSD.org
 COMMENT=	Open Source embedded SSL/TLS cryptographic library
 
 LICENSE=	GPLv2
 
-USE_PERL5_BUILD=	yes
+FETCH_ARGS=	-pRr
+ALL_TARGET=	no_test
+
+USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -33,8 +36,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/programs/*/${i} ${PREFIX}/bin/polarssl_${i}
 .endfor
 
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR}/
diff --git a/security/polarssl/distinfo b/security/polarssl/distinfo
index 4fc33ff2f9c2..f1b17d340e04 100644
--- a/security/polarssl/distinfo
+++ b/security/polarssl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (polarssl-1.1.4-gpl.tgz) = 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6
-SIZE (polarssl-1.1.4-gpl.tgz) = 611340
+SHA256 (polarssl-1.2.3-gpl.tgz) = 5cd3bc6aa85e1de809c3b4c76932794c60a8d05faf2cf8f62933ab97ef52e4ae
+SIZE (polarssl-1.2.3-gpl.tgz) = 978269
diff --git a/security/polarssl/files/patch-Makefile b/security/polarssl/files/patch-Makefile
deleted file mode 100644
index 6f5c3fe9cd85..000000000000
--- a/security/polarssl/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2011-06-21 10:59:00.000000000 +0200
-+++ Makefile	2011-08-13 16:25:23.000000000 +0200
-@@ -7,7 +7,7 @@
- all:
- 	cd library  && $(MAKE) all && cd ..
- 	cd programs && $(MAKE) all && cd ..
--	cd tests    && $(MAKE) all && cd ..
-+#	cd tests    && $(MAKE) all && cd ..
- 
- install:
- 	mkdir -p $(DESTDIR)/include/polarssl
diff --git a/security/polarssl/files/patch-library-Makefile b/security/polarssl/files/patch-library-Makefile
index bb956457f074..75b1dca1cc03 100644
--- a/security/polarssl/files/patch-library-Makefile
+++ b/security/polarssl/files/patch-library-Makefile
@@ -1,20 +1,25 @@
---- library/Makefile.orig	2010-03-24 15:57:15.000000000 +0900
-+++ library/Makefile	2010-07-15 14:33:59.000000000 +0900
-@@ -11,7 +11,7 @@
+--- library/Makefile.orig	2012-11-26 19:20:30.821850410 +0000
++++ library/Makefile	2012-11-26 19:21:01.534380354 +0000
+@@ -18,9 +18,7 @@
  # CFLAGS += -D_BSD_EXTENSION
-
+ 
  # To compile as a shared library:
--# CFLAGS += -fPIC
-+CFLAGS += -fPIC
-
- DLEXT=so
- # OSX shared library extension:
-@@ -29,7 +29,7 @@
-
+-ifdef SHARED
+ CFLAGS += -fPIC
+-endif
+ 
+ SONAME=libpolarssl.so.0
+ 
+@@ -53,11 +51,7 @@
+ 
  .SILENT:
-
+ 
+-ifndef SHARED
 -all: static
-+all: static shared
-
+-else
+-all: shared
+-endif
++all: shared static
+ 
  static: libpolarssl.a
-
+ 
diff --git a/security/polarssl/pkg-plist b/security/polarssl/pkg-plist
index 0b001adbb37b..6e8e3589a5f4 100644
--- a/security/polarssl/pkg-plist
+++ b/security/polarssl/pkg-plist
@@ -20,8 +20,10 @@ bin/polarssl_ssl_test
 include/polarssl/aes.h
 include/polarssl/arc4.h
 include/polarssl/asn1.h
+include/polarssl/asn1write.h
 include/polarssl/base64.h
 include/polarssl/bignum.h
+include/polarssl/blowfish.h
 include/polarssl/bn_mul.h
 include/polarssl/camellia.h
 include/polarssl/certs.h
@@ -35,6 +37,7 @@ include/polarssl/dhm.h
 include/polarssl/entropy.h
 include/polarssl/entropy_poll.h
 include/polarssl/error.h
+include/polarssl/gcm.h
 include/polarssl/havege.h
 include/polarssl/md.h
 include/polarssl/md2.h
@@ -45,15 +48,18 @@ include/polarssl/net.h
 include/polarssl/openssl.h
 include/polarssl/padlock.h
 include/polarssl/pem.h
+include/polarssl/pbkdf2.h
 include/polarssl/pkcs11.h
 include/polarssl/rsa.h
 include/polarssl/sha1.h
 include/polarssl/sha2.h
 include/polarssl/sha4.h
 include/polarssl/ssl.h
+include/polarssl/ssl_cache.h
 include/polarssl/timing.h
 include/polarssl/version.h
 include/polarssl/x509.h
+include/polarssl/x509write.h
 include/polarssl/xtea.h
 lib/libpolarssl.a
 lib/libpolarssl.so