~olbohlen/oi-userland.git

parent: 49611c0b | patch | commit | ignore whitespace

rebuild avahi & drop 32 bit; add test results

Andreas Wacknitz

2023-11-18 3640a20894b7e2f4523b473c12d07e2b284eae0c

rebuild avahi & drop 32 bit; add test results

1 files added

5 files modified

	components/network/avahi/Makefile	34 ●●●●● patch \| view \| raw \| blame \| history
	components/network/avahi/avahi-gui.p5m	14 ●●●●● patch \| view \| raw \| blame \| history
	components/network/avahi/avahi.p5m	94 ●●●●● patch \| view \| raw \| blame \| history
	components/network/avahi/manifests/sample-manifest.p5m	45 ●●●●● patch \| view \| raw \| blame \| history
	components/network/avahi/pkg5	6 ●●●●● patch \| view \| raw \| blame \| history
	components/network/avahi/test/results-all.master	9 ●●●●● patch \| view \| raw \| blame \| history

 components/network/avahi/Makefile

@@ -11,35 +11,37 @@

#
# Copyright 2014 Alexander Pyhalov.  All rights reserved.
# Copyright 2023 Andreas Wacknitz
#

BUILD_BITS = 32_and_64

BUILD_BITS= 64
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= avahi
COMPONENT_VERSION= 0.7
COMPONENT_REVISION= 4
COMPONENT_REVISION= 5
COMPONENT_SUMMARY= Avahi client and bridge to pkg://service/network/dns/mdns
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
COMPONENT_ARCHIVE_URL= \
  https://github.com/lathiat/avahi/releases/download/v0.7/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL = http://avahi.org
COMPONENT_ARCHIVE_HASH=    sha256:57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
COMPONENT_ARCHIVE_URL=    https://github.com/lathiat/avahi/releases/download/v0.7/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL=    https://avahi.org
COMPONENT_FMRI=            system/network/avahi
COMPONENT_CLASSIFICATION = Applications/Internet
COMPONENT_LICENSE=        LGPLv2.1
COMPONENT_LICENSE_FILE=    LICENSE

