Revert librt changes.

Prodded by espie@.
2014-03-23 18:17:34 +00:00 · 2014-03-23 18:17:34 +00:00 · 27785ee95e
commit 27785ee95e
parent 5d3f42f1b1
32 changed files with 221 additions and 54 deletions
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2014/03/18 10:34:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2014/03/23 18:17:34 kili Exp $

 SHARED_ONLY =		Yes

 COMMENT =		low-latency voice chat client

 DISTNAME =		mumble-1.2.5
-REVISION =		0
+REVISION =		1

 CATEGORIES =		audio

--- a/audio/mumble/patches/patch-plugins_link_link_pro
+++ b/audio/mumble/patches/patch-plugins_link_link_pro
@ -0,0 +1,12 @@
+$OpenBSD: patch-plugins_link_link_pro,v 1.3 2014/03/23 18:17:34 kili Exp $
+--- plugins/link/link.pro.orig	Wed Sep 25 18:13:36 2013
+++ plugins/link/link.pro	Wed Sep 25 18:17:10 2013
+@@ -9,8 +9,4 @@ win32 {
+ 
+ unix {
+ 	SOURCES		= link-posix.cpp
+-
+-        !macx {
+-		LIBS          += -lrt
+-	}
+ }
--- a/audio/mumble/patches/patch-src_mumble_mumble_pro
+++ b/audio/mumble/patches/patch-src_mumble_mumble_pro
@ -1,19 +1,29 @@
-$OpenBSD: patch-src_mumble_mumble_pro,v 1.2 2014/03/18 10:34:16 ajacoutot Exp $
+$OpenBSD: patch-src_mumble_mumble_pro,v 1.3 2014/03/23 18:17:34 kili Exp $

 Use celt from our ports tree

 --- src/mumble/mumble.pro.orig	Sat Feb  1 00:01:49 2014
 +++ src/mumble/mumble.pro	Tue Mar 18 11:24:50 2014
-@@ -67,11 +67,8 @@ CONFIG(sbcelt) {
+@@ -67,12 +67,9 @@ CONFIG(sbcelt) {
   LIBS *= -lcelt -lsbcelt
   DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT
 } else {
 -  unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) {
 +  unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt07) {
     CONFIG	*= no-bundled-celt
-  }
+   }
 -  CONFIG(no-bundled-celt) {
 -    INCLUDEPATH	*= /usr/include/celt
-   }
+-  }
   !CONFIG(no-bundled-celt) {
     INCLUDEPATH	*= ../../celt-0.7.0-src/libcelt
+   }
+@@ -199,7 +196,7 @@ unix {
+     HEADERS *= GlobalShortcut_unix.h
+     SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp SharedMemory_unix.cpp Log_unix.cpp
+     PKGCONFIG *= x11
+-    LIBS *= -lrt -lXi
+    LIBS *= -lXi
+ 
+     !CONFIG(no-oss) {
+       CONFIG  *= oss
--- a/devel/acpica/Makefile
+++ b/devel/acpica/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/03/18 10:50:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2014/03/23 18:17:34 kili Exp $

 ONLY_FOR_ARCHS =	amd64 i386

@ -7,7 +7,7 @@ V =			20111123
 DISTNAME =		acpica-unix-$V
 PKGNAME =		acpica-$V
 CATEGORIES =		devel
-REVISION =		1
+REVISION =		2

 HOMEPAGE =		http://www.acpica.org/
 MASTER_SITES =		${HOMEPAGE}download/
--- a/devel/acpica/patches/patch-generate_unix_acpiexec_Makefile
+++ b/devel/acpica/patches/patch-generate_unix_acpiexec_Makefile
@ -0,0 +1,12 @@
+$OpenBSD: patch-generate_unix_acpiexec_Makefile,v 1.4 2014/03/23 18:17:34 kili Exp $
+--- generate/unix/acpiexec/Makefile.orig	Wed Jan 11 00:31:39 2012
+++ generate/unix/acpiexec/Makefile	Wed Jan 11 00:31:56 2012
+@@ -200,7 +200,7 @@ OBJECTS = \
+ CFLAGS+= \
+     -DACPI_EXEC_APP \
+     -I$(ACPIEXEC)
+-LDFLAGS += -lpthread -lrt
+LDFLAGS += -lpthread
+ 
+ #
+ # Rules
--- a/devel/acpica/patches/patch-tools_acpiexec_Makefile
+++ b/devel/acpica/patches/patch-tools_acpiexec_Makefile
@ -1,6 +1,15 @@
-$OpenBSD: patch-tools_acpiexec_Makefile,v 1.3 2014/03/18 10:50:47 ajacoutot Exp $
+$OpenBSD: patch-tools_acpiexec_Makefile,v 1.4 2014/03/23 18:17:34 kili Exp $
 --- tools/acpiexec/Makefile.orig	Wed Nov 23 16:22:35 2011
 +++ tools/acpiexec/Makefile	Wed Jan 11 00:32:00 2012
+@@ -22,7 +22,7 @@ PROG = acpiexec
+ HOST =          _LINUX
+ NOMAN =         YES
+ COMPILE =       $(CC) -c $(CFLAGS) $(CWARNINGFLAGS) -o$@ $<
+-LDFLAGS +=      -lpthread -lrt
+LDFLAGS +=      -pthread
+ 
+ ACPICA_COMPONENTS =
+ ACPICA_SRC =            ../..
@@ -257,16 +257,10 @@ CWARNINGFLAGS += \
     -Waddress \
     -Waggregate-return \
--- a/devel/ruby-prof/Makefile
+++ b/devel/ruby-prof/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2014/03/18 16:35:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2014/03/23 18:17:34 kili Exp $

 COMMENT =	fast code profiler for Ruby

 DISTNAME =	ruby-${PKGNAME}
 PKGNAME =	prof-0.10.6
-REVISION=	5
+REVISION=	6
 CATEGORIES =	devel

 HOMEPAGE =	http://ruby-prof.rubyforge.org/
--- a/devel/ruby-prof/patches/patch-ext_ruby_prof_extconf_rb
+++ b/devel/ruby-prof/patches/patch-ext_ruby_prof_extconf_rb
@ -0,0 +1,15 @@
+$OpenBSD: patch-ext_ruby_prof_extconf_rb,v 1.3 2014/03/23 18:17:34 kili Exp $
+
+clock_gettime is in libc in OpenBSD.
+
+--- ext/ruby_prof/extconf.rb.orig	Thu May  5 10:25:43 2011
+++ ext/ruby_prof/extconf.rb	Thu May  5 10:25:50 2011
+@@ -40,7 +40,7 @@ def add_define(name, value = nil)
+ end
+ require 'rubygems'
+ unless Gem.win_platform? || RUBY_PLATFORM =~ /darwin/
+-  $LDFLAGS += " -lrt" # for clock_gettime
+#  $LDFLAGS += " -lrt" # for clock_gettime
+ end
+ add_define("RUBY_VERSION", RUBY_VERSION.gsub('.', ''))
+ 
--- a/editors/gummi/Makefile
+++ b/editors/gummi/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2014/03/19 07:32:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2014/03/23 18:17:34 kili Exp $

 COMMENT =		simple LaTeX editor

 DISTNAME =		gummi-0.6.5
-REVISION =		0
+REVISION =		1

 CATEGORIES =		editors

--- a/editors/gummi/patches/patch-configure
+++ b/editors/gummi/patches/patch-configure
@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.4 2014/03/23 18:17:34 kili Exp $
+--- configure.orig	Sat Oct 20 15:36:04 2012
+++ configure	Sat Nov 24 22:35:55 2012
+@@ -5418,7 +5418,7 @@ fi
+ fi
+ 
+ # Add explicit linking flags
+-GUI_LIBS="$GUI_LIBS -pthread -lm -lz -lrt"
+GUI_LIBS="$GUI_LIBS -pthread -lm -lz"
+ 
+ # Checks for header files.
+ ac_ext=c
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2014/03/18 11:29:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2014/03/23 18:17:34 kili Exp $

 COMMENT =	infinite-world block sandbox game
 V =		0.4.9
 DISTNAME =	minetest-${V}
 CATEGORIES =	games x11
-REVISION =	0
+REVISION =	1

 HOMEPAGE =	http://www.minetest.net/

--- a/games/minetest/patches/patch-src_CMakeLists_txt
+++ b/games/minetest/patches/patch-src_CMakeLists_txt
@ -1,4 +1,4 @@
-$OpenBSD: patch-src_CMakeLists_txt,v 1.5 2014/03/18 11:29:46 ajacoutot Exp $
+$OpenBSD: patch-src_CMakeLists_txt,v 1.6 2014/03/23 18:17:34 kili Exp $
 --- src/CMakeLists.txt.orig	Wed Jan  1 22:54:28 2014
 +++ src/CMakeLists.txt	Tue Mar 18 11:50:33 2014
@@ -29,6 +29,8 @@ set(USE_GETTEXT 0)
@ -10,7 +10,21 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.5 2014/03/18 11:29:46 ajacoutot Exp $
 else()
 	MARK_AS_ADVANCED(GETTEXT_ICONV_DLL GETTEXT_INCLUDE_DIR GETTEXT_LIBRARY GETTEXT_MSGFMT)
 endif()
-@@ -430,7 +432,8 @@ if(BUILD_CLIENT)
+@@ -160,7 +162,12 @@ else()
+ 		endif(APPLE)
+ 	endif(BUILD_CLIENT)
+ 	find_package(ZLIB REQUIRED)
+-	set(PLATFORM_LIBS -lpthread -lrt ${CMAKE_DL_LIBS})
+	check_library_exists(rt clock_gettime "" HAVE_LIBRT)
+	if (HAVE_LIBRT)
+		set(PLATFORM_LIBS -lpthread -lrt ${CMAKE_DL_LIBS})
+	else()
+		set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS})
+	endif()
+ 	#set(CLIENT_PLATFORM_LIBS -lXxf86vm)
+ 	# This way Xxf86vm is found on OpenBSD too
+ 	find_library(XXF86VM_LIBRARY Xxf86vm)
+@@ -430,7 +437,8 @@ if(BUILD_CLIENT)
 		${BZIP2_LIBRARIES}
 		${PNG_LIBRARIES}
 		${X11_LIBRARIES}
