pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

removed weechat, it was added upstream



Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Mon Dec 7 00:25:37 2015 +0000
Changeset:	cace5059ddf6f793c859ebc6ea8cf3fc0863664e

Removed Files:
	weechat/DESCR
	weechat/Makefile
	weechat/PLIST
	weechat/distinfo
	weechat/options.mk
	weechat/patches/patch-ab
	weechat/patches/patch-po_CMakeLists.txt
	weechat/patches/patch-src_gui_curses_CMakeLists_txt
	weechat/patches/patch-src_gui_curses_gui-curses-term.c
	weechat/patches/patch-src_gui_curses_gui-curses-term_c
	weechat/patches/patch-src_plugins_charset_charset.c

Log Message:
removed weechat, it was added upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cace5059ddf6f793c859ebc6ea8cf3fc0863664e

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

diffstat:
 weechat/DESCR                                      |  3 --
 weechat/Makefile                                   | 41 ---------------
 weechat/PLIST                                      | 33 ------------
 weechat/distinfo                                   | 11 ----
 weechat/options.mk                                 | 60 ----------------------
 weechat/patches/patch-ab                           | 15 ------
 weechat/patches/patch-po_CMakeLists.txt            | 15 ------
 .../patches/patch-src_gui_curses_CMakeLists_txt    | 36 -------------
 .../patches/patch-src_gui_curses_gui-curses-term.c | 15 ------
 .../patches/patch-src_gui_curses_gui-curses-term_c | 41 ---------------
 .../patches/patch-src_plugins_charset_charset.c    | 14 -----
 11 files changed, 284 deletions(-)