TEST_TARGET = $(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk

COMPONENT_PREP_ACTION += (cd $(@D) &&\
            aclocal -I common &&\
        automake --add-missing &&\
        autoconf)
COMPONENT_PREP_ACTION += ( \
    cd $(@D) && \
    aclocal -I common && \
    automake --add-missing && \
    autoconf )

# Need this to build service-type-database
COMPONENT_PRE_CONFIGURE_ACTION = ( cp -r $(SOURCE_DIR)/* $(@D) )
COMPONENT_PRE_CONFIGURE_ACTION= ( cp -r $(SOURCE_DIR)/* $(@D) )

LDFLAGS += -ldns_sd

@@ -73,7 +75,9 @@
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"
COMPONENT_BUILD_ENV += CC="$(CC)"

# Build dependencies
unexport SHELLOPTS

# Manually added build dependencies
REQUIRED_PACKAGES += text/xmltoman

# Auto-generated dependencies

 components/network/avahi/avahi-gui.p5m

@@ -12,7 +12,7 @@
# Copyright 2019 Alexander Pyhalov
#

set name=pkg.fmri value=pkg:/system/network/avahi/gui@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)/gui@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="Avahi client GUI libs/utils"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
@@ -20,13 +20,9 @@
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

license LICENSE license='LGPLv2.1'
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/$(MACH64)/avahi-discover
file path=usr/bin/$(MACH64)/avahi-discover-standalone
link path=usr/bin/$(MACH64)/bshell target=bssh
file path=usr/bin/$(MACH64)/bssh
link path=usr/bin/$(MACH64)/bvnc target=bssh
file path=usr/bin/avahi-discover
file path=usr/bin/avahi-discover-standalone
link path=usr/bin/bshell target=bssh
file path=usr/bin/bssh
@@ -36,10 +32,6 @@
link path=usr/lib/$(MACH64)/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
file path=usr/lib/$(MACH64)/libavahi-ui.so.0.1.4
file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
link path=usr/lib/libavahi-ui.so target=libavahi-ui.so.0.1.4
link path=usr/lib/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
file path=usr/lib/libavahi-ui.so.0.1.4
file path=usr/lib/pkgconfig/avahi-ui.pc
file path=usr/share/applications/avahi-discover.desktop
file path=usr/share/applications/bssh.desktop
file path=usr/share/applications/bvnc.desktop

 components/network/avahi/avahi.p5m

@@ -1,18 +1,19 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"). You may
# only use this file in accordance with the terms of the CDDL.
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# source.  A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#

#
# Copyright 2014 Alexander Pyhalov. All rights reserved.
# # Copyright 2014 Alexander Pyhalov. All rights reserved.
#

set name=pkg.fmri value=pkg:/system/network/avahi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
@@ -20,37 +21,33 @@
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

license LICENSE license='LGPLv2.1'
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

<transform file path=.*\.py$ -> default pkg.tmp.autopyc false>
<transform file path=etc/.* ->  default preserve renamenew>
<transform file path=usr/share/locale/([^/]+)(\..+){0,1}(/.+){0,1} -> default facet.locale.%<\1> true>

<transform file path=.+/.*\.conf -> default preserve true>

file files/avahi-bridge-dsd.xml path=lib/svc/manifest/system/avahi-bridge-dsd.xml
file files/svc-avahi-bridge-dsd path=lib/svc/method/svc-avahi-bridge-dsd

file usr/sbin/avahi-daemon path=usr/sbin/$(MACH32)/avahi-daemon-bridge-dsd
file usr/sbin/$(MACH64)/avahi-daemon path=usr/sbin/$(MACH64)/avahi-daemon-bridge-dsd
hardlink path=usr/sbin/avahi-daemon-bridge-dsd target=../lib/isaexec pkg.linted.userland.action002.0=true
file usr/sbin/avahi-daemon path=usr/sbin/avahi-daemon-bridge-dsd

depend type=conditional fmri=pkg:/system/network/avahi/gui \
    predicate=pkg:/x11/server/xserver-common

file path=etc/avahi/avahi-daemon.conf
file path=etc/avahi/avahi-dnsconfd.action
file path=etc/avahi/hosts
file path=etc/avahi/services/sftp-ssh.service
file path=etc/avahi/services/ssh.service
file path=etc/dbus-1/system.d/avahi-dbus.conf
#file path=usr/bin/$(MACH64)/avahi-bookmarks
file path=usr/bin/$(MACH64)/avahi-browse
link path=usr/bin/$(MACH64)/avahi-browse-domains target=avahi-browse
file path=usr/bin/$(MACH64)/avahi-publish
link path=usr/bin/$(MACH64)/avahi-publish-address target=avahi-publish
link path=usr/bin/$(MACH64)/avahi-publish-service target=avahi-publish
file path=usr/bin/$(MACH64)/avahi-resolve
link path=usr/bin/$(MACH64)/avahi-resolve-address target=avahi-resolve
link path=usr/bin/$(MACH64)/avahi-resolve-host-name target=avahi-resolve
file path=usr/bin/$(MACH64)/avahi-set-host-name
link path=usr/bin/$(MACH64)/bshell target=bssh
#file path=usr/bin/avahi-bookmarks
file path=usr/bin/avahi-bookmarks pkg.depend.bypass-generate=.*
file path=usr/bin/avahi-browse
link path=usr/bin/avahi-browse-domains target=avahi-browse
#file path=usr/bin/avahi-discover
#file path=usr/bin/avahi-discover-standalone
file path=usr/bin/avahi-publish
link path=usr/bin/avahi-publish-address target=avahi-publish
link path=usr/bin/avahi-publish-service target=avahi-publish
@@ -58,6 +55,9 @@
link path=usr/bin/avahi-resolve-address target=avahi-resolve
link path=usr/bin/avahi-resolve-host-name target=avahi-resolve
file path=usr/bin/avahi-set-host-name
#link path=usr/bin/bshell target=bssh
#file path=usr/bin/bssh
#link path=usr/bin/bvnc target=bssh
file path=usr/include/avahi-client/client.h
file path=usr/include/avahi-client/lookup.h
file path=usr/include/avahi-client/publish.h
@@ -90,61 +90,44 @@
file path=usr/include/avahi-gobject/ga-record-browser.h
file path=usr/include/avahi-gobject/ga-service-browser.h
file path=usr/include/avahi-gobject/ga-service-resolver.h
#file path=usr/include/avahi-ui/avahi-ui.h
file path=usr/lib/$(MACH64)/avahi/service-types.db.dir
file path=usr/lib/$(MACH64)/avahi/service-types.db.pag
file path=usr/lib/$(MACH64)/girepository-1.0/Avahi-0.6.typelib
file path=usr/lib/$(MACH64)/girepository-1.0/AvahiCore-0.6.typelib
file path=usr/lib/$(MACH64)/libavahi-client.la
link path=usr/lib/$(MACH64)/libavahi-client.so target=libavahi-client.so.3.2.9
link path=usr/lib/$(MACH64)/libavahi-client.so.3 target=libavahi-client.so.3.2.9
file path=usr/lib/$(MACH64)/libavahi-client.so.3.2.9
file path=usr/lib/$(MACH64)/libavahi-common.la
link path=usr/lib/$(MACH64)/libavahi-common.so target=libavahi-common.so.3.5.3
link path=usr/lib/$(MACH64)/libavahi-common.so.3 target=libavahi-common.so.3.5.3
file path=usr/lib/$(MACH64)/libavahi-common.so.3.5.3
file path=usr/lib/$(MACH64)/libavahi-core.la
link path=usr/lib/$(MACH64)/libavahi-core.so target=libavahi-core.so.7.0.2
link path=usr/lib/$(MACH64)/libavahi-core.so.7 target=libavahi-core.so.7.0.2
file path=usr/lib/$(MACH64)/libavahi-core.so.7.0.2
file path=usr/lib/$(MACH64)/libavahi-glib.la
link path=usr/lib/$(MACH64)/libavahi-glib.so target=libavahi-glib.so.1.0.2
link path=usr/lib/$(MACH64)/libavahi-glib.so.1 target=libavahi-glib.so.1.0.2
file path=usr/lib/$(MACH64)/libavahi-glib.so.1.0.2
file path=usr/lib/$(MACH64)/libavahi-gobject.la
link path=usr/lib/$(MACH64)/libavahi-gobject.so target=libavahi-gobject.so.0.0.5
link path=usr/lib/$(MACH64)/libavahi-gobject.so.0 \
  target=libavahi-gobject.so.0.0.5
    target=libavahi-gobject.so.0.0.5
file path=usr/lib/$(MACH64)/libavahi-gobject.so.0.0.5
#link path=usr/lib/$(MACH64)/libavahi-ui.so target=libavahi-ui.so.0.1.4
#link path=usr/lib/$(MACH64)/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
#file path=usr/lib/$(MACH64)/libavahi-ui.so.0.1.4
file path=usr/lib/$(MACH64)/pkgconfig/avahi-client.pc
file path=usr/lib/$(MACH64)/pkgconfig/avahi-core.pc
file path=usr/lib/$(MACH64)/pkgconfig/avahi-glib.pc
file path=usr/lib/$(MACH64)/pkgconfig/avahi-gobject.pc
file path=usr/lib/avahi/service-types.db.dir
file path=usr/lib/avahi/service-types.db.pag
file path=usr/lib/girepository-1.0/Avahi-0.6.typelib
file path=usr/lib/girepository-1.0/AvahiCore-0.6.typelib
link path=usr/lib/libavahi-client.so target=libavahi-client.so.3.2.9
link path=usr/lib/libavahi-client.so.3 target=libavahi-client.so.3.2.9
file path=usr/lib/libavahi-client.so.3.2.9
link path=usr/lib/libavahi-common.so target=libavahi-common.so.3.5.3
link path=usr/lib/libavahi-common.so.3 target=libavahi-common.so.3.5.3
file path=usr/lib/libavahi-common.so.3.5.3
link path=usr/lib/libavahi-core.so target=libavahi-core.so.7.0.2
link path=usr/lib/libavahi-core.so.7 target=libavahi-core.so.7.0.2
file path=usr/lib/libavahi-core.so.7.0.2
link path=usr/lib/libavahi-glib.so target=libavahi-glib.so.1.0.2
link path=usr/lib/libavahi-glib.so.1 target=libavahi-glib.so.1.0.2
file path=usr/lib/libavahi-glib.so.1.0.2
link path=usr/lib/libavahi-gobject.so target=libavahi-gobject.so.0.0.5
link path=usr/lib/libavahi-gobject.so.0 target=libavahi-gobject.so.0.0.5
file path=usr/lib/libavahi-gobject.so.0.0.5
file path=usr/lib/pkgconfig/avahi-client.pc
file path=usr/lib/pkgconfig/avahi-core.pc
file path=usr/lib/pkgconfig/avahi-glib.pc
file path=usr/lib/pkgconfig/avahi-gobject.pc
#file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
file path=usr/lib/python$(PYVER)/vendor-packages/avahi/ServiceTypeDatabase.py pkg.depend.bypass-generate=.*
file path=usr/lib/python$(PYVER)/vendor-packages/avahi/__init__.py
file path=usr/sbin/avahi-daemon
file path=usr/sbin/avahi-dnsconfd
#file path=usr/share/applications/avahi-discover.desktop
#file path=usr/share/applications/bssh.desktop
#file path=usr/share/applications/bvnc.desktop
file path=usr/share/avahi/avahi-service.dtd
#file path=usr/share/avahi/interfaces/avahi-discover.ui
file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
@@ -199,9 +182,11 @@
file path=usr/share/locale/uk/LC_MESSAGES/avahi.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo
file path=usr/share/man/man1/avahi-bookmarks.1
link path=usr/share/man/man1/avahi-browse-domains.1 target=avahi-browse.1
file path=usr/share/man/man1/avahi-browse.1
file path=usr/share/man/man1/avahi-daemon-bridge-dsd.1
#file path=usr/share/man/man1/avahi-discover.1
link path=usr/share/man/man1/avahi-publish-address.1 target=avahi-publish.1
link path=usr/share/man/man1/avahi-publish-service.1 target=avahi-publish.1
file path=usr/share/man/man1/avahi-publish.1
@@ -209,4 +194,11 @@
link path=usr/share/man/man1/avahi-resolve-host-name.1 target=avahi-resolve.1
file path=usr/share/man/man1/avahi-resolve.1
file path=usr/share/man/man1/avahi-set-host-name.1

#file path=usr/share/man/man1/bssh.1
#link path=usr/share/man/man1/bvnc.1 target=bssh.1
file path=usr/share/man/man5/avahi-daemon.conf.5
file path=usr/share/man/man5/avahi.hosts.5
file path=usr/share/man/man5/avahi.service.5
file path=usr/share/man/man8/avahi-daemon.8
file path=usr/share/man/man8/avahi-dnsconfd.8
file path=usr/share/man/man8/avahi-dnsconfd.action.8

 components/network/avahi/manifests/sample-manifest.p5m

@@ -29,24 +29,10 @@
file path=etc/avahi/services/sftp-ssh.service
file path=etc/avahi/services/ssh.service
file path=etc/dbus-1/system.d/avahi-dbus.conf
file path=usr/bin/$(MACH64)/avahi-bookmarks
file path=usr/bin/$(MACH64)/avahi-browse
link path=usr/bin/$(MACH64)/avahi-browse-domains target=avahi-browse
file path=usr/bin/$(MACH64)/avahi-discover
file path=usr/bin/$(MACH64)/avahi-discover-standalone
file path=usr/bin/$(MACH64)/avahi-publish
link path=usr/bin/$(MACH64)/avahi-publish-address target=avahi-publish
link path=usr/bin/$(MACH64)/avahi-publish-service target=avahi-publish
file path=usr/bin/$(MACH64)/avahi-resolve
link path=usr/bin/$(MACH64)/avahi-resolve-address target=avahi-resolve
link path=usr/bin/$(MACH64)/avahi-resolve-host-name target=avahi-resolve
file path=usr/bin/$(MACH64)/avahi-set-host-name
link path=usr/bin/$(MACH64)/bshell target=bssh
file path=usr/bin/$(MACH64)/bssh
link path=usr/bin/$(MACH64)/bvnc target=bssh
file path=usr/bin/avahi-bookmarks
file path=usr/bin/avahi-browse
link path=usr/bin/avahi-browse-domains target=avahi-browse
file path=usr/bin/avahi-discover
file path=usr/bin/avahi-discover-standalone
file path=usr/bin/avahi-publish
link path=usr/bin/avahi-publish-address target=avahi-publish
@@ -119,37 +105,8 @@
file path=usr/lib/$(MACH64)/pkgconfig/avahi-glib.pc
file path=usr/lib/$(MACH64)/pkgconfig/avahi-gobject.pc
file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
file path=usr/lib/avahi/service-types.db.dir
file path=usr/lib/avahi/service-types.db.pag
file path=usr/lib/girepository-1.0/Avahi-0.6.typelib
file path=usr/lib/girepository-1.0/AvahiCore-0.6.typelib
link path=usr/lib/libavahi-client.so target=libavahi-client.so.3.2.9
link path=usr/lib/libavahi-client.so.3 target=libavahi-client.so.3.2.9
file path=usr/lib/libavahi-client.so.3.2.9
link path=usr/lib/libavahi-common.so target=libavahi-common.so.3.5.3
link path=usr/lib/libavahi-common.so.3 target=libavahi-common.so.3.5.3
file path=usr/lib/libavahi-common.so.3.5.3
link path=usr/lib/libavahi-core.so target=libavahi-core.so.7.0.2
link path=usr/lib/libavahi-core.so.7 target=libavahi-core.so.7.0.2
file path=usr/lib/libavahi-core.so.7.0.2
link path=usr/lib/libavahi-glib.so target=libavahi-glib.so.1.0.2
link path=usr/lib/libavahi-glib.so.1 target=libavahi-glib.so.1.0.2
file path=usr/lib/libavahi-glib.so.1.0.2
link path=usr/lib/libavahi-gobject.so target=libavahi-gobject.so.0.0.5
link path=usr/lib/libavahi-gobject.so.0 target=libavahi-gobject.so.0.0.5
file path=usr/lib/libavahi-gobject.so.0.0.5
link path=usr/lib/libavahi-ui.so target=libavahi-ui.so.0.1.4
link path=usr/lib/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
file path=usr/lib/libavahi-ui.so.0.1.4
file path=usr/lib/pkgconfig/avahi-client.pc
file path=usr/lib/pkgconfig/avahi-core.pc
file path=usr/lib/pkgconfig/avahi-glib.pc
file path=usr/lib/pkgconfig/avahi-gobject.pc
file path=usr/lib/pkgconfig/avahi-ui.pc
file path=usr/lib/python$(PYVER)/vendor-packages/avahi/ServiceTypeDatabase.py
file path=usr/lib/python$(PYVER)/vendor-packages/avahi/__init__.py
file path=usr/sbin/$(MACH64)/avahi-daemon
file path=usr/sbin/$(MACH64)/avahi-dnsconfd
file path=usr/sbin/avahi-daemon
file path=usr/sbin/avahi-dnsconfd
file path=usr/share/applications/avahi-discover.desktop

 components/network/avahi/pkg5

@@ -12,13 +12,13 @@
        "shell/ksh93",
        "system/library",
        "system/library/dbus",
        "system/library/gcc-10-runtime",
        "system/library/gcc-13-runtime",
        "system/library/libdbus",
        "text/xmltoman"
    ],
    "fmris": [
        "system/network/avahi",
        "system/network/avahi/gui"
        "system/network/avahi/gui",
        "system/network/avahi"
    ],
    "name": "avahi"
}

 components/network/avahi/test/results-all.master

New file
@@ -0,0 +1,9 @@
PASS: dns-test
PASS: hashmap-test
# TOTAL: 2
# PASS:  2
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0

			@@ -11,35 +11,37 @@

			#
			# Copyright 2014 Alexander Pyhalov. All rights reserved.
			# Copyright 2023 Andreas Wacknitz
			#

			BUILD_BITS = 32_and_64

			BUILD_BITS= 64
			USE_DEFAULT_TEST_TRANSFORMS= yes
			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= avahi
			COMPONENT_VERSION= 0.7
			COMPONENT_REVISION= 4
			COMPONENT_REVISION= 5
			COMPONENT_SUMMARY= Avahi client and bridge to pkg://service/network/dns/mdns
			COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
			COMPONENT_ARCHIVE_HASH= \
			sha256:57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
			COMPONENT_ARCHIVE_URL= \
			https://github.com/lathiat/avahi/releases/download/v0.7/$(COMPONENT_ARCHIVE)
			COMPONENT_PROJECT_URL = http://avahi.org
			COMPONENT_ARCHIVE_HASH= sha256:57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
			COMPONENT_ARCHIVE_URL= https://github.com/lathiat/avahi/releases/download/v0.7/$(COMPONENT_ARCHIVE)
			COMPONENT_PROJECT_URL= https://avahi.org
			COMPONENT_FMRI= system/network/avahi
			COMPONENT_CLASSIFICATION = Applications/Internet
			COMPONENT_LICENSE= LGPLv2.1
			COMPONENT_LICENSE_FILE= LICENSE

			TEST_TARGET = $(NO_TESTS)
			include $(WS_MAKE_RULES)/common.mk

			COMPONENT_PREP_ACTION += (cd $(@D) &&\
			aclocal -I common &&\
			automake --add-missing &&\
			autoconf)
			COMPONENT_PREP_ACTION += ( \
			cd $(@D) && \
			aclocal -I common && \
			automake --add-missing && \
			autoconf )

			# Need this to build service-type-database
			COMPONENT_PRE_CONFIGURE_ACTION = ( cp -r $(SOURCE_DIR)/* $(@D) )
			COMPONENT_PRE_CONFIGURE_ACTION= ( cp -r $(SOURCE_DIR)/* $(@D) )

			LDFLAGS += -ldns_sd

			@@ -73,7 +75,9 @@
			COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"
			COMPONENT_BUILD_ENV += CC="$(CC)"

			# Build dependencies
			unexport SHELLOPTS

			# Manually added build dependencies
			REQUIRED_PACKAGES += text/xmltoman

			# Auto-generated dependencies

			@@ -12,7 +12,7 @@
			# Copyright 2019 Alexander Pyhalov
			#

			set name=pkg.fmri value=pkg:/system/network/avahi/gui@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)/gui@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.human-version value=$(HUMAN_VERSION)
			set name=pkg.summary value="Avahi client GUI libs/utils"
			set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
			@@ -20,13 +20,9 @@
			set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
			set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

			license LICENSE license='LGPLv2.1'
			license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

			file path=usr/bin/$(MACH64)/avahi-discover
			file path=usr/bin/$(MACH64)/avahi-discover-standalone
			link path=usr/bin/$(MACH64)/bshell target=bssh
			file path=usr/bin/$(MACH64)/bssh
			link path=usr/bin/$(MACH64)/bvnc target=bssh
			file path=usr/bin/avahi-discover
			file path=usr/bin/avahi-discover-standalone
			link path=usr/bin/bshell target=bssh
			file path=usr/bin/bssh
			@@ -36,10 +32,6 @@
			link path=usr/lib/$(MACH64)/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
			file path=usr/lib/$(MACH64)/libavahi-ui.so.0.1.4
			file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
			link path=usr/lib/libavahi-ui.so target=libavahi-ui.so.0.1.4
			link path=usr/lib/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
			file path=usr/lib/libavahi-ui.so.0.1.4
			file path=usr/lib/pkgconfig/avahi-ui.pc
			file path=usr/share/applications/avahi-discover.desktop
			file path=usr/share/applications/bssh.desktop
			file path=usr/share/applications/bvnc.desktop

			@@ -1,18 +1,19 @@
			#
			# This file and its contents are supplied under the terms of the
			# Common Development and Distribution License ("CDDL"). You may
			# only use this file in accordance with the terms of the CDDL.
			# Common Development and Distribution License ("CDDL"), version 1.0.
			# You may only use this file in accordance with the terms of version
			# 1.0 of the CDDL.
			#
			# A full copy of the text of the CDDL should have accompanied this
			# source. A copy of the CDDL is also available via the Internet at
			# source. A copy of the CDDL is also available via the Internet at
			# http://www.illumos.org/license/CDDL.
			#

			#
			# Copyright 2014 Alexander Pyhalov. All rights reserved.
			# # Copyright 2014 Alexander Pyhalov. All rights reserved.
			#

			set name=pkg.fmri value=pkg:/system/network/avahi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			set name=pkg.human-version value=$(HUMAN_VERSION)
			set name=pkg.summary value="$(COMPONENT_SUMMARY)"
			set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
			@@ -20,37 +21,33 @@
			set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
			set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

			license LICENSE license='LGPLv2.1'
			license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

			<transform file path=.*\.py$ -> default pkg.tmp.autopyc false>
			<transform file path=etc/.* -> default preserve renamenew>
			<transform file path=usr/share/locale/([^/]+)(\..+){0,1}(/.+){0,1} -> default facet.locale.%<\1> true>

			<transform file path=.+/.*\.conf -> default preserve true>

			file files/avahi-bridge-dsd.xml path=lib/svc/manifest/system/avahi-bridge-dsd.xml
			file files/svc-avahi-bridge-dsd path=lib/svc/method/svc-avahi-bridge-dsd

			file usr/sbin/avahi-daemon path=usr/sbin/$(MACH32)/avahi-daemon-bridge-dsd
			file usr/sbin/$(MACH64)/avahi-daemon path=usr/sbin/$(MACH64)/avahi-daemon-bridge-dsd
			hardlink path=usr/sbin/avahi-daemon-bridge-dsd target=../lib/isaexec pkg.linted.userland.action002.0=true
			file usr/sbin/avahi-daemon path=usr/sbin/avahi-daemon-bridge-dsd

			depend type=conditional fmri=pkg:/system/network/avahi/gui \
			predicate=pkg:/x11/server/xserver-common

			file path=etc/avahi/avahi-daemon.conf
			file path=etc/avahi/avahi-dnsconfd.action
			file path=etc/avahi/hosts
			file path=etc/avahi/services/sftp-ssh.service
			file path=etc/avahi/services/ssh.service
			file path=etc/dbus-1/system.d/avahi-dbus.conf
			#file path=usr/bin/$(MACH64)/avahi-bookmarks
			file path=usr/bin/$(MACH64)/avahi-browse
			link path=usr/bin/$(MACH64)/avahi-browse-domains target=avahi-browse
			file path=usr/bin/$(MACH64)/avahi-publish
			link path=usr/bin/$(MACH64)/avahi-publish-address target=avahi-publish
			link path=usr/bin/$(MACH64)/avahi-publish-service target=avahi-publish
			file path=usr/bin/$(MACH64)/avahi-resolve
			link path=usr/bin/$(MACH64)/avahi-resolve-address target=avahi-resolve
			link path=usr/bin/$(MACH64)/avahi-resolve-host-name target=avahi-resolve
			file path=usr/bin/$(MACH64)/avahi-set-host-name
			link path=usr/bin/$(MACH64)/bshell target=bssh
			#file path=usr/bin/avahi-bookmarks
			file path=usr/bin/avahi-bookmarks pkg.depend.bypass-generate=.*
			file path=usr/bin/avahi-browse
			link path=usr/bin/avahi-browse-domains target=avahi-browse
			#file path=usr/bin/avahi-discover
			#file path=usr/bin/avahi-discover-standalone
			file path=usr/bin/avahi-publish
			link path=usr/bin/avahi-publish-address target=avahi-publish
			link path=usr/bin/avahi-publish-service target=avahi-publish
			@@ -58,6 +55,9 @@
			link path=usr/bin/avahi-resolve-address target=avahi-resolve
			link path=usr/bin/avahi-resolve-host-name target=avahi-resolve
			file path=usr/bin/avahi-set-host-name
			#link path=usr/bin/bshell target=bssh
			#file path=usr/bin/bssh
			#link path=usr/bin/bvnc target=bssh
			file path=usr/include/avahi-client/client.h
			file path=usr/include/avahi-client/lookup.h
			file path=usr/include/avahi-client/publish.h
			@@ -90,61 +90,44 @@
			file path=usr/include/avahi-gobject/ga-record-browser.h
			file path=usr/include/avahi-gobject/ga-service-browser.h
			file path=usr/include/avahi-gobject/ga-service-resolver.h
			#file path=usr/include/avahi-ui/avahi-ui.h
			file path=usr/lib/$(MACH64)/avahi/service-types.db.dir
			file path=usr/lib/$(MACH64)/avahi/service-types.db.pag
			file path=usr/lib/$(MACH64)/girepository-1.0/Avahi-0.6.typelib
			file path=usr/lib/$(MACH64)/girepository-1.0/AvahiCore-0.6.typelib
			file path=usr/lib/$(MACH64)/libavahi-client.la
			link path=usr/lib/$(MACH64)/libavahi-client.so target=libavahi-client.so.3.2.9
			link path=usr/lib/$(MACH64)/libavahi-client.so.3 target=libavahi-client.so.3.2.9
			file path=usr/lib/$(MACH64)/libavahi-client.so.3.2.9
			file path=usr/lib/$(MACH64)/libavahi-common.la
			link path=usr/lib/$(MACH64)/libavahi-common.so target=libavahi-common.so.3.5.3
			link path=usr/lib/$(MACH64)/libavahi-common.so.3 target=libavahi-common.so.3.5.3
			file path=usr/lib/$(MACH64)/libavahi-common.so.3.5.3
			file path=usr/lib/$(MACH64)/libavahi-core.la
			link path=usr/lib/$(MACH64)/libavahi-core.so target=libavahi-core.so.7.0.2
			link path=usr/lib/$(MACH64)/libavahi-core.so.7 target=libavahi-core.so.7.0.2
			file path=usr/lib/$(MACH64)/libavahi-core.so.7.0.2
			file path=usr/lib/$(MACH64)/libavahi-glib.la
			link path=usr/lib/$(MACH64)/libavahi-glib.so target=libavahi-glib.so.1.0.2
			link path=usr/lib/$(MACH64)/libavahi-glib.so.1 target=libavahi-glib.so.1.0.2
			file path=usr/lib/$(MACH64)/libavahi-glib.so.1.0.2
			file path=usr/lib/$(MACH64)/libavahi-gobject.la
			link path=usr/lib/$(MACH64)/libavahi-gobject.so target=libavahi-gobject.so.0.0.5
			link path=usr/lib/$(MACH64)/libavahi-gobject.so.0 \
			target=libavahi-gobject.so.0.0.5
			target=libavahi-gobject.so.0.0.5
			file path=usr/lib/$(MACH64)/libavahi-gobject.so.0.0.5
			#link path=usr/lib/$(MACH64)/libavahi-ui.so target=libavahi-ui.so.0.1.4
			#link path=usr/lib/$(MACH64)/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
			#file path=usr/lib/$(MACH64)/libavahi-ui.so.0.1.4
			file path=usr/lib/$(MACH64)/pkgconfig/avahi-client.pc
			file path=usr/lib/$(MACH64)/pkgconfig/avahi-core.pc
			file path=usr/lib/$(MACH64)/pkgconfig/avahi-glib.pc
			file path=usr/lib/$(MACH64)/pkgconfig/avahi-gobject.pc
			file path=usr/lib/avahi/service-types.db.dir
			file path=usr/lib/avahi/service-types.db.pag
			file path=usr/lib/girepository-1.0/Avahi-0.6.typelib
			file path=usr/lib/girepository-1.0/AvahiCore-0.6.typelib
			link path=usr/lib/libavahi-client.so target=libavahi-client.so.3.2.9
			link path=usr/lib/libavahi-client.so.3 target=libavahi-client.so.3.2.9
			file path=usr/lib/libavahi-client.so.3.2.9
			link path=usr/lib/libavahi-common.so target=libavahi-common.so.3.5.3
			link path=usr/lib/libavahi-common.so.3 target=libavahi-common.so.3.5.3
			file path=usr/lib/libavahi-common.so.3.5.3
			link path=usr/lib/libavahi-core.so target=libavahi-core.so.7.0.2
			link path=usr/lib/libavahi-core.so.7 target=libavahi-core.so.7.0.2
			file path=usr/lib/libavahi-core.so.7.0.2
			link path=usr/lib/libavahi-glib.so target=libavahi-glib.so.1.0.2
			link path=usr/lib/libavahi-glib.so.1 target=libavahi-glib.so.1.0.2
			file path=usr/lib/libavahi-glib.so.1.0.2
			link path=usr/lib/libavahi-gobject.so target=libavahi-gobject.so.0.0.5
			link path=usr/lib/libavahi-gobject.so.0 target=libavahi-gobject.so.0.0.5
			file path=usr/lib/libavahi-gobject.so.0.0.5
			file path=usr/lib/pkgconfig/avahi-client.pc
			file path=usr/lib/pkgconfig/avahi-core.pc
			file path=usr/lib/pkgconfig/avahi-glib.pc
			file path=usr/lib/pkgconfig/avahi-gobject.pc
			#file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
			file path=usr/lib/python$(PYVER)/vendor-packages/avahi/ServiceTypeDatabase.py pkg.depend.bypass-generate=.*
			file path=usr/lib/python$(PYVER)/vendor-packages/avahi/__init__.py
			file path=usr/sbin/avahi-daemon
			file path=usr/sbin/avahi-dnsconfd
			#file path=usr/share/applications/avahi-discover.desktop
			#file path=usr/share/applications/bssh.desktop
			#file path=usr/share/applications/bvnc.desktop
			file path=usr/share/avahi/avahi-service.dtd
			#file path=usr/share/avahi/interfaces/avahi-discover.ui
			file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
			file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
			file path=usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml
			@@ -199,9 +182,11 @@
			file path=usr/share/locale/uk/LC_MESSAGES/avahi.mo
			file path=usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo
			file path=usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo
			file path=usr/share/man/man1/avahi-bookmarks.1
			link path=usr/share/man/man1/avahi-browse-domains.1 target=avahi-browse.1
			file path=usr/share/man/man1/avahi-browse.1
			file path=usr/share/man/man1/avahi-daemon-bridge-dsd.1
			#file path=usr/share/man/man1/avahi-discover.1
			link path=usr/share/man/man1/avahi-publish-address.1 target=avahi-publish.1
			link path=usr/share/man/man1/avahi-publish-service.1 target=avahi-publish.1
			file path=usr/share/man/man1/avahi-publish.1
			@@ -209,4 +194,11 @@
			link path=usr/share/man/man1/avahi-resolve-host-name.1 target=avahi-resolve.1
			file path=usr/share/man/man1/avahi-resolve.1
			file path=usr/share/man/man1/avahi-set-host-name.1

			#file path=usr/share/man/man1/bssh.1
			#link path=usr/share/man/man1/bvnc.1 target=bssh.1
			file path=usr/share/man/man5/avahi-daemon.conf.5
			file path=usr/share/man/man5/avahi.hosts.5
			file path=usr/share/man/man5/avahi.service.5
			file path=usr/share/man/man8/avahi-daemon.8
			file path=usr/share/man/man8/avahi-dnsconfd.8
			file path=usr/share/man/man8/avahi-dnsconfd.action.8

			@@ -29,24 +29,10 @@
			file path=etc/avahi/services/sftp-ssh.service
			file path=etc/avahi/services/ssh.service
			file path=etc/dbus-1/system.d/avahi-dbus.conf
			file path=usr/bin/$(MACH64)/avahi-bookmarks
			file path=usr/bin/$(MACH64)/avahi-browse
			link path=usr/bin/$(MACH64)/avahi-browse-domains target=avahi-browse
			file path=usr/bin/$(MACH64)/avahi-discover
			file path=usr/bin/$(MACH64)/avahi-discover-standalone
			file path=usr/bin/$(MACH64)/avahi-publish
			link path=usr/bin/$(MACH64)/avahi-publish-address target=avahi-publish
			link path=usr/bin/$(MACH64)/avahi-publish-service target=avahi-publish
			file path=usr/bin/$(MACH64)/avahi-resolve
			link path=usr/bin/$(MACH64)/avahi-resolve-address target=avahi-resolve
			link path=usr/bin/$(MACH64)/avahi-resolve-host-name target=avahi-resolve
			file path=usr/bin/$(MACH64)/avahi-set-host-name
			link path=usr/bin/$(MACH64)/bshell target=bssh
			file path=usr/bin/$(MACH64)/bssh
			link path=usr/bin/$(MACH64)/bvnc target=bssh
			file path=usr/bin/avahi-bookmarks
			file path=usr/bin/avahi-browse
			link path=usr/bin/avahi-browse-domains target=avahi-browse
			file path=usr/bin/avahi-discover
			file path=usr/bin/avahi-discover-standalone
			file path=usr/bin/avahi-publish
			link path=usr/bin/avahi-publish-address target=avahi-publish
			@@ -119,37 +105,8 @@
			file path=usr/lib/$(MACH64)/pkgconfig/avahi-glib.pc
			file path=usr/lib/$(MACH64)/pkgconfig/avahi-gobject.pc
			file path=usr/lib/$(MACH64)/pkgconfig/avahi-ui.pc
			file path=usr/lib/avahi/service-types.db.dir
			file path=usr/lib/avahi/service-types.db.pag
			file path=usr/lib/girepository-1.0/Avahi-0.6.typelib
			file path=usr/lib/girepository-1.0/AvahiCore-0.6.typelib
			link path=usr/lib/libavahi-client.so target=libavahi-client.so.3.2.9
			link path=usr/lib/libavahi-client.so.3 target=libavahi-client.so.3.2.9
			file path=usr/lib/libavahi-client.so.3.2.9
			link path=usr/lib/libavahi-common.so target=libavahi-common.so.3.5.3
			link path=usr/lib/libavahi-common.so.3 target=libavahi-common.so.3.5.3
			file path=usr/lib/libavahi-common.so.3.5.3
			link path=usr/lib/libavahi-core.so target=libavahi-core.so.7.0.2
			link path=usr/lib/libavahi-core.so.7 target=libavahi-core.so.7.0.2
			file path=usr/lib/libavahi-core.so.7.0.2
			link path=usr/lib/libavahi-glib.so target=libavahi-glib.so.1.0.2
			link path=usr/lib/libavahi-glib.so.1 target=libavahi-glib.so.1.0.2
			file path=usr/lib/libavahi-glib.so.1.0.2
			link path=usr/lib/libavahi-gobject.so target=libavahi-gobject.so.0.0.5
			link path=usr/lib/libavahi-gobject.so.0 target=libavahi-gobject.so.0.0.5
			file path=usr/lib/libavahi-gobject.so.0.0.5
			link path=usr/lib/libavahi-ui.so target=libavahi-ui.so.0.1.4
			link path=usr/lib/libavahi-ui.so.0 target=libavahi-ui.so.0.1.4
			file path=usr/lib/libavahi-ui.so.0.1.4
			file path=usr/lib/pkgconfig/avahi-client.pc
			file path=usr/lib/pkgconfig/avahi-core.pc
			file path=usr/lib/pkgconfig/avahi-glib.pc
			file path=usr/lib/pkgconfig/avahi-gobject.pc
			file path=usr/lib/pkgconfig/avahi-ui.pc
			file path=usr/lib/python$(PYVER)/vendor-packages/avahi/ServiceTypeDatabase.py
			file path=usr/lib/python$(PYVER)/vendor-packages/avahi/__init__.py
			file path=usr/sbin/$(MACH64)/avahi-daemon
			file path=usr/sbin/$(MACH64)/avahi-dnsconfd
			file path=usr/sbin/avahi-daemon
			file path=usr/sbin/avahi-dnsconfd
			file path=usr/share/applications/avahi-discover.desktop

			@@ -12,13 +12,13 @@
			"shell/ksh93",
			"system/library",
			"system/library/dbus",
			"system/library/gcc-10-runtime",
			"system/library/gcc-13-runtime",
			"system/library/libdbus",
			"text/xmltoman"
			],
			"fmris": [
			"system/network/avahi",
			"system/network/avahi/gui"
			"system/network/avahi/gui",
			"system/network/avahi"
			],
			"name": "avahi"
			}

New file
			@@ -0,0 +1,9 @@
			PASS: dns-test
			PASS: hashmap-test
			# TOTAL: 2
			# PASS: 2
			# SKIP: 0
			# XFAIL: 0
			# FAIL: 0
			# XPASS: 0
			# ERROR: 0