summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2006-12-07 01:23:36 +0000
committerVlastimil Babka <caster@gentoo.org>2006-12-07 01:23:36 +0000
commitb594b1bc55b6ad4a39ff2806cda516bef0eadc70 (patch)
tree18e37a9280d8da70a8df020142a8331b6d361eee /dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild
parentAdded xfce44_extra_package method (diff)
downloadhistorical-b594b1bc55b6ad4a39ff2806cda516bef0eadc70.tar.gz
historical-b594b1bc55b6ad4a39ff2806cda516bef0eadc70.tar.bz2
historical-b594b1bc55b6ad4a39ff2806cda516bef0eadc70.zip
Fix building on fbsd with patch from upstream svn provided by Flameeyes, bug #157381.
Package-Manager: portage-2.1.2_rc2-r5
Diffstat (limited to 'dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild')
-rw-r--r--dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild24
1 files changed, 13 insertions, 11 deletions
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild
index 8e57994f46fc..19c888ae858c 100644
--- a/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild,v 1.2 2006/10/05 15:20:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild,v 1.3 2006/12/07 01:23:35 caster Exp $
-inherit java-pkg-2 java-ant-2 eutils
+WANT_AUTOCONF=2.5
+inherit java-pkg-2 java-ant-2 eutils autotools
DESCRIPTION="Tools to allow java programs to run as unix daemons"
SRC_URI="mirror://apache/jakarta/commons/daemon/source/daemon-${PV}.tar.gz"
@@ -22,32 +23,33 @@ S=${WORKDIR}/daemon-${PV}
src_unpack() {
unpack ${A}
+ cd "${S}"
# Submitted upstream to http://bugs.gentoo.org/show_bug.cgi?id=132563
epatch "${FILESDIR}/1.0.1-as-needed.patch"
- cd ${S}/src/native/unix
+ # Fix fbsd building, from upstream svn, #157381
+ epatch "${FILESDIR}/1.0.1-fbsd.patch"
+
+ cd "${S}/src/native/unix"
sed -e "s/powerpc/powerpc|powerpc64/g" -i support/apsupport.m4
- export WANT_AUTOCONF="2.5"
- autoconf
+ eautoconf
}
src_compile() {
# compile native stuff
- cd ${S}/src/native/unix
+ cd "${S}/src/native/unix"
econf || die "configure failed"
emake || die "make failed"
# compile java stuff
- cd ${S}
- local antflags="jar"
- use doc && antflags="${antflags} javadoc"
- eant ${antflags} || die "compilation problem"
+ cd "${S}"
+ eant jar $(use_doc)
}
src_install() {
dobin src/native/unix/jsvc
- java-pkg_dojar dist/${PN}.jar || die "Unable to install"
+ java-pkg_dojar dist/${PN}.jar
dodoc README RELEASE-NOTES.txt *.html
use doc && java-pkg_dohtml -r dist/docs/*