diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2010-07-20 18:18:25 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-07-20 18:18:25 +0000 |
commit | cceb170c11dbe7211b9f310e61e0bb9ef61c2cf3 (patch) | |
tree | 8059ab66861342b7a0e852c018a3f6ca46bc0c39 /net-misc/mDNSResponder | |
parent | clean old (diff) | |
download | gentoo-2-cceb170c11dbe7211b9f310e61e0bb9ef61c2cf3.tar.gz gentoo-2-cceb170c11dbe7211b9f310e61e0bb9ef61c2cf3.tar.bz2 gentoo-2-cceb170c11dbe7211b9f310e61e0bb9ef61c2cf3.zip |
clean old cruft
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'net-misc/mDNSResponder')
-rw-r--r-- | net-misc/mDNSResponder/ChangeLog | 9 | ||||
-rw-r--r-- | net-misc/mDNSResponder/files/mDNSResponder-107.1-Makefiles.patch | 155 | ||||
-rw-r--r-- | net-misc/mDNSResponder/files/mDNSResponder-107.5-Makefiles.patch | 170 | ||||
-rw-r--r-- | net-misc/mDNSResponder/files/mDNSResponder-107.6-Makefiles.diff | 155 | ||||
-rw-r--r-- | net-misc/mDNSResponder/files/mDNSResponder-98-Makefiles.patch | 96 | ||||
-rw-r--r-- | net-misc/mDNSResponder/mDNSResponder-107.1.ebuild | 100 | ||||
-rw-r--r-- | net-misc/mDNSResponder/mDNSResponder-107.5.ebuild | 107 | ||||
-rw-r--r-- | net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild | 122 | ||||
-rw-r--r-- | net-misc/mDNSResponder/mDNSResponder-98.ebuild | 41 |
9 files changed, 8 insertions, 947 deletions
diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog index b9ff0a73a04a..befd9268ee48 100644 --- a/net-misc/mDNSResponder/ChangeLog +++ b/net-misc/mDNSResponder/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/mDNSResponder # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.53 2010/01/07 15:54:35 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.54 2010/07/20 18:18:25 mr_bones_ Exp $ + + 20 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org> + -mDNSResponder-98.ebuild, -files/mDNSResponder-98-Makefiles.patch, + -mDNSResponder-107.1.ebuild, -files/mDNSResponder-107.1-Makefiles.patch, + -mDNSResponder-107.5.ebuild, -files/mDNSResponder-107.5-Makefiles.patch, + -mDNSResponder-107.6-r5.ebuild, -files/mDNSResponder-107.6-Makefiles.diff: + clean old cruft 07 Jan 2010; Christian Faulhammer <fauli@gentoo.org> mDNSResponder-212.1.ebuild: diff --git a/net-misc/mDNSResponder/files/mDNSResponder-107.1-Makefiles.patch b/net-misc/mDNSResponder/files/mDNSResponder-107.1-Makefiles.patch deleted file mode 100644 index 73e44b3499da..000000000000 --- a/net-misc/mDNSResponder/files/mDNSResponder-107.1-Makefiles.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff -Nur mDNSResponder-107.1.orig/Clients/Makefile mDNSResponder-107.1/Clients/Makefile ---- mDNSResponder-107.1.orig/Clients/Makefile 2004-09-24 23:15:26.000000000 +0200 -+++ mDNSResponder-107.1/Clients/Makefile 2006-02-22 20:49:14.000000000 +0100 -@@ -49,11 +49,14 @@ - ############################################################################# - - --# If library /usr/lib/libdns_sd.* exists, then link it -+ifneq "$(wildcard ../mDNSPosix/build/prod/libdns_sd.*)" "" -+LIBS ?= -L../mDNSPosix/build/prod/ -ldns_sd -+endif -+ifneq "$(wildcard ../mDNSPosix/build/debug/libdns_sd.*)" "" -+LIBS ?= -L../mDNSPosix/build/debug/ -ldns_sd -+endif - ifneq "$(wildcard /usr/lib/libdns_sd.*)" "" --LIBS = -ldns_sd --else --LIBS = -+LIBS ?= -ldns_sd - endif - - targets: build/dns-sd -diff -Nur mDNSResponder-107.1.orig/mDNSPosix/Makefile mDNSResponder-107.1/mDNSPosix/Makefile ---- mDNSResponder-107.1.orig/mDNSPosix/Makefile 2005-04-14 23:07:10.000000000 +0200 -+++ mDNSResponder-107.1/mDNSPosix/Makefile 2006-02-22 21:25:42.000000000 +0100 -@@ -224,7 +224,7 @@ - - COREDIR = ../mDNSCore - SHAREDDIR = ../mDNSShared --JDK = /usr/jdk -+JDK = `java-config -O` - - CC = @cc - LD = ld -shared -@@ -384,7 +384,7 @@ - - all: setup Daemon libdns_sd Client Responder ProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) - --install: setup InstalledDaemon InstalledLib InstalledStartup InstalledManPages $(OPTINSTALL) -+install: setup InstalledDaemon InstalledLib InstalledManPages $(OPTINSTALL) - - # 'setup' sets up the build directory structure the way we want - setup: -@@ -419,7 +419,7 @@ - CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o - - $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) -- @$(LD) $(LIBFLAGS) -o $@ $+ -+ @$(LD) $(LIBFLAGS) -soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+ - @$(STRIP) $@ - - # nss_mdns target builds the Name Service Switch module -@@ -427,42 +427,38 @@ - @echo "Name Service Switch module done" - - $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o -- @$(LD) $(LIBFLAGS) -o $@ $+ -+ @$(LD) $(LIBFLAGS) -soname=$(NSSLINKNAME) -o $@ $+ - @$(STRIP) $@ - - ############################################################################# - - # The Install targets place built stuff in their proper places --InstalledDaemon: $(INSTBASE)/sbin/mdnsd -+InstalledDaemon: $(DESTDIR)$(INSTBASE)/sbin/mdnsd - @echo $+ " installed" - --InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h -+InstalledLib: $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/include/dns_sd.h - @echo $+ " installed" - --InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) -+InstalledStartup: $(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) - @echo $+ " installed" - --InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8 -+InstalledNSS: $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME) $(DESTDIR)etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8 - @echo $+ " installed" - --InstalledManPages: $(MANPATH)/man8/mdnsd.8 -+InstalledManPages: $(DESTDIR)$(MANPATH)/man8/mdnsd.8 - @echo $+ " installed" - --$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd -+$(DESTDIR)$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd - $(CP) $< $@ - --$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) -+$(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) - $(CP) $< $@ -- $(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) --ifdef LDCONFIG -- # -m means 'merge into existing database', -R means 'rescan directories' -- $(LDCONFIG) -mR --endif -+ $(LN) libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) - --$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h -+$(DESTDIR)$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h - $(CP) $< $@ - --$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) -+$(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) - $(CP) $< $@ - chmod ugo+x $@ - ifdef RUNLEVELSCRIPTSDIR -@@ -478,31 +474,26 @@ - endif - endif - --$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE) -- $(LN) $< $@ -- ldconfig -+$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE) -+ $(LN) $(NSSLIBFILE) $@ - --$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) -+$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) - $(CP) $< $@ - chmod 444 $@ - --/etc/nss_mdns.conf: nss_mdns.conf -+$(DESTDIR)etc/nss_mdns.conf: nss_mdns.conf - $(CP) $< $@ - chmod 444 $@ -- # Check the nsswitch.conf file. -- # If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns' -- cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns -- sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf - --$(MANPATH)/man5/%.5: %.5 -+$(DESTDIR)$(MANPATH)/man5/%.5: %.5 - cp $< $@ - chmod 444 $@ - --$(MANPATH)/man8/%.8: %.8 -+$(DESTDIR)$(MANPATH)/man8/%.8: %.8 - cp $< $@ - chmod 444 $@ - --$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 -+$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 - cp $< $@ - chmod 444 $@ - -@@ -537,7 +528,7 @@ - $(JAR) -cf $@ -C $(OBJDIR) com - - $(BUILDDIR)/libjdns_sd.$(LDSUFFIX): $(JAVASRC)/JNISupport.c $(OBJDIR)/DNSSD.java.h -- $(CC) -o $@ $< $(JAVACFLAGS) -I$(OBJDIR) -+ $(CC) -o $@ $< $(JAVACFLAGS) -I$(OBJDIR) -L$(BUILDDIR) - - $(OBJDIR)/com/apple/dnssd/%.class: $(JAVASRC)/%.java - $(JAVAC) -d $(OBJDIR) -classpath $(OBJDIR) $< - diff --git a/net-misc/mDNSResponder/files/mDNSResponder-107.5-Makefiles.patch b/net-misc/mDNSResponder/files/mDNSResponder-107.5-Makefiles.patch deleted file mode 100644 index a84142bc5445..000000000000 --- a/net-misc/mDNSResponder/files/mDNSResponder-107.5-Makefiles.patch +++ /dev/null @@ -1,170 +0,0 @@ -Index: mDNSResponder-107.5/Clients/Makefile -=================================================================== ---- mDNSResponder-107.5.orig/Clients/Makefile -+++ mDNSResponder-107.5/Clients/Makefile -@@ -51,12 +51,16 @@ - - ############################################################################# - --# On OS X the dns_sd library functions are included in libSystem, which is implicitly linked with every executable --# If /usr/lib/libSystem.dylib exists, then we're on OS X, so we don't need also to link the "dns_sd" shared library --ifneq "$(wildcard /usr/lib/libSystem.dylib)" "" --LIBS = --else --LIBS = -L../mDNSPosix/build/prod/ -ldns_sd -+ifneq "$(wildcard ../mDNSPosix/build/prod/libdns_sd.*)" "" -+ LIBS ?= -L../mDNSPosix/build/prod/ -ldns_sd -+endif -+ -+ifneq "$(wildcard ../mDNSPosix/build/debug/libdns_sd.*)" "" -+ LIBS ?= -L../mDNSPosix/build/debug/ -ldns_sd -+endif -+ -+ifneq "$(wildcard /usr/lib/libdns_sd.*)" "" -+ LIBS ?= -ldns_sd - endif - - targets: build/dns-sd -@@ -68,4 +72,4 @@ build: - mkdir build - - build/dns-sd: build dns-sd.c -- cc $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -o $@ -+ $(CC) $(CFLAGS_OPT) $(LDFLAGS) $(filter %.c %.o, $+) $(LIBS) -I../mDNSShared -o $@ -Index: mDNSResponder-107.5/mDNSPosix/Makefile -=================================================================== ---- mDNSResponder-107.5.orig/mDNSPosix/Makefile -+++ mDNSResponder-107.5/mDNSPosix/Makefile -@@ -401,13 +401,13 @@ endif - endif - endif - --CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) -+CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) $(OPT_CFLAGS) - - ############################################################################# - - all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) - --install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) -+install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) - - # 'setup' sets up the build directory structure the way we want - setup: -@@ -443,7 +443,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ - CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o - - $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) -- @$(LD) $(LIBFLAGS) -o $@ $+ -+ @$(LD) $(LIBFLAGS) -Wl,-soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+ - @$(STRIP) $@ - - Clients: setup libdns_sd ../Clients/build/dns-sd -@@ -457,49 +457,45 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE - @echo "Name Service Switch module done" - - $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o -- @$(LD) $(LIBFLAGS) -o $@ $+ -+ @$(LD) $(LIBFLAGS) -Wl,-soname=$(NSSLINKNAME) -o $@ $+ - @$(STRIP) $@ - - ############################################################################# - - # The Install targets place built stuff in their proper places --InstalledDaemon: $(INSTBASE)/sbin/mdnsd -+InstalledDaemon: $(DESTDIR)$(INSTBASE)/sbin/mdnsd - @echo $+ " installed" - --InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h -+InstalledLib: $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/include/dns_sd.h - @echo $+ " installed" - --InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) -+InstalledStartup: $(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) - @echo $+ " installed" - --InstalledManPages: $(MANPATH)/man8/mdnsd.8 -+InstalledManPages: $(DESTDIR)$(MANPATH)/man8/mdnsd.8 - @echo $+ " installed" - --InstalledClients: $(INSTBASE)/bin/dns-sd -+InstalledClients: $(DESTDIR)$(INSTBASE)/bin/dns-sd - @echo $+ " installed" - --InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8 -+InstalledNSS: $(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME) $(DESTDIR)etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8 - @echo $+ " installed" - - # Note: If daemon already installed, we make sure it's stopped before overwriting it --$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd -+$(DESTDIR)$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd - @if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi - $(CP) $< $@ - --$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) -+$(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) - $(CP) $< $@ -- $(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) --ifdef LDCONFIG -- # -m means 'merge into existing database', -R means 'rescan directories' -- $(LDCONFIG) -mR --endif -+ $(LN) libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) - --$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h -+$(DESTDIR)$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h - $(CP) $< $@ - - # We make this target dependent on $(INSTBASE)/sbin/mdnsd because we need to ensure - # that the daemon is installed *before* we try to execute the command to start it. --$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) $(INSTBASE)/sbin/mdnsd -+$(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) - $(CP) $< $@ - chmod ugo+x $@ - $@ start -@@ -516,36 +512,32 @@ else - endif - endif - --$(MANPATH)/man5/%.5: %.5 -+$(DESTDIR)$(MANPATH)/man5/%.5: %.5 - cp $< $@ - chmod 444 $@ - --$(MANPATH)/man8/%.8: %.8 -+$(DESTDIR)$(MANPATH)/man8/%.8: %.8 - cp $< $@ - chmod 444 $@ - --$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 -+$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 - cp $< $@ - chmod 444 $@ - --$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd -+$(DESTDIR)$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd -+ mkdir $(DESTDIR)$(INSTBASE)/bin - $(CP) $< $@ - --$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE) -- $(LN) $< $@ -- ldconfig -+$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE) -+ $(LN) $(NSSLIBFILE) $@ - --$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) -+$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) - $(CP) $< $@ - chmod 444 $@ - --/etc/nss_mdns.conf: nss_mdns.conf -+$(DESTDIR)etc/nss_mdns.conf: nss_mdns.conf - $(CP) $< $@ - chmod 444 $@ -- # Check the nsswitch.conf file. -- # If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns' -- cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns -- sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf - - ############################################################################# - diff --git a/net-misc/mDNSResponder/files/mDNSResponder-107.6-Makefiles.diff b/net-misc/mDNSResponder/files/mDNSResponder-107.6-Makefiles.diff deleted file mode 100644 index b0ef62e835d3..000000000000 --- a/net-misc/mDNSResponder/files/mDNSResponder-107.6-Makefiles.diff +++ /dev/null @@ -1,155 +0,0 @@ ---- mDNSPosix/Makefile.orig 2007-04-27 19:32:18.000000000 +0200 -+++ mDNSPosix/Makefile 2007-04-27 19:37:54.000000000 +0200 -@@ -265,7 +265,6 @@ - - COREDIR = ../mDNSCore - SHAREDDIR = ../mDNSShared --JDK = /usr/jdk - - CC = @cc - LD = ld -shared -@@ -426,18 +425,18 @@ - RUNLEVELSCRIPTSDIR = /etc - else - # else install into /etc/rc.d/ (*BSD) --STARTUPSCRIPTDIR = $(INSTBASE)/etc/rc.d -+STARTUPSCRIPTDIR = $(DESTDIR)$(INSTBASE)/etc/rc.d - endif - endif - endif - --CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) -+CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG) $(OPT_CFLAGS) - - ############################################################################# - - all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) - --install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) -+install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) - - # 'setup' sets up the build directory structure the way we want - setup: -@@ -473,7 +472,7 @@ - CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o - - $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) -- @$(LD) $(LINKOPTS) -o $@ $+ -+ @$(LD) $(LIBFLAGS) -Wl,-soname=libdns_sd.$(LDSUFFIX).$(LIBVERS) -o $@ $+ - @$(STRIP) $@ - - Clients: setup libdns_sd ../Clients/build/dns-sd -@@ -487,95 +486,59 @@ - @echo "Name Service Switch module done" - - $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o -- @$(LD) $(LINKOPTS) -o $@ $+ -+ @$(LD) $(LIBFLAGS) -Wl,-soname=$(NSSLINKNAME) -o $@ $+ - @$(STRIP) $@ - - ############################################################################# - - # The Install targets place built stuff in their proper places --InstalledDaemon: $(INSTBASE)/sbin/mdnsd -+InstalledDaemon: $(DESTDIR)$(INSTBASE)/sbin/mdnsd - @echo $+ " installed" - --InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h -+InstalledLib: $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/include/dns_sd.h - @echo $+ " installed" - --InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) -+InstalledStartup: $(DESTDIR)$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) - @echo $+ " installed" - --InstalledManPages: $(MANPATH)/man8/mdnsd.8 -+InstalledManPages: $(DESTDIR)$(MANPATH)/man8/mdnsd.8 - @echo $+ " installed" - --InstalledClients: $(INSTBASE)/bin/dns-sd -+InstalledClients: $(DESTDIR)$(INSTBASE)/bin/dns-sd - @echo $+ " installed" - --InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8 -+InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) $(DESTDIR)etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8 - @echo $+ " installed" - --# Note: If daemon already installed, we make sure it's stopped before overwriting it --$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd -- @if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi -+$(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) - $(CP) $< $@ -+ $(LN) libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) - --$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) -+$(DESTDIR)$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h - $(CP) $< $@ -- $(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) --ifdef LDCONFIG -- # -m means 'merge into existing database', -R means 'rescan directories' -- $(LDCONFIG) -mR --endif -- --$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h -- $(CP) $< $@ -- --# We make this target dependent on $(INSTBASE)/sbin/mdnsd because we need to ensure --# that the daemon is installed *before* we try to execute the command to start it. --$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) $(INSTBASE)/sbin/mdnsd -- $(CP) $< $@ -- chmod ugo+x $@ -- $@ start --ifdef RUNLEVELSCRIPTSDIR --ifeq ($(wildcard $(RUNLEVELSCRIPTSDIR)/runlevels/default), $(RUNLEVELSCRIPTSDIR)/runlevels/default) -- $(LN) $@ $(RUNLEVELSCRIPTSDIR)/runlevels/default/mdns --else -- $(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc2.d/S52mdns -- $(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc3.d/S52mdns -- $(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc4.d/S52mdns -- $(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc5.d/S52mdns -- $(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc0.d/K16mdns -- $(LN) $@ $(RUNLEVELSCRIPTSDIR)/rc6.d/K16mdns --endif --endif - --$(MANPATH)/man5/%.5: %.5 -+$(DESTDIR)$(MANPATH)/man5/%.5: %.5 - cp $< $@ - chmod 444 $@ - --$(MANPATH)/man8/%.8: %.8 -+$(DESTDIR)$(MANPATH)/man8/%.8: %.8 - cp $< $@ - chmod 444 $@ - --$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 -+$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 - cp $< $@ - chmod 444 $@ - --$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd -+$(DESTDIR)$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd -+ mkdir $(DESTDIR)$(INSTBASE)/bin - $(CP) $< $@ - --$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE) -- $(LN) $< $@ -- ldconfig -- --$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) -- $(CP) $< $@ -- chmod 444 $@ -+$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE) -+ $(LN) $(NSSLIBFILE) $@ - --/etc/nss_mdns.conf: nss_mdns.conf -+$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) - $(CP) $< $@ - chmod 444 $@ -- # Check the nsswitch.conf file. -- # If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns' -- cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns -- sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf - - ############################################################################# - diff --git a/net-misc/mDNSResponder/files/mDNSResponder-98-Makefiles.patch b/net-misc/mDNSResponder/files/mDNSResponder-98-Makefiles.patch deleted file mode 100644 index eb55c145f041..000000000000 --- a/net-misc/mDNSResponder/files/mDNSResponder-98-Makefiles.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- mDNSResponder-98/mDNSPosix/Makefile.orig 2005-01-27 22:55:00.000000000 +0000 -+++ mDNSResponder-98/mDNSPosix/Makefile 2005-02-06 18:13:21.437292552 +0000 -@@ -369,7 +369,7 @@ - - all: setup Daemon libdns_sd Client Responder ProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) - --install: setup InstalledDaemon InstalledLib InstalledStartup InstalledManPages $(OPTINSTALL) -+install: setup InstalledDaemon InstalledLib InstalledManPages $(OPTINSTALL) - - # 'setup' sets up the build directory structure the way we want - setup: -@@ -418,36 +418,32 @@ - ############################################################################# - - # The Install targets place built stuff in their proper places --InstalledDaemon: $(INSTBASE)/sbin/mdnsd -+InstalledDaemon: ${DESTDIR}/$(INSTBASE)/sbin/mdnsd - @echo $+ " installed" - --InstalledLib: $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) $(INSTBASE)/include/dns_sd.h -+InstalledLib: ${DESTDIR}/$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS) ${DESTDIR}/$(INSTBASE)/include/dns_sd.h - @echo $+ " installed" - --InstalledStartup: $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) -+InstalledStartup: ${DESTDIR}/$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) - @echo $+ " installed" - --InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNAME) /etc/nss_mdns.conf $(MANPATH)/man5/nss_mdns.conf.5 $(MANPATH)/man8/libnss_mdns.8 -+InstalledNSS: ${DESTDIR}/$(NSSINSTPATH)/$(NSSLINKNAME) ${DESTDIR}/etc/nss_mdns.conf ${DESTDIR}/$(MANPATH)/man5/nss_mdns.conf.5 ${DESTDIR}/$(MANPATH)/man8/libnss_mdns.8 - @echo $+ " installed" - --InstalledManPages: $(MANPATH)/man8/mdnsd.8 -+InstalledManPages: ${DESTDIR}/$(MANPATH)/man8/mdnsd.8 - @echo $+ " installed" - --$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd -+${DESTDIR}/$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd - $(CP) $< $@ - --$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) -+${DESTDIR}/$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) - $(CP) $< $@ -- $(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) --ifdef LDCONFIG -- # -m means 'merge into existing database', -R means 'rescan directories' -- $(LDCONFIG) -mR --endif -+ $(LN) $@ ${DESTDIR}/$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) - --$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h -+${DESTDIR}/$(INSTBASE)/include/dns_sd.h: $(SHAREDDIR)/dns_sd.h - $(CP) $< $@ - --$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) -+${DESTDIR}/$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) - $(CP) $< $@ - chmod ugo+x $@ - ifdef RUNLEVELSCRIPTSDIR -@@ -463,31 +459,26 @@ - endif - endif - --$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE) -+${DESTDIR}/$(NSSINSTPATH)/$(NSSLINKNAME): ${DESTDIR}/$(NSSINSTPATH)/$(NSSLIBFILE) - $(LN) $< $@ -- ldconfig - --$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) -+${DESTDIR}/$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE) - $(CP) $< $@ - chmod 444 $@ - --/etc/nss_mdns.conf: nss_mdns.conf -+${DESTDIR}/etc/nss_mdns.conf: nss_mdns.conf - $(CP) $< $@ - chmod 444 $@ -- # Check the nsswitch.conf file. -- # If 'mdns' does not already appear on the "hosts:" line, then add it right before 'dns' -- cp -f /etc/nsswitch.conf /etc/nsswitch.conf.pre-mdns -- sed -e '/mdns/!s/^\(hosts:.*\)dns\(.*\)/\1mdns dns\2/' /etc/nsswitch.conf.pre-mdns > /etc/nsswitch.conf - --$(MANPATH)/man5/%.5: %.5 -+${DESTDIR}/$(MANPATH)/man5/%.5: %.5 - cp $< $@ - chmod 444 $@ - --$(MANPATH)/man8/%.8: %.8 -+${DESTDIR}/$(MANPATH)/man8/%.8: %.8 - cp $< $@ - chmod 444 $@ - --$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 -+${DESTDIR}/$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 - cp $< $@ - chmod 444 $@ - diff --git a/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild deleted file mode 100644 index 332397068016..000000000000 --- a/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild,v 1.5 2008/09/21 13:04:29 jmbsvicetto Exp $ - -inherit eutils multilib base - -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://helios.et.put.poznan.pl/~jstachow/pub/${P}.tar.gz" -LICENSE="APSL-2 BSD" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug java" - -PATCHES=( "${FILESDIR}/${P}-Makefiles.patch" ) - -pkg_setup() { - if use elibc_FreeBSD; then - os=freebsd - else - os=linux - fi -} - -src_compile() { - local debug - if use debug; then - debug="DEBUG=1" - fi - - cd "${S}"/mDNSPosix - emake os=${os} ${debug} || die "make mDNSPosix failed" - - if use java; then - emake os=${os} ${debug} Java || die "make mDNSPosix java failed" - fi - - cd "${S}"/Clients - emake os=${os} ${debug} || die "make Clients failed" -} - -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 - - make DESTDIR="${D}" os=${os} ${debug} install || die "install failed" - - dosbin "${S}"/mDNSPosix/build/${objdir}/dnsextd - dosbin "${S}"/mDNSPosix/build/${objdir}/mDNSResponderPosix - dosbin "${S}"/mDNSPosix/build/${objdir}/mDNSNetMonitor - - dobin "${S}"/Clients/build/dns-sd - dobin "${S}"/mDNSPosix/build/${objdir}/mDNSProxyResponderPosix - dobin "${S}"/mDNSPosix/build/${objdir}/mDNSIdentify - - 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 - - dodoc "${S}"/README.txt - - # Fix multilib-strictness - mv "${D}"/lib "${D}"/$(get_libdir) - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - - if use java; then - java-pkg_dojar "${S}"/mDNSPosix/build/prod/dns_sd.jar - java-pkg_doso "${S}"/mDNSPosix/build/prod/libjdns_sd.so - 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 -} diff --git a/net-misc/mDNSResponder/mDNSResponder-107.5.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.5.ebuild deleted file mode 100644 index f9a36267202e..000000000000 --- a/net-misc/mDNSResponder/mDNSResponder-107.5.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.5.ebuild,v 1.6 2008/09/21 13:04:29 jmbsvicetto Exp $ - -inherit eutils multilib base toolchain-funcs flag-o-matic - -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="mirror://gentoo/${P}.tar.gz" -LICENSE="APSL-2 BSD" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug java" - -PATCHES=( "${FILESDIR}/${P}-Makefiles.patch" ) - -pkg_setup() { - if use elibc_FreeBSD; then - os=freebsd - else - os=linux - fi -} - -mdnsmake() { - local debug, jdk - use java && jdk="JDK=$(java-config -O)" - use debug && debug='DEBUG=1' - einfo "Running emake " os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \ - ${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \ - STRIP="true" LOCALBASE="/usr" "$@" - emake -j1 os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \ - ${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \ - STRIP="true" LOCALBASE="/usr" "$@" -} - -src_compile() { - cd "${S}"/mDNSPosix - mdnsmake || die "make mDNSPosix failed" - - if use java; then - mdnsmake Java || die "make mDNSPosix java failed" - fi - - cd "${S}"/Clients - mdnsmake || die "make Clients failed" -} - -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 - - emake -j1 LOCALBASE="/usr" DESTDIR="${D}" os=${os} ${debug} install || die "install failed" - - dosbin "${S}"/mDNSPosix/build/${objdir}/dnsextd - dosbin "${S}"/mDNSPosix/build/${objdir}/mDNSResponderPosix - dosbin "${S}"/mDNSPosix/build/${objdir}/mDNSNetMonitor - - dobin "${S}"/Clients/build/dns-sd - dobin "${S}"/mDNSPosix/build/${objdir}/mDNSProxyResponderPosix - dobin "${S}"/mDNSPosix/build/${objdir}/mDNSIdentify - - 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 - - dodoc "${S}"/README.txt - - # Fix multilib-strictness - mv "${D}"/lib "${D}"/$(get_libdir) - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) - - if use java; then - java-pkg_dojar "${S}"/mDNSPosix/build/prod/dns_sd.jar - java-pkg_doso "${S}"/mDNSPosix/build/prod/libjdns_sd.so - 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 -} diff --git a/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild deleted file mode 100644 index a79e9aeb3162..000000000000 --- a/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild,v 1.12 2008/09/21 13:04:29 jmbsvicetto 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="Apache-2.0 BSD" - -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="debug doc" - -DEPEND="!net-dns/avahi - java? ( >=virtual/jdk-1.4 )" -RDEPEND="!net-dns/avahi - java? ( >=virtual/jre-1.4 )" - -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 - java-pkg-opt-2_pkg_setup -} - -mdnsmake() { - local debug jdk - use java && jdk="JDK=$(java-config -O)" - if use debug; then - debug='DEBUG=1' - sed -e 's|LIBS = -L../mDNSPosix/build/prod/ -ldns_sd|LIBS = -L../mDNSPosix/build/debug/ -ldns_sd|g' ../Clients/Makefile || die "sed failed" - fi - - einfo "Running emake " os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \ - ${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \ - LOCALBASE="/usr" JAVACFLAGS="${JAVACFLAGS}" "$@" - emake -j1 os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \ - ${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \ - LOCALBASE="/usr" JAVACFLAGS="${JAVACFLAGS}" "$@" -} - -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 -} diff --git a/net-misc/mDNSResponder/mDNSResponder-98.ebuild b/net-misc/mDNSResponder/mDNSResponder-98.ebuild deleted file mode 100644 index dba2d014c914..000000000000 --- a/net-misc/mDNSResponder/mDNSResponder-98.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-98.ebuild,v 1.19 2008/09/21 13:04:29 jmbsvicetto Exp $ - -inherit eutils - -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://helios.et.put.poznan.pl/~jstachow/pub/${P}.tar.gz" -LICENSE="APSL-2" - -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86" -IUSE="" - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}"/${P}-Makefiles.patch -} - -src_compile() { - cd "${S}"/mDNSPosix - make os=linux -} - -src_install() { - cd "${S}"/mDNSPosix - dodir /usr/sbin - dodir /usr/bin - dodir /usr/lib - dodir /usr/include - dodir /lib/ - dodir /etc/ - dodir /usr/share/man/man5/ - dodir /usr/share/man/man8/ - - make DESTDIR="${D}" os=linux install - - # Install init scripts - newinitd "${FILESDIR}"/mdnsd.init.d mdnsd -} |