public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-libs/OpenSRF: ChangeLog OpenSRF-1.0.1.ebuild
@ 2008-12-09  9:13 Robin H. Johnson (robbat2)
  0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson (robbat2) @ 2008-12-09  9:13 UTC (permalink / raw
  To: gentoo-commits

robbat2     08/12/09 09:13:02

  Modified:             ChangeLog
  Added:                OpenSRF-1.0.1.ebuild
  Log:
  Version bump.
  (Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64)

Revision  Changes    Path
1.2                  dev-libs/OpenSRF/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- ChangeLog	29 Sep 2008 04:13:48 -0000	1.1
+++ ChangeLog	9 Dec 2008 09:13:02 -0000	1.2
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/OpenSRF
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v 1.1 2008/09/29 04:13:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v 1.2 2008/12/09 09:13:02 robbat2 Exp $
+
+*OpenSRF-1.0.1 (09 Dec 2008)
+
+  09 Dec 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/OpenSRF-1.0.1-buildfix.patch, +OpenSRF-1.0.1.ebuild:
+  Version bump.
 
 *OpenSRF-0.9 (29 Sep 2008)
 



1.1                  dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild?rev=1.1&content-type=text/plain

Index: OpenSRF-1.0.1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild,v 1.1 2008/12/09 09:13:02 robbat2 Exp $

inherit eutils multilib flag-o-matic apache-module autotools perl-module

DESCRIPTION="OpenSRF is a framework that allows the development of software without requiring a detailed knowledge of Evergreen's structure."
HOMEPAGE="http://open-ils.org/"
SRC_URI="http://open-ils.org/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
DEPEND=">=www-servers/apache-2.2.9
		>=dev-libs/yaz-3.0
		app-dicts/aspell-en
		>=dev-lang/spidermonkey-1.6
		>=dev-db/libdbi-drivers-0.8.2
		>=dev-db/libdbi-0.8.2
		net-im/ejabberd
		dev-libs/libmemcache
		dev-perl/FreezeThaw
		dev-perl/Cache-Memcached
		dev-perl/DateTime
		dev-perl/DateTime-Locale
		dev-perl/DateTime-TimeZone
		dev-perl/DateTime-Format-ISO8601
		dev-perl/DBD-Pg
		dev-perl/Email-Send
		dev-perl/GD-Graph3d
		dev-perl/Log-Log4perl
		dev-perl/JSON-XS
		dev-perl/XML-LibXML
		dev-perl/XML-LibXSLT
		dev-perl/XML-Simple
		dev-perl/Template-Toolkit
		dev-perl/Text-Aspell
		dev-perl/UNIVERSAL-require
		dev-perl/Unix-Syslog
		dev-perl/Text-CSV
		dev-perl/Text-CSV-Simple
		dev-perl/Text-CSV_XS
		dev-perl/Spreadsheet-WriteExcel
		dev-perl/Tie-IxHash
		dev-perl/Net-XMPP
		dev-perl/Authen-SASL
		dev-perl/XML-Stream
		dev-perl/net-server
		dev-perl/Class-DBI-AbstractSearch
		dev-perl/JavaScript-SpiderMonkey
		dev-perl/MARC-Record
		dev-perl/MARC-Charset
		dev-perl/MARC-XML
		dev-perl/Net-Z3950-ZOOM"

PERL_S="${S}/src/perl"

APXS2_S="${S}/src/gateway/.libs/"
APACHE2_MOD_FILE="${APXS2_S}/osrf_json_gateway.so ${APXS2_S}/osrf_http_translator.so"
#APACHE2_MOD_CONF="42_${PN}"
#APACHE2_MOD_DEFINE="FOO"
#DOCFILES="docs/*.html"
need_apache2_2

RDEPEND="${DEPEND}"

src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/${PN}-1.0.1-buildfix.patch
	eautoreconf
}

#src_compile() {
#	LIBXML2_CFLAGS=$(xml2-config --cflags)
#	LIBXML2_CFLAGS="${LIBXML2_CFLAGS//*-I}"
#	LIBXML2_HEADERS="${LIBXML2_CFLAGS// *}"
#	APR_HEADERS=$(apr-1-config --includedir)
#	APACHE2_HEADERS=$(apxs2 -q INCLUDEDIR)
#	sed -i \
#		-e '/^export PREFIX=/s,/.*,/usr,' \
#		-e '/^export BINDIR=/s,/.*,${PREFIX}/bin,' \
#		-e "/^export LIBDIR=/s,/.*,\${PREFIX}/$(get_libdir)," \
#		-e '/^export PERLDIR=/s,/.*,${LIBDIR}/perl5,' \
#		-e '/^export INCLUDEDIR=/s,/.*,${PREFIX}/include,' \
#		-e '/^export ETCDIR=/s,/.*,/etc,' \
#		-e '/^export SOCK=/s,/.*,/var/run/opensrf,' \
#		-e '/^export PID=/s,/.*,/var/run/opensrf,' \
#		-e '/^export LOG=/s,/.*,/var/log,' \
#		-e '/^export TMP=/s,/.*,/tmp,' \
#		-e '/^export APXS2=/s,/.*,/usr/sbin/apxs2,' \
#		-e "/^export APACHE2_HEADERS=/s,/.*,${APACHE2_HEADERS}," \
#		-e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \
#		-e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \
#		install.conf
#	emake verbose || die "Failed to build"
#}
src_compile() {
	econf \
		--with-apxs=/usr/sbin/apxs2 \
		|| die "econf failed"
	cd "${S}" && emake || die "main emake failed"
	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed"
}

