Index: head/x11/xlockmore/Makefile
===================================================================
--- head/x11/xlockmore/Makefile	(revision 509520)
+++ head/x11/xlockmore/Makefile	(revision 509521)
@@ -1,166 +1,175 @@
 # Created by: Scott Mace <smace@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xlockmore
-PORTVERSION=	5.57
+PORTVERSION=	5.58
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.sillycycle.com/xlock/ \
 		LOCAL/jgh/x11/${PORTNAME}/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}.README
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Like XLock session locker/screen saver, but just more
 
 LICENSE=	BSD2CLAUSE
 
 USES=		tar:xz gnome
 
 GNU_CONFIGURE=	yes
+PORTDOCS=	README ${PORTNAME}.README
 CONFIGURE_ARGS=	--without-motif --without-ttf --without-editres \
 		--without-dtsaver --without-rplay --without-nas \
 		--without-gtk --without-esound --disable-setuid
 
 USE_XORG=	x11 xaw ice sm xpm xext xinerama
 
 LIB_DEPENDS+=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
 OPTIONS_DEFINE=	MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
 		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP \
-		XINERAMA
+		XINERAMA DOCS
 OPTIONS_DEFAULT=	XINERAMA
 OPTIONS_SUB=	yes
 
 MESAGL_DESC=	Mesa 3D (for GL modes)
 MB_DESC=	Xmb function series
 SYSLOG_DESC=	Syslog logging
 DISABLE_ALLOW_ROOT_DESC=	Allows users to turn off allowroot
 NICE_ONLY_DESC=	Only low cpu modes
 BLANK_ONLY_DESC=	Blank mode only (boring)
 BAD_PAM_DESC=	Xlock will ask PAM with root rights
 GTK2_DESC=	Build Gtk2 graphical shell
 XLOCK_GROUP_DESC=	Allow xlock group to logout
 TIME_BOMB_DESC=	Allow autologout
 CUSTOMIZATION_DESC=	Allow tune through resource file
 JP_DESC=	Japanese Language Support
 
 OPTIONS_RADIO=	ONE
 OPTIONS_RADIO_ONE=	PAM XLOCK_GROUP
 
 NO_OPTIONS_SORT=yes
 
 JP_IMPLIES=	MB
 
 MAKE_ARGS+=	bindir=${PREFIX}/bin \
 		mandir=${PREFIX}/man/man1 \
 		datarootdir=${PREFIX}/share \
 		xapploaddir=${PREFIX}/lib/X11/app-defaults
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKERBEROS4}
 CONFIGURE_ARGS+=--enable-kerberos4
 KRB4LIB=	-lcom_err -lcrypto
 .endif
 .if defined(KRB5_HOME) && exists(${KRB5_HOME})
 CONFIGURE_ARGS+=--enable-kerberos5
 CFLAGS+=	-I${KRB5_HOME}/include
 KRB5LIB=	-L${KRB5_HOME}/lib
 .endif
 
 .if ${PORT_OPTIONS:MMESAGL}
 CONFIGURE_ARGS+=	--with-mesa
 MESALIB=	-lpthread
 USE_GL=		yes
 LIB_DEPENDS+=	libftgl.so:graphics/ftgl
 CFLAGS+=	-I${LOCALBASE}/include/FTGL -I${LOCALBASE}/include/freetype2
 .else
 CONFIGURE_ARGS+=	--without-mesa --without-opengl --without-ftgl
 .endif
 
 .if ${PORT_OPTIONS:MNICE_ONLY}
 CONFIGURE_ARGS+=	--enable-nice-only
 .endif
 
 .if ${PORT_OPTIONS:MBAD_PAM}
 CONFIGURE_ARGS+=	--enable-bad-pam
 .endif
 
 .if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--enable-pam
 .endif
 
 .if ${PORT_OPTIONS:MNICE_ONLY}
 CONFIGURE_ARGS+=	--enable-nice-only
 .endif
 
 .if ${PORT_OPTIONS:MBLANK_ONLY}
 CONFIGURE_ARGS+=	--enable-blank-only
 .endif
 
 .if ${PORT_OPTIONS:MMB}
 CONFIGURE_ARGS+=	--enable-use-mb
 .endif
 
 .if ${PORT_OPTIONS:MJP}
 XLOCKMORE_LANG=	ja
 CATEGORIES+=	japanese
 .endif
 
 .if defined(XLOCKMORE_LANG)
 CONFIGURE_ARGS+=	--with-lang=${XLOCKMORE_LANG}
 .endif
 
 .if ${PORT_OPTIONS:MSYSLOG}
 CONFIGURE_ARGS+=	--enable-syslog
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
 CONFIGURE_ARGS+=	--with-gtk2
 USE_GNOME+=	gtk20
 .else
 CONFIGURE_ARGS+=	--without-gtk2
 .endif
 
 .if ${PORT_OPTIONS:MXLOCK_GROUP}
 CONFIGURE_ARGS+=	--enable-xlock-group
 .endif
 
 .if ${PORT_OPTIONS:MTIME_BOMB}
 CONFIGURE_ARGS+=	--enable-bomb
 .else
 CONFIGURE_ARGS+=	--disable-bomb
 .endif
 
 .if ${PORT_OPTIONS:MCUSTOMIZATION}
 CONFIGURE_ARGS+=	--enable-customization
 .endif
 
 .if ${PORT_OPTIONS:MMAGICK}
 LIB_DEPENDS+=	libMagickCore-6.so:graphics/ImageMagick6
 .else
 CONFIGURE_ARGS+=	--without-magick
 .endif
 
 CONFIGURE_ENV+=		XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}"
 
 .if ${PORT_OPTIONS:MDISABLE_ALLOW_ROOT}
 CONFIGURE_ARGS+=	--disable-allow-root
 .endif
 
 .if ${PORT_OPTIONS:MXINERAMA}
 CONFIGURE_ARGS+=	--with-xinerama
 .endif
 
 .if ${PORT_OPTIONS:MPAM} && empty(PORT_OPTIONS:MBAD_PAM)
 pre-extract:
 	@${ECHO}
 	@${ECHO} "You have enabled PAM support. If you want to authenticate against"
 	@${ECHO} "root only accessible PAM modules then define WITH_BAD_PAM=yes also."
 	@${ECHO} "For example, pam_unix requires root rights to access shadow passwords."
 	@${ECHO}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.README ${STAGEDIR}${DOCSDIR}/${PORTNAME}.README
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/x11/xlockmore/distinfo
===================================================================
--- head/x11/xlockmore/distinfo	(revision 509520)
+++ head/x11/xlockmore/distinfo	(revision 509521)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1565032489
-SHA256 (xlockmore-5.57.tar.xz) = f9acf99befd798ac93909b2d7d6578a256d2dac283ddc562acc9b6ef10cc28a3
-SIZE (xlockmore-5.57.tar.xz) = 1835880
+TIMESTAMP = 1566409879
+SHA256 (xlockmore-5.58.tar.xz) = fc9f81773afef0dc7e3e62defbad4056d8d16af9ba8208eeec73d1b2970e41ed
+SIZE (xlockmore-5.58.tar.xz) = 1878452
+SHA256 (xlockmore.README) = 53d8827a2b1f256e1fc23da90936b25ee5f9c5f90228c15f383ef0f8f1dbec2b
+SIZE (xlockmore.README) = 178001