Fix building on fbsd with patch from upstream svn provided by Flameeyes, bug #157381.

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 44 insertions, 30 deletions

diff --git a/dev-java/commons-daemon/ChangeLog b/dev-java/commons-daemon/ChangeLog
index 2722083aa6f8..da9130b59143 100644
--- a/dev-java/commons-daemon/ChangeLog
+++ b/dev-java/commons-daemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-daemon
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.21 2006/10/05 15:20:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.22 2006/12/07 01:23:35 caster Exp $
+
+  07 Dec 2006; Vlastimil Babka <caster@gentoo.org> +files/1.0.1-fbsd.patch,
+  commons-daemon-1.0.1-r1.ebuild:
+  Fix building on fbsd with patch from upstream svn provided by Flameeyes, bug
+  #157381.
 
   05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   commons-daemon-1.0.1.ebuild, commons-daemon-1.0.1-r1.ebuild:
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 7cd3027f6a3f..ab95e73ee04f 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,23 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.1-as-needed.patch 1295 RMD160 97f3cca890f3b2be7e0aeaa2d710acb8504fb096 SHA1 deb095d7d97006e8f7fe05d1d2c42f4b63d07281 SHA256 640d2239d1679892e218c9c71053c37719894d6438b00e1ece5e0e461ed4f888
 MD5 c9be4f24c5ff845b60a4cdbe704407db files/1.0.1-as-needed.patch 1295
 RMD160 97f3cca890f3b2be7e0aeaa2d710acb8504fb096 files/1.0.1-as-needed.patch 1295
 SHA256 640d2239d1679892e218c9c71053c37719894d6438b00e1ece5e0e461ed4f888 files/1.0.1-as-needed.patch 1295
+AUX 1.0.1-fbsd.patch 544 RMD160 d539c2ba63e6c9dfe6ce6ef7bde36962b0f2cb01 SHA1 98755f64462c4a69e9a6dc77b9e45e29772a0c0d SHA256 9b9627a7c87cc80525a49b726e5d369199ca27f4028899343edf2997dc4371d5
+MD5 48f9026de2d4047372e3556152633f59 files/1.0.1-fbsd.patch 544
+RMD160 d539c2ba63e6c9dfe6ce6ef7bde36962b0f2cb01 files/1.0.1-fbsd.patch 544
+SHA256 9b9627a7c87cc80525a49b726e5d369199ca27f4028899343edf2997dc4371d5 files/1.0.1-fbsd.patch 544
 DIST daemon-1.0.1.tar.gz 301023 RMD160 b77ffd3dbc40d18d867afd62015ba1aa05bd9c65 SHA1 05f034b8c58a3bd367a72fe5532b354f76e1df93 SHA256 177107b8d99cabdbcda58cec284a2e2ccb5063113cc1fdb1b672754d4652848c
-EBUILD commons-daemon-1.0.1-r1.ebuild 1614 RMD160 59f65e67a20d2ba54fe2b71017e639dbbda189da SHA1 fdbce0ed281ce755b03364482b2af97bdd589dfc SHA256 1567cbda4f63b31db07cef5a7b1e1b9ddd11346ea6849fc8da38610eb3f73d65
-MD5 e4cadc8518abd14d9707cda9ee12dd9f commons-daemon-1.0.1-r1.ebuild 1614
-RMD160 59f65e67a20d2ba54fe2b71017e639dbbda189da commons-daemon-1.0.1-r1.ebuild 1614
-SHA256 1567cbda4f63b31db07cef5a7b1e1b9ddd11346ea6849fc8da38610eb3f73d65 commons-daemon-1.0.1-r1.ebuild 1614
+EBUILD commons-daemon-1.0.1-r1.ebuild 1601 RMD160 09f8e5b3ddffb5d802abe94fd7234625f326ded2 SHA1 1da7a121ac62cdfa722042259ba31ec2ac6d9441 SHA256 a309db8c737d3ed5d3e981ff8910c40916fb902b59b02f8a3072202f04f6b9f7
+MD5 59a7a524768ca0724e8341be709f3621 commons-daemon-1.0.1-r1.ebuild 1601
+RMD160 09f8e5b3ddffb5d802abe94fd7234625f326ded2 commons-daemon-1.0.1-r1.ebuild 1601
+SHA256 a309db8c737d3ed5d3e981ff8910c40916fb902b59b02f8a3072202f04f6b9f7 commons-daemon-1.0.1-r1.ebuild 1601
 EBUILD commons-daemon-1.0.1.ebuild 1687 RMD160 edda8ad88b0ac8dfec775fce6545fa5856f460ef SHA1 a07c8fdc1709e1b1176d19551ed9e7563bc3a69c SHA256 597076ecc51b711ef764d73b7e54da5786081f1f188f3c907e902cd6e21a6e6c
 MD5 f645ce2448e6d76bdf6d77fe3549e8b9 commons-daemon-1.0.1.ebuild 1687
 RMD160 edda8ad88b0ac8dfec775fce6545fa5856f460ef commons-daemon-1.0.1.ebuild 1687
 SHA256 597076ecc51b711ef764d73b7e54da5786081f1f188f3c907e902cd6e21a6e6c commons-daemon-1.0.1.ebuild 1687
