Add ~x86-fbsd keyword.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 47 insertions, 36 deletions

diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index 2972af43023a..7b61e1297191 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.51 2006/04/10 14:52:52 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.52 2006/04/17 17:44:53 flameeyes Exp $
+
+  17 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libpq-8.1.3-r1.ebuild:
+  Add ~x86-fbsd keyword.
 
 *libpq-8.1.3-r1 (10 Apr 2006)
 
diff --git a/dev-db/libpq/libpq-8.1.3-r1.ebuild b/dev-db/libpq/libpq-8.1.3-r1.ebuild
index b9fe465382e9..842a8ca1427e 100644
--- a/dev-db/libpq/libpq-8.1.3-r1.ebuild
+++ b/dev-db/libpq/libpq-8.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.1.3-r1.ebuild,v 1.1 2006/04/10 14:52:52 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.1.3-r1.ebuild,v 1.2 2006/04/17 17:44:53 flameeyes Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ssl nls pam readline zlib kerberos threads"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 36b9eafb41ce..51b27054be21 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/postgresql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.266 2006/04/10 14:54:06 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.267 2006/04/17 17:48:18 flameeyes Exp $
+
+  17 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  postgresql-8.1.3-r1.ebuild:
+  Add ~x86-fbsd keyword.
 
 *postgresql-8.1.3-r1 (10 Apr 2006)
 
diff --git a/dev-db/postgresql/postgresql-8.1.3-r1.ebuild b/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
index 04b07ddcfaeb..f23b6f7acba7 100644
--- a/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
+++ b/dev-db/postgresql/postgresql-8.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3-r1.ebuild,v 1.1 2006/04/10 14:49:58 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.3-r1.ebuild,v 1.2 2006/04/17 17:48:18 flameeyes Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 #IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
 IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime threads"
 
@@ -187,38 +187,42 @@ pkg_config() {
 		eerror "(database directory = ${PG_DIR})."
 		exit 1
 	else
-		local SEM=`sysctl -n kernel.sem | cut -f-3`
-		local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-		local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16`
-		local SHMMAX=`sysctl -n kernel.shmmax`
-		local SHMMAX_MIN=`expr 250000 + 8200 \* 1000 + 14200 \* 100`
-
-		if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then
-			eerror "The current value of SEMMNI is too low"
-			eerror "for postgresql to run ${MAX_CONNECTIONS} connections"
-			eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-			echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
+		if use kernel_linux; then
+			local SEM=`sysctl -n kernel.sem | cut -f-3`
+			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
+			local SEMMNI_MIN=`expr \( ${MAX_CONNECTIONS} + 15 \) / 16`
+			local SHMMAX=`sysctl -n kernel.shmmax`
+			local SHMMAX_MIN=`expr 250000 + 8200 \* 1000 + 14200 \* 100`
+
+			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ]; then
+				eerror "The current value of SEMMNI is too low"
+				eerror "for postgresql to run ${MAX_CONNECTIONS} connections"
+				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
+				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
+			fi
+			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
+
+			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
+				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
+				ewarn "Restoring the SEMMNI value to the previous value"
+				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
+				ewarn "and set it to at least ${SEMMNI_MIN}"
+				ewarn ""
+				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
+				ewarn ""
+			fi
+
+			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
+				eerror "The current value of SHMMAX is too low for postgresql to run."
+				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
+				eerror ""
+				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
+				eerror ""
+			fi
+		else
+			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
 		fi
-		su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
-
-		if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-			echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-			ewarn "Restoring the SEMMNI value to the previous value"
-			ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-			ewarn "and set it to at least ${SEMMNI_MIN}"
-			ewarn ""
-			ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-			ewarn ""
-		fi
-
-		if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
-			eerror "The current value of SHMMAX is too low for postgresql to run."
-			eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
-			eerror ""
-			eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-			eerror ""
 
-		fi
 		einfo ""
 		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
 		einfo ""