8 files changed, 29 insertions, 85 deletions
diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile
index 6a7301fcc4fa..f74329ab63a8 100644
--- a/multimedia/atomicparsley/Makefile
+++ b/multimedia/atomicparsley/Makefile
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	AtomicParsley
-PORTVERSION=	0.9.0
-PORTREVISION=	2
+PORTNAME=	atomicparsley
+PORTVERSION=	20210114.184825.1dbe1be
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}%20v${PORTVERSION}
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command line program for reading parsing and setting MP4/M4A metadata
@@ -13,17 +10,13 @@ COMMENT=	Command line program for reading parsing and setting MP4/M4A metadata
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		zip
-
+USES=		cmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	wez
 PLIST_FILES=	bin/AtomicParsley
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,g++,${CXX},g' -e 's,-g -O2 -Wall,${CXXFLAGS},g' ${WRKSRC}/build
-
-do-build:
-	cd ${WRKSRC} && ./build
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/AtomicParsley ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${PLIST_FILES:Mbin/*:T:S,^,${INSTALL_WRKSRC}/,} \
+		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/multimedia/atomicparsley/distinfo b/multimedia/atomicparsley/distinfo
index 5a75a89e0011..2f5589306db4 100644
--- a/multimedia/atomicparsley/distinfo
+++ b/multimedia/atomicparsley/distinfo
@@ -1,2 +1,3 @@
-SHA256 (AtomicParsley-source-0.9.0.zip) = de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e
-SIZE (AtomicParsley-source-0.9.0.zip) = 172615
+TIMESTAMP = 1610678905
+SHA256 (wez-atomicparsley-20210114.184825.1dbe1be_GH0.tar.gz) = 8877262c86d0ad231a5b0eaa8ab9c0c1d4e06fafea0b96a819d9a5e565a28b8c
+SIZE (wez-atomicparsley-20210114.184825.1dbe1be_GH0.tar.gz) = 228477
diff --git a/multimedia/atomicparsley/files/patch-AP_commons.h b/multimedia/atomicparsley/files/patch-AP_commons.h
deleted file mode 100644
index 7fa71ba2285d..000000000000
--- a/multimedia/atomicparsley/files/patch-AP_commons.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./AP_commons.h.orig	2006-08-27 02:35:15.000000000 +0000
-+++ ./AP_commons.h	2008-04-21 16:40:55.000000000 +0000
-@@ -38,15 +38,6 @@
- #endif
- #endif /*_UINT32_T */
- 
--#ifndef _UINT64_T
--#define _UINT64_T
--#if defined (_MSC_VER)
--typedef unsigned __int64	 uint64_t;
--#else
--typedef unsigned long long   uint64_t;
--#endif /* _MSC_VER */
--#endif /* _UINT64_T */
--
- #ifndef _INT16_T
- #define _INT16_T
- typedef short       int16_t;
diff --git a/multimedia/atomicparsley/files/patch-AtomicParsley.cpp b/multimedia/atomicparsley/files/patch-AtomicParsley.cpp
deleted file mode 100644
index d9fad0924367..000000000000
--- a/multimedia/atomicparsley/files/patch-AtomicParsley.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- AtomicParsley.cpp.orig	2006-09-15 23:22:33 UTC
-+++ AtomicParsley.cpp
-@@ -1447,7 +1447,7 @@ void APar_Extract_uuid_binary_file(Atomi
- 	uint32_t atom_offsets = 0;
- 	char* uuid_outfile = (char*)calloc(1, sizeof(char)*MAXPATHLEN+1); //malloc a new string because it may be a cli arg for a specific output path	
- 	if (output_path == NULL) {
--		char* orig_suffix = strrchr(originating_file, '.');
-+		const char* orig_suffix = strrchr(originating_file, '.');
- 		if (orig_suffix == NULL) {
- 			fprintf(stdout, "AP warning: a file extension for the input file was not found.\n\tGlobbing onto original filename...\n");
- 			path_len = strlen(originating_file);
-@@ -4462,7 +4462,7 @@ void APar_TestTracksForKind() {
- #endif
- 
- void APar_DeriveNewPath(const char *filePath, char* temp_path, int output_type, const char* file_kind, char* forced_suffix, bool random_filename = true) {
--	char* suffix = NULL;
-+	const char* suffix = NULL;
- 	if (forced_suffix == NULL) {
- 		suffix = strrchr(filePath, '.');
- 	} else {
-@@ -4480,7 +4480,7 @@ void APar_DeriveNewPath(const char *file
- 		memcpy(temp_path, filePath, base_len);
- 		memcpy(temp_path + base_len, file_kind, strlen(file_kind));
- #else
--		char* file_name = strrchr(filePath, '/');
-+		const char* file_name = strrchr(filePath, '/');
- 		size_t file_name_len = strlen(file_name);
- 		memcpy(temp_path, filePath, filepath_len-file_name_len+1);
- 		memcpy(temp_path + strlen(temp_path), ".", 1);
-@@ -5006,7 +5006,7 @@ void APar_WriteFile(const char* m4aFile,
- 			free_modified_name = true;
- 			if (forced_suffix_type == FORCE_M4B_TYPE) { //using --stik Audiobook with --overWrite will change the original file's extension
- 				uint16_t filename_len = strlen(m4aFile);
--				char* suffix = strrchr(m4aFile, '.');
-+				const char* suffix = strrchr(m4aFile, '.');
- 				memcpy(originating_file, m4aFile, filename_len+1 );
- 				memcpy(originating_file + (filename_len - strlen(suffix) ), ".m4b", 5 );
- 			}
diff --git a/multimedia/atomicparsley/files/patch-build b/multimedia/atomicparsley/files/patch-build
deleted file mode 100644
index 4de7ce504d45..000000000000
--- a/multimedia/atomicparsley/files/patch-build
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.orig	2006-09-10 15:02:58 UTC
-+++ build
-@@ -93,6 +93,8 @@ elif test $OS = Linux ; then
- elif test $OS = CYGWIN ; then
-   g++ -g -O2 -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o  obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o -lgcc 
- 
-+elif test $OS = FreeBSD || test $OS = DragonflyBSD ; then
-+  g++ -g -O2 -Wall -o AtomicParsley obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
- else
-   g++ -g -O2 -Wall -o AtomicParsley.exe obj_files/APar_sha1.o obj_files/APar_uuid.o obj_files/AP_commons.o obj_files/AtomicParsley_genres.o obj_files/AP_iconv.o obj_files/AP_AtomExtracts.o obj_files/AtomicParsley.o obj_files/main.o
- fi
diff --git a/multimedia/atomicparsley/files/patch-src_CDtoc.cpp b/multimedia/atomicparsley/files/patch-src_CDtoc.cpp
new file mode 100644
index 000000000000..747f1ca0ca1d
--- /dev/null
+++ b/multimedia/atomicparsley/files/patch-src_CDtoc.cpp
@@ -0,0 +1,17 @@
+audio/cdparanoia uses 0xaa on FreeBSD
+
+src/CDtoc.cpp:165:40: error: use of undeclared identifier 'LEADOUT_TRACK_NUMBER'
+    if (track_TOC_desc->tracknumber == LEADOUT_TRACK_NUMBER) {
+                                       ^
+
+--- src/CDtoc.cpp.orig	2021-01-15 02:48:25 UTC
++++ src/CDtoc.cpp
+@@ -73,7 +73,7 @@ CD_TOC_ *cdTOC = NULL;
+ uint8_t LEADOUT_TRACK_NUMBER = MACOSX_LEADOUT_TRACK;
+ #elif defined(__linux__)
+ uint8_t LEADOUT_TRACK_NUMBER = CDROM_LEADOUT;
+-#elif defined(_WIN32)
++#else
+ uint8_t LEADOUT_TRACK_NUMBER =
+     0xAA; // NOTE: for WinXP IOCTL_CDROM_READ_TOC_EX code, its 0xA2
+ #endif
diff --git a/multimedia/atomicparsley/pkg-descr b/multimedia/atomicparsley/pkg-descr
index 37fd01ca3e38..9e1dfaecc83f 100644
--- a/multimedia/atomicparsley/pkg-descr
+++ b/multimedia/atomicparsley/pkg-descr
@@ -6,4 +6,4 @@ setting metadata into MPEG-4 files supporting these styles of metadata:
     * ISO copyright notices at movie & track level for MPEG-4
     * uuid private user extension text & file embedding for MPEG-4
 
-WWW: http://atomicparsley.sourceforge.net/
+WWW: https://github.com/wez/atomicparsley
diff --git a/multimedia/get_iplayer/Makefile b/multimedia/get_iplayer/Makefile
index 5b17d1627e50..a11808f8a059 100644
--- a/multimedia/get_iplayer/Makefile
+++ b/multimedia/get_iplayer/Makefile
@@ -41,7 +41,7 @@ OPTIONS_DEFAULT=	FFMPEG ATOMICPARSLEY
 FFMPEG_DESC=	Enable file conversion using FFmpeg
 FFMPEG_RUN_DEPENDS=	ffmpeg>=0:multimedia/ffmpeg
 ATOMICPARSLEY_DESC=	Enable tagging of media files
-ATOMICPARSLEY_RUN_DEPENDS=	AtomicParsley>=0:multimedia/atomicparsley
+ATOMICPARSLEY_RUN_DEPENDS=	atomicparsley>=0:multimedia/atomicparsley
 
 post-patch:
 	${REINPLACE_CMD} -e "108,110c\\${.newline}	\$$opt_cmdline->{getiplayer} = \"${PREFIX}/bin/${PORTNAME}\";" \