src_install() {
	einfo "Doing src_install"
	#emake install-verbose DESTDIR="${D}" || die "Failed to install"
	emake install DESTDIR="${D}" || die "Failed to install"
	apache-module_src_install || die "apache-module_src_install failed"
	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
	#insinto /usr/share/opensrf
	#doins src/javascript/*js
	#dodoc doc/*
}

src_test() {
	emake check || die "emake check failed"
	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed"
}

pkg_config() {
	JABBER_SERVER=${JABBER_SERVER:=localhost}
	JABBER_PORT=${JABBER_PORT:=5222}
	PASSWORD=${PASSWORD:=osrf}
	einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}"
	einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}"
	cd "${ROOT}"/usr/share/doc/${PF}/examples
	for user in osrf router ; do
		perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \
			|| die "Failed to add $user user to server"
	done
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/OpenSRF: ChangeLog OpenSRF-1.0.1.ebuild
@ 2009-01-02 23:36 Robin H. Johnson (robbat2)
  0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-01-02 23:36 UTC (permalink / raw
  To: gentoo-commits

robbat2     09/01/02 23:36:29

  Modified:             ChangeLog OpenSRF-1.0.1.ebuild
  Log:
  Disable the pkg_config routine for now as it needs functional jabber. Fix a braindead search in the ctl tool, and remember to install the docs and javascript, and everything with correct paths.
  (Portage version: 2.2_rc20/cvs/Linux 2.6.28-03114-g3c92ec8 x86_64)

Revision  Changes    Path
1.4                  dev-libs/OpenSRF/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/ChangeLog?r1=1.3&r2=1.4

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -w -b -B -u -u -r1.3 -r1.4
--- ChangeLog	9 Dec 2008 10:05:16 -0000	1.3
+++ ChangeLog	2 Jan 2009 23:36:29 -0000	1.4
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/OpenSRF
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v 1.3 2008/12/09 10:05:16 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/ChangeLog,v 1.4 2009/01/02 23:36:29 robbat2 Exp $
+
+  02 Jan 2009; Robin H. Johnson <robbat2@gentoo.org>
+  files/OpenSRF-1.0.1-buildfix.patch, OpenSRF-1.0.1.ebuild:
+  Disable the pkg_config routine for now as it needs functional jabber. Fix
+  a braindead search in the ctl tool, and remember to install the docs and
+  javascript, and everything with correct paths.
 
   09 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> OpenSRF-1.0.1.ebuild:
   Use a more useful sysconf dir, for OpenILS/Evergreen to pick up.



1.3                  dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild?r1=1.2&r2=1.3

Index: OpenSRF-1.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- OpenSRF-1.0.1.ebuild	9 Dec 2008 10:05:16 -0000	1.2
+++ OpenSRF-1.0.1.ebuild	2 Jan 2009 23:36:29 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild,v 1.2 2008/12/09 10:05:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild,v 1.3 2009/01/02 23:36:29 robbat2 Exp $
 
 inherit eutils multilib flag-o-matic apache-module autotools perl-module
 
@@ -99,6 +99,7 @@ src_compile() {
 	econf \
 		--with-apxs=/usr/sbin/apxs2 \
 		--sysconfdir=/etc/opensrf \
+		--localstatedir=/var \
 		|| die "econf failed"
 	cd "${S}" && emake || die "main emake failed"
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed"
@@ -110,9 +111,9 @@ src_install() {
 	emake install DESTDIR="${D}" || die "Failed to install"
 	apache-module_src_install || die "apache-module_src_install failed"
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
-	#insinto /usr/share/opensrf
-	#doins src/javascript/*js
-	#dodoc doc/*
+	insinto /usr/share/opensrf
+	doins src/javascript/*js
+	dodoc README doc/*
 }
 
 src_test() {
@@ -121,14 +122,15 @@ src_test() {
 }
 
 pkg_config() {
-	JABBER_SERVER=${JABBER_SERVER:=localhost}
-	JABBER_PORT=${JABBER_PORT:=5222}
-	PASSWORD=${PASSWORD:=osrf}
-	einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}"
-	einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}"
-	cd "${ROOT}"/usr/share/doc/${PF}/examples
-	for user in osrf router ; do
-		perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \
-			|| die "Failed to add $user user to server"
-	done
+	:
+	#JABBER_SERVER=${JABBER_SERVER:=localhost}
+	#JABBER_PORT=${JABBER_PORT:=5222}
+	#PASSWORD=${PASSWORD:=osrf}
+	#einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}"
+	#einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}"
+	#cd "${ROOT}"/usr/share/doc/${PF}/examples
+	#for user in osrf router ; do
+	#	perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \
+	#		|| die "Failed to add $user user to server"
+	#done
 }






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-01-02 23:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-09  9:13 [gentoo-commits] gentoo-x86 commit in dev-libs/OpenSRF: ChangeLog OpenSRF-1.0.1.ebuild Robin H. Johnson (robbat2)
  -- strict thread matches above, loose matches on Subject: below --
2009-01-02 23:36 Robin H. Johnson (robbat2)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox