Index: branches/2017Q1/sysutils/fusefs-rar2fs/Makefile
===================================================================
--- branches/2017Q1/sysutils/fusefs-rar2fs/Makefile	(revision 431713)
+++ branches/2017Q1/sysutils/fusefs-rar2fs/Makefile	(revision 431714)
@@ -1,38 +1,42 @@
 # Created by: Joris Vandalon
 # $FreeBSD$
 
 PORTNAME=	rar2fs
-PORTVERSION=	1.15.1
-PORTREVISION=	1
+PORTVERSION=	1.23.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-MASTER_SITES=	GOOGLE_CODE:rar2fs http://www.rarlab.com/rar/:unrarsrc
 PKGNAMEPREFIX=	fusefs-
-DISTFILES=	rar2fs-1.15.1.tar.gz:rar2fs unrarsrc-4.2.4.tar.gz:unrarsrc
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Mount rar archives as filesystem
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Unfetchable (google code has gone away)
+LIB_DEPENDS=	libunrar.so.5:${LIBUNRAR_PORT}
+BUILD_DEPENDS=	${NONEXISTENT}:${LIBUNRAR_PORT}:patch
 
-LIB_DEPENDS=	libunrar.so:archivers/libunrar4
+USE_GITHUB=	yes
+GH_ACCOUNT=	hasse69
 
+USES=		autoreconf execinfo gmake fuse
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fuse-lib=${LOCALBASE}/lib \
-	--with-fuse=${LOCALBASE}/include/fuse \
-	--with-unrar=${WRKDIR}/unrar \
-	--with-unrar-lib=${LOCALBASE}/lib
+		--with-fuse=${LOCALBASE}/include/fuse \
+		--with-unrar=`${MAKE} -C ${PORTSDIR}/${LIBUNRAR_PORT} -VWRKSRC` \
+		--with-unrar-lib=${LOCALBASE}/lib
+CONFIGURE_ENV=	LIBUNRAR_PKG=${LIBUNRAR_PKG}
 
-PLIST_FILES=	bin/${PORTNAME} man/man1/rar2fs.1.gz
-USES=		execinfo fuse gmake
+PLIST_FILES=	bin/${PORTNAME} \
+		bin/mkr2i \
+		man/man1/rar2fs.1.gz
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/-lstdc++/-lexecinfo/' -e '/_LINK =/s/CC/CXX/' \
-		${WRKSRC}/Makefile.in
+LIBUNRAR_PORT=	archivers/libunrar5
+LIBUNRAR_PKG=	${LIBUNRAR_PORT:S|archivers/||}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/rar2fs.1 ${STAGEDIR}${PREFIX}/man/man1
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lstdc++||g' -e '/rar2fs_LINK =/s|CC|CXX|' \
+		${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
Index: branches/2017Q1/sysutils/fusefs-rar2fs/distinfo
===================================================================
--- branches/2017Q1/sysutils/fusefs-rar2fs/distinfo	(revision 431713)
+++ branches/2017Q1/sysutils/fusefs-rar2fs/distinfo	(revision 431714)
@@ -1,4 +1,3 @@
-SHA256 (rar2fs-1.15.1.tar.gz) = 1ae1df5b8eda3d954740010e931e16342957a8b6cd41676a017fc9bbcd900973
-SIZE (rar2fs-1.15.1.tar.gz) = 205577
-SHA256 (unrarsrc-4.2.4.tar.gz) = 9432bf798e5f7123f3060f37b75b7c07f36f0091305f46473dcae9154f8cd686
-SIZE (unrarsrc-4.2.4.tar.gz) = 164641
+TIMESTAMP = 1483210781
+SHA256 (hasse69-rar2fs-v1.23.1_GH0.tar.gz) = 2dab03c8c58379b0ddda798ca909ac48bf0445b2400eee706c91c3efe28caf4c
+SIZE (hasse69-rar2fs-v1.23.1_GH0.tar.gz) = 126375
Index: branches/2017Q1/sysutils/fusefs-rar2fs/files/patch-configure.ac
===================================================================
--- branches/2017Q1/sysutils/fusefs-rar2fs/files/patch-configure.ac	(nonexistent)
+++ branches/2017Q1/sysutils/fusefs-rar2fs/files/patch-configure.ac	(revision 431714)
@@ -0,0 +1,24 @@
+--- configure.ac.orig	2017-01-05 12:03:06 UTC
++++ configure.ac
+@@ -434,6 +434,21 @@ if test x"$UNRAR_LIBS" != x; then
+ fi
+ ########################################################
+ 
++########################################################
++# Check if we need to set -DOPENSSL_AES
++if test x"$UNRAR_LIBS" != x; then
++    AC_CHECK_TOOL(PKG_STATIC,pkg-static)
++    AC_MSG_CHECKING([if unrar library needs -DOPENSSL_AES])
++    openssl_aes=`$PKG_STATIC query '%Ok %Ov' $LIBUNRAR_PKG | grep '^OPENSSL_AES' | cut -f 2 -d ' '`
++    if test x"$openssl_aes" != x"on"; then
++        AC_MSG_RESULT([no])
++    else
++        AC_MSG_RESULT([yes])
++        UNRAR_CXXFLAGS="$UNRAR_CXXFLAGS -DOPENSSL_AES"
++    fi
++fi
++########################################################
++
+ AM_ICONV
+ 
+ AC_MSG_CHECKING(for commit hash in git repo)

Property changes on: branches/2017Q1/sysutils/fusefs-rar2fs/files/patch-configure.ac
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1/sysutils/fusefs-rar2fs/pkg-descr
===================================================================
--- branches/2017Q1/sysutils/fusefs-rar2fs/pkg-descr	(revision 431713)
+++ branches/2017Q1/sysutils/fusefs-rar2fs/pkg-descr	(revision 431714)
@@ -1,9 +1,9 @@
 rar2fs is a FUSE based file system that can mount a source RAR
 archive/volume or a directory containing any number of RAR
 archives and access (read only) the contents as plain files/directories.
 Other files located in the source directory are handled transparently.
 Both compressed and non-compressed archives/volumes are supported but
 full media seek support (aka. indexing) is only available for
 non-compressed plaintext archives.
 
-WWW: http://code.google.com/p/rar2fs/
+WWW: http://hasse69.github.io/rar2fs/
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 431713)
+++ branches/2017Q1	(revision 431714)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r431712