Attachment 205789 Details for Bug 239215 – Makefile.diff

[patch] Makefile.diff

patch-toxic.diff (text/plain), 2.53 KB, created by Andriy Voskoboinyk on 2019-07-15 08:31:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2019-07-15 08:31:03 UTC

Size: 2.53 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 506581)
>+++ Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	toxic
> PORTVERSION=	0.8.3
> DISTVERSIONPREFIX=	v
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-im
> 
> MAINTAINER=	thierry@FreeBSD.org
>@@ -16,9 +16,7 @@
> 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	\
>@@ -25,11 +23,11 @@
> 		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,11 +39,18 @@
> 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
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(nonexistent)
>+++ files/patch-Makefile	(working copy)
>@@ -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: 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

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 239215: 205789 | 205790 | 205791