@ -20,7 +34,7 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.5 2014/03/18 11:29:46 ajacoutot Exp $
 		${SOUND_LIBRARIES}
 		${SQLITE3_LIBRARY}
 		${LUA_LIBRARY}
-@@ -465,7 +468,8 @@ if(BUILD_SERVER)
+@@ -465,7 +473,8 @@ if(BUILD_SERVER)
 		${ZLIB_LIBRARIES}
 		${SQLITE3_LIBRARY}
 		${JSON_LIBRARY}
@ -30,7 +44,7 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.5 2014/03/18 11:29:46 ajacoutot Exp $
 		${LUA_LIBRARY}
 		${PLATFORM_LIBS}
 	)
-@@ -533,7 +537,7 @@ else()
+@@ -533,7 +542,7 @@ else()
 		set(ARCH i386)
 	endif()
 
--- a/games/stepmania/Makefile
+++ b/games/stepmania/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2014/03/20 18:07:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2014/03/23 18:17:34 kili Exp $

 BROKEN-alpha=	libtomcrypt/src/headers/tomcrypt_cfg.h:130:6: error: #error You must specify a word size as well as endianess in tomcrypt_cfg.h

@ -8,7 +8,7 @@ SHARED_ONLY =	Yes

 DISTNAME = 	stepmania-5.0b2a
 PKGNAME =	stepmania-5.0beta2a
