Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Nov 2019 19:33:58 +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: r518420 - head/irc/weechat
Message-ID:  <201911251933.xAPJXwum076201@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Mon Nov 25 19:33:57 2019
New Revision: 518420
URL: https://svnweb.freebsd.org/changeset/ports/518420

Log:
  irc/weechat: Update to 2.6

Modified:
  head/irc/weechat/Makefile
  head/irc/weechat/distinfo

Modified: head/irc/weechat/Makefile
==============================================================================
--- head/irc/weechat/Makefile	Mon Nov 25 18:44:49 2019	(r518419)
+++ head/irc/weechat/Makefile	Mon Nov 25 19:33:57 2019	(r518420)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	2.5
-PORTREVISION=	1
+DISTVERSION=	2.6
 CATEGORIES=	irc
 MASTER_SITES=	https://weechat.org/files/src/
 
@@ -18,6 +17,7 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libgpg-error.so:security/libgpg-error
 
 USES=		cmake:noninja ncurses libtool tar:xz
+USES=		cmake:noninja ncurses libtool
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DLIBDATADIR=${LOCALBASE}/libdata
@@ -77,19 +77,20 @@ TCL_USES=		tcl
 
 .include <bsd.port.pre.mk>
 
-.if !empty(PORT_OPTIONS:MPYTHON) && ${PYTHON_MAJOR_VER} >= 3
-WARNING=	"Using Python 3.x is NOT recommended because many \"official\" scripts won\'t work"
-CMAKE_ARGS+=	-DENABLE_PYTHON3:BOOL=true \
-		-DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/libpython${PYTHON_VER}m.so
+.if !empty(PORT_OPTIONS:MPYTHON) && ${PYTHON_MAJOR_VER} == 2
+CMAKE_ARGS+=	-DENABLE_PYTHON2:BOOL=true \
+#		-DPYTHON_LIBRARIES=${LOCALBASE}/lib
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \
+	@${REINPLACE_CMD} 's|$${LIBDIR}/../pkgconfig|$${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt
 .for f in src/CMakeLists.txt src/core/CMakeLists.txt cmake/*.cmake
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/${f}
 .endfor
+	@${REINPLACE_CMD} 's|python${PYTHON_MAJOR_VER}|python-${PYTHON_VER}|' \
+		${WRKSRC}/cmake/FindPython.cmake
 
 post-patch-ICON-off:
 	@${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' ${WRKSRC}/CMakeLists.txt

Modified: head/irc/weechat/distinfo
==============================================================================
--- head/irc/weechat/distinfo	Mon Nov 25 18:44:49 2019	(r518419)
+++ head/irc/weechat/distinfo	Mon Nov 25 19:33:57 2019	(r518420)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559903689
-SHA256 (weechat-2.5.tar.xz) = 52c87775c3ff9714a62cfa5b7e13e2fa59bf32829fe083781c1d9c7f1c2d4c27
-SIZE (weechat-2.5.tar.xz) = 2067180
+TIMESTAMP = 1568870364
+SHA256 (weechat-2.6.tar.gz) = efa9ff53b78cfba4bf1c49ecac1651838a68d1109f76533b703ec90920619fc2
+SIZE (weechat-2.6.tar.gz) = 4212612



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