Fix Java build, thanks to Krzysiek Pawlik, bug #176334.

Package-Manager: portage-2.1.2.5

diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog
index 73da55c28cda328ca8b1a37125986685aad58bc4..cc1f59e844a200d03487582b4c50e92a3dd4abd1 100644 (file)
--- a/net-misc/mDNSResponder/ChangeLog
+++ b/net-misc/mDNSResponder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mDNSResponder
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.31 2007/04/28 12:43:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.32 2007/04/28 15:12:04 carlo Exp $
+
+*mDNSResponder-107.6-r4 (28 Apr 2007)
+
+  28 Apr 2007; Carsten Lohrke <carlo@gentoo.org>
+  +files/mDNSResponder-107.6-java.patch, +mDNSResponder-107.6-r4.ebuild:
+  Fix Java build, thanks to Krzysiek Pawlik, bug #176334.
 
 *mDNSResponder-107.6-r3 (28 Apr 2007)
 

diff --git a/net-misc/mDNSResponder/Manifest b/net-misc/mDNSResponder/Manifest
index 1e0dc80950961ffe231b326a3d3b9db07486645e..b4a0cee0b3111220d09fa18d96927f2c7931cf2c 100644 (file)
--- a/net-misc/mDNSResponder/Manifest
+++ b/net-misc/mDNSResponder/Manifest
@@ -18,6 +18,10 @@ AUX mDNSResponder-107.6-Makefiles.diff 5724 RMD160 cb66f0fd9a05428568f056bb9d9ca
 MD5 83653b10dce432bc15a12976343cff3d files/mDNSResponder-107.6-Makefiles.diff 5724
 RMD160 cb66f0fd9a05428568f056bb9d9ca3e1586bd542 files/mDNSResponder-107.6-Makefiles.diff 5724
 SHA256 a9fdf852d1dd4a1980adf262a076c0c6def7c906d27974a9233bebe9020aa8f4 files/mDNSResponder-107.6-Makefiles.diff 5724
+AUX mDNSResponder-107.6-java.patch 1787 RMD160 5389adbf32ebb90255c60a448638063edf14f00e SHA1 c82b77006fbce40d1550d233b4eb37e70910280b SHA256 06517377d7e7f374004b3080d5d35c375ce6f0142354ae3b252232e41d2a578a
+MD5 c2be6137d5da56374c795dd6dcd32c54 files/mDNSResponder-107.6-java.patch 1787
+RMD160 5389adbf32ebb90255c60a448638063edf14f00e files/mDNSResponder-107.6-java.patch 1787
+SHA256 06517377d7e7f374004b3080d5d35c375ce6f0142354ae3b252232e41d2a578a files/mDNSResponder-107.6-java.patch 1787
 AUX mDNSResponder-98-Makefiles.patch 3631 RMD160 e6cf2d5bdbc84196407cc8e0bdb94ec16b7b41f0 SHA1 86971bf586a06102dd15edcfd6a84be53b497f8c SHA256 8e43b1a664e4cf532afeef54f8a3be8f1b62435bb6391793ace271d06ce2e4ff
 MD5 7087496865b0e264a209619124877965 files/mDNSResponder-98-Makefiles.patch 3631
 RMD160 e6cf2d5bdbc84196407cc8e0bdb94ec16b7b41f0 files/mDNSResponder-98-Makefiles.patch 3631
@@ -54,14 +58,18 @@ EBUILD mDNSResponder-107.6-r3.ebuild 3435 RMD160 1deca974432e1b74f86bf28ece7c2b4
 MD5 2e514de0a96348036e405d5695d785c7 mDNSResponder-107.6-r3.ebuild 3435
 RMD160 1deca974432e1b74f86bf28ece7c2b47c5a069ff mDNSResponder-107.6-r3.ebuild 3435
 SHA256 3fde74f734f39298583e84703bc3c0bde801ef678d5791db0c48a8803172e145 mDNSResponder-107.6-r3.ebuild 3435