-REVISION =	1
+REVISION =	2
 EXTRACT_SUFX = 	-src.tar.bz2
 HOMEPAGE =	http://www.stepmania.com
 MASTER_SITES = 	${MASTER_SITE_SOURCEFORGE:=stepmania/}
--- a/games/stepmania/patches/patch-src_Makefile_in
+++ b/games/stepmania/patches/patch-src_Makefile_in
@ -1,6 +1,15 @@
-$OpenBSD: patch-src_Makefile_in,v 1.3 2014/03/18 12:25:12 ajacoutot Exp $
+$OpenBSD: patch-src_Makefile_in,v 1.4 2014/03/23 18:17:34 kili Exp $
 --- src/Makefile.in.orig	Sun Jun 16 03:17:19 2013
 +++ src/Makefile.in	Sun Nov  3 10:11:16 2013
+@@ -2177,7 +2177,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBICONV = @LIBICONV@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@ -lpthread -lrt
+LIBS = @LIBS@ -lpthread -liconv
+ LTLIBICONV = @LTLIBICONV@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
@@ -2716,7 +2716,7 @@ main_SOURCES = $(PNG) $(Screens) $(DataStructures) $(F
 	$(StepMania) $(Arch) $(ActorsInGameplayAndMenus) \
 	$(ActorsInMenus) $(ActorsInGameplay) $(Rage) $(Actors) \
--- a/graphics/mandelbulber/Makefile
+++ b/graphics/mandelbulber/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2014/03/18 10:18:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2014/03/23 18:17:34 kili Exp $

 COMMENT =		3D fractal renderer

 V =			1.15
 DISTNAME =		mandelbulber${V}
 PKGNAME =		mandelbulber-${V}
-REVISION =		0
+REVISION =		1

 CATEGORIES =		graphics

--- a/graphics/mandelbulber/patches/patch-makefiles_objects_mk
+++ b/graphics/mandelbulber/patches/patch-makefiles_objects_mk
@ -0,0 +1,10 @@
+$OpenBSD: patch-makefiles_objects_mk,v 1.3 2014/03/23 18:17:34 kili Exp $
+--- makefiles/objects.mk.orig	Sun May  5 17:29:00 2013
+++ makefiles/objects.mk	Sun May  5 17:29:04 2013
+@@ -4,5 +4,5 @@
+ 
+ USER_OBJS :=
+ 
+-LIBS := -lgthread-2.0 -lrt -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lrt -lpng -ljpeg
+LIBS := -lgthread-2.0 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lglib-2.0 -lgthread-2.0 -lpng -ljpeg
+ 
--- a/mail/zarafa/zarafa/Makefile
+++ b/mail/zarafa/zarafa/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.160 2014/03/18 09:26:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.161 2014/03/23 18:17:34 kili Exp $

 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-web=	zarafa webaccess frontend and MAPI extensions for PHP
@ -7,7 +7,7 @@ PKGNAME=	zarafa-${V}
 PKGNAME-main=	zarafa-${V}
 PKGNAME-web=	zarafa-webaccess-${V}

-REVISION-main=	0
+REVISION-main=	1

 CATEGORIES=	mail www productivity

--- a/mail/zarafa/zarafa/patches/patch-provider_server_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-provider_server_Makefile_in
@ -1,11 +1,15 @@
-$OpenBSD: patch-provider_server_Makefile_in,v 1.17 2014/03/18 09:26:16 ajacoutot Exp $
+$OpenBSD: patch-provider_server_Makefile_in,v 1.18 2014/03/23 18:17:34 kili Exp $
 --- provider/server/Makefile.in.orig	Sat Sep 28 00:00:06 2013
-+++ provider/server/Makefile.in	Tue Mar 18 09:54:45 2014
-@@ -339,6 +339,7 @@ zarafa_server_LDADD = \
+++ provider/server/Makefile.in	Wed Oct 30 14:32:59 2013
+@@ -339,9 +339,10 @@ zarafa_server_LDADD = \
 	${top_builddir}/common/libcommon_util.la								\
 	${top_builddir}/common/libcommon_mapi.la								\
 	${top_builddir}/common/libcommon_ssl.la									\
 +	${top_builddir}/mapi4linux/src/libmapi.la \
 	$(PROG_LIBS)															\
 	$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS)	\
