12 files changed, 52 insertions, 98 deletions
diff --git a/filesystems/Makefile b/filesystems/Makefile
index b7cef3bcbc8..ba327c13571 100644
--- a/filesystems/Makefile
+++ b/filesystems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/10/07 10:13:16 bouyer Exp $
+# $NetBSD: Makefile,v 1.49 2020/01/07 16:15:25 nia Exp $
 #
 
 COMMENT=	File systems, and file system related packages
@@ -21,7 +21,7 @@ SUBDIR+=	fuse-exfat
 SUBDIR+=	fuse-ext2
 SUBDIR+=	fuse-gmailfs
 SUBDIR+=	fuse-gphotofs
-SUBDIR+=	fuse-gstfs
+SUBDIR+=	fuse-gstfs-ng
 SUBDIR+=	fuse-httpfs
 SUBDIR+=	fuse-loggedfs
 SUBDIR+=	fuse-lzofs
diff --git a/filesystems/fuse-gstfs-ng/DESCR b/filesystems/fuse-gstfs-ng/DESCR
new file mode 100644
index 00000000000..351a2676d70
--- /dev/null
+++ b/filesystems/fuse-gstfs-ng/DESCR
@@ -0,0 +1,7 @@
+gstfs-ng is a FUSE-based file system that works as a dynamic
+gstreamer-based transcoder over an existing directory.
+
+For example, this can make your FLAC music archive appear as an
+MP3 or OGG archive.
+
+Transcodings can be cached in memory and persisted to disk.
diff --git a/filesystems/fuse-gstfs-ng/Makefile b/filesystems/fuse-gstfs-ng/Makefile
new file mode 100644
index 00000000000..fdb2c7612b9
--- /dev/null
+++ b/filesystems/fuse-gstfs-ng/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1 2020/01/07 16:15:25 nia Exp $
+
+DISTNAME=	gstfs-ng-1.1
+PKGNAME=	fuse-${DISTNAME}
+CATEGORIES=	filesystems
+MASTER_SITES=	${MASTER_SITE_GITHUB:=rtyle/}
+GITHUB_PROJECT=	gstfs-ng
+GITHUB_TAG=	${PKGVERSION_NOREV}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://github.com/rtyle/gstfs-ng
+COMMENT=	FUSE-based file system for dynamic gstreamer-based transcoding
+LICENSE=	gnu-lgpl-v3
+
+USE_TOOLS+=	pkg-config bash:run
+USE_LANGUAGES=	c c++03
+
+REPLACE_BASH+=	gstfs-ng.monitor
+
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	${PKGMANDIR}/man8
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gstfs-ng ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gstfs-ng.monitor ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/gstfs-ng.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../mk/fuse.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/fuse-gstfs-ng/PLIST b/filesystems/fuse-gstfs-ng/PLIST
new file mode 100644
index 00000000000..2f4f6eee9e4
--- /dev/null
+++ b/filesystems/fuse-gstfs-ng/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2020/01/07 16:15:25 nia Exp $
+bin/gstfs-ng
+bin/gstfs-ng.monitor
+man/man8/gstfs-ng.8
diff --git a/filesystems/fuse-gstfs-ng/distinfo b/filesystems/fuse-gstfs-ng/distinfo
new file mode 100644
index 00000000000..442c339a916
--- /dev/null
+++ b/filesystems/fuse-gstfs-ng/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2020/01/07 16:15:25 nia Exp $
+
+SHA1 (gstfs-ng-1.1.tar.gz) = 4f3c853ccd74f19bc736c31969fe8db4425a1d41
+RMD160 (gstfs-ng-1.1.tar.gz) = 74cc0956fe769f18c7351aa7934489889c1bed4c
+SHA512 (gstfs-ng-1.1.tar.gz) = 96011f120ae3a516c6c0b47b3c42bbd708599a449b921ee48130f44f9c546767b94fb3096fe56e7a511a3125e8f02820ad6c1705eb54e9c498e883ccaae6c8b4
+Size (gstfs-ng-1.1.tar.gz) = 34885 bytes
diff --git a/filesystems/fuse-gstfs/DESCR b/filesystems/fuse-gstfs/DESCR
deleted file mode 100644
index 4cbc13da3c8..00000000000
--- a/filesystems/fuse-gstfs/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-GSTFS is a filesystem for on-demand transcoding of music files between
-different formats.  It utilizes the gstreamer library for conversion so any
-formats supported by gstreamer should also be supported by gstfs.  The
-filesystem's only requirement is that the gstreamer pipeline begin with a
-filesrc with the name "_source" and end with an fdsink with the name "_dest".
-The filesystem will automatically substitute the filename and fd number in
-these pipelines.
diff --git a/filesystems/fuse-gstfs/Makefile b/filesystems/fuse-gstfs/Makefile
deleted file mode 100644
index c68472294e8..00000000000
--- a/filesystems/fuse-gstfs/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2017/08/01 14:58:57 wiz Exp $
-#
-
-DISTNAME=	gstfs-0.1
-PKGNAME=	fuse-${DISTNAME}
-PKGREVISION=	5
-CATEGORIES=	filesystems
-MASTER_SITES=	https://bobcopeland.com/gstfs/releases/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://bobcopeland.com/gstfs/
-COMMENT=	On-demand, transcoding filesystem (using GStreamer pipeline)
-
-USE_TOOLS+=		pkg-config gmake
-
-DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-PTHREAD_AUTO_VARS=	yes
-REPLACE_SH=		*.sh
-###
-### XXX pick up the FUSE pkg-config override hook
-###
-do-configure:
-	@${DO_NADA}
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT_DIR} ${DESTDIR}${EGDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/gstfs ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/ogg2mp3.sh ${DESTDIR}${EGDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/mp32wav.sh ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
-
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../mk/fuse.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/fuse-gstfs/PLIST b/filesystems/fuse-gstfs/PLIST
deleted file mode 100644
index cbd1dc1f8a0..00000000000
--- a/filesystems/fuse-gstfs/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:59 joerg Exp $
-bin/gstfs
-share/doc/fuse-gstfs/README
-share/examples/fuse-gstfs/mp32wav.sh
-share/examples/fuse-gstfs/ogg2mp3.sh
diff --git a/filesystems/fuse-gstfs/distinfo b/filesystems/fuse-gstfs/distinfo
deleted file mode 100644
index 23e9981a005..00000000000
--- a/filesystems/fuse-gstfs/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 00:15:00 agc Exp $
-
-SHA1 (gstfs-0.1.tar.gz) = f3184e178f2345077bd5dfcaee774f6bef81bcf2
-RMD160 (gstfs-0.1.tar.gz) = 1c41e7ed8b4b47da880999c75c1448aed389287b
-SHA512 (gstfs-0.1.tar.gz) = 94cd29af4e638062322ee86f9c9f9c36aa06e0cfe57c36dddd032999be823b32492ba13a8802250691ee28a130244bbf780beb9615528dbfbda2cc50db14d1f3
-Size (gstfs-0.1.tar.gz) = 7689 bytes
-SHA1 (patch-aa) = b5f028bf31f31d8afa2f67e4e4960fc5ee93b66f
-SHA1 (patch-ab) = 2571dc1d44ef5b89f31ae1258c5631fdf60c1d0e
-SHA1 (patch-ac) = dac5ca16b460c1fe347b44de77c6796e0c14e65b
diff --git a/filesystems/fuse-gstfs/patches/patch-aa b/filesystems/fuse-gstfs/patches/patch-aa
deleted file mode 100644
index 5c9c770978a..00000000000
--- a/filesystems/fuse-gstfs/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/08/17 12:56:49 marino Exp $
-
---- Makefile.orig	2008-08-31 16:13:53.000000000 +0000
-+++ Makefile
-@@ -5,14 +5,14 @@ DISTFILES=*.[ch] *.sh Makefile README CO
- SRCS=gstfs.c xcode.c
- OBJS=$(SRCS:.c=.o)
- 
--LIBS=-lpthread `pkg-config --libs fuse glib-2.0 gstreamer-0.10`
-+LIBS+=`pkg-config --libs fuse glib-2.0 gstreamer-0.10`
- 
- CFLAGS+=-g -Wall -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26 `pkg-config --cflags fuse glib-2.0 gstreamer-0.10`
- 
- all: gstfs
- 
- gstfs: $(OBJS)
--	gcc -o gstfs $(OBJS) $(LIBS)
-+	${CC} -o gstfs $(OBJS) $(LIBS) $(LDFLAGS)
- 
- clean:
- 	$(RM) gstfs *.o
diff --git a/filesystems/fuse-gstfs/patches/patch-ab b/filesystems/fuse-gstfs/patches/patch-ab
deleted file mode 100644
index ec9412fe1a6..00000000000
--- a/filesystems/fuse-gstfs/patches/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/14 06:37:49 bjs Exp $
-
---- mp32wav.sh.orig	2008-08-31 12:13:53.000000000 -0400
-+++ mp32wav.sh
-@@ -1,2 +1,2 @@
- #! /bin/sh
--./gstfs -d -osrc=$1,src_ext=mp3,dst_ext=wav,pipeline="filesrc name=\"_source\" ! decodebin ! audioconvert ! wavenc ! fdsink name=\"_dest\" sync=false" $2
-+gstfs -d -osrc=$1,src_ext=mp3,dst_ext=wav,pipeline="filesrc name=\"_source\" ! decodebin ! audioconvert ! wavenc ! fdsink name=\"_dest\" sync=false" $2
diff --git a/filesystems/fuse-gstfs/patches/patch-ac b/filesystems/fuse-gstfs/patches/patch-ac
deleted file mode 100644
index 981c662f18a..00000000000
--- a/filesystems/fuse-gstfs/patches/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/12/14 06:37:49 bjs Exp $
-
---- ogg2mp3.sh.orig	2008-08-31 12:13:53.000000000 -0400
-+++ ogg2mp3.sh
-@@ -1,2 +1,2 @@
- #! /bin/sh
--./gstfs -f -osrc=$1,src_ext=ogg,dst_ext=mp3,pipeline="filesrc name=\"_source\" ! oggdemux ! vorbisdec ! audioconvert ! lame bitrate=160 ! fdsink name=\"_dest\" sync=false" $2
-+gstfs -f -osrc=$1,src_ext=ogg,dst_ext=mp3,pipeline="filesrc name=\"_source\" ! oggdemux ! vorbisdec ! audioconvert ! lame bitrate=160 ! fdsink name=\"_dest\" sync=false" $2