sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 765.1.2

Browse source 
- Remove outdated PORTSCOUT
- Simplify patch file
- Update WWW
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2016-11-22 06:55:13 +00:00
parent 0ad7daa08c
commit c87493299f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=426783
4 changed files with 45 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/mDNSResponder/Makefile
View file

@ -1,8 +1,8 @@
# Created by: Alfred Perlstein <alfred@FreeBSD.org> # Created by: Alfred Perlstein <alfred@FreeBSD.org>VE_IPV6
# $FreeBSD$ # $FreeBSD$
PORTNAME= mDNSResponder PORTNAME= mDNSResponder
PORTVERSION= 625.41.2 PORTVERSION= 765.1.2
CATEGORIES= net dns CATEGORIES= net dns
MASTER_SITES= http://opensource.apple.com/tarballs/${PORTNAME}/ MASTER_SITES= http://opensource.apple.com/tarballs/${PORTNAME}/
@ -13,16 +13,14 @@ LICENSE= APACHE20 BSD3CLAUSE
LICENSE_COMB= dual LICENSE_COMB= dual
# lib/libdns_sd.so.1 sbin/mdnsd # lib/libdns_sd.so.1 sbin/mdnsd
CONFLICTS_INSTALL= avahi-libdns openmdns CONFLICTS_INSTALL= avahi-libdns- openmdns-
OPTIONS_DEFINE= IPV6 OPTIONS_DEFINE= IPV6
PORTSCOUT= skipv:625.60.4
ALL_TARGET= all dnsextd ALL_TARGET= all dnsextd
BUILD_WRKSRC= ${WRKSRC}/mDNSPosix BUILD_WRKSRC= ${WRKSRC}/mDNSPosix
INSTALL_WRKSRC= ${WRKSRC}/mDNSPosix INSTALL_WRKSRC= ${WRKSRC}/mDNSPosix
MAKE_ARGS= LDCONFIG=${TRUE} LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man STRIP=${STRIP_CMD} os=freebsd MAKE_ARGS= LDCONFIG=${TRUE} LOCALBASE=${PREFIX} MAN_PATH=${MANPREFIX}/man STRIP=${STRIP_CMD} os=freebsd
MAKE_JOBS_UNSAFE= yes MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_RC_SUBR= mdnsd mdnsresponderposix USE_RC_SUBR= mdnsd mdnsresponderposix

6
net/mDNSResponder/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1466892159 TIMESTAMP = 1479732106
SHA256 (mDNSResponder-625.41.2.tar.gz) = 8efdd7d57445f4defdb450217c31afc5c5d258822764bb02f4e8282430b33119 SHA256 (mDNSResponder-765.1.2.tar.gz) = 108f21529c621d82b5f0802b9b4102ed9619d03435f7e5ca2b9dbed1ea11ddf1
SIZE (mDNSResponder-625.41.2.tar.gz) = 2022161 SIZE (mDNSResponder-765.1.2.tar.gz) = 2307465

116
net/mDNSResponder/files/patch-mDNSPosix-Makefile
View file