diffs:
diff --git a/weechat/DESCR b/weechat/DESCR
deleted file mode 100644
index 655ae19..0000000
--- a/weechat/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-WeeChat (Wee Enhanced Environment for Chat) is a fast and light IRC
-client. Everything can be done with a keyboard, and it is customizable
-and extensible with scripts.
diff --git a/weechat/Makefile b/weechat/Makefile
deleted file mode 100644
index 8b73b67..0000000
--- a/weechat/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.58 2015/11/07 23:03:31 dholland Exp $
-
-DISTNAME=	weechat-1.3
-CATEGORIES=	chat
-MASTER_SITES=	http://www.weechat.org/files/src/
-
-MAINTAINER=	tonio%NetBSD.org@localhost
-HOMEPAGE=	http://www.weechat.org/
-COMMENT=	Lightweight and user friendly curses based IRC client
-LICENSE=	gnu-gpl-v3
-EXTRACT_SUFX=	.tar.bz2
-
-BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
-
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		msgfmt pkg-config
-USE_LANGUAGES=		c99
-USE_LIBTOOL=		yes
-USE_CMAKE=		yes
-
-CMAKE_ARGS+=		-DENABLE_ASPELL:BOOL=OFF
-CMAKE_ARGS+=		-DENABLE_GUILE:BOOL=OFF
-CMAKE_ARGS+=		-DENABLE_TCL:BOOL=OFF
-CMAKE_ARGS+=		-DENABLE_MAN:BOOL=ON
-CMAKE_ARGS+=		-DENABLE_V8:BOOL=OFF
-CMAKE_ARGS+=		-DMANDIR:STRING=${PKGMANDIR}
-CMAKE_ARGS+=		-DLOCALEDIR:STRING=${PKGLOCALEDIR}/locale
-CMAKE_ARGS+=		-DENABLE_CHARSET:BOOL=ON
-
-LDFLAGS+=		${BUILDLINK_LDADD.gettext}
-
-.include "options.mk"
-
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-#.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/weechat/PLIST b/weechat/PLIST
deleted file mode 100644
index d14eb6f..0000000
--- a/weechat/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD$
-bin/weechat
-include/weechat/weechat-plugin.h
-lib/pkgconfig/weechat.pc
-lib/weechat/plugins/alias.so
-lib/weechat/plugins/charset.so
-lib/weechat/plugins/exec.so
-lib/weechat/plugins/fifo.so
-lib/weechat/plugins/irc.so
-lib/weechat/plugins/logger.so
-lib/weechat/plugins/relay.so
-lib/weechat/plugins/script.so
-lib/weechat/plugins/trigger.so
-lib/weechat/plugins/xfer.so
-man/de/man1/weechat.1
-man/fr/man1/weechat.1
-man/it/man1/weechat.1
-man/ja/man1/weechat.1
-man/man1/weechat.1
-man/pl/man1/weechat.1
-man/ru/man1/weechat.1
-share/icons/hicolor/32x32/apps/weechat.png
-share/locale/cs/LC_MESSAGES/weechat.mo
-share/locale/de/LC_MESSAGES/weechat.mo
-share/locale/es/LC_MESSAGES/weechat.mo
-share/locale/fr/LC_MESSAGES/weechat.mo
-share/locale/hu/LC_MESSAGES/weechat.mo
-share/locale/it/LC_MESSAGES/weechat.mo
-share/locale/ja/LC_MESSAGES/weechat.mo
-share/locale/pl/LC_MESSAGES/weechat.mo
-share/locale/pt_BR/LC_MESSAGES/weechat.mo
-share/locale/ru/LC_MESSAGES/weechat.mo
-share/locale/tr/LC_MESSAGES/weechat.mo
diff --git a/weechat/distinfo b/weechat/distinfo
deleted file mode 100644
index 3cc2f12..0000000
--- a/weechat/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-SHA1 (weechat-1.3.tar.bz2) = 3d6cac3a92b194819197ee7ed435a0c2e62a7c66
-RMD160 (weechat-1.3.tar.bz2) = 2484204e67eea53328a37c7d588cb76f76dfd0ec
-SHA512 (weechat-1.3.tar.bz2) = 82159f1c630bf389e7a3b8baf29b67c50711e1a767040440c71bfd7d3cd0c3005b7423e6dd53c2437512cc68953f540039971a4e6f6d7a4cdb4a4e74e4c3985b
-Size (weechat-1.3.tar.bz2) = 2402422 bytes
-SHA1 (patch-ab) = 2a4583e0f5b0336e8c42ad9eb5a65bbec4730207
-SHA1 (patch-po_CMakeLists.txt) = 9b97a4a4da4175e31ea53352fd0b95e1c985ba1e
-SHA1 (patch-src_gui_curses_CMakeLists_txt) = 28a1b3b9920cc130d0454a18b111d37b8090038b
-SHA1 (patch-src_gui_curses_gui-curses-term_c) = 900af9a94e74f229b32031bfeced1b85ea3a0ccf
-SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
diff --git a/weechat/options.mk b/weechat/options.mk
deleted file mode 100644
index ca1cee6..0000000
--- a/weechat/options.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: options.mk,v 1.12 2015/08/01 19:10:15 tonio Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.weechat
-PKG_SUPPORTED_OPTIONS=	gnutls python lua wide-curses perl ruby
-PKG_SUGGESTED_OPTIONS=	gnutls
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		lua plugin python perl ruby
-
-.if !empty(PKG_OPTIONS:Mgnutls)
-.include "../../security/gnutls/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mwide-curses)
-.include "../../devel/ncursesw/buildlink3.mk"
-.else
-.include "../../devel/ncurses/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mpython)
-.include "../../lang/python/extension.mk"
-CMAKE_ARGS+=		-DENABLE_PYTHON:BOOL=ON
-PLIST.python=		yes
-.else
-CMAKE_ARGS+=		-DENABLE_PYTHON:BOOL=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mlua)
-LUA_VERSIONS_INCOMPATIBLE=	52
-.include "../../lang/lua/buildlink3.mk"
-CMAKE_ARGS+=		-DENABLE_LUA:BOOL=ON
-PLIST.lua=		yes
-.else
-CMAKE_ARGS+=		-DENABLE_LUA:BOOL=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mperl)
-.include "../../lang/perl5/buildlink3.mk"
-CMAKE_ARGS+=		-DENABLE_PERL:BOOL=ON
-USE_TOOLS+=		perl
-PLIST.perl=		yes
-.else
-CMAKE_ARGS+=		-DENABLE_PERL:BOOL=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mruby)
-.include "../../lang/ruby/buildlink3.mk"
-CMAKE_ARGS+=		-DENABLE_RUBY:BOOL=ON
-PLIST.ruby=		yes
-BUILDLINK_INCDIRS.${RUBY_BASE}+=	${RUBY_INC}
-BUILDLINK_INCDIRS.${RUBY_BASE}+=	${RUBY_ARCHINC}
-.else
-CMAKE_ARGS+=		-DENABLE_RUBY:BOOL=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mpython) || \
-    !empty(PKG_OPTIONS:Mlua)
-PLIST.plugin=		yes
-.endif
diff --git a/weechat/patches/patch-ab b/weechat/patches/patch-ab
deleted file mode 100644
index 9eb74e5..0000000
--- a/weechat/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2015/08/01 19:10:15 tonio Exp $
-
-Prefer ncursesw/curses.h over ncursesw/ncurses.h.
-
---- src/gui/curses/gui-curses.h.orig	2012-01-08 09:13:53.000000000 +0000
-+++ src/gui/curses/gui-curses.h
-@@ -23,6 +23,8 @@
- #include <time.h>
- 
- #ifdef HAVE_NCURSESW_CURSES_H
-+#include <ncursesw/curses.h>
-+#elif HAVE_NCURSESW_NCURSES_H
- #include <ncursesw/ncurses.h>
- #elif HAVE_NCURSES_H
- #include <ncurses.h>
diff --git a/weechat/patches/patch-po_CMakeLists.txt b/weechat/patches/patch-po_CMakeLists.txt
deleted file mode 100644
index 60ce408..0000000
--- a/weechat/patches/patch-po_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-po_CMakeLists.txt,v 1.4 2015/08/01 19:10:15 tonio Exp $
-
-Drop package-name and package-version args to xgettext.
-
---- po/CMakeLists.txt.orig	2014-08-15 08:09:01.000000000 +0000
-+++ po/CMakeLists.txt
-@@ -56,7 +56,7 @@ if(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC
-   add_custom_command(
-     OUTPUT ${POT_FILE_PATH}
-     COMMAND ${XGETTEXT_EXECUTABLE}
--    ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
-+    ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --from-code=UTF-8 --directory=${CMAKE_SOURCE_DIR} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES}
-     DEPENDS ${POT_DEPENDS}
-     COMMENT "Generating ${POT_FILE}"
-     )
diff --git a/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/weechat/patches/patch-src_gui_curses_CMakeLists_txt
deleted file mode 100644
index faf6672..0000000
--- a/weechat/patches/patch-src_gui_curses_CMakeLists_txt
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.5 2015/08/01 19:10:15 tonio Exp $
-
-Test for ncursesw
-
---- src/gui/curses/CMakeLists.txt.orig	2015-05-10 07:24:50.000000000 +0000
-+++ src/gui/curses/CMakeLists.txt
-@@ -37,9 +37,11 @@ set(EXECUTABLE weechat)
- 
- find_package(Ncurses)
- if(NCURSES_FOUND)
-+  check_include_files(ncursesw/term.h HAVE_NCURSES_TERM_H)
-+  check_include_files(ncursesw/curses.h HAVE_NCURSESW_CURSES_H)
-   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
-   if(NCURSESW_HEADERS)
--    add_definitions(-DHAVE_NCURSESW_CURSES_H)
-+    add_definitions(-DHAVE_NCURSESW_NCURSES_H)
-   else()
-     check_include_files(ncurses.h NCURSES_HEADERS)
-     if(NCURSES_HEADERS)
-@@ -59,6 +61,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS"
-   list(APPEND EXTRA_LIBS "socket" "nsl")
- endif()
- 
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
-+  list(APPEND EXTRA_LIBS "curses")
-+endif()
-+
- list(APPEND EXTRA_LIBS "pthread")
- 
- if(ICONV_LIBRARY)
-@@ -103,4 +109,4 @@ list(APPEND CMAKE_INSTALL_MANIFEST_FILES
- 
- # Install executable and symbolic link
- install(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin)
-+
diff --git a/weechat/patches/patch-src_gui_curses_gui-curses-term.c b/weechat/patches/patch-src_gui_curses_gui-curses-term.c
deleted file mode 100644
index 089c422..0000000
--- a/weechat/patches/patch-src_gui_curses_gui-curses-term.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Make C compiler happy
-
---- src/gui/curses/gui-curses-term.c.orig	2015-08-16 06:27:07.000000000 +0000
-+++ src/gui/curses/gui-curses-term.c
-@@ -45,7 +45,7 @@
- void
- gui_term_set_eat_newline_glitch (int value)
- {
--#ifdef HAVE_EAT_NEWLINE_GLITCH
-+#if defined(HAVE_EAT_NEWLINE_GLITCH) && !defined(__NetBSD__)
-     eat_newline_glitch = value;
- #else
-     /* make C compiler happy */
diff --git a/weechat/patches/patch-src_gui_curses_gui-curses-term_c b/weechat/patches/patch-src_gui_curses_gui-curses-term_c
deleted file mode 100644
index d75faba..0000000
--- a/weechat/patches/patch-src_gui_curses_gui-curses-term_c
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.5 2015/08/01 19:10:15 tonio Exp $
-
-Include <ncurses/term.h>, not <ncursesw/term.h>.
-Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H.
-
-Workaround for build failure on early NetBSD 6.99.* and prerelease 6.0
-(PR 46492)
-
---- src/gui/curses/gui-curses-term.c.orig	2015-05-10 07:24:50.000000000 +0000
-+++ src/gui/curses/gui-curses-term.c
-@@ -23,15 +23,15 @@
- #include "config.h"
- #endif
- 
--#ifdef HAVE_NCURSESW_CURSES_H
--#ifdef __sun
-+#ifdef HAVE_NCURSES_TERM_H
- #include <ncurses/term.h>
- #else
--#include <ncursesw/term.h>
--#endif /* __sun */
--#else
-+#ifdef __NetBSD__
-+/* workaround for build failure on early 6.99.* and prerelease 6.0 */
-+#include <sys/cdefs.h>
-+#endif
- #include <term.h>
--#endif /* HAVE_NCURSESW_CURSES_H */
-+#endif /* HAVE_NCURSESW_TERM_H */
- 
- 
- /*
-@@ -45,7 +45,7 @@
- void
- gui_term_set_eat_newline_glitch (int value)
- {
--#ifdef HAVE_EAT_NEWLINE_GLITCH
-+#if defined(HAVE_EAT_NEWLINE_GLITCH) && !defined(__NetBSD__)
-     eat_newline_glitch = value;
- #else
-     /* make C compiler happy */
diff --git a/weechat/patches/patch-src_plugins_charset_charset.c b/weechat/patches/patch-src_plugins_charset_charset.c
deleted file mode 100644
index fd331ee..0000000
--- a/weechat/patches/patch-src_plugins_charset_charset.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_plugins_charset_charset.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
-
-Need strings.h for strcasecmp()
-
---- src/plugins/charset/charset.c.orig	2013-05-20 08:06:14.000000000 +0000
-+++ src/plugins/charset/charset.c
-@@ -25,6 +25,7 @@
- #define __USE_GNU
- #endif
- #include <string.h>
-+#include <strings.h>
- #include <iconv.h>
- 
- #include "../weechat-plugin.h"


Home | Main Index | Thread Index | Old Index