Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Dec 2017 19:39:23 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r455425 - head/irc/weechat
Message-ID:  <201712031939.vB3JdN7l030045@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sun Dec  3 19:39:23 2017
New Revision: 455425
URL: https://svnweb.freebsd.org/changeset/ports/455425

Log:
  irc/weechat: Unbreak builds, add PHP option
  
   - Remove leftovers from 2.0-RC testing
   - Add PHP option and .so
   - Simplify cmake enable
  
  Reported by:	antoine, adamw

Modified:
  head/irc/weechat/Makefile
  head/irc/weechat/pkg-plist

Modified: head/irc/weechat/Makefile
==============================================================================
--- head/irc/weechat/Makefile	Sun Dec  3 19:29:13 2017	(r455424)
+++ head/irc/weechat/Makefile	Sun Dec  3 19:39:23 2017	(r455425)
@@ -3,6 +3,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	https://weechat.org/files/src/
 
@@ -16,9 +17,8 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 
-USES=		cmake:outsource,noninja autoreconf ncurses libtool tar:xz
+USES=		cmake:outsource,noninja ncurses libtool tar:xz
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
 
 CMAKE_ARGS+=	-DENABLE_GUILE=no \
 		-DLIBDATADIR=${LOCALBASE}/libdata
@@ -31,7 +31,7 @@ OPTIONS_SUB=		yes
 OPTIONS_EXCLUDE_powerpc64=	RUBY
 
 OPTIONS_GROUP=		PLUGINS
-OPTIONS_GROUP_PLUGINS=	ASPELL CHARSET JAVASCRIPT LUA PERL PYTHON RUBY TCL
+OPTIONS_GROUP_PLUGINS=	ASPELL CHARSET JAVASCRIPT LUA PERL PYTHON PHP RUBY TCL
 
 BACKTRACE_DESC=		Provide crash backtraces
 CA_BUNDLE_DESC=		Include CA bundle for certificate verification
@@ -43,50 +43,30 @@ JAVASCRIPT_DESC=	Javascript script support
 PYTHON_DESC=		Python script support
 RUBY_DESC=		Ruby script support
 
-ASPELL_CMAKE_BOOLL=	ENABLE_ASPELL
-ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
+.for _opt in ASPELL CHARSET ICONV JAVASCRIPT GNUTLS LUA NLS PERL PHP PYTHON RUBY TCL
+${_opt}_CMAKE_BOOL=	ENABLE_${_opt}
+.endfor
 
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 BACKTRACE_CMAKE_BOOL=	ENABLE_BACKTRACE
-
 CA_BUNDLE_CMAKE_ON=	-DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-
-CHARSET_CMAKE_BOOL=	ENABLE_CHARSET
 CHARSET_IMPLIES=	ICONV
-
 DOCS_CMAKE_BOOL=	ENABLE_DOC
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
-
-ICONV_CMAKE_BOOL=	ENABLE_ICONV
 ICONV_USES=		iconv
-
-JAVASCRIPT_CMAKE_BOOL=	ENABLE_JAVASCRIPT
 JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8
-
-GNUTLS_CMAKE_BOOL=	ENABLE_GNUTLS
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=		pkgconfig
-
-LUA_CMAKE_BOOL=		ENABLE_LUA
 LUA_USES=		lua pkgconfig
-
 MANPAGES_CMAKE_BOOL=	ENABLE_MAN
 MANPAGES_CMAKE_ON=	-DMANDIR=${MANPREFIX}/man
 MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
-
-NLS_CMAKE_BOOL=		ENABLE_NLS
 NLS_USES=		gettext
-
-PERL_CMAKE_BOOL=	ENABLE_PERL
 PERL_USES=		perl5
-
-PYTHON_CMAKE_BOOL=	ENABLE_PYTHON
+PHP_USES=		php:embed
 PYTHON_USES=		python
-
-RUBY_CMAKE_BOOL=	ENABLE_RUBY
 RUBY_USE=		ruby=yes
-
-TCL_CMAKE_BOOL=		ENABLE_TCL
 TCL_USES=		tcl:85+
 
 .include <bsd.port.pre.mk>

Modified: head/irc/weechat/pkg-plist
==============================================================================
--- head/irc/weechat/pkg-plist	Sun Dec  3 19:29:13 2017	(r455424)
+++ head/irc/weechat/pkg-plist	Sun Dec  3 19:39:23 2017	(r455425)
@@ -26,6 +26,7 @@ libdata/pkgconfig/weechat.pc
 %%JAVASCRIPT%%lib/weechat/plugins/javascript.so
 %%LUA%%lib/weechat/plugins/lua.so
 %%PERL%%lib/weechat/plugins/perl.so
+%%PHP%%lib/weechat/plugins/php.so
 %%PYTHON%%lib/weechat/plugins/python.so
 %%RUBY%%lib/weechat/plugins/ruby.so
 %%TCL%%lib/weechat/plugins/tcl.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712031939.vB3JdN7l030045>