svn commit: r506727 - in head/net-im/toxic: . files

[Andriy Voskoboinyk]

Author: avos (src committer)
Date: Tue Jul 16 06:57:13 2019
New Revision: 506727
URL: https://svnweb.freebsd.org/changeset/ports/506727

Log:
  net-im/toxic: drop unused dependencies, unbreak PYTHON option
  
  - Remove security/libsodium and audio/opus dependencies;
  the port does not reference nor links against them.
  - Allow to use ncurses from base (if possible).
  - Patch python3 detection to use proper pkgconfig/python3-config and
  bin/python3 paths.
  - Move USES upper (portlint).
  - Bump PORTREVISION.
  
  PR:		239215
  Approved by:	portmgr (blanket(s): dependencies, build fix(es))
  MFH:		2019Q3

Added:
  head/net-im/toxic/files/patch-Makefile   (contents, props changed)
Modified:
  head/net-im/toxic/Makefile

Modified: head/net-im/toxic/Makefile
==============================================================================
--- head/net-im/toxic/Makefile	Tue Jul 16 06:01:03 2019	(r506726)
+++ head/net-im/toxic/Makefile	Tue Jul 16 06:57:13 2019	(r506727)
@@ -4,7 +4,7 @@
 PORTNAME=	toxic
 PORTVERSION=	0.8.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 
 MAINTAINER=	thierry at FreeBSD.org
@@ -16,20 +16,18 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox	\
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
-		libsodium.so:security/libsodium		\
-		libpng.so:graphics/png		\
-		libopus.so:audio/opus			\
+		libpng.so:graphics/png			\
 		libcurl.so:ftp/curl			\
 		libv4l2.so:multimedia/libv4l		\
 		libqrencode.so:graphics/libqrencode	\
 		libconfig.so:devel/libconfig
 RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox
 
+USES=		desktop-file-utils gettext-runtime gmake ncurses openal:al,alut pkgconfig
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	JFreegman
 
-USES=		desktop-file-utils gettext-runtime gmake ncurses:port openal:al,alut pkgconfig
-
 OPTIONS_DEFINE=	X11 PYTHON
 OPTIONS_DEFAULT=X11
 
@@ -41,10 +39,17 @@ X11_LIB_DEPENDS=libnotify.so:devel/libnotify
 PYTHON_USES=	python:3.3+
 PYTHON_MAKE_ARGS=	ENABLE_PYTHON=1
 
+CFLAGS+=	-I${NCURSESINC}
+LDFLAGS+=	-L${NCURSESLIB}
 MAKE_ENV=	USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}"	\
 		MANDIR="${MANPREFIX}/man"
 LLD_UNSAFE=	yes
 SUB_FILES=	pkg-message
+
+post-patch-PYTHON-on:
+	${REINPLACE_CMD} -e '/PYTHON3_LIBS/ s|python3|python-${PYTHON_VER}|' \
+			 -e 's|python3-config|${PYTHON_VERSION}-config|g' \
+		${WRKSRC}/cfg/checks/python.mk
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD.*$$|${GH_TAGNAME}|'	\

Added: head/net-im/toxic/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/toxic/files/patch-Makefile	Tue Jul 16 06:57:13 2019	(r506727)
@@ -0,0 +1,13 @@
+--- Makefile.orig	2019-07-14 18:05:38 UTC
++++ Makefile
+@@ -23,6 +23,10 @@ UNAME_S = $(shell uname -s)
+ ifeq ($(UNAME_S), Linux)
+ LDFLAGS += -ldl -lrt
+ endif
++ifeq ($(UNAME_S), FreeBSD)
++LIBS := $(filter-out ncursesw, $(LIBS))
++LDFLAGS += -lncursesw
++endif
+ ifeq ($(UNAME_S), OpenBSD)
+ LIBS := $(filter-out ncursesw, $(LIBS))
+ LDFLAGS += -lncursesw