Attachment #166045 for bug #206558

View | Details | Raw Unified | Return to bug 206558
Collapse All | Expand All




# $FreeBSD: head/net-im/uTox/Makefile 402446 2015-11-26 13:35:09Z amdmi3 $

PORTNAME=	uTox
DISTVERSION=	0.5.1.20160121
CATEGORIES=	net-im net-p2p

MAINTAINER=	fidaj@ukr.net


USE_GITHUB=	yes
GH_ACCOUNT=	GrayHatter
GH_TAGNAME=	b623d58

USES=		compiler:c11 desktop-file-utils gmake openal:al pkgconfig
USE_XORG=	x11 xext xrender

		${WRKSRC}/${MAKEFILE}

post-install:
	${MV} ${WRKSRC}/src/utox.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
	${RM} -rf ${STAGEDIR}${MAN1PREFIX}/share/man
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/utox


Lines 1-2 Link Here

(-)b/uTox_n_b/distinfo (-2 / +2 lines)
1	SHA256 (GrayHatter-uTox-0.4.4.20151120-8eaef84_GH0.tar.gz) = e30a87cbfa2139e7b7d8b434b53e848c749cdf0bfe476edb085d58cc97575cca	1	SHA256 (GrayHatter-uTox-0.5.1.20160121-b623d58_GH0.tar.gz) = eaaeccc253c6262b9316783ed51d87b9103bef54f5dbf60b4ef9f124a9a342c0
2	SIZE (GrayHatter-uTox-0.4.4.20151120-8eaef84_GH0.tar.gz) = 960162	2	SIZE (GrayHatter-uTox-0.5.1.20160121-b623d58_GH0.tar.gz) = 978712




--- Makefile.orig	2015-12-29 12:13:36.418539000 +0200
+++ Makefile	2015-12-29 12:16:20.089265000 +0200
@@ -2,7 +2,7 @@
 # set to anything else to disable them
 DBUS = 1
 V4LCONVERT = 1
-FILTER_AUDIO = 0
+FILTER_AUDIO = 1
 UNITY = 0
 
 DEPS = libtoxav libtoxcore openal vpx libsodium
@@ -50,6 +50,37 @@
-endif
-
 ifeq ($(UNITY), 1)
     DEPS += messaging-menu unity
 endif
@@ -41,6 +37,7 @@ endif
 
 	TRAY_OBJ = icons/utox-128x128.o
 	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
