Update the Spectrum Fuse ports to version 1.2.0

- Always include libaudiofile support, it was ON in fuse-utils
  but OFF in libspectrum
- Bump version of libspectrum.so to 8.2.0
- New ulitity tape2pulses

- Add missing LIB_DEPENDS / USES / USE_* [1]
- Remove upstreamed patch
- Pet portlint
Reported by:	poudriere [1]

3 files changed, 16 insertions, 20 deletions

diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index 0bf51c767b3f..cadb021e4438 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fuse-utils
-PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTVERSION=	1.2.0
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fuse-emulator/${PORTNAME}/${PORTVERSION}
 
@@ -13,23 +12,17 @@ COMMENT=	Utilities from the Free Unix Spectrum Emulator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile \
+		libgcrypt.so:security/libgcrypt \
+		libspectrum.so:emulators/libspectrum
+
+USES=		gettext iconv pkgconfig
+USE_GNOME=	glib20
 
-LIB_DEPENDS=	libspectrum.so:emulators/libspectrum
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libspectrum-prefix=${LOCALBASE} \
 		--with-local-prefix=${LOCALBASE}
 
-OPTIONS_DEFINE=	AUDIOTOOLS DOCS
-OPTIONS_DEFAULT=	AUDIOTOOLS
-
-AUDIOTOOLS_DESC=	Build audio <-> tape utilities
-
-OPTIONS_SUB=	yes
-
-AUDIOTOOLS_CONFIGURE_WITH=	audiofile
-AUDIOTOOLS_LIB_DEPENDS=		libaudiofile.so:audio/libaudiofile
-
 # FIXME no way to specify ffmpeg1 paths to configure script
 #FFMPEG_LIB_DEPENDS=	libavformat1.so:multimedia/ffmpeg1
 #FFMPEG_CONFIGURE_WITH=	ffmpeg
diff --git a/emulators/fuse-utils/distinfo b/emulators/fuse-utils/distinfo
index 54ccd2ee9935..365fb421e970 100644
--- a/emulators/fuse-utils/distinfo
+++ b/emulators/fuse-utils/distinfo
@@ -1,2 +1,3 @@
-SHA256 (fuse-utils-1.1.1.tar.gz) = 7c36c0b42805661a06c21aede3461ffc8ccdb5ce56fe232875bf86e79f77c93c
-SIZE (fuse-utils-1.1.1.tar.gz) = 505766
+TIMESTAMP = 1465508963
+SHA256 (fuse-utils-1.2.0.tar.gz) = 0a8d20d9c2a90619ab8e82dc33a5e91424c64a558728369dd9009435da1ef8be
+SIZE (fuse-utils-1.2.0.tar.gz) = 499785
diff --git a/emulators/fuse-utils/pkg-plist b/emulators/fuse-utils/pkg-plist
index fe4e94d1f2b5..66fd56c2e0f0 100644
--- a/emulators/fuse-utils/pkg-plist
+++ b/emulators/fuse-utils/pkg-plist
@@ -1,4 +1,4 @@
-%%AUDIOTOOLS%%bin/audio2tape
+bin/audio2tape
 bin/createhdf
 bin/fmfconv
 bin/listbasic
@@ -10,7 +10,8 @@ bin/rzxtool
 bin/scl2trd
 bin/snap2tzx
 bin/snapconv
-%%AUDIOTOOLS%%bin/tape2wav
+bin/tape2pulses
+bin/tape2wav
 bin/tapeconv
 bin/tzxlist
 man/man1/createhdf.1.gz
@@ -27,8 +28,9 @@ man/man1/snapconv.1.gz
 man/man1/tapeconv.1.gz
 man/man1/tzxlist.1.gz
 man/man1/profile2map.1.gz
-%%AUDIOTOOLS%%man/man1/audio2tape.1.gz
-%%AUDIOTOOLS%%man/man1/tape2wav.1.gz
+man/man1/audio2tape.1.gz
+man/man1/tape2pulses.1.gz
+man/man1/tape2wav.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README