net/utox: updated to 0.3.2

jasperla · Jun 24, 2015 · 3ed3b93 · 3ed3b93
1 parent a04e584
commit 3ed3b93
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/net/utox/Makefile b/net/utox/Makefile
@@ -1,11 +1,8 @@
 # $OpenBSD$
 
 COMMENT =		lightweight graphical Tox client
-
 DISTNAME =		utox-${GH_TAGNAME:v%=%}
-
 CATEGORIES =		net telephony
-
 HOMEPAGE =		http://utox.org/
 
 MAINTAINER =		Dmitrij D. Czarkoff <czarkoff@gmail.com>
@@ -19,16 +16,18 @@ WANTLIB += vpx z
 
 GH_ACCOUNT =		notsecure
 GH_PROJECT =		uTox
-GH_TAGNAME =		v0.3
+GH_TAGNAME =		v0.3.2
 
 LIB_DEPENDS =		audio/openal \
 			audio/libfilteraudio \
 			net/toxcore
 
-MAKE_FLAGS =		DBUS=0 V4LCONVERT=0
+MAKE_FLAGS =		DBUS=0 V4LCONVERT=0 \
+			GIT_V=d16f53912b161893431fd16025af94d4d8a14f53
 FAKE_FLAGS =		PREFIX=${TRUEPREFIX} MANDIR=${TRUEPREFIX}/man
 
 USE_GMAKE =		Yes
+NO_TEST =		Yes
 
 CFLAGS +=		-I${LOCALBASE}/include -I${X11BASE}/include
 LDFLAGS +=		-L${LOCALBASE}/lib -L${X11BASE}/lib

diff --git a/net/utox/distinfo b/net/utox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (utox-0.3.tar.gz) = rYNDXkWPqQWEgpm87StfaWPEZE7lpUMa393g6cNYhrQ=
-SIZE (utox-0.3.tar.gz) = 779912
+SHA256 (utox-0.3.2.tar.gz) = hIAlB14hNVw6iqlZCSMT1mtK1q4DYw6zDMOvznUKzGg=
+SIZE (utox-0.3.2.tar.gz) = 940709
diff --git a/net/utox/patches/patch-Makefile b/net/utox/patches/patch-Makefile
@@ -1,6 +1,6 @@
 $OpenBSD$
---- Makefile.orig	Mon May 18 05:51:03 2015
-+++ Makefile	Sun Jun  7 19:08:42 2015
+--- Makefile.orig	Sun Jun  7 20:12:47 2015
++++ Makefile	Wed Jun 24 01:41:12 2015
 @@ -26,7 +26,8 @@ endif
 
  UNAME_S := $(shell uname -s)
@@ -19,7 +19,7 @@ $OpenBSD$
 
  SRC = $(wildcard *.c png/png.c)
  OBJ = $(SRC:.c=.o)
-@@ -60,8 +62,7 @@ OBJ = $(SRC:.c=.o)
+@@ -61,8 +63,7 @@ GIT_V = $(shell git describe --abbrev=8 --dirty --alwa
  all: utox
 
  utox: $(OBJ)
@@ -29,10 +29,10 @@ $OpenBSD$
 
  install: utox
  	mkdir -p $(DESTDIR)$(PREFIX)/bin
-@@ -102,14 +103,13 @@ install: utox
+@@ -103,14 +104,13 @@ install: utox
  	install -m 644 utox.desktop $(DESTDIR)$(PREFIX)/share/applications/utox.desktop
- 	if [ "$UNITY" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(PREFIX)/share/applications/utox.desktop; fi
- 	
+ 	if [ "$(UNITY)" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(PREFIX)/share/applications/utox.desktop; fi
+
 -	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
 -	install -m 644 utox.1 $(DESTDIR)$(PREFIX)/share/man/man1/utox.1
 +	mkdir -p $(DESTDIR)$(MANDIR)/man1
@@ -42,8 +42,8 @@ $OpenBSD$
 
  .c.o:
 -	@echo "  CC    $@"
--	@$(CC) $(CFLAGS) -o $@ -c $<
-+	$(CC) $(CFLAGS) -o $@ -c $<
+-	@$(CC) $(CFLAGS) -o $@ -c -DGIT_VERSION=\"$(GIT_V)\" $<
++	$(CC) $(CFLAGS) -o $@ -c -DGIT_VERSION=\"$(GIT_V)\" $<
 
  clean:
  	rm -f utox *.o png/*.o