- 	$(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+-	$(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+	$(SSL_LIBS) $(TCMALLOC_LIBS)
+ 
+ zarafa_server_SOURCES = ECServer.cpp  \
+ 						ECSoapServerConnection.h ECSoapServerConnection.cpp \
--- a/net/gnugk/Makefile
+++ b/net/gnugk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2014/03/18 09:01:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2014/03/23 18:17:35 kili Exp $

 SHARED_ONLY=	Yes

@ -6,7 +6,7 @@ COMMENT=	H.323 gatekeeper

 V=		3.5
 DISTNAME=	gnugk-${V}
-REVISION=	0
+REVISION=	1

 WRKDIST=	${WRKDIR}/gnugk-${V}

--- a/net/gnugk/patches/patch-configure
+++ b/net/gnugk/patches/patch-configure
@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.15 2014/03/18 09:01:07 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.16 2014/03/23 18:17:35 kili Exp $
 --- configure.orig	Thu Jan  2 13:27:20 2014
 +++ configure	Fri Jan  3 07:02:38 2014
@@ -3733,7 +3733,7 @@ else
@ -28,3 +28,12 @@ $OpenBSD: patch-configure,v 1.15 2014/03/18 09:01:07 ajacoutot Exp $
 if test "${H460SUPPORT:-unset}" = "unset" ; then
 	if test "x${h46023}" != "xno" ; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No H.460 support available" >&5
+@@ -4590,7 +4590,7 @@ $as_echo_n "checking for ssh_handle_key_exchange()/ssh
+ 
+ 		for try in /usr/lib /usr/local/lib $libssh_lib_dir; do
+ 			if test -d $try; then
+-				LIBS="$old_LIBS -L$try -lssh -lcrypto -lz -lrt"
+				LIBS="$old_LIBS -L$try -lssh -lcrypto -lz"
+ 				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ extern ssh_handle_key_exchange(); extern ssh_blocking_flush();
--- a/net/maradns-deadwood/Makefile
+++ b/net/maradns-deadwood/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2014/03/18 10:50:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2014/03/23 18:17:35 kili Exp $

 COMMENT=	recursive DNS resolver

@ -6,7 +6,7 @@ DISTNAME=	deadwood-3.2.03c
 PKGNAME=	${DISTNAME:S/^/maradns-/}
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	net
-REVISION=	0
+REVISION=	1

 HOMEPAGE=	http://maradns.org/deadwood/

--- a/net/maradns-deadwood/patches/patch-src_Makefile
+++ b/net/maradns-deadwood/patches/patch-src_Makefile
@ -1,4 +1,4 @@
-$OpenBSD: patch-src_Makefile,v 1.2 2014/03/18 10:50:47 ajacoutot Exp $
+$OpenBSD: patch-src_Makefile,v 1.3 2014/03/23 18:17:35 kili Exp $
 --- src/Makefile.orig	Wed Dec 21 19:44:37 2011
 +++ src/Makefile	Tue Mar 20 22:30:12 2012
@@ -68,7 +68,7 @@ DwSys.o:	DwSys.c DwStr.h
@ -10,3 +10,10 @@ $OpenBSD: patch-src_Makefile,v 1.2 2014/03/18 10:50:47 ajacoutot Exp $
 
 DwRandPrime.h: RandomPrime
 	if [ -e /dev/urandom ] ; then ./RandomPrime > DwRandPrime.h ; fi
+@@ -86,5 +86,5 @@ Test:		Test.c DwStr.o DwStr.h DwStr_functions.h $(OBJS
+ 	$(CC) $(FLAGS) -Wall -o Test Test.c $(OBJS)
+ 
+ Deadwood:	DwMain.c $(OBJS) DwStr_functions.h version.h
+-	$(CC) $(FLAGS) -Wall -o Deadwood DwMain.c $(OBJS) -lrt
+	$(CC) $(FLAGS) -Wall -o Deadwood DwMain.c $(OBJS)
+ 
--- a/textproc/mupdf/Makefile
+++ b/textproc/mupdf/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.46 2014/03/18 12:26:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.47 2014/03/23 18:17:35 kili Exp $

 COMMENT =	graphic library, pdf parser, viewer and utilities

 V =		1.3
 DISTNAME =	mupdf-$V-source
 PKGNAME =	mupdf-${V:S/-rc/rc/}
-REVISION =	2
+REVISION =	3

 CATEGORIES =	textproc x11

--- a/textproc/mupdf/patches/patch-Makerules
+++ b/textproc/mupdf/patches/patch-Makerules
@ -1,4 +1,4 @@
-$OpenBSD: patch-Makerules,v 1.9 2014/03/18 12:26:08 ajacoutot Exp $
+$OpenBSD: patch-Makerules,v 1.10 2014/03/23 18:17:35 kili Exp $
 --- Makerules.orig	Wed Aug 14 14:41:20 2013
 +++ Makerules	Tue Mar 18 12:39:27 2014
@@ -6,6 +6,7 @@ OS := $(OS:Windows_NT=MINGW)
@ -17,7 +17,15 @@ $OpenBSD: patch-Makerules,v 1.9 2014/03/18 12:26:08 ajacoutot Exp $
 
 # Windows (MINGW) build doesn't use system libraries.
 ifeq "$(OS)" "MINGW"
-@@ -62,8 +64,8 @@ SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
+@@ -55,15 +57,15 @@ SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config
+ SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
+ endif
+ 
+-SYS_CURL_DEPS = -lpthread -lrt
+SYS_CURL_DEPS = $(shell pkg-config --libs libcurl)
+ 
+ SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
 
 SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
 SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
--- a/x11/emelfm2/Makefile
+++ b/x11/emelfm2/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2014/03/18 09:55:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2014/03/23 18:17:35 kili Exp $

 COMMENT =		GTK+2 file manager

 DISTNAME =		emelfm2-0.7.3
-REVISION=		3
+REVISION=		4

 CATEGORIES =		x11
 HOMEPAGE =		http://emelfm2.net/
--- a/x11/emelfm2/patches/patch-Makefile
+++ b/x11/emelfm2/patches/patch-Makefile
@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.8 2014/03/18 09:55:06 ajacoutot Exp $
+$OpenBSD: patch-Makefile,v 1.9 2014/03/23 18:17:35 kili Exp $
 --- Makefile.orig	Wed Jun 16 23:56:54 2010
 +++ Makefile	Mon Sep  3 11:03:01 2012
@@ -140,7 +140,7 @@ LIBS_XOBJECTS = $(LIBS_XSOURCES:%.c=$(OBJECTS_DIR)/%.s
@ -10,6 +10,15 @@ $OpenBSD: patch-Makefile,v 1.8 2014/03/18 09:55:06 ajacoutot Exp $
 ifeq ($(USE_LATEST), 1)
 #these are redundant now
 #lCFLAGS += -DGTK_DISABLE_DEPRECATED
+@@ -228,7 +228,7 @@ lLIBS_CFLAGS = -shared -fPIC -DPIC
+ 
+ #setup linking
+ # -lrt needed for clock_gettime()
+-lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0) -lrt
+lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0)
+ ifeq ($(USE_FAM),1)
+ lLIBS += -lfam
+ endif
@@ -258,7 +258,7 @@ all: $(OBJECTS_DIR) $(BUILD_FILE) $(TARGET) $(LIBS) $(
 
 plugins: $(OBJECTS_DIR)/$(LIBS) $(LIBS_OBJECTS) $(LIBS_XOBJECTS)
--- a/x11/gnome/desktop/Makefile
+++ b/x11/gnome/desktop/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.119 2014/03/18 08:03:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.120 2014/03/23 18:17:35 kili Exp $

 SHARED_ONLY=		Yes

@ -7,7 +7,7 @@ COMMENT=		components for the GNOME desktop
 GNOME_PROJECT=		gnome-desktop
 # sync with meta/gnome "V" variable
 GNOME_VERSION=		3.10.2
-REVISION=		2
+REVISION=		3

 SHARED_LIBS +=  gnome-desktop-3      2.0      # 4.0

--- a/x11/gnome/desktop/patches/patch-libgnome-desktop_Makefile_in
+++ b/x11/gnome/desktop/patches/patch-libgnome-desktop_Makefile_in
@ -1,4 +1,4 @@
-$OpenBSD: patch-libgnome-desktop_Makefile_in,v 1.11 2014/03/18 08:03:23 ajacoutot Exp $
+$OpenBSD: patch-libgnome-desktop_Makefile_in,v 1.12 2014/03/23 18:17:35 kili Exp $

 XXX fix+push upstream

@ -13,3 +13,13 @@ XXX fix+push upstream
 	-DPNP_IDS=\""$(PNP_IDS)"\"				\
 	-DXKB_BASE=\""$(XKB_BASE)"\"				\
 	$(DISABLE_DEPRECATED_CFLAGS)
+@@ -566,8 +566,7 @@ libgnome_desktop_3_la_LIBADD = \
+ 	$(XLIB_LIBS)		\
+ 	$(LIBM)			\
+ 	$(GNOME_DESKTOP_LIBS)	\
+-	libgsystem.la           \
+-	-lrt
+	libgsystem.la
+ 
+ libgnome_desktop_3_la_LDFLAGS = \
+ 	-version-info $(LT_VERSION) \
--- a/x11/i3/Makefile
+++ b/x11/i3/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.82 2014/03/19 07:31:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.83 2014/03/23 18:17:35 kili Exp $

 COMMENT =	improved dynamic tiling window manager

 DISTNAME =	i3-4.7.2
-REVISION =	3
+REVISION =	4
 CATEGORIES =	x11

 EXTRACT_SUFX =	.tar.bz2
--- a/x11/i3/patches/patch-common_mk
+++ b/x11/i3/patches/patch-common_mk
@ -1,4 +1,4 @@
-$OpenBSD: patch-common_mk,v 1.16 2014/03/19 07:31:53 ajacoutot Exp $
+$OpenBSD: patch-common_mk,v 1.17 2014/03/23 18:17:35 kili Exp $
 --- common.mk.orig	Thu Jan 23 22:52:24 2014
 +++ common.mk	Tue Mar 18 12:45:57 2014
@@ -1,5 +1,5 @@
@ -19,7 +19,7 @@ $OpenBSD: patch-common_mk,v 1.16 2014/03/19 07:31:53 ajacoutot Exp $
 
 # yajl
 YAJL_CFLAGS := $(call cflags_for_lib, yajl)
-@@ -160,9 +160,9 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
+@@ -160,20 +160,13 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
 endif
 
 ifeq ($(UNAME),OpenBSD)
@ -31,3 +31,14 @@ $OpenBSD: patch-common_mk,v 1.16 2014/03/19 07:31:53 ajacoutot Exp $
 endif
 
 ifeq ($(UNAME),FreeBSD)
+ LIBS += -liconv
+-endif
+-
+-ifeq ($(UNAME),Darwin)
+-LIBS += -liconv
+-else
+-# Darwin (Mac OS X) doesn’t have librt
+-LIBS += -lrt
+ endif
+ 
+ ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
--- a/x11/ion/Makefile
+++ b/x11/ion/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2014/03/18 10:50:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.61 2014/03/23 18:17:35 kili Exp $

 COMMENT=	light, keyboard friendly window manager

@ -6,7 +6,7 @@ V=		20090110
 DISTNAME=	ion-3-${V}
 PKGNAME=	ion-${V}
 CATEGORIES=	x11
-REVISION=	0
+REVISION=	1

 HOMEPAGE=	http://modeemi.cs.tut.fi/~tuomov/ion/
 MASTER_SITES=	http://tuomov.iki.fi/software/dl/
--- a/x11/ion/patches/patch-system_mk
+++ b/x11/ion/patches/patch-system_mk
@ -1,4 +1,4 @@
-$OpenBSD: patch-system_mk,v 1.11 2014/03/18 10:50:47 ajacoutot Exp $
+$OpenBSD: patch-system_mk,v 1.12 2014/03/23 18:17:35 kili Exp $
 --- system.mk.orig	Fri Jan  9 23:20:27 2009
 +++ system.mk	Tue Mar 18 11:41:59 2014
@@ -8,7 +8,7 @@
@ -84,7 +84,7 @@ $OpenBSD: patch-system_mk,v 1.11 2014/03/18 10:50:47 ajacoutot Exp $
 # You may also need to give the location of its headers. The following
 # should work on Mac OS X (which needs the above option as well) with
 # macports.
-@@ -127,7 +131,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
+@@ -127,12 +131,12 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 # You may uncomment this if you know that your system C libary provides
 # asprintf and  vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
 # defined, an implementation provided in libtu/sprintf_2.2/ is used. 
@ -93,6 +93,12 @@ $OpenBSD: patch-system_mk,v 1.11 2014/03/18 10:50:47 ajacoutot Exp $
 
 # The following setting is needed with GNU libc for clock_gettime and the
 # monotonic clock. Other systems may not need it, or may not provide a
+ # monotonic clock at all (which Ion can live with, and usually detect).
+-EXTRA_LIBS += -lrt
+#EXTRA_LIBS += -lrt
+ 
+ # Cygwin needs this.
+ #DEFINES += -DCF_NO_GETLOADAVG
@@ -149,16 +153,16 @@ EXTRA_LIBS += -lrt
 ## C compiler. 
 ##