CVS commit: pkgsrc/chat/weechat

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 30 11:07:19 UTC 2020

Modified Files:
        pkgsrc/chat/weechat: Makefile distinfo options.mk
        pkgsrc/chat/weechat/patches: patch-src_core_weechat.c
Removed Files:
        pkgsrc/chat/weechat/patches: patch-CMakeLists.txt
            patch-cmake_FindNcurses.cmake patch-src_plugins_charset_charset.c
            patch-src_plugins_python_CMakeLists.txt

Log Message:
weechat: Drop patches that are no longer needed.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/chat/weechat/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/chat/weechat/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/chat/weechat/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/chat/weechat/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/chat/weechat/patches/patch-cmake_FindNcurses.cmake
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/weechat/patches/patch-src_core_weechat.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/chat/weechat/patches/patch-src_plugins_charset_charset.c \
    pkgsrc/chat/weechat/patches/patch-src_plugins_python_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/chat/weechat/Makefile
diff -u pkgsrc/chat/weechat/Makefile:1.112 pkgsrc/chat/weechat/Makefile:1.113
--- pkgsrc/chat/weechat/Makefile:1.112  Mon Mar 30 09:31:52 2020
+++ pkgsrc/chat/weechat/Makefile        Mon Mar 30 11:07:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2020/03/30 09:31:52 nia Exp $
+# $NetBSD: Makefile,v 1.113 2020/03/30 11:07:18 nia Exp $
 
 DISTNAME=      weechat-2.8
 CATEGORIES=    chat
@@ -35,12 +35,14 @@ LDFLAGS.SunOS+=             -lresolv
 
 BUILDLINK_TRANSFORM+=  rm:-Werror-implicit-function-declaration
 
-# use standard cmake mechanisms for detecting python
-# works better with pkgsrc.
+.include "options.mk"
+
 pre-configure:
-       ${RM} -f ${WRKSRC}/cmake/FindPython.cmake
+.if !empty(PKG_OPTIONS:Mpython)
+       ${LN} -sf ${BUILDLINK_DIR}/lib/pkgconfig/python-${PYVERSSUFFIX}.pc \
+               ${BUILDLINK_DIR}/lib/pkgconfig/python3.pc
+.endif
 
-.include "options.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/chat/weechat/distinfo
diff -u pkgsrc/chat/weechat/distinfo:1.60 pkgsrc/chat/weechat/distinfo:1.61
--- pkgsrc/chat/weechat/distinfo:1.60   Mon Mar 30 09:31:52 2020
+++ pkgsrc/chat/weechat/distinfo        Mon Mar 30 11:07:18 2020
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.60 2020/03/30 09:31:52 nia Exp $
+$NetBSD: distinfo,v 1.61 2020/03/30 11:07:18 nia Exp $
 
 SHA1 (weechat-2.8.tar.xz) = fec7018168f2fa973b1a4d8224fdac8b59617ada
 RMD160 (weechat-2.8.tar.xz) = 6c1453c5b97ba061bc2539033e62eb7f07ee52c8
 SHA512 (weechat-2.8.tar.xz) = 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
 Size (weechat-2.8.tar.xz) = 2248868 bytes
-SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d
-SHA1 (patch-cmake_FindNcurses.cmake) = 93969b86538f1b707903dce4691af99a67ede6ce
 SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068
-SHA1 (patch-src_core_weechat.c) = 062cd7443a756edbdf60289a7847b4278d520105
-SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
+SHA1 (patch-src_core_weechat.c) = aeb3cb052976e6b4603d3515ffc40bed98434a9f
 SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341
-SHA1 (patch-src_plugins_python_CMakeLists.txt) = 1f425f6c852c5973f84eea0add3c63bb6fcfa772

Index: pkgsrc/chat/weechat/options.mk
diff -u pkgsrc/chat/weechat/options.mk:1.23 pkgsrc/chat/weechat/options.mk:1.24
--- pkgsrc/chat/weechat/options.mk:1.23 Fri Dec  6 15:39:06 2019
+++ pkgsrc/chat/weechat/options.mk      Mon Mar 30 11:07:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2019/12/06 15:39:06 jperkin Exp $
+# $NetBSD: options.mk,v 1.24 2020/03/30 11:07:18 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.weechat
 # mk/curses will handle wide-curses
@@ -18,12 +18,6 @@ PLIST_VARS+=         lua plugin python perl rub
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 .include "../../lang/python/extension.mk"
 CMAKE_ARGS+=   -DENABLE_PYTHON=ON
-CMAKE_ARGS+=   -DPython_EXECUTABLE=${PYTHONBIN}
-.  if ${OPSYS} == "Darwin"
-CMAKE_ARGS+=   -DPYTHON_LIBRARIES=${PREFIX}/lib/libpython${PYVERSSUFFIX}.dylib
-.  else
-CMAKE_ARGS+=   -DPYTHON_LIBRARIES=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so
-.  endif
 PLIST.python=  yes
 .else
 CMAKE_ARGS+=   -DENABLE_PYTHON=OFF

Index: pkgsrc/chat/weechat/patches/patch-src_core_weechat.c
diff -u pkgsrc/chat/weechat/patches/patch-src_core_weechat.c:1.1 pkgsrc/chat/weechat/patches/patch-src_core_weechat.c:1.2
--- pkgsrc/chat/weechat/patches/patch-src_core_weechat.c:1.1    Thu Mar  7 18:09:24 2019
+++ pkgsrc/chat/weechat/patches/patch-src_core_weechat.c        Mon Mar 30 11:07:18 2020
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_core_weechat.c,v 1.1 2019/03/07 18:09:24 jperkin Exp $
+$NetBSD: patch-src_core_weechat.c,v 1.2 2020/03/30 11:07:18 nia Exp $
 
-Need unistd.h for mkdtemp(3).
+Need unistd.h for mkdtemp(3) (on what platform?)
 
 --- src/core/weechat.c.orig    2019-02-17 07:20:07.000000000 +0000
 +++ src/core/weechat.c