Index: head/net-im/uTox/Makefile =================================================================== --- head/net-im/uTox/Makefile (revision 411821) +++ head/net-im/uTox/Makefile (revision 411822) @@ -1,51 +1,50 @@ # $FreeBSD$ PORTNAME= uTox -PORTVERSION= 0.5.1.20160121 -PORTREVISION= 2 +PORTVERSION= 0.7.0.20160321 CATEGORIES= net-im net-p2p MAINTAINER= fidaj@ukr.net COMMENT= Lightweight Tox client LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox \ ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libsodium.so:${PORTSDIR}/security/libsodium \ libv4lconvert.so:${PORTSDIR}/multimedia/libv4l \ libvpx.so:${PORTSDIR}/multimedia/libvpx \ libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox USE_GITHUB= yes GH_ACCOUNT= GrayHatter -GH_TAGNAME= b623d58 +GH_TAGNAME= 9524f98 USES= compiler:c11 desktop-file-utils gmake openal:al pkgconfig USE_XORG= x11 xext xrender INSTALLS_ICONS= yes OPTIONS_DEFINE= DBUS OPTIONS_DEFAULT= DBUS DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_MAKE_ARGS_OFF= DBUS=0 post-patch: @${REINPLACE_CMD} -e 's|$$(GIT_V)|${DISTVERSION}-${GH_TAGNAME}|' \ - -e 's|share/man|man|' ${WRKSRC}/${MAKEFILE} + -e 's|(DATAROOTDIR)/man|(PREFIX)/man|' ${WRKSRC}/${MAKEFILE} pre-configure: @(if [ ! -e "${LOCALBASE}/lib/libtoxav.so" ]; then \ ${ECHO_CMD} "==> ${PKGNAME} requires net-im/tox port to be built with SODIUM option enabled"; \ ${FALSE}; \ fi) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/utox .include Index: head/net-im/uTox/distinfo =================================================================== --- head/net-im/uTox/distinfo (revision 411821) +++ head/net-im/uTox/distinfo (revision 411822) @@ -1,2 +1,2 @@ -SHA256 (GrayHatter-uTox-0.5.1.20160121-b623d58_GH0.tar.gz) = eaaeccc253c6262b9316783ed51d87b9103bef54f5dbf60b4ef9f124a9a342c0 -SIZE (GrayHatter-uTox-0.5.1.20160121-b623d58_GH0.tar.gz) = 978712 +SHA256 (GrayHatter-uTox-0.7.0.20160321-9524f98_GH0.tar.gz) = 5e6a6023e63ec77f5378541ed5f03981aa8b71b5586d8b02b24335dfcc88a636 +SIZE (GrayHatter-uTox-0.7.0.20160321-9524f98_GH0.tar.gz) = 1986717 Index: head/net-im/uTox/files/patch-Makefile =================================================================== --- head/net-im/uTox/files/patch-Makefile (revision 411821) +++ head/net-im/uTox/files/patch-Makefile (revision 411822) @@ -1,49 +1,52 @@ ---- Makefile.orig 2015-12-29 12:13:36.418539000 +0200 -+++ Makefile 2015-12-29 12:16:20.089265000 +0200 -@@ -2,7 +2,7 @@ +--- Makefile.orig 2016-03-21 02:14:57 UTC ++++ Makefile +@@ -2,9 +2,9 @@ # set to anything else to disable them - DBUS = 1 - V4LCONVERT = 1 --FILTER_AUDIO = 0 -+FILTER_AUDIO = 1 - UNITY = 0 + DBUS = 1 + V4LCONVERT = 1 +-FILTER_AUDIO = 0 ++FILTER_AUDIO = 1 + UNITY = 0 +-XP = 0 ++XP = 0 DEPS = libtoxav libtoxcore openal vpx libsodium -@@ -50,6 +50,37 @@ + +@@ -53,6 +53,37 @@ ifeq ($(UNAME_S), Linux) 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 Index: head/net-im/uTox/files/patch-src_ui.c =================================================================== --- head/net-im/uTox/files/patch-src_ui.c (nonexistent) +++ head/net-im/uTox/files/patch-src_ui.c (revision 411822) @@ -0,0 +1,21 @@ +--- src/ui.c.orig 2016-03-21 02:14:57 UTC ++++ src/ui.c +@@ -275,16 +275,9 @@ static void draw_settings_header(int UNU + setfont(FONT_SELF_NAME); + drawstr(MAIN_LEFT + SCALE(10), SCALE(10), UTOX_SETTINGS); + #ifdef GIT_VERSION +- int x = MAIN_LEFT + SCALE(10) + UTOX_STR_WIDTH(UTOX_SETTINGS) + SCALE(10); ++ int x = MAIN_LEFT + UTOX_SCALE(5 ) + UTOX_STR_WIDTH(UTOX_SETTINGS) + UTOX_SCALE(5 ); + setfont(FONT_TEXT); +- drawtext(x, SCALE(10), (uint8_t*)GIT_VERSION, strlen(GIT_VERSION)); +- char version_string[64]; +- int count; +- count = snprintf(version_string, 64, "Core v%u.%u.%u ToxAV v%u.%u.%u ToxES v%u.%u.%u", +- tox_version_major(), tox_version_minor(), tox_version_patch(), +- toxav_version_major(), toxav_version_minor(), toxav_version_patch(), +- toxes_version_major(), toxes_version_minor(), toxes_version_patch()); +- drawtextwidth_right(w, textwidth((char_t*)version_string, count), SCALE(10), (uint8_t*)version_string, strlen(version_string)); ++ drawtext(x, UTOX_SCALE(5), (uint8_t*)GIT_VERSION, strlen(GIT_VERSION)); + #endif + } + Property changes on: head/net-im/uTox/files/patch-src_ui.c ___________________________________________________________________ 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