+else ifeq ($(UNAME_S), FreeBSD)
+	OUT_FILE = utox
+
+	DEPS += fontconfig freetype2 x11 xext xrender
+
+	ifeq ($(V4LCONVERT), 1)
+		DEPS += libv4lconvert
+	else
+		CFLAGS += -DNO_V4LCONVERT
+	endif
+
+	ifeq ($(UNITY), 1)
+		DEPS += messaging-menu unity
+		CFLAGS += -DUNITY
+	endif
+
+	ifeq ($(DBUS), 1)
+		DEPS += dbus-1
+	else
+		CFLAGS += -DNO_DBUS
+	endif
+
+	CFLAGS += $(shell pkg-config --cflags $(DEPS))
+
+	LDFLAGS += $(shell pkg-config --libs $(DEPS))
+
+	OS_SRC = $(wildcard src/xlib/*.c)
+	OS_OBJ = $(OS_SRC:.c=.o)
+
+	TRAY_OBJ = icons/utox-128x128.o
+	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
 else ifeq ($(UNAME_O), Cygwin)
 	OUT_FILE = utox.exe
 
 ifeq ($(UNITY), 1)

Return to bug 206558

Lines 1-7 Link Here

(-)b/uTox_n_b/Makefile (-3 / +3 lines)
1	# $FreeBSD: head/net-im/uTox/Makefile 402446 2015-11-26 13:35:09Z amdmi3 $	1	# $FreeBSD: head/net-im/uTox/Makefile 402446 2015-11-26 13:35:09Z amdmi3 $
2		2
3	PORTNAME= uTox	3	PORTNAME= uTox
4	DISTVERSION= 0.4.4.20151120	4	DISTVERSION= 0.5.1.20160121
5	CATEGORIES= net-im net-p2p	5	CATEGORIES= net-im net-p2p
6		6
7	MAINTAINER= fidaj@ukr.net	7	MAINTAINER= fidaj@ukr.net
Lines 21-27 RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox Link Here
21		21
22	USE_GITHUB= yes	22	USE_GITHUB= yes
23	GH_ACCOUNT= GrayHatter	23	GH_ACCOUNT= GrayHatter
24	GH_TAGNAME= 8eaef84	24	GH_TAGNAME= b623d58
25		25
26	USES= compiler:c11 desktop-file-utils gmake openal:al pkgconfig	26	USES= compiler:c11 desktop-file-utils gmake openal:al pkgconfig
27	USE_XORG= x11 xext xrender	27	USE_XORG= x11 xext xrender
Lines 38-44 pre-configure: Link Here
38	${WRKSRC}/${MAKEFILE}	38	${WRKSRC}/${MAKEFILE}
39		39
40	post-install:	40	post-install:
41	${MV} ${WRKSRC}/utox.1 ${STAGEDIR}${MAN1PREFIX}/man/man1	41	${MV} ${WRKSRC}/src/utox.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
42	${RM} -rf ${STAGEDIR}${MAN1PREFIX}/share/man	42	${RM} -rf ${STAGEDIR}${MAN1PREFIX}/share/man
43	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/utox	43	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/utox
44		44

Lines 1-21 Link Here

(-)b/uTox_n_b/files/patch-Makefile (-18 / +46 lines)
1	--- Makefile.orig 2015-06-13 00:14:56 UTC	1	--- Makefile.orig 2015-12-29 12:13:36.418539000 +0200
2	+++ Makefile	2	+++ Makefile 2015-12-29 12:16:20.089265000 +0200
3	@@ -16,10 +16,6 @@ ifeq ($(V4LCONVERT), 1)	3	@@ -2,7 +2,7 @@
4	DEPS += libv4lconvert	4	# set to anything else to disable them
5	endif	5	DBUS = 1
		6	V4LCONVERT = 1
		7	-FILTER_AUDIO = 0
		8	+FILTER_AUDIO = 1
		9	UNITY = 0
6		10
7	-ifeq ($(FILTER_AUDIO), 1)	11	DEPS = libtoxav libtoxcore openal vpx libsodium
8	- DEPS += filteraudio	12	@@ -50,6 +50,37 @@
9	-endif
10	-
11	ifeq ($(UNITY), 1)
12	DEPS += messaging-menu unity
13	endif
14	@@ -41,6 +37,7 @@ endif
15		13
16	ifeq ($(FILTER_AUDIO), 1)	14	TRAY_OBJ = icons/utox-128x128.o
17	CFLAGS += -DAUDIO_FILTERING	15	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
18	+ LDFLAGS += -lfilteraudio	16	+else ifeq ($(UNAME_S), FreeBSD)
19	endif	17	+ OUT_FILE = utox
		18	+
		19	+ DEPS += fontconfig freetype2 x11 xext xrender
		20	+
		21	+ ifeq ($(V4LCONVERT), 1)
		22	+ DEPS += libv4lconvert
		23	+ else
		24	+ CFLAGS += -DNO_V4LCONVERT
		25	+ endif
		26	+
		27	+ ifeq ($(UNITY), 1)
		28	+ DEPS += messaging-menu unity
		29	+ CFLAGS += -DUNITY
		30	+ endif
		31	+
		32	+ ifeq ($(DBUS), 1)
		33	+ DEPS += dbus-1
		34	+ else
		35	+ CFLAGS += -DNO_DBUS
		36	+ endif
		37	+
		38	+ CFLAGS += $(shell pkg-config --cflags $(DEPS))
		39	+
		40	+ LDFLAGS += $(shell pkg-config --libs $(DEPS))
		41	+
		42	+ OS_SRC = $(wildcard src/xlib/*.c)
		43	+ OS_OBJ = $(OS_SRC:.c=.o)
		44	+
		45	+ TRAY_OBJ = icons/utox-128x128.o
		46	+ TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
		47	else ifeq ($(UNAME_O), Cygwin)
		48	OUT_FILE = utox.exe
20		49
21	ifeq ($(UNITY), 1)