CVS commit: pkgsrc/audio/ympd

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr 18 18:43:07 UTC 2022

Modified Files:
        pkgsrc/audio/ympd: Makefile distinfo
        pkgsrc/audio/ympd/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/audio/ympd/patches: patch-src_mongoose.c

Log Message:
ympd: Honor CFLAGS. Fix illumos build.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ympd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/ympd/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/ympd/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/ympd/patches/patch-src_mongoose.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/ympd/Makefile
diff -u pkgsrc/audio/ympd/Makefile:1.1 pkgsrc/audio/ympd/Makefile:1.2
--- pkgsrc/audio/ympd/Makefile:1.1      Tue Jul 20 06:37:18 2021
+++ pkgsrc/audio/ympd/Makefile  Mon Apr 18 18:43:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/07/20 06:37:18 nia Exp $
+# $NetBSD: Makefile,v 1.2 2022/04/18 18:43:07 nia Exp $
 
 DISTNAME=      ympd-1.3.0
 CATEGORIES=    audio
@@ -16,6 +16,9 @@ USE_LANGUAGES=        c c++
 
 BUILD_DEFS+=   VARBASE
 
+CFLAGS.SunOS+= -D_POSIX_C_SOURCE=200112L
+LDFLAGS.SunOS+=        -lnsl -lsocket
+
 .include "../../mk/bsd.prefs.mk"
 
 RCD_SCRIPTS+=  ympd

Index: pkgsrc/audio/ympd/distinfo
diff -u pkgsrc/audio/ympd/distinfo:1.3 pkgsrc/audio/ympd/distinfo:1.4
--- pkgsrc/audio/ympd/distinfo:1.3      Tue Oct 26 09:59:39 2021
+++ pkgsrc/audio/ympd/distinfo  Mon Apr 18 18:43:07 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 09:59:39 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/04/18 18:43:07 nia Exp $
 
 BLAKE2s (ympd-1.3.0.tar.gz) = b5ca6d6c898366f89d61805960a568a093008cfe8b307fa24405194ebd9c6f01
 SHA512 (ympd-1.3.0.tar.gz) = 7e2bd4124b0e7692e2528e9fc50955d1b357ba042d8c97941160ad31ee0c89bc53b349195b45d27ce77aaa954bc01aceba1a30cdb89d9f58644a0b4934498a16
 Size (ympd-1.3.0.tar.gz) = 350115 bytes
-SHA1 (patch-CMakeLists.txt) = 727b742ffc579575b00d0a185f071b67805f1ef8
+SHA1 (patch-CMakeLists.txt) = 74d21cf3d850b1a723ea803b5c0bbc459bd8a452
+SHA1 (patch-src_mongoose.c) = 9ef4d9fe2f7a9e9e337f5c81f335e4111329f8e9

Index: pkgsrc/audio/ympd/patches/patch-CMakeLists.txt
diff -u pkgsrc/audio/ympd/patches/patch-CMakeLists.txt:1.1 pkgsrc/audio/ympd/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/audio/ympd/patches/patch-CMakeLists.txt:1.1  Tue Jul 20 06:37:18 2021
+++ pkgsrc/audio/ympd/patches/patch-CMakeLists.txt      Mon Apr 18 18:43:07 2022
@@ -1,9 +1,21 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2021/07/20 06:37:18 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2022/04/18 18:43:07 nia Exp $
 
+Honor CFLAGS.
 Use CMAKE_INSTALL_MANDIR.
 
 --- CMakeLists.txt.orig        2016-02-13 21:01:52.000000000 +0000
 +++ CMakeLists.txt
+@@ -24,8 +24,8 @@ include_directories(${PROJECT_BINARY_DIR
+ 
+ include(CheckCSourceCompiles)
+ 
+-set(CMAKE_C_FLAGS "-std=gnu99 -Wall")
+-set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall")
++set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -pedantic")
+ if(WITH_IPV6)
+     set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS NS_ENABLE_IPV6)
+ endif()
 @@ -72,8 +72,10 @@ endif()
  add_executable(ympd ${SOURCES})
  target_link_libraries(ympd ${LIBMPDCLIENT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES})

Added files:

Index: pkgsrc/audio/ympd/patches/patch-src_mongoose.c
diff -u /dev/null pkgsrc/audio/ympd/patches/patch-src_mongoose.c:1.1
--- /dev/null   Mon Apr 18 18:43:07 2022
+++ pkgsrc/audio/ympd/patches/patch-src_mongoose.c      Mon Apr 18 18:43:07 2022
@@ -0,0 +1,16 @@
+$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@localhost>
+ #define SHA1HANDSOFF
+-#if defined(__sun)
+-#include "solarisfixes.h"
+-#endif
+ 
+ union char64long16 { unsigned char c[64]; uint32_t l[16]; };
+