On 10/04/14 12:04, Henrik Friedrichsen wrote:
> On Sat, Oct 04, 2014 at 11:21:18AM +0100, Stuart Henderson wrote:
>> This doesn't apply to -current, please update your tree first.
> Pardon me. Looks like I missed out on a commit from a few days ago.
>
> Here goes another try.
>
weechat 0.4.2 ruby plunin is broken by the ruby update, only
built/working if by a fuke the correct multiple ruby versions have been
installed, during the build and at runtime. A weechat update is required.
weechat 1.0.1 supports Ruby 2.1, weechat 0.4.2 only supports Ruby 1.8,
1.9, weechat 0.4.3 supports up to Ruby 2.0. As ruby 2.1 is default,
weechat 1.0.1 is needed.
weechat 0.4.2 to 1.0.1 - tcl plugin can be built incorrectly against the
wrong versions of tcl, this is corrected by changing the version
detection, and forcing use of the correct version using the configure
args passed to cmake.
$ make show=CONFIGURE_ARGS
-DENABLE_ASPELL=no -DENABLE_GUILE=no -DENABLE_RUBY=yes
-DENABLE_LUA=yes -DENABLE_TCL=yes -DENABLE_PYTHON=yes
-DHAVE_BACKTRACE=no -DMANDIR=/usr/local/man -DENABLE_MAN=on
-DCA_FILE=/etc/ssl/cert.pem -DTCL_TCLSH=/usr/local/bin/tclsh8.5
-DTCL_INCLUDE_PATH=/usr/local/include/tcl8.5 -DMODTCL_LIB=tcl85
To ensure the correct generation of the PLIST's, the plugins should
depends on weechat,-main. RUN_DEPENDS-{lua,ruby,python,tcl} updated. The
plugins are of little use without weechat installed.
All ports should pass
make port-lib-depends-check or make lib-depends-check or
$ check-lib-depends -d . weechat-*-1*.tgz
Scanning: ok
once built, LIB_DEPENDS / WANTLIB's have been updated to pass this.
Not only does the port have to build, it has to build even if other
versions of lua/Python/Ruby/Tcl are installed, and build without relying
on other ports being built also. Tried the different combinations
building on amd64.
No runtime testing has been carried out.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/weechat/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 27 Sep 2014 17:07:20 -0000 1.15
+++ Makefile 7 Oct 2014 09:31:22 -0000
@@ -6,15 +6,13 @@ COMMENT-python= Python bindings for weec
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.2
+V= 1.0.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
-REVISION-main= 0
PKGNAME-lua= weechat-lua-${V}
PKGNAME-python= weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
-REVISION-ruby= 0
PKGNAME-tcl= weechat-tcl-${V}
CATEGORIES= net
@@ -35,7 +33,7 @@ WANTLIB-main= c curl m ncursesw perl pth
WANTLIB-lua= ${MODLUA_WANTLIB}
WANTLIB-python= ${MODPY_WANTLIB}
-WANTLIB-ruby= ${MODRUBY_WANTLIB}
+WANTLIB-ruby= ${MODRUBY_WANTLIB} gmp m pthread
WANTLIB-tcl= ${MODTCL_WANTLIB}
MODULES= devel/cmake \
@@ -55,16 +53,17 @@ LIB_DEPENDS= security/libgcrypt \
net/curl
LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS}
-RUN_DEPENDS-lua= ${MODLUA_RUN_DEPENDS}
+RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS}
LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS}
-RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS}
+RUN_DEPENDS-python= net/weechat,-main ${MODPY_RUN_DEPENDS}
-LIB_DEPENDS-ruby= ${MODRUBY_LIB_DEPENDS}
-RUN_DEPENDS-ruby= ${MODRUBY_RUN_DEPENDS}
+LIB_DEPENDS-ruby= ${MODRUBY_LIB_DEPENDS} \
+ devel/gmp
+RUN_DEPENDS-ruby= net/weechat,-main ${MODRUBY_RUN_DEPENDS}
LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS}
-RUN_DEPENDS-tcl= ${MODTCL_RUN_DEPENDS}
+RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS}
CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
-DENABLE_GUILE=no \
@@ -75,11 +74,14 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
-DHAVE_BACKTRACE=no \
-DMANDIR=${PREFIX}/man \
-DENABLE_MAN=on \
- -DCA_FILE=/etc/ssl/cert.pem
+ -DCA_FILE=/etc/ssl/cert.pem \
+ -DTCL_TCLSH=${MODTCL_BIN} \
+ -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
+ -DMODTCL_LIB=${MODTCL_LIB}
post-install:
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/weechat
- $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.txt \
+ $(INSTALL_DATA) $(WRKSRC)/doc/en/weechat_*.en.asciidoc \
${PREFIX}/share/doc/weechat/
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/weechat/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 14 Nov 2013 22:30:29 -0000 1.5
+++ distinfo 6 Oct 2014 18:07:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.2.tar.gz) = O7mWTvd2GDrauVE7fjZiFwA5qsyrIetxz76sSUaU1w8=
-SIZE (weechat-0.4.2.tar.gz) = 2729241
+SHA256 (weechat-1.0.1.tar.gz) = P1O23Rfx5i2GsQCoH298i44OfrJnC2K0ZApue2CkxlM=
+SIZE (weechat-1.0.1.tar.gz) = 3237820
Index: patches/patch-cmake_FindTCL_cmake
===================================================================
RCS file: patches/patch-cmake_FindTCL_cmake
diff -N patches/patch-cmake_FindTCL_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_FindTCL_cmake 6 Oct 2014 18:21:39 -0000
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- cmake/FindTCL.cmake.orig Sun Sep 28 07:59:19 2014
++++ cmake/FindTCL.cmake Mon Oct 6 19:16:37 2014
+@@ -97,14 +97,22 @@ if(WIN32)
+ )
+ endif()
+
+-find_library(TCL_LIBRARY
+- NAMES
+- tcl86 tcl8.6
+- tcl85 tcl8.5
+- tcl
+- tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
+- PATHS ${TCL_POSSIBLE_LIB_PATHS}
+- )
++IF(MODTCL_LIB)
++ find_library(TCL_LIBRARY
++ NAMES
++ ${MODTCL_LIB}
++ PATHS ${TCL_POSSIBLE_LIB_PATHS}
++ )
++ELSE(MODTCL_LIB)
++ find_library(TCL_LIBRARY
++ NAMES
++ tcl86 tcl8.6
++ tcl85 tcl8.5
++ tcl
++ tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
++ PATHS ${TCL_POSSIBLE_LIB_PATHS}
++ )
++ENDIF(MODTCL_LIB)
+
+ cmake_find_frameworks(Tcl)
+
Index: patches/patch-doc_CMakeLists_txt
===================================================================
RCS file: /home/cvs/ports/net/weechat/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-doc_CMakeLists_txt
--- patches/patch-doc_CMakeLists_txt 14 Nov 2013 22:30:29 -0000 1.3
+++ patches/patch-doc_CMakeLists_txt 6 Oct 2014 18:21:53 -0000
@@ -1,24 +1,23 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.3 2013/11/14 22:30:29 fgsch Exp $
---- doc/CMakeLists.txt.orig Thu Nov 14 16:25:14 2013
-+++ doc/CMakeLists.txt Thu Nov 14 16:25:16 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)
+--- doc/CMakeLists.txt.orig Sun Sep 28 07:59:19 2014
++++ doc/CMakeLists.txt Mon Oct 6 19:20:37 2014
+@@ -23,12 +23,12 @@ 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()
+ endif()
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/net/weechat/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 17 Nov 2013 00:05:51 -0000 1.5
+++ pkg/PLIST-main 7 Oct 2014 09:47:49 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.5 2013/11/17 00:05:51 fgsch Exp $
@bin bin/weechat
+bin/weechat-curses
include/weechat/
include/weechat/weechat-plugin.h
lib/pkgconfig/weechat.pc
@@ -7,24 +8,25 @@ lib/weechat/
lib/weechat/plugins/
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/perl.so
lib/weechat/plugins/relay.so
-lib/weechat/plugins/rmodifier.so
lib/weechat/plugins/script.so
+lib/weechat/plugins/trigger.so
lib/weechat/plugins/xfer.so
@man man/man1/weechat.1
share/doc/weechat/
-share/doc/weechat/weechat_dev.en.txt
-share/doc/weechat/weechat_faq.en.txt
-share/doc/weechat/weechat_plugin_api.en.txt
-share/doc/weechat/weechat_quickstart.en.txt
-share/doc/weechat/weechat_relay_protocol.en.txt
-share/doc/weechat/weechat_scripting.en.txt
-share/doc/weechat/weechat_tester.en.txt
-share/doc/weechat/weechat_user.en.txt
+share/doc/weechat/weechat_dev.en.asciidoc
+share/doc/weechat/weechat_faq.en.asciidoc
+share/doc/weechat/weechat_plugin_api.en.asciidoc
+share/doc/weechat/weechat_quickstart.en.asciidoc
+share/doc/weechat/weechat_relay_protocol.en.asciidoc
+share/doc/weechat/weechat_scripting.en.asciidoc
+share/doc/weechat/weechat_tester.en.asciidoc
+share/doc/weechat/weechat_user.en.asciidoc
@comment share/icons/
@comment share/icons/hicolor/
@comment share/icons/hicolor/32x32/