+EBUILD mDNSResponder-107.6-r4.ebuild 3547 RMD160 95af6b1b927aa056513ac6f32aafcfdd6011163a SHA1 a4a5d00cb488b9607ed62f868a642f75d3eaa17b SHA256 540813daba3a8bbd319f27b0b38357213c55faebf85143ea02e6129f7e726a2a
+MD5 6ff7715ae3dfaee9b1cc1b1f358d9094 mDNSResponder-107.6-r4.ebuild 3547
+RMD160 95af6b1b927aa056513ac6f32aafcfdd6011163a mDNSResponder-107.6-r4.ebuild 3547
+SHA256 540813daba3a8bbd319f27b0b38357213c55faebf85143ea02e6129f7e726a2a mDNSResponder-107.6-r4.ebuild 3547
 EBUILD mDNSResponder-98.ebuild 1012 RMD160 bfe529d833974ff31298b8370f93048b0d49e979 SHA1 18b31b6e4ba9713778320cbe39040502491916ad SHA256 10e1886c91d99d739771aaad0d936a3209e07e34b4562586f308a53504858d8e
 MD5 f3ee9315f1c612f51b83cfa9def9df5e mDNSResponder-98.ebuild 1012
 RMD160 bfe529d833974ff31298b8370f93048b0d49e979 mDNSResponder-98.ebuild 1012
 SHA256 10e1886c91d99d739771aaad0d936a3209e07e34b4562586f308a53504858d8e mDNSResponder-98.ebuild 1012
-MISC ChangeLog 4792 RMD160 6fa5396e9c26b59dd019d02ab21d40e711a7e7f1 SHA1 ea81d316814669040ee111228827b7ffaa873bc2 SHA256 206226d97bac6bcbb2f1882f086ddec2de32555e33fb8d83961b2d6f19b00598
-MD5 af387b0ce002c2e75b47be46be49d819 ChangeLog 4792
-RMD160 6fa5396e9c26b59dd019d02ab21d40e711a7e7f1 ChangeLog 4792
-SHA256 206226d97bac6bcbb2f1882f086ddec2de32555e33fb8d83961b2d6f19b00598 ChangeLog 4792
+MISC ChangeLog 5012 RMD160 d7be743e87170d3cdd429bfc0fce1efa732dd890 SHA1 a0ce907ab2a2042011fb1bd927daffb6d91e5a40 SHA256 34d5418a0a251dc9501aea36ad3aa3f6f907e31c28df39da21ad7332e0426e8f
+MD5 047f37a1d1f5cdb25a4a93772ccc9c15 ChangeLog 5012
+RMD160 d7be743e87170d3cdd429bfc0fce1efa732dd890 ChangeLog 5012
+SHA256 34d5418a0a251dc9501aea36ad3aa3f6f907e31c28df39da21ad7332e0426e8f ChangeLog 5012
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -75,6 +83,9 @@ SHA256 e8a669ddfb3bd95be4aaaaf176fbcf89b933010cf6ff9e8c11c86250770e1376 files/di
 MD5 e5f35be016ae60995be2e44a68de8ec3 files/digest-mDNSResponder-107.6-r3 262
 RMD160 87a9c5109eda62dcff565fe52c7b44581024502e files/digest-mDNSResponder-107.6-r3 262
 SHA256 99dffdd9ce28636bc59575f11155e139590ad3711968707b50cdd3509fd6d9a0 files/digest-mDNSResponder-107.6-r3 262
+MD5 e5f35be016ae60995be2e44a68de8ec3 files/digest-mDNSResponder-107.6-r4 262
+RMD160 87a9c5109eda62dcff565fe52c7b44581024502e files/digest-mDNSResponder-107.6-r4 262
+SHA256 99dffdd9ce28636bc59575f11155e139590ad3711968707b50cdd3509fd6d9a0 files/digest-mDNSResponder-107.6-r4 262
 MD5 a16f554d629c185fe9bded447743110b files/digest-mDNSResponder-98 253
 RMD160 34b39264e2382110fda49cc7fdab8f1e1a3ae545 files/digest-mDNSResponder-98 253
 SHA256 22ba0f9d01e45330fa7992e0f29673c458c6df6f3881764fc07e04bf09d56337 files/digest-mDNSResponder-98 253

diff --git a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r4 b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r4
new file mode 100644 (file)
index 0000000..dc5573b
--- /dev/null
+++ b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r4
@@ -0,0 +1,3 @@
+MD5 aa4e0e5c57f94489463ea6576591ce9d mDNSResponder-107.6.tar.gz 1441339
+RMD160 68d9ef5949839a950d673c66cc8d0e5bd0348fbb mDNSResponder-107.6.tar.gz 1441339
+SHA256 43d427d3d5c78aef57a49898def469cc4cae28190462205368be1f3a0fcc0165 mDNSResponder-107.6.tar.gz 1441339

