From 449985d28f2e329444b0816bb4a091b905d07b32 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Mon, 11 Aug 2014 13:39:02 +0200
Subject: [PATCH] pkgtools/pkgin

Setup default repository to the official Minix3 one.
---
 devel/bison/patches/patch-lib_spawni.c    | 17 -----------------
 pkgtools/pkgin/Makefile                   | 13 ++++++++++++-
 pkgtools/pkgin/PLIST                      |  1 +
 pkgtools/pkgin/distinfo                   |  1 +
 pkgtools/pkgin/patches/patch-REPOSITORIES | 10 ++++++++++
 5 files changed, 24 insertions(+), 18 deletions(-)
 delete mode 100644 devel/bison/patches/patch-lib_spawni.c
 create mode 100644 pkgtools/pkgin/patches/patch-REPOSITORIES

diff --git a/devel/bison/patches/patch-lib_spawni.c b/devel/bison/patches/patch-lib_spawni.c
deleted file mode 100644
index 2dcbd7cb7..000000000
--- a/devel/bison/patches/patch-lib_spawni.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- lib/spawni.c.orig	Mon Apr  8 09:18:57 2013
-+++ lib/spawni.c
-@@ -223,10 +223,12 @@ __spawni (pid_t *pid, const char *file,
-     }
- #endif
- 
-+#ifndef __minix
-   /* Set the process group ID.  */
-   if ((flags & POSIX_SPAWN_SETPGROUP) != 0
-       && setpgid (0, attrp->_pgrp) != 0)
-     _exit (SPAWN_ERROR);
-+#endif
- 
-   /* Set the effective user and group IDs.  */
-   if ((flags & POSIX_SPAWN_RESETIDS) != 0
diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile
index 3794968be..972c37eab 100644
--- a/pkgtools/pkgin/Makefile
+++ b/pkgtools/pkgin/Makefile
@@ -52,11 +52,22 @@ MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 DEPENDS+=		pkg_install>=20130901:../../pkgtools/pkg_install
 
 # those have official repositories
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix"
+.if (${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix")
+INSTALLATION_DIRS+=	${PREFIX}/etc/pkgin
+
+pre-install:
+	${GREP} -i ${OS_VARIANT} ${WRKSRC}/REPOSITORIES >> 			\
+		${WRKSRC}/repositories.conf
+
+post-install:
+	 ${INSTALL_DATA} ${WRKSRC}/repositories.conf ${DESTDIR}${PREFIX}/etc/pkgin/repositories.conf
+.else
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
 pre-install:
 	${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> 			\
 		${WRKSRC}/repositories.conf
 .endif
+.endif # (${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix")
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin
diff --git a/pkgtools/pkgin/PLIST b/pkgtools/pkgin/PLIST
index 0329264a0..e4ac92a66 100644
--- a/pkgtools/pkgin/PLIST
+++ b/pkgtools/pkgin/PLIST
@@ -1,4 +1,5 @@
 @comment $NetBSD: PLIST,v 1.4 2014/01/21 16:31:27 jperkin Exp $
+etc/pkgin/repositories.conf
 bin/pkgin
 man/cat1/pkgin.0
 man/man1/pkgin.1
diff --git a/pkgtools/pkgin/distinfo b/pkgtools/pkgin/distinfo
index bdb78dd06..334a5da4f 100644
--- a/pkgtools/pkgin/distinfo
+++ b/pkgtools/pkgin/distinfo
@@ -4,5 +4,6 @@ SHA1 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 58d06c5884dd490508f609c
 RMD160 (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = e783457044af3b41a784012f4d0961ed87e8c4af
 Size (3859170568fbe4fe21b5660dbaeca8d65ac10f1b.tar.gz) = 187873 bytes
 SHA1 (patch-Makefile.in) = 46f676a8e2bdb89f1d0f6f4e6c9cce55c56bb4bd
+SHA1 (patch-REPOSITORIES) = 6860ab8758fd7ae4f2dd427ae39aa3c37b3f8226
 SHA1 (patch-actions.c) = c7a630a2509ade9d913abb771a7bde4653a44e78
 SHA1 (patch-main.c) = 2faf9b225fdf30a997c5c0249cd40486d5d8d55c
diff --git a/pkgtools/pkgin/patches/patch-REPOSITORIES b/pkgtools/pkgin/patches/patch-REPOSITORIES
new file mode 100644
index 000000000..2a02e244d
--- /dev/null
+++ b/pkgtools/pkgin/patches/patch-REPOSITORIES
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- REPOSITORIES.orig	Wed May  7 15:48:08 2014
++++ REPOSITORIES
+@@ -1,4 +1,4 @@
+ # NetBSD OS release can look like 6.0_STABLE, do not use it as-is
+ ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/$arch/@OSREL@/All
+ http://mirror-master.dragonflybsd.org/packages/$arch/DragonFly-$osrelease/stable/All/
+-ftp://ftp.minix3.org/pub/minix/packages/$osrelease/$arch/All
++http://www.minix3.org/pkgsrc/packages/$osrelease/$arch/All