@ -1,4 +1,4 @@
--- mDNSPosix/Makefile.orig 2015-03-04 03:09:18 UTC --- mDNSPosix/Makefile.orig 2016-04-24 15:07:24 UTC
+++ mDNSPosix/Makefile +++ mDNSPosix/Makefile
@@ -54,8 +54,8 @@ COREDIR = ../mDNSCore @@ -54,8 +54,8 @@ COREDIR = ../mDNSCore
SHAREDDIR ?= ../mDNSShared SHAREDDIR ?= ../mDNSShared
@ -11,25 +11,43 @@
FLEX = @flex FLEX = @flex
ST = @strip ST = @strip
LD = ld -shared LD = ld -shared
@@ -123,7 +123,7 @@ ifeq ($(os),freebsd) @@ -121,9 +121,9 @@ else
ifeq ($(os),freebsd)
# If not already defined, set LOCALBASE to /usr/local # If not already defined, set LOCALBASE to /usr/local
LOCALBASE?=/usr/local -LOCALBASE?=/usr/local
INSTBASE=$(LOCALBASE) -INSTBASE=$(LOCALBASE)
-CFLAGS_OS = -DHAVE_IPV6 -CFLAGS_OS = -DHAVE_IPV6
+LOCALBASE ?= /usr/local
+INSTBASE ?= $(DESTDIR)$(LOCALBASE)
+CFLAGS_OS = -DHAVE_IPV6 -DTARGET_OS_FREEBSD +CFLAGS_OS = -DHAVE_IPV6 -DTARGET_OS_FREEBSD
# FreeBSD 4 requires threaded code to be compiled and linked using the "-pthread" option, # FreeBSD 4 requires threaded code to be compiled and linked using the "-pthread" option,
# and requires that the "-lpthread" link option NOT be used # and requires that the "-lpthread" link option NOT be used
# This appies only to FreeBSD -- "man cc" on FreeBSD says: # This appies only to FreeBSD -- "man cc" on FreeBSD says:
@@ -217,7 +217,7 @@ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $ @@ -185,12 +185,7 @@
endif
endif
all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor dnsextd $(OPTIONALTARG) -# If directory /usr/share/man exists, then we install man pages into that, else /usr/man
-ifeq ($(wildcard /usr/share/man), /usr/share/man)
-MANPATH := /usr/share/man
-else
-MANPATH := /usr/man
-endif
+MANPATH := $(DESTDIR)$(MAN_PATH)
-install: setup InstalledDaemon InstalledStartup InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) # If directories /etc/init.d/rc*.d exist, then we install into that (Suse)
ifeq ($(wildcard /etc/init.d/rc2.d/), /etc/init.d/rc2.d/)
@@ -219,7 +219,7 @@ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $
all: setup Daemon libdns_sd Clients SAClient SAResponder SAProxyResponder Identify NetMonitor $(OPTIONALTARG)
-install: setup InstalledStartup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
+install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL) +install: setup InstalledDaemon InstalledLib InstalledManPages InstalledClients $(OPTINSTALL)
# 'setup' sets up the build directory structure the way we want # 'setup' sets up the build directory structure the way we want
setup: setup:
@@ -257,13 +257,13 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ @@ -259,13 +259,13 @@ 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 CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
$(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
@ -46,7 +64,7 @@
@$(MAKE) -C ../Clients @$(MAKE) -C ../Clients
# nss_mdns target builds the Name Service Switch module # nss_mdns target builds the Name Service Switch module
@@ -271,49 +271,49 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE @@ -273,7 +273,7 @@ nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE
@echo "Name Service Switch module done" @echo "Name Service Switch module done"
$(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o $(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
@ -55,93 +73,33 @@
@$(STRIP) $@ @$(STRIP) $@
############################################################################# #############################################################################
@@ -298,14 +298,12 @@ InstalledNSS: $(NSSINSTPATH)/$(NSSLINKNA
# 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) /etc/nss_mdns.conf $(DESTDIR)$(MANPATH)/man5/nss_mdns.conf.5 $(DESTDIR)$(MANPATH)/man8/libnss_mdns.8
@echo $+ " installed" @echo $+ " installed"
# Note: If daemon already installed, we make sure it's stopped before overwriting it # Note: If daemon already installed, we make sure it's stopped before overwriting it
-$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd -$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME)
+$(DESTDIR)$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd - @if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi
@if test -x $@; then $(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) stop; fi +$(INSTBASE)/sbin/mdnsd: $(BUILDDIR)/mdnsd
$(CP) $< $@ $(CP) $< $@
- @$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME) start
-$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX) $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
+$(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX).$(LIBVERS): $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
$(CP) $< $@ $(CP) $< $@
- $(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) - $(LN) $@ $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
+ $(LN) libdns_sd.$(LDSUFFIX).$(LIBVERS) $(DESTDIR)$(INSTBASE)/lib/libdns_sd.$(LDSUFFIX) + $(LN) $(notdir $@) $(INSTBASE)/lib/libdns_sd.$(LDSUFFIX)
ifdef LDCONFIG ifdef LDCONFIG
# -m means 'merge into existing database', -R means 'rescan directories' # -m means 'merge into existing database', -R means 'rescan directories'
$(LDCONFIG) -mR $(LDCONFIG) -mR
endif @@ -338,7 +336,7 @@ $(MANPATH)/man8/%.8: %.8
-$(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
+$(STARTUPSCRIPTDIR)/$(STARTUPSCRIPTNAME): mdnsd.sh $(STARTUPSCRIPTDIR) $(DESTDIR)$(INSTBASE)/sbin/mdnsd
$(CP) $< $@
chmod ugo+x $@
$@ start
@@ -330,26 +330,26 @@ 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 $< $@ cp $< $@
chmod 444 $@ chmod 444 $@
-$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8 -$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponder.8
+$(DESTDIR)$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponderPosix.8 +$(MANPATH)/man8/mdnsd.8: $(SHAREDDIR)/mDNSResponderPosix.8
cp $< $@ cp $< $@
chmod 444 $@ chmod 444 $@
-$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd @@ -491,6 +489,8 @@ $(OBJDIR)/NetMonitor.c.o: $(C
+$(DESTDIR)$(INSTBASE)/bin/dns-sd: ../Clients/build/dns-sd
$(CP) $< $@
-$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
+$(DESTDIR)$(NSSINSTPATH)/$(NSSLINKNAME): $(NSSINSTPATH)/$(NSSLIBFILE)
$(LN) $< $@
ldconfig
-$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
+$(DESTDIR)$(NSSINSTPATH)/$(NSSLIBFILE): $(BUILDDIR)/$(NSSLIBFILE)
$(CP) $< $@
chmod 444 $@
@@ -491,6 +491,8 @@ $(OBJDIR)/NetMonitor.c.o: $(C
$(BUILDDIR)/dnsextd: $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o $(BUILDDIR)/dnsextd: $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
$(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD) $(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)

2
net/mDNSResponder/pkg-descr
View file

@ -8,4 +8,4 @@ The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP
networking initiative. networking initiative.
WWW: https://developer.apple.com/bonjour/ WWW: https://developer.apple.com/bonjour/
WWW: http://opensource.apple.com/tarballs/mDNSResponder/ WWW: https://opensource.apple.com/tarballs/mDNSResponder/