diff --git a/net-misc/mDNSResponder/files/mDNSResponder-107.6-java.patch b/net-misc/mDNSResponder/files/mDNSResponder-107.6-java.patch
new file mode 100644 (file)
index 0000000..1a4fec6
--- /dev/null
+++ b/net-misc/mDNSResponder/files/mDNSResponder-107.6-java.patch
@@ -0,0 +1,38 @@
+diff -Nru mDNSResponder-107.6.vanilla/Clients/Java/nmakefile mDNSResponder-107.6/Clients/Java/nmakefile
+--- mDNSResponder-107.6.vanilla/Clients/Java/nmakefile 2007-04-28 15:32:09.000000000 +0200
++++ mDNSResponder-107.6/Clients/Java/nmakefile 2007-04-28 15:32:50.000000000 +0200
+@@ -94,7 +94,7 @@
+ JAVASRC       = .
+ .SUFFIXES : .java
+ {$(JAVASRC)}.java{$(BAOBJ)}.class:    
+-      $(JAVAC) -d $(BAOBJ) -classpath $(BAOBJ);$(DNS_SD) $<
++      $(JAVAC) $(JAVACFLAGS) -d $(BAOBJ) -classpath $(BAOBJ);$(DNS_SD) $<
+ {$(JAVASRC)}.java{$(SCOBJ)}.class:    
+-      $(JAVAC) -d $(SCOBJ) -classpath $(SCOBJ);$(DNS_SD) $<
++      $(JAVAC) $(JAVACFLAGS) -d $(SCOBJ) -classpath $(SCOBJ);$(DNS_SD) $<
+ 
+diff -Nru mDNSResponder-107.6.vanilla/mDNSPosix/Makefile mDNSResponder-107.6/mDNSPosix/Makefile
+--- mDNSResponder-107.6.vanilla/mDNSPosix/Makefile     2007-04-28 15:32:09.000000000 +0200
++++ mDNSResponder-107.6/mDNSPosix/Makefile     2007-04-28 15:33:34.000000000 +0200
+@@ -585,7 +585,7 @@
+ JAVAH = $(JDK)/bin/javah
+ JAVADOC = $(JDK)/bin/javadoc
+ JAR = $(JDK)/bin/jar
+-JAVACFLAGS = $(CFLAGS) $(JAVACFLAGS_OS) -I$(JDK)/include
++JAVACFLAGS_C = $(CFLAGS) $(JAVACFLAGS_OS) -I$(JDK)/include
+ 
+ Java: setup $(BUILDDIR)/dns_sd.jar $(BUILDDIR)/libjdns_sd.$(LDSUFFIX)
+       @echo "Java wrappers done"
+@@ -610,10 +610,10 @@
+       $(JAR) -cf $@ -C $(OBJDIR) com
+ 
+ $(BUILDDIR)/libjdns_sd.$(LDSUFFIX): $(JAVASRC)/JNISupport.c $(OBJDIR)/DNSSD.java.h setup libdns_sd
+-      $(CC) -o $@ $< $(JAVACFLAGS) -I$(OBJDIR) -L$(BUILDDIR)
++      $(CC) -o $@ $< $(JAVACFLAGS_C) -I$(OBJDIR) -L$(BUILDDIR)
+ 
+ $(OBJDIR)/com/apple/dnssd/%.class:    $(JAVASRC)/%.java
+-      $(JAVAC) -d $(OBJDIR) -classpath $(OBJDIR) $<
++      $(JAVAC) $(JAVACFLAGS) -d $(OBJDIR) -classpath $(OBJDIR) $<
+ 
+ $(OBJDIR)/DNSSD.java.h: $(OBJDIR)/com/apple/dnssd/DNSSD.class
+       $(JAVAH) -force -classpath $(OBJDIR) -o $@ \

