3 files changed, 14 insertions, 65 deletions

diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile
index ddaade55d407..1ebd9578b56a 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/sysutils/fusefs-rar2fs/Makefile
@@ -6,30 +6,31 @@
 #
 
 PORTNAME=	rar2fs
-PORTVERSION=	1.13.0
+PORTVERSION=	1.15.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}:rar2fs http://www.rarlab.com/rar/:unrarsrc
 PKGNAMEPREFIX=	fusefs-
-DISTFILES=	rar2fs-1.13.0.tar.gz:rar2fs unrarsrc-4.0.7.tar.gz:unrarsrc
+DISTFILES=	rar2fs-1.15.1.tar.gz:rar2fs unrarsrc-4.2.4.tar.gz:unrarsrc
 
 MAINTAINER=	joris@vandalon.nl
 COMMENT=	Mount rar archives as filesystem
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	unrar.3:${PORTSDIR}/archivers/libunrar4 \
-		fuse.2:${PORTSDIR}/sysutils/fusefs-libs
+LIB_DEPENDS=	unrar:${PORTSDIR}/archivers/libunrar4 \
+		fuse:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-fuse-lib=${LOCALBASE}/lib \
+	--with-fuse=${LOCALBASE}/include/fuse \
+	--with-unrar=${WRKDIR}/unrar \
+	--with-unrar-lib=${LOCALBASE}/lib
+
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		rar2fs.1
 USE_GMAKE=	yes
 
-post-patch:
-	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \
-		-e 's,%%PREFIX%%,${LOCALBASE},' \
-		${WRKSRC}/config.mk
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1/
diff --git a/sysutils/fusefs-rar2fs/distinfo b/sysutils/fusefs-rar2fs/distinfo
index e4c205423688..051642877b30 100644
--- a/sysutils/fusefs-rar2fs/distinfo
+++ b/sysutils/fusefs-rar2fs/distinfo
@@ -1,4 +1,4 @@
-SHA256 (rar2fs-1.13.0.tar.gz) = 8ab2740b3d7dc073d67a502db8f822c66d533175fca54a79a1c905140b165dec
-SIZE (rar2fs-1.13.0.tar.gz) = 63785
-SHA256 (unrarsrc-4.0.7.tar.gz) = eac9ed7493870ca7f67b23e9208aef1db701c381123ac462e97f703777a33071
-SIZE (unrarsrc-4.0.7.tar.gz) = 152853
+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
\ No newline at end of file
diff --git a/sysutils/fusefs-rar2fs/files/patch-config.mk b/sysutils/fusefs-rar2fs/files/patch-config.mk
deleted file mode 100644
index 5ce1ddb44e94..000000000000
--- a/sysutils/fusefs-rar2fs/files/patch-config.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-$FreeBSD$
-
-Automatically fills in the correct areas in config.mk with FreeBSD-sane
-defaults.  Sed is used to correct the substitutions.
-
---- config.mk.orig	2011-05-17 21:17:09.000000000 +0200
-+++ config.mk	2011-05-30 14:11:09.689753703 +0200
-@@ -1,37 +1,39 @@
- # Change below to match current configuration
- ##########################
- 
-+DESTDIR=%%PREFIX%%
-+
- ##########################
- # This is the path (absolute or relative) to the folder containing
- # the full portable "Unrar C++ library" (libunrar) sources 
--UNRAR_SRC=./unrar
-+UNRAR_SRC=../unrar
- 
- ##########################
- # This is the path (absolute or relative) to the folder containing
- # the compiled libunrar.so.
- # This can be left blank if the system already points out the location
- # of a compatible unrarlib.so, eg. /lib.
--UNRAR_LIB=
-+UNRAR_LIB=%%LOCALBASE%%/lib
- 
- ##########################
- # This is the path (absolute or relative) to the folder containing
- # the FUSE development header files.
- # This can be left blank if the header files are already placed in
- # some default location such as /usr/include.
--FUSE_SRC=
-+FUSE_SRC=%%LOCALBASE%%/include
- 
- ##########################
- # This is the path (absolute or relative) to the folder containing
- # the FUSE library files.
- # This can be left blank if the system already points out the location
- # of a compatible FUSE library, eg. /lib.
--FUSE_LIB=
-+FUSE_LIB=%%LOCALBASE%%/lib
- 
- ##########################
- # Does the host support glibc custom streams?
- # If unsure try 'y' here. If linker fails to find e.g. fmemopen()
- # your answer was most likely incorrect.
--HAS_GLIBC_CUSTOM_STREAMS=y
-+HAS_GLIBC_CUSTOM_STREAMS=n
- 
- ##########################
- # For Mac OS X, choose if 64-bit inodes (file serial number) should