Index: branches/2019Q3/net-im/toxic/Makefile =================================================================== --- branches/2019Q3/net-im/toxic/Makefile (revision 506841) +++ branches/2019Q3/net-im/toxic/Makefile (revision 506842) @@ -1,57 +1,62 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= toxic PORTVERSION= 0.8.3 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= thierry@FreeBSD.org COMMENT= Console client for Tox LICENSE= GPLv3+ 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 X11_USES= gnome X11_USE= GNOME=gdkpixbuf2,glib20 XORG=x11 X11_MAKE_ARGS_OFF= DISABLE_X11=1 DISABLE_DESKTOP_NOTIFY=1 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}|' \ ${WRKSRC}/cfg/global_vars.mk post-install: ${RM} ${STAGEDIR}${MANPREFIX}/man/man1/toxic.1-e ${STAGEDIR}${MANPREFIX}/man/man5/toxic.conf.5-e ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/toxic .include Index: branches/2019Q3/net-im/toxic/files/patch-Makefile =================================================================== --- branches/2019Q3/net-im/toxic/files/patch-Makefile (nonexistent) +++ branches/2019Q3/net-im/toxic/files/patch-Makefile (revision 506842) @@ -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 Property changes on: branches/2019Q3/net-im/toxic/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q3 =================================================================== --- branches/2019Q3 (revision 506841) +++ branches/2019Q3 (revision 506842) Property changes on: branches/2019Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r506727