6 files changed, 30 insertions, 112 deletions

diff --git a/security/yapet/Makefile b/security/yapet/Makefile
index a6d2d0b3fb94..a4c1f2615d53 100644
--- a/security/yapet/Makefile
+++ b/security/yapet/Makefile
@@ -1,81 +1,31 @@
-# Created by: Rafael Ostertag <rafi@guengel.ch>
 # $FreeBSD$
 
 PORTNAME=	yapet
-PORTVERSION=	0.7
+PORTVERSION=	1.0
 CATEGORIES=	security
-MASTER_SITES=	http://www.guengel.ch/myapps/yapet/downloads/ http://homepage.hispeed.ch/rostertag/yapet/
+MASTER_SITES=	http://www.guengel.ch/myapps/yapet/downloads/
 
 MAINTAINER=	rafi@guengel.ch
 COMMENT=	Curses based password manager
 
-MAN1=		yapet.1
-MANCOMPRESSED=	no
+LICENSE=	GPLv3
 
+USES=		gmake
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	TTITLE PWGEN CSV2YAPET DOCS
-OPTIONS_DEFAULT=	TTITLE PWGEN CSV2YAPET
-TTITLE_DESC=	Enable Terminal Title
-PWGEN_DESC=	Enable Password Generator
-CSV2YAPET_DESC=	Build csv2yapet
+CONFIGURE_ARGS=	--enable-silent-rules
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		CONVERTERS DOCS NLS
+OPTIONS_DEFAULT=	CONVERTERS
+OPTIONS_SUB=		yes
 
-# --enable-silent-rules:  will make the build quiet
-# --disable-install-doc:  I take care of installing docs
-CONFIGURE_ARGS+=	--enable-silent-rules --disable-install-doc
+CONVERTERS_DESC=	Utilities for importing/exporting CSV files
+CONVERTERS_CONFIGURE_ENABLE=	converters
 
-.if ${PORT_OPTIONS:MTTITLE}
-CONFIGURE_ARGS+=	--enable-terminal-title
-.else
-CONFIGURE_ARGS+=	--disable-terminal-title
-.endif
-
-.if ${PORT_OPTIONS:MPWGEN}
-CONFIGURE_ARGS+=	--enable-pwgen
-.else
-CONFIGURE_ARGS+=	--disable-pwgen
-.endif
-
-.if ${PORT_OPTIONS:MCSV2YAPET}
-CONFIGURE_ARGS+=	--enable-csv2yapet
-MAN1+=			csv2yapet.1
-PLIST_SUB+=		CSV2YAPET=""
-.else
-CONFIGURE_ARGS+=	--disable-csv2yapet
-PLIST_SUB+=		CSV2YAPET="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=			gettext
-CONFIGURE_ARGS+=	--enable-nls
-PLIST_SUB+=		NLS=""
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_SUB+=		NOPORTDOCS=""
-.else
-PLIST_SUB+=		NOPORTDOCS="@comment "
-.endif
-
-# Taking care of installing docs due to --disable-install-doc
-# configure switch.
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/AUTHORS ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/DESIGN ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/THANKS ${DOCSDIR}
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+NLS_CPPFLAGS=		-I${LOCALBASE}/include
+NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/security/yapet/distinfo b/security/yapet/distinfo
index 02f5f6389610..0ae6de3d230c 100644
--- a/security/yapet/distinfo
+++ b/security/yapet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (yapet-0.7.tar.gz) = e668fbb5ad471b541e7c110d5fbaeeb4f067c66cee071519a16c5927c6e11085
-SIZE (yapet-0.7.tar.gz) = 2931100
+SHA256 (yapet-1.0.tar.gz) = b419ceb29fbc18f1d048280630214716086542f290df5b62e0d30f7084582772
+SIZE (yapet-1.0.tar.gz) = 3591948
diff --git a/security/yapet/files/patch-ui-basewindow.cc b/security/yapet/files/patch-ui-basewindow.cc
deleted file mode 100644
index b92129d9a538..000000000000
--- a/security/yapet/files/patch-ui-basewindow.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- ui/basewindow.cc.orig	2013-09-17 22:04:34.000000000 +0200
-+++ ui/basewindow.cc	2013-09-17 22:05:18.000000000 +0200
-@@ -33,6 +33,10 @@
- # include <stdio.h>
- #endif
- 
-+#ifdef HAVE_STDLIB_H
-+# include <stdlib.h>
-+#endif
-+
- #ifdef HAVE_ALGORITHM
- # include <algorithm>
- #endif
diff --git a/security/yapet/files/patch-ui-secstring.h b/security/yapet/files/patch-ui-secstring.h
deleted file mode 100644
index 842d7db0290c..000000000000
--- a/security/yapet/files/patch-ui-secstring.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/secstring.h.orig	2013-09-18 19:44:08.000000000 +0200
-+++ ui/secstring.h	2013-09-18 19:44:30.000000000 +0200
-@@ -61,7 +61,7 @@
-             public:
-                 void deallocate (typename std::allocator<T>::pointer p,
-                                  typename std::allocator<T>::size_type n) {
--                    memset (p, '0', n*sizeof (std::allocator<T>::value_type) );
-+                    memset (p, '0', n*sizeof (typename std::allocator<T>::value_type) );
-                     std::allocator<T>::deallocate (p, n);
-                 }
- 
diff --git a/security/yapet/files/patch-yapet-cfgfile.h b/security/yapet/files/patch-yapet-cfgfile.h
deleted file mode 100644
index c79adb440dae..000000000000
--- a/security/yapet/files/patch-yapet-cfgfile.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- yapet/cfgfile.h.orig	2013-09-05 20:47:04.000000000 +0200
-+++ yapet/cfgfile.h	2013-09-05 20:47:46.000000000 +0200
-@@ -35,6 +35,10 @@
- # include <string>
- #endif
- 
-+#ifdef HAVE_SSTREAM
-+# include <sstream>
-+#endif
-+
- // Used for the YAPET::PWGEN::RNGENGINE type
- #include "pwgen/rng.h"
- 
diff --git a/security/yapet/pkg-plist b/security/yapet/pkg-plist
index 353bf54db7cf..42301b958c84 100644
--- a/security/yapet/pkg-plist
+++ b/security/yapet/pkg-plist
@@ -1,12 +1,17 @@
+%%CONVERTERS%%bin/csv2yapet
 bin/yapet
-%%CSV2YAPET%%bin/csv2yapet
+%%CONVERTERS%%bin/yapet2csv
+%%CONVERTERS%%man/man1/csv2yapet.1.gz
+man/man1/yapet.1.gz
+%%CONVERTERS%%man/man1/yapet2csv.1.gz
+man/man5/yapet_colors.5.gz
+man/man5/yapet_config.5.gz
 share/applications/yapet.desktop
-%%NOPORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%NOPORTDOCS%%%%DOCSDIR%%/DESIGN
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%%%DOCSDIR%%/README
-%%NOPORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/DESIGN
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%share/locale/de/LC_MESSAGES/libyacurs.mo
 %%NLS%%share/locale/de/LC_MESSAGES/yapet.mo
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
-%%NOPORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%