diff options
author | 2009-01-02 23:36:29 +0000 | |
---|---|---|
committer | 2009-01-02 23:36:29 +0000 | |
commit | 93ababac7d93de1a006623a3268c44c1d9e647b7 (patch) | |
tree | be653362a1bb54cbf06c876fb39937aa2a57f843 /dev-libs | |
parent | Initial commit. Dep for EverGreen ILS (via CQL-Parser). (diff) | |
download | historical-93ababac7d93de1a006623a3268c44c1d9e647b7.tar.gz historical-93ababac7d93de1a006623a3268c44c1d9e647b7.tar.bz2 historical-93ababac7d93de1a006623a3268c44c1d9e647b7.zip |
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.
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-03114-g3c92ec8 x86_64
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/OpenSRF/ChangeLog | 10 | ||||
-rw-r--r-- | dev-libs/OpenSRF/Manifest | 6 | ||||
-rw-r--r-- | dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild | 32 | ||||
-rw-r--r-- | dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch | 14 |
4 files changed, 42 insertions, 20 deletions
diff --git a/dev-libs/OpenSRF/ChangeLog b/dev-libs/OpenSRF/ChangeLog index 22bf0d4783c7..352b9f9090ee 100644 --- a/dev-libs/OpenSRF/ChangeLog +++ b/dev-libs/OpenSRF/ChangeLog @@ -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. diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest index f58b41e10a3a..5687cc132d3a 100644 --- a/dev-libs/OpenSRF/Manifest +++ b/dev-libs/OpenSRF/Manifest @@ -1,8 +1,8 @@ AUX OpenSRF-0.9-buildfix.patch 10610 RMD160 c70fc3ecbfb6add462d190dae0aa93d2e2985889 SHA1 7acfdb4cccf8285e3454528acd2159b17b176bb4 SHA256 1298392bf77506d29f3cb1096524455e538e6760edb2b6ada130171f21398f38 -AUX OpenSRF-1.0.1-buildfix.patch 6578 RMD160 74816d9e1d6eabb3171f47387040cc17ba374673 SHA1 32f3c394473d5b77a1ed68444a78bdbf9fb18d42 SHA256 eb15af3189dfd4bcb8b39c2f42e4ff50fbb77cc8714e4c14f70cbeb9f06223e5 +AUX OpenSRF-1.0.1-buildfix.patch 7128 RMD160 45e391833a7b3e7fb6e216e68fb689fe44f47611 SHA1 dc7ac6196f1aae37f46666c240857e32d3f19566 SHA256 c380901d67883515c132d3b3c49642e0a29e3037311aa41739af5695941bb8b5 DIST OpenSRF-0.9.tar.gz 276345 RMD160 ee50fa4c1e0bc883f03988a3b96587ad8a721d1d SHA1 e10dd7def5c6dd32ceacc1096a104a42627219f8 SHA256 62b20e6cc40fbee84b6a754c01006fbb31b5bf588fcb9240efa507b4480b082c DIST OpenSRF-1.0.1.tar.gz 1080452 RMD160 6539521e6f8ec5aadb685d246caba8ccaa3cd9c6 SHA1 965e798b426c242b1deee9d302aa0ba9bb47b21d SHA256 b0683f6fa5c94ae7e093afa715a3d89624abfc86165e36ff6ea28dd61b3acac0 EBUILD OpenSRF-0.9.ebuild 3366 RMD160 aac1faab24cfc089361b9d5b73bfcf899d94c6b6 SHA1 2375e1bfd1f2ace0eae65d0df9d6e081eb5ccb6a SHA256 163e7e1396124ef1b4ac3a16b0dc6d989335040127a0b4b506767a6f1622884d -EBUILD OpenSRF-1.0.1.ebuild 4213 RMD160 ee474a1746dbb647db3e44da4fb71c2472a25002 SHA1 dae30fd39051ac7caf3a877c133c9629fb69e700 SHA256 95ebff9332d32e9f9881b60462da9db314716ac8be4c1ec1ba6486dc37516a08 -MISC ChangeLog 806 RMD160 611469346242e0d802d84937a8eb8a6a999be806 SHA1 fb957041677e1b34defca12a8791e8856f9896c8 SHA256 d0bf030964d1b3a50e4174c0e6379bf715dc1152cc4cdc3715304cd64752cf6f +EBUILD OpenSRF-1.0.1.ebuild 4255 RMD160 2cc744c962179ab0a0afb39b2b264977194f8836 SHA1 be0aa20f811d804b92e5998f72c19547da3467bc SHA256 a9de6d377b33d336d91f0c9f40d1712126594ecc1caae5397635bafd17536d7a +MISC ChangeLog 1120 RMD160 cd27ce5e61046b5bd4b3a9dbafff35caae6e4dc2 SHA1 4cd2da9c86c9242914f77a5feffd785c44bc5f61 SHA256 8f1e35ab3013e4028dd0aaa66855b39fcaa782c9a624184e1d4d52c8f222d84f MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 diff --git a/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild b/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild index d970156249a8..584e7193610e 100644 --- a/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild +++ b/dev-libs/OpenSRF/OpenSRF-1.0.1.ebuild @@ -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 } diff --git a/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch index 75a6f8ac2e2e..e93e6e6f824e 100644 --- a/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch +++ b/dev-libs/OpenSRF/files/OpenSRF-1.0.1-buildfix.patch @@ -3,6 +3,7 @@ - split out install targets to build the apache modules - disable perl and apache install targets, will use gentoo tools instead - compile fix to osrf_chat.c +- Hardcode location of osrf_config instead of using a long recursive find statement Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> @@ -162,3 +163,16 @@ diff -Nuar OpenSRF-1.0.1.orig/Makefile.am OpenSRF-1.0.1/Makefile.am - cp @srcdir@/src/gateway/apachetools.h @includedir@/opensrf/apachetools.h + cp @srcdir@/src/gateway/apachetools.h $(DESTDIR)@includedir@/opensrf/apachetools.h +diff -Nuar OpenSRF-1.0.1/bin/osrf_ctl.sh +--- OpenSRF-1.0.1.orig/bin/osrf_ctl.sh 2008-09-24 20:27:44.000000000 -0700 ++++ OpenSRF-1.0.1/bin/osrf_ctl.sh 2008-12-09 02:25:39.018456228 -0800 +@@ -87,7 +87,8 @@ + esac; + done + +-OSRF_CONFIG=`find $BASEDIR -name osrf_config` ++#OSRF_CONFIG=`find $BASEDIR -name osrf_config` ++OSRF_CONFIG=/usr/bin/osrf_config + + [ -z "$OPT_CONFIG" ] && OPT_CONFIG=`$OSRF_CONFIG --sysconfdir`/opensrf_core.xml; + if [ ! -r "$OPT_CONFIG" ]; then |