From 64168a8ee4f52473eac97d0172e11d9b66f77168 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Thu, 2 Jul 2015 16:33:04 +0000 Subject: [PATCH] Update to the latest git snapshot, dated Jun-28-2015 Tested by me and kirby@ with ownCloud and Seafile OK kirby@ (maintainer) --- devel/libinotify/Makefile | 11 ++++++----- devel/libinotify/distinfo | 4 ++-- devel/libinotify/patches/patch-Makefile_am | 15 +++++++++++++++ .../patches/patch-tests_symlink_test_cc | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 devel/libinotify/patches/patch-Makefile_am create mode 100644 devel/libinotify/patches/patch-tests_symlink_test_cc diff --git a/devel/libinotify/Makefile b/devel/libinotify/Makefile index 3b535a4f2f0..133bb711a49 100644 --- a/devel/libinotify/Makefile +++ b/devel/libinotify/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2014/11/06 13:11:28 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.6 2015/07/02 16:33:04 dcoppa Exp $ COMMENT = kevent based inotify -DISTNAME = libinotify-20141104 +DISTNAME = libinotify-20150628 -SHARED_LIBS = inotify 0.0 +SHARED_LIBS = inotify 1.0 CATEGORIES = devel @@ -15,8 +15,9 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB = pthread -MASTER_SITES = https://distfiles.bsdfrog.org/ -WRKDIST = ${WRKDIR}/dmatveev-libinotify-kqueue-eb214de +MASTER_SITES = http://www.linklevel.net/distfiles/ \ + https://distfiles.bsdfrog.org/ +WRKDIST = ${WRKDIR}/dmatveev-libinotify-kqueue-b41b7ee BUILD_DEPENDS = devel/libtool \ ${MODGNU_AUTOCONF_DEPENDS} \ diff --git a/devel/libinotify/distinfo b/devel/libinotify/distinfo index a40220d16f6..846aa1310c2 100644 --- a/devel/libinotify/distinfo +++ b/devel/libinotify/distinfo @@ -1,2 +1,2 @@ -SHA256 (libinotify-20141104.tar.gz) = A/nKIkp7vdW5qVr82F30cW6D/yIO3lVZF1/pHH8JI8U= -SIZE (libinotify-20141104.tar.gz) = 34508 +SHA256 (libinotify-20150628.tar.gz) = RKVZNRvzs/pgg9ZyZaIBuwoKmoRWs30hLrV7o/dYW3c= +SIZE (libinotify-20150628.tar.gz) = 57673 diff --git a/devel/libinotify/patches/patch-Makefile_am b/devel/libinotify/patches/patch-Makefile_am new file mode 100644 index 00000000000..5d912c84c7c --- /dev/null +++ b/devel/libinotify/patches/patch-Makefile_am @@ -0,0 +1,15 @@ +$OpenBSD: patch-Makefile_am,v 1.3 2015/07/02 16:33:04 dcoppa Exp $ + +Unbreak separate build + +--- Makefile.am.orig Thu Jul 2 09:32:47 2015 ++++ Makefile.am Thu Jul 2 09:33:08 2015 +@@ -41,7 +41,7 @@ libinotify_la_SOURCES += compat/fstatat.c + endif + + libinotify_la_CFLAGS = -I. -DNDEBUG @PTHREAD_CFLAGS@ +-libinotify_la_LDFLAGS = @PTHREAD_LIBS@ -export-symbols libinotify.sym ++libinotify_la_LDFLAGS = @PTHREAD_LIBS@ -export-symbols $(top_srcdir)/libinotify.sym + endif + + ############################################################ diff --git a/devel/libinotify/patches/patch-tests_symlink_test_cc b/devel/libinotify/patches/patch-tests_symlink_test_cc new file mode 100644 index 00000000000..27f1b93048b --- /dev/null +++ b/devel/libinotify/patches/patch-tests_symlink_test_cc @@ -0,0 +1,15 @@ +$OpenBSD: patch-tests_symlink_test_cc,v 1.1 2015/07/02 16:33:04 dcoppa Exp $ + +XXX: OpenBSD does not support changing the timestamp of a symlink + +--- tests/symlink_test.cc.orig Thu Jul 2 09:22:39 2015 ++++ tests/symlink_test.cc Thu Jul 2 09:22:53 2015 +@@ -209,7 +209,7 @@ void symlink_test::run () + cons.output.reset (); + cons.input.receive (); + +- system ("touch -h slt-wd3/baz"); ++ system ("touch slt-wd3/baz"); + + cons.output.wait (); + received = cons.output.registered ();