- Update security/libkpass to version 5 [1]

- Force libkpass to link with gettext, library uses symbols from
  libintl without linking to it - this creates problems for
  consumers (only for ckpass right now)
- Update security/ckpass to version 0.2 [2]

PR:		ports/177561 [1]
PR:		ports/177562 [2]
Submitted by:	Veniamin Gvozdikov <g.veniamin@googlemail.com> (maintainer)

7 files changed, 30 insertions, 27 deletions

diff --git a/security/ckpass/Makefile b/security/ckpass/Makefile
index f89d0b97605f..de581501d7e2 100644
--- a/security/ckpass/Makefile
+++ b/security/ckpass/Makefile
@@ -1,9 +1,8 @@
 # Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ckpass
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -12,11 +11,11 @@ COMMENT=	Ncurses based password database client
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	kpass.0:${PORTSDIR}/security/libkpass
+LIB_DEPENDS=	kpass:${PORTSDIR}/security/libkpass
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/ckpass
 
diff --git a/security/ckpass/distinfo b/security/ckpass/distinfo
index 9a1782bba032..f888006dd977 100644
--- a/security/ckpass/distinfo
+++ b/security/ckpass/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ckpass-0.1.tar.gz) = 2bf19b9214127d5772fc70777e2db147ed58c809fa003fe3cbd23c361336d12e
-SIZE (ckpass-0.1.tar.gz) = 89129
+SHA256 (ckpass-0.2.tar.gz) = 4027708b9518e7d320958f186f6b932001a3501c88773a88191fe5c976fe0686
+SIZE (ckpass-0.2.tar.gz) = 95921
diff --git a/security/ckpass/pkg-descr b/security/ckpass/pkg-descr
index b0ee43e80f01..35479b74a192 100644
--- a/security/ckpass/pkg-descr
+++ b/security/ckpass/pkg-descr
@@ -1,4 +1,4 @@
 An ncurses based password database client that is compatible
 with KeePass 1.x format databases.
 
-WWW:	http://ckpass.sourceforge.net/
+WWW: http://ckpass.sourceforge.net/
diff --git a/security/libkpass/Makefile b/security/libkpass/Makefile
index 57ab9ede22de..e3f34c3b38f7 100644
--- a/security/libkpass/Makefile
+++ b/security/libkpass/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	libkpass
-# Date created:		2011-09-12
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libkpass
-PORTVERSION=	3
+PORTVERSION=	5
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
@@ -15,14 +11,19 @@ COMMENT=	Library for a reading/writing KeePass 1.x DB
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	nettle:${PORTSDIR}/security/nettle
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
-CFLAGS+=	-Dbswap_32=bswap32 -Dbswap_16=bswap16
+CFLAGS+=	-Dbswap_32=bswap32 -Dbswap_16=bswap16 \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 PLIST_FILES=	include/kpass.h \
 		lib/libkpass.so \
-		lib/libkpass.so.0 \
+		lib/libkpass.so.1 \
 		lib/libkpass.la \
 		lib/libkpass.a
 
diff --git a/security/libkpass/distinfo b/security/libkpass/distinfo
index 7d0106f095fe..ba04bab9359e 100644
--- a/security/libkpass/distinfo
+++ b/security/libkpass/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libkpass-3.tar.gz) = 390ebca29040ae1a015f4c067de16fe585693d2b4f95caca24529917bdb2dfec
-SIZE (libkpass-3.tar.gz) = 313707
+SHA256 (libkpass-5.tar.gz) = 72bea97b2a2f5a68bdf52b3a67fc38028fcd295b016169e05c631fec9596faca
+SIZE (libkpass-5.tar.gz) = 402843
diff --git a/security/libkpass/files/patch-src_kpass.c b/security/libkpass/files/patch-src_kpass.c
index 6aec2467426e..e6c6fd812b02 100644
--- a/security/libkpass/files/patch-src_kpass.c
+++ b/security/libkpass/files/patch-src_kpass.c
@@ -1,11 +1,14 @@
---- src/kpass.c.orig	2011-09-12 11:39:12.476116248 +0400
-+++ src/kpass.c	2011-09-12 11:39:37.962483090 +0400
-@@ -19,7 +19,7 @@
- 
- #include <string.h>
- #include <openssl/evp.h>
--#include <byteswap.h>
+--- src/kpass.c.orig	2013-04-01 18:36:50.878364960 +0000
++++ src/kpass.c	2013-04-01 18:37:43.162887560 +0000
+@@ -23,7 +23,11 @@
+ #include <nettle/aes.h>
+ #include <nettle/sha.h>
+ #include <nettle/cbc.h>
++#ifdef __FreeBSD__
 +#include <sys/endian.h>
++#else
+ #include <byteswap.h>
++#endif
  #include <time.h>
  
- #include "kpass.h"
+ #include <libintl.h>
diff --git a/security/libkpass/pkg-descr b/security/libkpass/pkg-descr
index 21e73379162d..43d2ebfdc4c9 100644
--- a/security/libkpass/pkg-descr
+++ b/security/libkpass/pkg-descr
@@ -1,4 +1,4 @@
 Libkpass is a from-scratch C implementation of reading and writing
 KeePass 1.x format password databases.
 
-WWW:	http://libkpass.sourceforge.net/
+WWW: http://libkpass.sourceforge.net/