-MISC ChangeLog 3011 RMD160 0be8881fe91260840b4f005bca21aeb73521df12 SHA1 155c021ef1b371a186c0ec260938b96b8a0d945c SHA256 efeb2df97c1d91b35f723f507e4ed343379229a4bab59fc511172b59e427ed06
-MD5 6738b5d70e329cd4cfad02459b8209a4 ChangeLog 3011
-RMD160 0be8881fe91260840b4f005bca21aeb73521df12 ChangeLog 3011
-SHA256 efeb2df97c1d91b35f723f507e4ed343379229a4bab59fc511172b59e427ed06 ChangeLog 3011
+MISC ChangeLog 3210 RMD160 45b45f245738bf2b981d4ea979e375d75bd7a63e SHA1 d03636625942a3a8cfcbcfe5c14eb09cd24a7bc2 SHA256 91feffe801f7b9439187b1c61ebaf57a076c6bc35e87ca07c9d56c9081f7eb95
+MD5 e85220fa58691d2d6934d06b216e3e88 ChangeLog 3210
+RMD160 45b45f245738bf2b981d4ea979e375d75bd7a63e ChangeLog 3210
+SHA256 91feffe801f7b9439187b1c61ebaf57a076c6bc35e87ca07c9d56c9081f7eb95 ChangeLog 3210
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -28,10 +29,3 @@ SHA256 48ecc6d148e38bb4563627f45eefe01663cc435820e920937d8c570b62330a09 files/di
 MD5 fddd3a2c1a4c981297f9b860c934775c files/digest-commons-daemon-1.0.1-r1 238
 RMD160 a6e1fb33ccb1551a62716c164102b3d85116ae84 files/digest-commons-daemon-1.0.1-r1 238
 SHA256 48ecc6d148e38bb4563627f45eefe01663cc435820e920937d8c570b62330a09 files/digest-commons-daemon-1.0.1-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJSLgKRy60XGEcJIRAt/pAJ9wpZFenWkNVeDU2xyGUMfOrs9alACgslFB
-lCL/4gDp3QhrLc5VCquPbvo=
-=Cx3t
------END PGP SIGNATURE-----
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/*
diff --git a/dev-java/commons-daemon/files/1.0.1-fbsd.patch b/dev-java/commons-daemon/files/1.0.1-fbsd.patch
new file mode 100644
index 000000000000..b7851899752d
--- /dev/null
+++ b/dev-java/commons-daemon/files/1.0.1-fbsd.patch
@@ -0,0 +1,13 @@
+Index: daemon-1.0.1/src/native/unix/support/apsupport.m4
+===================================================================
+--- daemon-1.0.1.orig/src/native/unix/support/apsupport.m4
++++ daemon-1.0.1/src/native/unix/support/apsupport.m4
+@@ -49,7 +49,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
+     CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread"
+     LDFLAGS="-Kthread $LDFLAGS -ldl"
+     ;;
+-  freebsd4.?)
++  freebsd*)
+     CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread"
+     LDFLAGS="-pthread $LDFLAGS"
+     supported_os="freebsd"