From 93ef0e66c22b5f2b0b1a3317a0dd889a93c4d107 Mon Sep 17 00:00:00 2001
From: jhale <jhale@FreeBSD.org>
Date: Mon, 16 Jan 2017 23:42:07 +0000
Subject: Update to 1.23.1 Unbreak fetch (project moved to Github) Take
 maintainership for now

PR:		214277 (based on)
Submitted by:	Niclas <zappe_1337@hotmail.com>
MFH:		2017Q1 (blanket)
---
 sysutils/fusefs-rar2fs/Makefile                 | 42 ++++++++++++++-----------
 sysutils/fusefs-rar2fs/distinfo                 |  7 ++---
 sysutils/fusefs-rar2fs/files/patch-configure.ac | 24 ++++++++++++++
 sysutils/fusefs-rar2fs/pkg-descr                |  2 +-
 4 files changed, 51 insertions(+), 24 deletions(-)
 create mode 100644 sysutils/fusefs-rar2fs/files/patch-configure.ac

(limited to 'sysutils')

diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile
index 9a7294a35e81..1bb98eac9136 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/sysutils/fusefs-rar2fs/Makefile
@@ -2,37 +2,41 @@
 # $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>
diff --git a/sysutils/fusefs-rar2fs/distinfo b/sysutils/fusefs-rar2fs/distinfo
index d695c09394d3..747ef2fb5dc0 100644
--- a/sysutils/fusefs-rar2fs/distinfo
+++ b/sysutils/fusefs-rar2fs/distinfo
@@ -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
diff --git a/sysutils/fusefs-rar2fs/files/patch-configure.ac b/sysutils/fusefs-rar2fs/files/patch-configure.ac
new file mode 100644
index 000000000000..02ff1d32cef8
--- /dev/null
+++ b/sysutils/fusefs-rar2fs/files/patch-configure.ac
@@ -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)
diff --git a/sysutils/fusefs-rar2fs/pkg-descr b/sysutils/fusefs-rar2fs/pkg-descr
index ddba1c0a5f1b..23c01551ec39 100644
--- a/sysutils/fusefs-rar2fs/pkg-descr
+++ b/sysutils/fusefs-rar2fs/pkg-descr
@@ -6,4 +6,4 @@ 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/
-- 
cgit