Mon Apr 18 18:43:07 2022 UTC ()
ympd: Honor CFLAGS. Fix illumos build.


(nia)
diff -r1.1 -r1.2 pkgsrc/audio/ympd/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/ympd/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/ympd/patches/patch-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/audio/ympd/patches/patch-src_mongoose.c
cvs diff -r1.1 -r1.2 pkgsrc/audio/ympd/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/ympd/Makefile 2021/07/20 06:37:18 1.1
+++ pkgsrc/audio/ympd/Makefile 2022/04/18 18:43:07 1.2
@@ -1,31 +1,34 @@ @@ -1,31 +1,34 @@
1# $NetBSD: Makefile,v 1.1 2021/07/20 06:37:18 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2022/04/18 18:43:07 nia Exp $
2 2
3DISTNAME= ympd-1.3.0 3DISTNAME= ympd-1.3.0
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_GITHUB:=notandy/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=notandy/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.ympd.org/ 9HOMEPAGE= https://www.ympd.org/
10COMMENT= Music Player Daemon web UI 10COMMENT= Music Player Daemon web UI
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16 16
17BUILD_DEFS+= VARBASE 17BUILD_DEFS+= VARBASE
18 18
 19CFLAGS.SunOS+= -D_POSIX_C_SOURCE=200112L
 20LDFLAGS.SunOS+= -lnsl -lsocket
 21
19.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
20 23
21RCD_SCRIPTS+= ympd 24RCD_SCRIPTS+= ympd
22 25
23.if ${INIT_SYSTEM} == "rc.d" 26.if ${INIT_SYSTEM} == "rc.d"
24DEPENDS+= daemonize-[0-9]*:../../sysutils/daemonize 27DEPENDS+= daemonize-[0-9]*:../../sysutils/daemonize
25.endif 28.endif
26 29
27YMPD_USER?= ympd 30YMPD_USER?= ympd
28YMPD_GROUP?= ympd 31YMPD_GROUP?= ympd
29PKG_GROUPS= ${YMPD_GROUP} 32PKG_GROUPS= ${YMPD_GROUP}
30PKG_USERS= ${YMPD_USER}:${YMPD_GROUP} 33PKG_USERS= ${YMPD_USER}:${YMPD_GROUP}
31PKG_GROUPS_VARS= YMPD_USER 34PKG_GROUPS_VARS= YMPD_USER
cvs diff -r1.3 -r1.4 pkgsrc/audio/ympd/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/ympd/distinfo 2021/10/26 09:59:39 1.3
+++ pkgsrc/audio/ympd/distinfo 2022/04/18 18:43:07 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.3 2021/10/26 09:59:39 nia Exp $ 1$NetBSD: distinfo,v 1.4 2022/04/18 18:43:07 nia Exp $
2 2
3BLAKE2s (ympd-1.3.0.tar.gz) = b5ca6d6c898366f89d61805960a568a093008cfe8b307fa24405194ebd9c6f01 3BLAKE2s (ympd-1.3.0.tar.gz) = b5ca6d6c898366f89d61805960a568a093008cfe8b307fa24405194ebd9c6f01
4SHA512 (ympd-1.3.0.tar.gz) = 7e2bd4124b0e7692e2528e9fc50955d1b357ba042d8c97941160ad31ee0c89bc53b349195b45d27ce77aaa954bc01aceba1a30cdb89d9f58644a0b4934498a16 4SHA512 (ympd-1.3.0.tar.gz) = 7e2bd4124b0e7692e2528e9fc50955d1b357ba042d8c97941160ad31ee0c89bc53b349195b45d27ce77aaa954bc01aceba1a30cdb89d9f58644a0b4934498a16
5Size (ympd-1.3.0.tar.gz) = 350115 bytes 5Size (ympd-1.3.0.tar.gz) = 350115 bytes
6SHA1 (patch-CMakeLists.txt) = 727b742ffc579575b00d0a185f071b67805f1ef8 6SHA1 (patch-CMakeLists.txt) = 74d21cf3d850b1a723ea803b5c0bbc459bd8a452
 7SHA1 (patch-src_mongoose.c) = 9ef4d9fe2f7a9e9e337f5c81f335e4111329f8e9
cvs diff -r1.1 -r1.2 pkgsrc/audio/ympd/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/audio/ympd/patches/patch-CMakeLists.txt 2021/07/20 06:37:18 1.1
+++ pkgsrc/audio/ympd/patches/patch-CMakeLists.txt 2022/04/18 18:43:07 1.2
@@ -1,18 +1,30 @@ @@ -1,18 +1,30 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2021/07/20 06:37:18 nia Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2022/04/18 18:43:07 nia Exp $
2 2
 3Honor CFLAGS.
3Use CMAKE_INSTALL_MANDIR. 4Use CMAKE_INSTALL_MANDIR.
4 5
5--- CMakeLists.txt.orig 2016-02-13 21:01:52.000000000 +0000 6--- CMakeLists.txt.orig 2016-02-13 21:01:52.000000000 +0000
6+++ CMakeLists.txt 7+++ CMakeLists.txt
 8@@ -24,8 +24,8 @@ include_directories(${PROJECT_BINARY_DIR
 9
 10 include(CheckCSourceCompiles)
 11
 12-set(CMAKE_C_FLAGS "-std=gnu99 -Wall")
 13-set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic")
 14+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall")
 15+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -pedantic")
 16 if(WITH_IPV6)
 17 set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS NS_ENABLE_IPV6)
 18 endif()
7@@ -72,8 +72,10 @@ endif() 19@@ -72,8 +72,10 @@ endif()
8 add_executable(ympd ${SOURCES}) 20 add_executable(ympd ${SOURCES})
9 target_link_libraries(ympd ${LIBMPDCLIENT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES}) 21 target_link_libraries(ympd ${LIBMPDCLIENT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES})
10  22
11+include(GNUInstallDirs) 23+include(GNUInstallDirs)
12+ 24+
13 install(TARGETS ympd DESTINATION bin) 25 install(TARGETS ympd DESTINATION bin)
14-install(FILES ympd.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) 26-install(FILES ympd.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
15+install(FILES ympd.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) 27+install(FILES ympd.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
16 if(WITH_DYNAMIC_ASSETS) 28 if(WITH_DYNAMIC_ASSETS)
17 install(DIRECTORY htdocs DESTINATION share/${PROJECT_NAME}) 29 install(DIRECTORY htdocs DESTINATION share/${PROJECT_NAME})
18 endif() 30 endif()
File Added: pkgsrc/audio/ympd/patches/patch-src_mongoose.c
$NetBSD: patch-src_mongoose.c,v 1.1 2022/04/18 18:43:07 nia Exp $

solarisfixes.h does not exist, and doesn't seem to be needed anyway.

--- src/mongoose.c.orig	2016-02-13 21:01:52.000000000 +0000
+++ src/mongoose.c
@@ -2801,9 +2801,6 @@ static int is_big_endian(void) {
 // START OF SHA-1 code
 // Copyright(c) By Steve Reid <steve@edmweb.com>
 #define SHA1HANDSOFF
-#if defined(__sun)
-#include "solarisfixes.h"
-#endif
 
 union char64long16 { unsigned char c[64]; uint32_t l[16]; };