diff --git a/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild
new file mode 100644 (file)
index 0000000..42bd1eb
--- /dev/null
+++ b/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild,v 1.1 2007/04/28 15:12:04 carlo Exp $
+
+inherit eutils base toolchain-funcs flag-o-matic java-pkg-opt-2
+
+DESCRIPTION="The mDNSResponder project is a component of Bonjour, Apple's initiative for zero-configuration networking."
+HOMEPAGE="http://developer.apple.com/networking/bonjour/index.html"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/${P}.tar.gz"
+LICENSE="APSL-2 BSD"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc ipv6"
+
+DEPEND="!sys-auth/nss-mdns
+               java? ( >=virtual/jdk-1.5 )"
+RDEPEND="!sys-auth/nss-mdns
+               java? ( >=virtual/jre-1.5 )"
+
+PATCHES="${FILESDIR}/mDNSResponder-107.6-Makefiles.diff ${FILESDIR}/mDNSResponder-107.6-java.patch"
+pkg_setup() {
+       if use elibc_FreeBSD; then
+               os=freebsd
+       else
+               os=linux
+       fi
+}
+
+mdnsmake() {
+       local debug jdk __ipv6
+       use java && jdk="JDK=$(java-config -O)"
+       use debug && debug='DEBUG=1'
+       use ipv6 && __ipv6='HAVE_IPV6=1' || __ipv6='HAVE_IPV6=0'
+       einfo "Running emake " os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \
+               ${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \
+                LOCALBASE="/usr" JAVACFLAGS="$(java-pkg_javac-args)" "$@"
+       emake -j1 os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \
+               ${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \
+               LOCALBASE="/usr" JAVACFLAGS="$(java-pkg_javac-args)" ${__ipv6} "$@"
+}
+
+src_compile() {
+       cd ${S}/mDNSPosix
+       mdnsmake || die "make failed"
+
+       if use java; then
+               mdnsmake Java || die "make mDNSPosix java failed"
+               if use doc ; then
+                       mdnsmake JavaDoc || die "make mDNSPosix java doc failed"
+               fi
+       fi
+}
+
+src_install() {
+       cd "${S}/mDNSPosix"
+
+       dodir /usr/sbin
+       dodir /usr/lib
+       dodir /usr/include
+       dodir /lib
+       dodir /etc
+       dodir /usr/share/man/man5
+       dodir /usr/share/man/man8
+
+       local debug
+       local objdir="prod"
+       if use debug; then
+               debug="DEBUG=1"
+               objdir=debug
+       fi
+
+       dosbin ${S}/mDNSPosix/build/${objdir}/dnsextd
+       dosbin ${S}/mDNSPosix/build/${objdir}/mDNSResponderPosix
+       dosbin ${S}/mDNSPosix/build/${objdir}/mDNSNetMonitor
+       dosbin ${S}/mDNSPosix/build/${objdir}/mdnsd
+
+       dobin ${S}/Clients/build/dns-sd
+       dobin ${S}/mDNSPosix/build/${objdir}/mDNSProxyResponderPosix
+       dobin ${S}/mDNSPosix/build/${objdir}/mDNSIdentify
+       dobin ${S}/mDNSPosix/build/${objdir}/mDNSClientPosix
+
+       dolib ${S}/mDNSPosix/build/${objdir}/libdns_sd.so
+       dolib ${S}/mDNSPosix/build/${objdir}/libnss_mdns-0.2.so
+       dosym libdns_sd.so /usr/$(get_libdir)/libdns_sd.so.1
+       dosym libnss_mdns-0.2.so /usr/$(get_libdir)/libnss_mdns.so.2
+
+       newinitd ${FILESDIR}/mdnsd.init.d mdnsd
+       newinitd ${FILESDIR}/mDNSResponderPosix.init.d mDNSResponderPosix
+       newconfd ${FILESDIR}/mDNSResponderPosix.conf.d mDNSResponderPosix
+       newinitd ${FILESDIR}/dnsextd.init.d dnsextd
+       newconfd ${FILESDIR}/dnsextd.conf.d dnsextd
+
+       insinto /etc
+       doins ${FILESDIR}/mDNSResponderPosix.conf
+
+       insinto /usr/include
+       doins ${S}/mDNSShared/dns_sd.h
+
+       dodoc ${S}/README.txt
+
+       if use java; then
+               java-pkg_dojar ${S}/mDNSPosix/build/${objdir}/dns_sd.jar
+               java-pkg_doso ${S}/mDNSPosix/build/${objdir}/libjdns_sd.so
+               use doc && java-pkg_dojavadoc ${S}/mDNSPosix/build/${objdir}
+       fi
+
+}
+
+pkg_postinst() {
+       echo
+       elog "To enable multicast dns lookups for applications"
+       elog "that are not multicast dns aware, edit the 'hosts:'"
+       elog "line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+       elog "hosts: files mdns dns"
+       echo
+}