From 8af45fd5fb70876f1f30f2aa0561d772137e0f25 Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Wed, 3 Jan 2018 14:55:27 +0100
Subject: [PATCH] rump: retrieve port sources using git

fixes #2621
---
 repos/dde_rump/lib/mk/rump_include.inc   |  2 +-
 repos/dde_rump/patches/gram_config.patch | 12 ------------
 repos/dde_rump/patches/lock.patch        | 23 -----------------------
 repos/dde_rump/ports/dde_rump.hash       |  2 +-
 repos/dde_rump/ports/dde_rump.port       | 24 +++++-------------------
 5 files changed, 7 insertions(+), 56 deletions(-)
 delete mode 100644 repos/dde_rump/patches/gram_config.patch
 delete mode 100644 repos/dde_rump/patches/lock.patch

diff --git a/repos/dde_rump/lib/mk/rump_include.inc b/repos/dde_rump/lib/mk/rump_include.inc
index 5b119e8299..839076e8b8 100644
--- a/repos/dde_rump/lib/mk/rump_include.inc
+++ b/repos/dde_rump/lib/mk/rump_include.inc
@@ -10,7 +10,7 @@ $(RUMP_BASE)/include/machine: $(RUMP_BASE)
 	$(VERBOSE_MK)mkdir -p $(RUMP_BASE)/include
 	$(VERBOSE_MK)for arch in $(INC_ARCH); do \
 		ln -sf $(RUMP_PORT_DIR)/src/sys/arch/$$arch/include $(RUMP_BASE)/include/$$arch ; done
-	$(VERBOSE_MK)touch $(RUMP_BASE)/include/pthread_types.h
+	$(VERBOSE_MK)touch -a $(RUMP_BASE)/include/pthread_types.h
 	$(VERBOSE_MK)ln -sf $(INC_MACHINE) $(RUMP_BASE)/include/machine
 
 all: $(RUMP_BASE)/include/machine
diff --git a/repos/dde_rump/patches/gram_config.patch b/repos/dde_rump/patches/gram_config.patch
deleted file mode 100644
index 6eaa60a9db..0000000000
--- a/repos/dde_rump/patches/gram_config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/usr.bin/config/gram.y b/src/usr.bin/config/gram.y
-index 7e63598..5f9064a 100644
---- a/src/usr.bin/config/gram.y
-+++ b/src/usr.bin/config/gram.y
-@@ -142,6 +142,7 @@ static struct condexpr *mk_cx_or(struct condexpr *, struct condexpr *);
- 
- static	void	setmachine(const char *, const char *, struct nvlist *, int);
- static	void	check_maxpart(void);
-+static	void	check_version(void);
- 
- static struct loclist *present_loclist(struct loclist *ll);
- static void app(struct loclist *, struct loclist *);
diff --git a/repos/dde_rump/patches/lock.patch b/repos/dde_rump/patches/lock.patch
deleted file mode 100644
index 8a6f2cc244..0000000000
--- a/repos/dde_rump/patches/lock.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/sys/arch/arm/include/lock.h b/sys/arch/arm/include/lock.h
-index ba612d5..8e0e2f3 100644
---- a/src/sys/arch/arm/include/lock.h
-+++ b/src/sys/arch/arm/include/lock.h
-@@ -105,8 +105,18 @@ static __inline unsigned char
- __swp(unsigned char __val, __cpu_simple_lock_t *__ptr)
- {
- 	uint32_t __val32;
-+#ifdef _ARM_ARCH_6
- 	__asm volatile("swpb	%0, %1, [%2]"
- 	    : "=&r" (__val32) : "r" (__val), "r" (__ptr) : "memory");
-+#else
-+	__asm volatile(" 1:                  \n"
-+	               "  ldrexb %0, [%2]    \n"
-+	               "  strexb r0, %1, [%2]\n"
-+	               "  teqeq  r0, #0      \n"
-+	               "  bne 1b             \n"
-+	               : "=&r" (__val32) : "r" (__val), "r" (__ptr)
-+	               : "memory", "r0");
-+#endif
- 	return __val32;
- }
- #else
diff --git a/repos/dde_rump/ports/dde_rump.hash b/repos/dde_rump/ports/dde_rump.hash
index 8964f32877..62d3960f6b 100644
--- a/repos/dde_rump/ports/dde_rump.hash
+++ b/repos/dde_rump/ports/dde_rump.hash
@@ -1 +1 @@
-2e7f21f64fa91b723c2679eb3ed90d8c861d6273
+88651ddaf056424fee8354603d57c8fd34ef4e05
diff --git a/repos/dde_rump/ports/dde_rump.port b/repos/dde_rump/ports/dde_rump.port
index 0b5311ad89..f5a3cb2874 100644
--- a/repos/dde_rump/ports/dde_rump.port
+++ b/repos/dde_rump/ports/dde_rump.port
@@ -1,20 +1,6 @@
 LICENSE   := BSD
-VERSION   := cvs
-DOWNLOADS := rump.cvs
-
-$(call check_tool, cvs)
-
-URL(rump)  := :pserver:anoncvs@anoncvs.netbsd.org:2401/cvsroot
-REV(rump)  := "20141216 2100UTC"
-DIR(rump)  := src/lib/dde_rump
-HASH_INPUT += $(REP_DIR)/rump.list
-
-PATCHES   := $(shell find $(REP_DIR)/patches/*.patch)
-PATCH_OPT := -N -d ${DIR(rump)} -p1
-
-%.cvs:
-	@echo "CVS checkout rump ..."
-	$(VERBOSE)cat $(REP_DIR)/rump.list | xargs cvs -d $(URL($*)) -Q -z3 export \
-	-D $(REV($*)) -d $(DIR($*))
-
-# vi: set ft=make :
+VERSION   := git
+DOWNLOADS := rump.git
+URL(rump) := https://github.com/ssumpf/rump.git
+DIR(rump) := src/lib/dde_rump
+REV(rump) := 206ffa06cedd0779af0043997fd182b00ff4688c