svn commit: r506842 - in branches/2019Q3/net-im/toxic: . files
Andriy Voskoboinyk
avos at FreeBSD.org
Thu Jul 18 08:40:02 UTC 2019
Author: avos (src committer)
Date: Thu Jul 18 08:40:01 2019
New Revision: 506842
URL: https://svnweb.freebsd.org/changeset/ports/506842
Log:
MFH: r506727
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))
Added:
branches/2019Q3/net-im/toxic/files/patch-Makefile
- copied unchanged from r506727, head/net-im/toxic/files/patch-Makefile
Modified:
branches/2019Q3/net-im/toxic/Makefile
Directory Properties:
branches/2019Q3/ (props changed)
Modified: branches/2019Q3/net-im/toxic/Makefile
==============================================================================
--- branches/2019Q3/net-im/toxic/Makefile Thu Jul 18 08:18:05 2019 (r506841)
+++ branches/2019Q3/net-im/toxic/Makefile Thu Jul 18 08:40:01 2019 (r506842)
@@ -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}|' \
Copied: branches/2019Q3/net-im/toxic/files/patch-Makefile (from r506727, head/net-im/toxic/files/patch-Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2019Q3/net-im/toxic/files/patch-Makefile Thu Jul 18 08:40:01 2019 (r506842, copy of r506727, head/net-im/toxic/files/patch-Makefile)
@@ -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
More information about the svn-ports-all
mailing list