CVS commit: pkgsrc/wm/icewm14

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 28 16:24:54 UTC 2018

Modified Files:
        pkgsrc/wm/icewm14: Makefile distinfo
        pkgsrc/wm/icewm14/patches: patch-src_CMakeLists.txt

Log Message:
icewm14: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/icewm14/Makefile \
    pkgsrc/wm/icewm14/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/icewm14/patches/patch-src_CMakeLists.txt

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

Modified files:

Index: pkgsrc/wm/icewm14/Makefile
diff -u pkgsrc/wm/icewm14/Makefile:1.1 pkgsrc/wm/icewm14/Makefile:1.2
--- pkgsrc/wm/icewm14/Makefile:1.1      Thu Nov  1 09:25:29 2018
+++ pkgsrc/wm/icewm14/Makefile  Wed Nov 28 16:24:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2018/11/28 16:24:54 jperkin Exp $
 
 DISTNAME=      icewm-1.4.2
 CATEGORIES=    wm
@@ -20,6 +20,8 @@ USE_CMAKE=    yes
 USE_LANGUAGES= c c++03
 USE_TOOLS+=    msgfmt pkg-config
 
+LDFLAGS.SunOS+=        -lsocket -lnsl
+
 post-extract:
        cp ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
 
Index: pkgsrc/wm/icewm14/distinfo
diff -u pkgsrc/wm/icewm14/distinfo:1.1 pkgsrc/wm/icewm14/distinfo:1.2
--- pkgsrc/wm/icewm14/distinfo:1.1      Thu Nov  1 09:25:29 2018
+++ pkgsrc/wm/icewm14/distinfo  Wed Nov 28 16:24:54 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
+$NetBSD: distinfo,v 1.2 2018/11/28 16:24:54 jperkin Exp $
 
 SHA1 (icewm-1.4.2.tar.bz2) = d1f9af531fec7beaa334db9c0e4764b9e40bbacd
 RMD160 (icewm-1.4.2.tar.bz2) = 6aaabad0c235901556951c9d88178adf15e29f51
 SHA512 (icewm-1.4.2.tar.bz2) = 0d227d75d2e3e6e5314eb0990375b85a34496e61e8b504ee023decb52b0c3a20bfd65c0d491b738d3742ddf3f21acfabfc8e4d43df51d137f568580b6c5ed0cd
 Size (icewm-1.4.2.tar.bz2) = 1731772 bytes
-SHA1 (patch-src_CMakeLists.txt) = 6a86bf3860656291e7a5f0b646325e19fd90127a
+SHA1 (patch-src_CMakeLists.txt) = 87a236a6d53937921ffca0044b1497124f8a9d83
 SHA1 (patch-src_base.h) = 5321f1f1f8fd1ced2c5f38a7e5e614deee4703df
 SHA1 (patch-src_icesm.cc) = c7fa247c395bb36307b7757a8c2698b62b7d0a6e
 SHA1 (patch-src_icetray.cc) = a8e70da376e13be187037f190c672b8b75fd287b

Index: pkgsrc/wm/icewm14/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/wm/icewm14/patches/patch-src_CMakeLists.txt:1.1 pkgsrc/wm/icewm14/patches/patch-src_CMakeLists.txt:1.2
--- pkgsrc/wm/icewm14/patches/patch-src_CMakeLists.txt:1.1      Thu Nov  1 09:25:29 2018
+++ pkgsrc/wm/icewm14/patches/patch-src_CMakeLists.txt  Wed Nov 28 16:24:54 2018
@@ -1,8 +1,16 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2018/11/01 09:25:29 bsiegert Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2018/11/28 16:24:54 jperkin Exp $
 
---- src/CMakeLists.txt.orig    2017-07-30 08:53:35.000000000 +0000
+--- src/CMakeLists.txt.orig    2017-07-30 08:53:35.524267864 +0000
 +++ src/CMakeLists.txt
-@@ -338,7 +338,7 @@ set(icewm_libs ${sm_LIBS} ${nls_LIBS} ${
+@@ -47,6 +47,7 @@ ENDIF()
+ if(ENABLE_NLS OR CONFIG_I18N)
+       find_library(CONFIG_LIBICONV iconv)
+       if(CONFIG_LIBICONV)
++              SET(CXXFLAGS_COMMON "${CXXFLAGS_COMMON} -DCONFIG_LIBICONV")
+               LIST(APPEND nls_LIBS iconv)
+       endif()
+       find_library(CONFIG_LIBINTL intl)
+@@ -338,7 +339,7 @@ set(icewm_libs ${sm_LIBS} ${nls_LIBS} ${
  TARGET_LINK_LIBRARIES(icewm${EXEEXT} ${icewm_libs})
  
  ADD_EXECUTABLE(genpref${EXEEXT} genpref.cc misc.cc)
@@ -11,7 +19,7 @@ $NetBSD: patch-src_CMakeLists.txt,v 1.1 
  
  IF(CONFIG_FDO_MENUS)
  ADD_EXECUTABLE(icewm-menu-fdo${EXEEXT} fdomenu.cc misc.cc)
-@@ -387,7 +387,7 @@ if(NOT CMAKE_CROSSCOMPILING)
+@@ -387,7 +388,7 @@ if(NOT CMAKE_CROSSCOMPILING)
     ADD_CUSTOM_COMMAND(TARGET genpref${EXEEXT}
        POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/lib