[patch] nakano-patch

patch (text/plain), 5.28 KB, created by Fabian Groffen on 2005-11-14 11:47:11 UTC

--- postgresql-8.1.0.ebuild	2005-11-13 00:09:52.000000000 +0100
+++ attachment.cgi?id=72787	2005-11-14 20:42:57.000000000 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.0.ebuild,v 1.3 2005/11/12 23:09:52 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.0.ebuild,v 1.1 2005/11/08 13:53:10 nakano Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -14,7 +14,7 @@
 
 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 ~ppc-macos"
 #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"
 
@@ -22,7 +22,7 @@
 	=dev-db/libpq-8.1*
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2
-	>=sys-devel/bison-1.875
+	!ppc-macos? ( >=sys-devel/bison-1.875 )
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	readline? ( >=sys-libs/readline-4.1 )
 	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
@@ -58,10 +58,9 @@
 			exit 1
 		fi
 	fi
-	enewgroup postgres 70 \
-		|| die "problem adding group postgres"
+	enewgroup postgres 70
 	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres \
-		|| die "problem adding user postgres"
+        || die "problem adding user postgres"
 }
 
 src_unpack() {
@@ -102,6 +101,7 @@
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
+		--with-gnu-ld \
 		$myconf || die
 
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
@@ -151,14 +151,17 @@
 		dodoc TODO.detail/* || die
 	fi
 
+	rm ${D}/usr/include/postgres_ext.h
 	cd ${S}
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
 
-	insinto /etc/conf.d/
-	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
+	if ! use ppc-macos; then
+		exeinto /etc/init.d/
+		newexe ${FILESDIR}/postgresql.init-${PV} postgresql || die
 
-	rm ${D}/usr/include/postgres_ext.h
+		insinto /etc/conf.d/
+		newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
+
+	fi
 }
 
 pkg_postinst() {
@@ -186,40 +189,44 @@
 		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
-		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 ""
-
+		if use ppc-macos; then
+			su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
+		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
+			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 ""
 		fi
-		einfo ""
-		einfo "You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl."
-		einfo ""
 	fi
 }