uTox-git: Update a patch

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Fri Aug 19 02:35:15 2016 +0200
Changeset:	161326a669dc19d1da5190c4e1a444167b29961c

Modified Files:
	uTox-git/distinfo
	uTox-git/patches/patch-Makefile

Log Message:
uTox-git: Update a patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=161326a669dc19d1da5190c4e1a444167b29961c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 uTox-git/distinfo               |   2 +-
 uTox-git/patches/patch-Makefile | 105 ++++++++++++++--------------------------
 2 files changed, 37 insertions(+), 70 deletions(-)

diffs:
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 97535d6..5258acb 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (patch-Makefile) = ab0d96ec739ff05ab67e353b6164b4f63329a5bb
+SHA1 (patch-Makefile) = 054a4c9f38462312c14930ef176f8f645bc1680c
 SHA1 (patch-src_main.h) = 1def46cb26e474b20a5e34ae5a471a7c9fbb004c
 SHA1 (patch-src_xlib_main.c) = 9ec90c640dd7603634593b3e00cba6714c955901
 SHA1 (patch-src_xlib_v4l.c) = 159ac6e676c0361262daeb3f5324e4916b09b16a
diff --git a/uTox-git/patches/patch-Makefile b/uTox-git/patches/patch-Makefile
index 8f8a88e..37998cb 100644
--- a/uTox-git/patches/patch-Makefile
+++ b/uTox-git/patches/patch-Makefile
@@ -4,88 +4,55 @@ Treat non-Cygwin platforms similarly.
 Use dl library only on Linux.
 Allow separate destination for manuals.
 
---- Makefile.orig	2016-03-21 09:05:38.000000000 +0000
+--- Makefile.orig	2016-08-18 19:46:17.000000000 +0000
 +++ Makefile
