Index: misc/free42/Makefile
===================================================================
--- misc/free42/Makefile
+++ misc/free42/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	Free42
-DISTVERSION=	2.0.7
+PORTNAME=	free42
+DISTVERSION=	2.0.10
 CATEGORIES=	misc
 MASTER_SITES=	http://thomasokken.com/free42/upstream/
-DISTNAME=	${PORTNAME:tl}-nologo-${DISTVERSION}
+DISTNAME=	${PORTNAME}-nologo-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simulation of the HP-42S scientific calculator and HP-82240 printer
@@ -26,22 +26,28 @@
 
 BUILD_WRKSRC=	${WRKSRC}/gtk
 
+PLIST_FILES=	bin/free42bin \
+		share/free42/skins/Ehrling42sl.gif \
+		share/free42/skins/Ehrling42sl.layout \
+		share/free42/skins/README.txt \
+		share/free42/skins/Standard.gif \
+		share/free42/skins/Standard.layout
+
 post-extract:
-	@${RM} `${FIND} ${WRKDIR} -name "*.orig"`
 	@cd ${BUILD_WRKSRC} && tar xvfz ../inteldecimal/IntelRDFPMathLib20U1.tar.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|"%s/%s.%s", free42dirname, name,|"%s/%s.%s", "${DATADIR:tl}", name,|' \
-		${BUILD_WRKSRC}/shell_skin.cc
+	@${REINPLACE_CMD} -e 's|snprintf(free42dirname, FILENAMELEN, "%s/\.free42", home)|strcpy(free42dirname, "${DATADIR}")|' \
+		${BUILD_WRKSRC}/shell_main.cc
 
 do-build:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} cleaner && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD}
-		# TODO do we need decimal fp arithmetic?: ${MAKE_CMD} BCD_MATH=1 SKIN_SYS_DIR="${DATADIR:tl}"
+		# TODO do we need decimal fp arithmetic?: ${MAKE_CMD} BCD_MATH=1 SKIN_SYS_DIR="${DATADIR}"
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/free42bin ${STAGEDIR}${PREFIX}/bin/
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} skins ${STAGEDIR}${DATADIR:tl}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} skins ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: misc/free42/distinfo
===================================================================
--- misc/free42/distinfo
+++ misc/free42/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511214642
-SHA256 (free42-nologo-2.0.7.tgz) = 97241d56372163904755f8fcf7724adcaa12a2e0fbaf9670c3661c3645805ccc
-SIZE (free42-nologo-2.0.7.tgz) = 7354819
+TIMESTAMP = 1515411890
+SHA256 (free42-nologo-2.0.10.tgz) = e15c8a96643d27961b89488bd1f040a453d03349b5436077ffd3825b7cffdbc3
+SIZE (free42-nologo-2.0.10.tgz) = 7389429
Index: misc/free42/pkg-plist
===================================================================
--- misc/free42/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/free42bin
-share/free42/skins/Ehrling42sl.gif
-share/free42/skins/Ehrling42sl.layout
-share/free42/skins/README.txt
-share/free42/skins/Standard.gif
-share/free42/skins/Standard.layout