Index: head/security/fpm2/Makefile
===================================================================
--- head/security/fpm2/Makefile	(revision 463002)
+++ head/security/fpm2/Makefile	(revision 463003)
@@ -1,59 +1,56 @@
 # Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	fpm2
 PORTVERSION=	0.79
 PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	http://als.regnet.cz/fpm2/download/
+MASTER_SITES=	https://als.regnet.cz/fpm2/download
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Program that allows you to securely store the passwords
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
-USES=		gmake pkgconfig tar:bzip2
+USES=		gmake localbase pkgconfig tar:bzip2
 USE_GNOME=	gtk20 intltool
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS ChangeLog README
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS NLS
 
 OPTIONS_SUB=	yes
 
-NLS_USES=		gettext
+NLS_USES=	gettext
+NLS_USES_OFF=	gettext-tools
 
-.include <bsd.port.options.mk>
-
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limit:^0.7\..*
 
 post-configure:
 	@${REINPLACE_CMD} -e \
 		's|^Icon.*|Icon=${PREFIX}/share/pixmaps/${PORTNAME}/logo.png|' \
 		-e 's|^Categories=.*|Categories=GTK;Utility;System;|' \
 		${WRKSRC}/data/${PORTNAME}.desktop.in
 
 post-patch:
 	@${REINPLACE_CMD} -E -e "s@encrypt\(@bfishencrypt\(@g" \
 		${WRKSRC}/src/blowfish.c
 	@${REINPLACE_CMD} -e 's|gdk_pixbuf_unref|g_object_unref|g' \
 		${WRKSRC}/src/interface.c
 
-.if ! ${PORT_OPTIONS:MNLS}
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's|USE_NLS=yes|USE_NLS=no|' ${WRKSRC}/configure
-.endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/fpm2/pkg-descr
===================================================================
--- head/security/fpm2/pkg-descr	(revision 463002)
+++ head/security/fpm2/pkg-descr	(revision 463003)
@@ -1,18 +1,18 @@
 Figaro's Password Manager 2 is a program that allows you to securely store the
 passwords using GTK2 interface. Features include:
 - Passwords are encrypted with the AES-256 algorithm.
 - Copy passwords or usernames to the clipboard/primary selection.
 - If the password is for a web site, FPM2 can keep track of the URLs of your
   login screens and can automatically launch your browser. In this capacity,
   FPM2 acts as a kind of bookmark manager.
 - You can teach FPM2 to launch other applications, and optionally pass
   hostnames,   usernames or passwords to the command line.
 - FPM2 also has a password generator that can choose passwords for you. It
   allows you to determine how long the password should be, and what types of
   characters (lower case, upper case, numbers and symbols) should be used.
   You can even have it avoid ambiguous characters such as a capital O or the
   number zero.
 - Auto-minimise and/or auto-locking passwords database after configurable time
   to the tray icon.
 
-WWW: http://als.regnet.cz/fpm2/
+WWW: https://als.regnet.cz/fpm2/