Hi,

attached is a diff that updates net/weechat to 0.4.2:
http://dev.weechat.org/post/2013/10/06/Version-0.4.2

As stated in the release notes[1], the binary got renamed from
weechat-curses to just plain weechat.

The missing include is fixed upstream and the CA file can now be set
via a configure flag. The post-install target got a slight adjustment,
as cmdline_options.en.txt is not really interesting when you have
a manpage IMHO.

Building of the manpage has to be specifically enabled and requires
asciidoc. I needed to comment out all language dirs, except English,
otherwise every translated manpage gets built and installed.
Please tell me, if you'd prefer to handle this some other way.

Tested on sparc64, though I had to comment out everything Ruby
related, as Ruby is marked broken on sparc64 ATM. It'd be nice if
somebody could do a full build. Everything else works fine.

Regards
        Simon

P.S.: No, I still won't take maintainership for it ;-)

[1] http://www.weechat.org/files/releasenotes/ReleaseNotes-0.4.2.html

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    3 Jun 2013 20:35:23 -0000       1.12
+++ Makefile    10 Oct 2013 09:17:37 -0000
@@ -6,7 +6,7 @@
 COMMENT-ruby=  Ruby bindings for weechat
 COMMENT-tcl=   Tcl bindings for weechat
 
-V=             0.4.1
+V=             0.4.2
 DISTNAME=      weechat-${V}
 
 PKGNAME-main=  weechat-${V}
@@ -48,6 +48,8 @@
 MODRUBY_RUNDEP=        No
 MODRUBY_REV=   1.9
 
+BUILD_DEPENDS= textproc/asciidoc
+
 LIB_DEPENDS=   security/libgcrypt \
                security/gnutls \
                net/curl
@@ -71,11 +73,13 @@
                -DENABLE_TCL=yes \
                -DENABLE_PYTHON=yes \
                -DHAVE_BACKTRACE=no \
-               -DMANDIR=${PREFIX}/man
+               -DMANDIR=${PREFIX}/man \
+               -DENABLE_MAN=on \
+               -DCA_FILE=/etc/ssl/cert.pem
 
 post-install:
        $(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
-       $(INSTALL_DATA) $(WRKSRC)/doc/en/*.en.txt ${PREFIX}/share/doc/weechat/
+       $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt 
${PREFIX}/share/doc/weechat/
 
 NO_TEST=       Yes
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo    3 Jun 2013 20:35:23 -0000       1.4
+++ distinfo    10 Oct 2013 09:17:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
-SIZE (weechat-0.4.1.tar.gz) = 2567828
+SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
+SIZE (weechat-0.4.2.tar.gz) = 2729241
Index: patches/patch-doc_CMakeLists_txt
===================================================================
RCS file: patches/patch-doc_CMakeLists_txt
diff -N patches/patch-doc_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_CMakeLists_txt    10 Oct 2013 09:17:37 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- doc/CMakeLists.txt.orig    Wed Oct  9 13:46:15 2013
++++ doc/CMakeLists.txt Wed Oct  9 13:47:13 2013
+@@ -24,13 +24,13 @@ IF(ENABLE_MAN OR ENABLE_DOC)
+   FIND_PACKAGE(Asciidoc)
+   IF(ASCIIDOC_FOUND)
+     ADD_SUBDIRECTORY( en )
+-    ADD_SUBDIRECTORY( fr )
+-    ADD_SUBDIRECTORY( it )
+-    ADD_SUBDIRECTORY( de )
+-    ADD_SUBDIRECTORY( pl )
+-    ADD_SUBDIRECTORY( es )
+-    ADD_SUBDIRECTORY( ru )
+-    ADD_SUBDIRECTORY( ja )
++    #    ADD_SUBDIRECTORY( fr )
++    #    ADD_SUBDIRECTORY( it )
++    #    ADD_SUBDIRECTORY( de )
++    #    ADD_SUBDIRECTORY( pl )
++    #    ADD_SUBDIRECTORY( es )
++    #    ADD_SUBDIRECTORY( ru )
++    #    ADD_SUBDIRECTORY( ja )
+   ENDIF(ASCIIDOC_FOUND)
+ 
+ ENDIF(ENABLE_MAN OR ENABLE_DOC)
Index: patches/patch-src_core_wee-config_c
===================================================================
RCS file: patches/patch-src_core_wee-config_c
diff -N patches/patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 3 Jun 2013 20:35:23 -0000       1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_core_wee-config_c,v 1.3 2013/06/03 20:35:23 sthen Exp $
---- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
-+++ src/core/wee-config.c      Sat May 25 21:55:06 2013
-@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
-         "gnutls_ca_file", "string",
-         N_("file containing the certificate authorities (\"%h\" will be "
-            "replaced by WeeChat home, \"~/.weechat\" by default)"),
--        NULL, 0, 0, "/etc/ssl/certs/ca-certificates.crt", NULL, 0, NULL, NULL,
-+        NULL, 0, 0, "/etc/ssl/cert.pem", NULL, 0, NULL, NULL,
-         &config_change_network_gnutls_ca_file, NULL, NULL, NULL);
-     config_network_gnutls_handshake_timeout = config_file_new_option (
-         weechat_config_file, ptr_section,
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===================================================================
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- patches/patch-src_plugins_xfer_xfer-dcc_c   3 Jun 2013 20:35:23 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_plugins_xfer_xfer-dcc_c,v 1.1 2013/06/03 20:35:23 sthen 
Exp $
---- src/plugins/xfer/xfer-dcc.c.orig   Sun May 26 10:42:17 2013
-+++ src/plugins/xfer/xfer-dcc.c        Sun May 26 10:42:48 2013
-@@ -21,6 +21,7 @@
- 
- #include <stdlib.h>
- #include <unistd.h>
-+#include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main      3 Jun 2013 20:35:23 -0000       1.3
+++ pkg/PLIST-main      10 Oct 2013 09:17:37 -0000
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST-main,v 1.3 2013/06/03 20:35:23 sthen Exp $
-@bin bin/weechat-curses
+@bin bin/weechat
+bin/weechat-curses
 include/weechat/
 include/weechat/weechat-plugin.h
 lib/pkgconfig/weechat.pc
@@ -15,7 +16,7 @@
 lib/weechat/plugins/rmodifier.so
 lib/weechat/plugins/script.so
 lib/weechat/plugins/xfer.so
-@man man/man1/weechat-curses.1
+@man man/man1/weechat.1
 share/doc/weechat/
 share/doc/weechat/weechat_dev.en.txt
 share/doc/weechat/weechat_faq.en.txt
@@ -36,3 +37,4 @@
 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

Reply via email to