remove trailing whitespace in sysctl.Linux.in, which produces a warning during build

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.12.4
+VERSION=	0.12.3
 PKG=		${NAME}-${VERSION}

conf.d/hostname

@@ -1,15 +1,2 @@
-# Set to the fully qualified domain name (e.g. "mybox.example.com") of
-# this machine, if it has one, otherwise set to the machine name
-# (e.g. "mybox").
+# Set to the fully-qualified hostname of this machine
 hostname="localhost"
-
-# Set to the NIS domain name of this machine, if it has one, otherwise
-# leave commented out.
-#nisdomainname="localdomain.com"
-
-# Set other alias-to-address mappings, if needed, otherwise leave
-# commented out.
-#aliases="127.0.0.1 mybox
-#10.0.0.1	mylaptop
-#172.16.0.1	myserver
-#192.168.0.1	myworkstation"

etc/rc.conf.GNU-kFreeBSD

@@ -1,11 +0,0 @@
-##############################################################################
-# GNU/kFreeBSD SPECIFIC OPTIONS
-
-# This is the subsystem type. Valid options on GNU/kFreeBSD:
-# ""        - nothing special
-# "jail"    - FreeBSD jails (not yet implemented)
-# If this is commented out, automatic detection will be used.
-#
-# This should be set to the value representing the environment this file is
-# PRESENTLY in, not the virtualization the environment is capable of.
-#rc_sys=""

init.d/bootmisc.in

@@ -117,7 +117,6 @@ migrate_to_run()
 
 clean_run()
 {
-	[ "$RC_SYS" = VSERVER ] && return 0
 	local dir
 	dir=$(mktemp -d)
 	mount --bind / $dir

init.d/hostname.in

@@ -27,27 +27,12 @@ start()
 	if [ "$hostname" != "localhost.localdomain" ]; then
 		out="$out localhost.localdomain"
 	fi
-	[ -n "$aliases" ] && out2="$aliases"
+	[ -n "$aliases" ] && out="$out $aliases"
 	ebegin "Configuring /etc/hosts"
-	cat << END > /etc/hosts
-# Local Host Database
-#
-# This AUTOMATICALLY-GENERATED file describes a number of aliases-to-address
-# mappings for the local hosts that share this file.
-#
-# In the presence of the domain name service or NIS, this file may not be
-# consulted at all; see /etc/host.conf for the resolution order.
-#
-# DO NOT EDIT THIS FILE BY HAND; YOUR CHANGES WILL BE OVERWRITTEN
-#
-# Define alias-to-address mappings in /etc/conf.d/hostname
-
-# IPv4 and IPv6 localhost aliases
+	[ -e /etc/hosts ] && sed -i -e '/[[:space:]]*127.0.0.1[[:space:]]/d' -e '/[[:space:]]*::1[[:space:]]/d' /etc/hosts
+	cat <<END >> /etc/hosts
 127.0.0.1	$out
 ::1		$out
-
-# Other aliases
-$out2
 END
 	chmod 0644 /etc/hosts
 	eend $?

mk/os-GNU-kFreeBSD.mk

@@ -1,9 +0,0 @@
-# Copyright (c) 2008 Roy Marples <roy@marples.name>
-# Released under the 2-clause BSD license.
-
-# Generic definitions
-
-CPPFLAGS+=	-D_BSD_SOURCE -D_XOPEN_SOURCE=700
-LIBDL=		-Wl,-Bdynamic -ldl
-LIBKVM?=
-include ${MK}/os-BSD.mk

mk/os.mk

@@ -3,7 +3,7 @@
 
 # Generic definitions
 
-_OS_SH=		uname -s | tr '/' '-'
+_OS_SH=		uname -s
 _OS:= 		$(shell ${_OS_SH})
 OS?= 		${_OS}
 include ${MK}/os-${OS}.mk

src/librc/librc-daemon.c

@@ -30,7 +30,7 @@
 
 #include "librc.h"
 
-#if defined(__linux__) || defined (__GLIBC__)
+#if defined(__linux__)
 static bool
 pid_is_exec(pid_t pid, const char *exec)
 {

src/rc/mountinfo.c

@@ -39,7 +39,7 @@
 #  include <sys/statvfs.h>
 #  define statfs statvfs
 #  define F_FLAGS f_flag
-#elif defined (__linux__) || defined (__GLIBC__)
+#elif defined (__linux__)
 #  include <mntent.h>
 #endif
 
@@ -265,7 +265,7 @@ find_mounts(struct args *args)
 	return list;
 }
 
-#elif defined (__linux__) || defined (__GLIBC__)
+#elif defined (__linux__)
 static struct mntent *
 getmntfile(const char *file)
 {

src/rc/rc-logger.c

@@ -44,7 +44,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#if defined(__linux__) || defined(__GLIBC__)
+#ifdef __linux__
 #  include <pty.h>
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 #  include <util.h>

src/rc/runscript.c

@@ -52,7 +52,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#if defined(__linux__) || defined(__GLIBC__)
+#ifdef __linux__
 #  include <pty.h>
 #elif defined(__NetBSD__) || defined(__OpenBSD__)
 #  include <util.h>