Index: head/news/golded+/Makefile
===================================================================
--- head/news/golded+/Makefile	(revision 521621)
+++ head/news/golded+/Makefile	(revision 521622)
@@ -1,59 +1,61 @@
 # Created by: Max Khon
 # $FreeBSD$
 
 PORTNAME=	golded+
 PORTVERSION=	1.1.5.a${SNAPDATE}
-PORTREVISION=	1
 CATEGORIES=	news mail
-MASTER_SITES=	SF/golded-plus/Golded%2B%201.1.5%20snapshots/2016.03.22
+MASTER_SITES=	SF/golded-plus/Golded%2B%201.1.5%20snapshots/${_SNAPDATE}
 DISTNAME=	gpsrc-115-${SNAPDATE}
-EXTRACT_SUFX=	.tgz
-SNAPDATE=	20160322
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	GoldEd+ (FTN message editor)
 
-USES=		gmake ncurses
+LICENSE=	GPLv2 LGPL20
+LICENSE_COMB=	multi
 
+USES=		gmake ncurses tar:tgz
+
+_SNAPDATE=	2017.03.03
+SNAPDATE=	${_SNAPDATE:S/.//g}
 WRKSRC=		${WRKDIR}/golded-plus/${PORTNAME}
 
 DOCS=		copying copying.lib license.txt notework.txt rusfaq.txt\
 		tips.txt notework.rus
 PORTDOCS=	${DOCS} gold_ref.txt gold_usr.txt
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_SUB_LIST=	NOTEWORK="Please read the ${DOCSDIR}/notework.txt before using ${PORTNAME}"
 DOCS_SUB_LIST_OFF=	NOTEWORK=""
 
 post-patch:
 	@${SED}\
 		-e 's,^\(#define __GVER_VENDOR_NAME__\).*,\1 "",'\
 		-e 's,\(#define __GVER_VENDOR_FIDO__\).*,\1 "",'\
 		-e 's,\(#define __GVER_VENDOR_EMAIL__\).*,\1 "${MAINTAINER}",'\
 		-e 's,\(#define __GVER_RELEASENAME__\).*,\1 "Golded+ FreeBSD port",'\
 		-e 's,\(#define __GVER_POSTVERSION__\).*,\1 "-b${SNAPDATE}",'\
 		<${WRKSRC}/golded3/mygolded.__h >${WRKSRC}/golded3/mygolded.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/gedlnx ${STAGEDIR}${PREFIX}/bin/golded
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/gnlnx ${STAGEDIR}${PREFIX}/bin/goldnode
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/rddtlnx ${STAGEDIR}${PREFIX}/bin/rddt
 	${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in charset colorset config template
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/$i;
 	${FIND} ${WRKSRC}/cfgs/$i -maxdepth 1 -type f |\
 		${XARGS} -n 1 -J @ ${INSTALL_DATA} @ ${STAGEDIR}${EXAMPLESDIR}/$i
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/docs/$i ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/news/golded+/distinfo
===================================================================
--- head/news/golded+/distinfo	(revision 521621)
+++ head/news/golded+/distinfo	(revision 521622)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475600527
-SHA256 (gpsrc-115-20160322.tgz) = b937696f5a21f77fae3e5cf4040fd08acdbfa58aa695bad134a97c585b8a2577
-SIZE (gpsrc-115-20160322.tgz) = 1848932
+TIMESTAMP = 1577801874
+SHA256 (gpsrc-115-20170303.tgz) = 45c4de3fb20ae83a0cd2ad1c68c7f5478a52a434f50e61860b82cce4a7073310
+SIZE (gpsrc-115-20170303.tgz) = 1849100
Index: head/news/golded+/files/patch-goldlib-hunspell-affentry.hxx
===================================================================
--- head/news/golded+/files/patch-goldlib-hunspell-affentry.hxx	(revision 521621)
+++ head/news/golded+/files/patch-goldlib-hunspell-affentry.hxx	(revision 521622)
@@ -1,20 +1,20 @@
---- goldlib/hunspell/affentry.hxx.orig	2018-01-26 22:46:50.173607000 +0000
-+++ goldlib/hunspell/affentry.hxx	2018-01-26 22:47:27.023128000 +0000
-@@ -25,7 +25,7 @@
+--- goldlib/hunspell/affentry.hxx.orig	2006-04-05 17:20:12 UTC
++++ goldlib/hunspell/affentry.hxx
+@@ -25,7 +25,7 @@ class PfxEntry : public AffEntry (public)
    struct hentry *      check(const char * word, int len, char in_compound, 
                              const FLAG needflag = FLAG_NULL);
  
 -  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL);
 +  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0);
  
    char *      check_morph(const char * word, int len, char in_compound,
                              const FLAG needflag = FLAG_NULL);
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ class SfxEntry : public AffEntry (public)
                      AffEntry* ppfx, char ** wlst, int maxSug, int * ns,
                      const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL);
  
 -  struct hentry *   check_twosfx(const char * word, int len, int optflags, AffEntry* ppfx, const FLAG needflag = NULL);
 +  struct hentry *   check_twosfx(const char * word, int len, int optflags, AffEntry* ppfx, const FLAG needflag = 0);
  
    char *      check_twosfx_morph(const char * word, int len, int optflags,
                   AffEntry* ppfx, const FLAG needflag = FLAG_NULL);