-@@ -19,7 +19,29 @@ ifeq ($(FILTER_AUDIO), 1)
- 	CFLAGS += -DAUDIO_FILTERING
- endif
+@@ -15,6 +15,7 @@ LDFLAGS		+= -pthread -lm
+ DESTDIR		?=
+ PREFIX		?= /usr/local
+ DATAROOTDIR ?= $(PREFIX)/share
++MANROOTDIR ?= $(PREFIX)/man
+ 
+ HEADERS 	:= $(wildcard src/*.h src/*/*.h langs/*.h)
+ SRC 		:= $(wildcard src/*.c src/ui/*.c src/av/*.c)
+@@ -32,7 +33,12 @@ UNX_OBJ		:= $(UNX_SRC:.c=.o)
+ TRAY_OBJ	= icons/icon.o
+ 
  
 -ifeq ($(UNAME_S), Linux)
 +ifeq ($(UNAME_O), Cygwin)
-+	OUT_FILE = utox.exe
-+
-+	ifeq ($(XP), 1)
-+		CFLAGS += -D__WIN_LEGACY
-+	endif
-+
-+	CFLAGS  += -static
-+	LDFLAGS += /usr/x86_64-w64-mingw32/sys-root/mingw/lib/libwinpthread.a
-+
-+	PKG_CONFIG = x86_64-w64-mingw32-pkg-config
-+	CFLAGS  += $(shell $(PKG_CONFIG) --cflags $(DEPS))
-+	LDFLAGS += $(shell $(PKG_CONFIG) --libs   $(DEPS))
-+
-+	LDFLAGS += -liphlpapi -lws2_32 -lgdi32 -lmsimg32 -ldnsapi -lcomdlg32
-+	LDFLAGS += -Wl,-subsystem,windows -lwinmm -lole32 -loleaut32 -lstrmiids
-+
-+	OS_SRC = $(wildcard src/windows/*.c)
-+	OS_OBJ = $(OS_SRC:.c=.o)
-+
-+	TRAY_OBJ = icons/icon.o
-+	TRAY_GEN = x86_64-w64-mingw32-windres icons/icon.rc -O coff -o
++	SYS			= Cygwin
++	OUT_FILE	=
++	PKG_CONFIG	= x86_64-w64-mingw32-pkg-config
++	CC			= x86_64-w64-mingw32-gcc
 +else
- 	OUT_FILE = utox
- 
- 	DEPS += fontconfig freetype2 x11 xext xrender
-@@ -45,7 +67,10 @@ ifeq ($(UNAME_S), Linux)
+ 	SYS        	= Unix
+ 	OUT_FILE 	= utox
+ 	PKG_CONFIG 	= pkg-config
+@@ -68,7 +74,10 @@ ifeq ($(UNAME_S), Linux)
+ 	endif
  
  	CFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
- 
--	LDFLAGS += -lresolv -ldl
-+	LDFLAGS += -lresolv
+-	LDFLAGS += -lresolv -ldl $(shell $(PKG_CONFIG) --libs $(DEPS))
 +	ifeq ($(UNAME_S), Linux)
 +		LDFLAGS += -ldl
 +	endif
- 	LDFLAGS += $(shell $(PKG_CONFIG) --libs $(DEPS))
- 
- 	OS_SRC = $(wildcard src/xlib/*.c)
-@@ -53,34 +78,13 @@ ifeq ($(UNAME_S), Linux)
- 
- 	TRAY_OBJ = icons/utox-128x128.o
++	LDFLAGS += -lresolv $(shell $(PKG_CONFIG) --libs $(DEPS))
  	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
+ 
+ 	ifeq ($(CC), x86_64-w64-mingw32-gcc)
+@@ -90,11 +99,6 @@ ifeq ($(UNAME_S), Linux)
+ 		TRAY_GEN	= i686-w64-mingw32-windres icons/icon.rc -O coff -o
+ 		CFLAGS		= $(WIN_CFLAGS)
+ 	endif
 -else ifeq ($(UNAME_O), Cygwin)
--	OUT_FILE = utox.exe
--
--	ifeq ($(XP), 1)
--		CFLAGS += -D__WIN_LEGACY
--	endif
--
--	CFLAGS  += -static
--	LDFLAGS += /usr/x86_64-w64-mingw32/sys-root/mingw/lib/libwinpthread.a
--
--	PKG_CONFIG = x86_64-w64-mingw32-pkg-config
--	CFLAGS  += $(shell $(PKG_CONFIG) --cflags $(DEPS))
--	LDFLAGS += $(shell $(PKG_CONFIG) --libs   $(DEPS))
--
--	LDFLAGS += -liphlpapi -lws2_32 -lgdi32 -lmsimg32 -ldnsapi -lcomdlg32
--	LDFLAGS += -Wl,-subsystem,windows -lwinmm -lole32 -loleaut32 -lstrmiids
--
--	OS_SRC = $(wildcard src/windows/*.c)
--	OS_OBJ = $(OS_SRC:.c=.o)
--
--	TRAY_OBJ = icons/icon.o
--	TRAY_GEN = x86_64-w64-mingw32-windres icons/icon.rc -O coff -o
+-	SYS			= Cygwin
+-	OUT_FILE	=
+-	PKG_CONFIG	= x86_64-w64-mingw32-pkg-config
+-	CC			= x86_64-w64-mingw32-gcc
  endif
  
- 
- DESTDIR ?=
- PREFIX ?= /usr/local
- DATAROOTDIR ?= $(PREFIX)/share
-+MANROOTDIR ?= $(PREFIX)/man
- 
- SRC = $(wildcard src/*.c src/ui/*.c src/av/*.c)
- HEADERS = $(wildcard src/*.h src/*/*.h langs/*.h)
-@@ -132,8 +136,8 @@ install: utox
+ WIN_CFLAGS   = -Wall -Wshadow -static -Ofast -std=gnu99 -fgnu89-inline -fno-strict-aliasing -DAL_LIBTYPE_STATIC -DGIT_VERSION=\"$(GIT_V)\"
+@@ -190,8 +194,8 @@ install: utox
  	install -m 644 src/utox.desktop $(DESTDIR)$(DATAROOTDIR)/applications/utox.desktop
  	if [ "$(UNITY)" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(DATAROOTDIR)/applications/utox.desktop; fi
  
@@ -95,4 +62,4 @@ Allow separate destination for manuals.
 +	install -m 644 src/utox.1 $(DESTDIR)$(MANROOTDIR)/man1/utox.1
  
  $(OBJ): %.o: %.c $(HEADERS)
- 	@echo "  CC    $@"
+ 	@echo "      CC    $@"