pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net avahi: Split off package into *-ui variant for the...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1d1aa287c4d3
branches: trunk
changeset: 444464:1d1aa287c4d3
user: nia <nia%pkgsrc.org@localhost>
date: Fri Jan 08 14:08:35 2021 +0000
description:
avahi: Split off package into *-ui variant for the GTK UIs.
thou shalt not add a confusing amount of PKG_OPTIONS to a library.
diffstat:
net/Makefile | 3 +-
net/avahi-ui/DESCR | 4 ++
net/avahi-ui/Makefile | 29 +++++++++++++++
net/avahi-ui/PLIST | 9 ++++
net/avahi-ui/buildlink3.mk | 15 ++++++++
net/avahi/Makefile | 80 ++----------------------------------------
net/avahi/Makefile.common | 85 ++++++++++++++++++++++++++++++++++++++++++++++
net/avahi/PLIST | 26 +-------------
net/avahi/PLIST.howl | 22 -----------
net/avahi/PLIST.pygdbm | 8 ----
net/avahi/PLIST.python | 6 ---
net/avahi/buildlink3.mk | 25 +------------
net/avahi/options.mk | 77 -----------------------------------------
13 files changed, 151 insertions(+), 238 deletions(-)
diffs (truncated from 530 to 300 lines):
diff -r 6d1f97d48108 -r 1d1aa287c4d3 net/Makefile
--- a/net/Makefile Fri Jan 08 12:37:09 2021 +0000
+++ b/net/Makefile Fri Jan 08 14:08:35 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1369 2021/01/01 16:36:41 nia Exp $
+# $NetBSD: Makefile,v 1.1370 2021/01/08 14:08:35 nia Exp $
#
COMMENT= Networking tools
@@ -35,6 +35,7 @@
SUBDIR+= arpwatch
SUBDIR+= autonet
SUBDIR+= avahi
+SUBDIR+= avahi-ui
SUBDIR+= awhois
SUBDIR+= aws-sdk-go
SUBDIR+= balance
diff -r 6d1f97d48108 -r 1d1aa287c4d3 net/avahi-ui/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/avahi-ui/DESCR Fri Jan 08 14:08:35 2021 +0000
@@ -0,0 +1,4 @@
+Avahi is an implementation of the DNS Service Discovery and Multicast DNS
+specifications for Zeroconf Computing.
+
+This package contains graphical user interfaces for Avahi.
diff -r 6d1f97d48108 -r 1d1aa287c4d3 net/avahi-ui/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/avahi-ui/Makefile Fri Jan 08 14:08:35 2021 +0000
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1 2021/01/08 14:08:35 nia Exp $
+
+.include "../../net/avahi/Makefile.common"
+
+PKGNAME= ${DISTNAME:S/avahi-/avahi-ui-/g}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+COMMENT= Facilitate service discovery on a local network (GUI)
+
+BUILD_DIRS+= avahi-common avahi-client avahi-glib avahi-ui
+INSTALL_DIRS+= avahi-ui
+
+CONFIGURE_ARGS+= --enable-gtk3
+
+INSTALLATION_DIRS+= lib/pkgconfig
+
+PKGCONFIG_OVERRIDE_STAGE= pre-install
+PKGCONFIG_OVERRIDE+= avahi-ui-gtk3.pc
+
+pre-install:
+ cd ${WRKSRC} && ${MAKE_ENV} ${GMAKE} avahi-ui-gtk3.pc
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/avahi-ui-gtk3.pc \
+ ${DESTDIR}${PREFIX}/lib/pkgconfig
+
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 6d1f97d48108 -r 1d1aa287c4d3 net/avahi-ui/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/avahi-ui/PLIST Fri Jan 08 14:08:35 2021 +0000
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2021/01/08 14:08:35 nia Exp $
+bin/bshell
+bin/bssh
+bin/bvnc
+include/avahi-ui/avahi-ui.h
+lib/libavahi-ui-gtk3.la
+lib/pkgconfig/avahi-ui-gtk3.pc
+share/applications/bssh.desktop
+share/applications/bvnc.desktop
diff -r 6d1f97d48108 -r 1d1aa287c4d3 net/avahi-ui/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/avahi-ui/buildlink3.mk Fri Jan 08 14:08:35 2021 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2021/01/08 14:08:35 nia Exp $
+
+BUILDLINK_TREE+= avahi-ui
+
+.if !defined(AVAHI_UI_BUILDLINK3_MK)
+AVAHI_UI_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.avahi-ui+= avahi-ui>=0.8
+BUILDLINK_PKGSRCDIR.avahi-ui?= ../../net/avahi-ui
+
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../net/avahi/buildlink3.mk"
+.endif # AVAHI_UI_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -avahi-ui
diff -r 6d1f97d48108 -r 1d1aa287c4d3 net/avahi/Makefile
--- a/net/avahi/Makefile Fri Jan 08 12:37:09 2021 +0000
+++ b/net/avahi/Makefile Fri Jan 08 14:08:35 2021 +0000
@@ -1,61 +1,19 @@
-# $NetBSD: Makefile,v 1.98 2020/12/04 20:45:32 nia Exp $
+# $NetBSD: Makefile,v 1.99 2021/01/08 14:08:35 nia Exp $
-DISTNAME= avahi-0.8
+.include "Makefile.common"
+
PKGREVISION= 3
-CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_GITHUB:=lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://avahi.org/
COMMENT= Facilitate service discovery on a local network
-LICENSE= gnu-lgpl-v2.1
-
-EXTRACT_USING= bsdtar
-
-GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
-USE_PKGINSTALL= YES
-USE_PKGLOCALEDIR= YES
-USE_TOOLS+= pkg-config gmake msgfmt xgettext
-
-# Requires --desktop in msgfmt.
-_TOOLS_USE_PKGSRC.msgfmt= yes
-
-CONFIGURE_ARGS+= --disable-gtk
-PKGCONFIG_OVERRIDE+= avahi-client.pc.in
-PKGCONFIG_OVERRIDE+= avahi-compat-howl.pc.in
-PKGCONFIG_OVERRIDE+= avahi-compat-libdns_sd.pc.in
-PKGCONFIG_OVERRIDE+= avahi-core.pc.in
-PKGCONFIG_OVERRIDE+= avahi-glib.pc.in
-PKGCONFIG_OVERRIDE+= avahi-gobject.pc.in
-PKGCONFIG_OVERRIDE+= avahi-libevent.pc.in
-PKGCONFIG_OVERRIDE+= avahi-qt3.pc.in
-PKGCONFIG_OVERRIDE+= avahi-qt4.pc.in
-PKGCONFIG_OVERRIDE+= avahi-qt5.pc.in
-PKGCONFIG_OVERRIDE+= avahi-sharp.pc.in
-PKGCONFIG_OVERRIDE+= avahi-ui-gtk3.pc.in
-PKGCONFIG_OVERRIDE+= avahi-ui-sharp.pc.in
-PKGCONFIG_OVERRIDE+= avahi-ui.pc.in
-
-AVAHI_USER= avahi
-AVAHI_GROUP= avahi
-RCD_SCRIPTS= avahidaemon
-BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
-PLIST_SRC= ${PKGDIR}/PLIST
-PKG_SYSCONFSUBDIR= avahi
-USE_LANGUAGES= c99 c++
+CONFIGURE_ARGS+= --disable-gtk3
PKG_USERS= ${AVAHI_USER}:${AVAHI_GROUP}
PKG_GROUPS= ${AVAHI_GROUP}
PKG_GECOS.${AVAHI_USER}= Avahi user
-.include "options.mk"
-
-CFLAGS.NetBSD+= -D_NETBSD_SOURCE
-CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=600
-# Not yet reported upstream.
-CPPFLAGS.Darwin+= -D__APPLE_USE_RFC_3542
+RCD_SCRIPTS= avahidaemon
PLIST_SRC+= ${PKGDIR}/PLIST.shared
@@ -72,27 +30,6 @@
CONF_FILES+= ${PREFIX}/share/examples/avahi/avahi-dbus.conf \
${PKG_SYSCONFBASE}/dbus-1/system.d/avahi-dbus.conf
-CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER}
-CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP}
-CONFIGURE_ARGS+= --with-avahi_priv_access_group=${REAL_ROOT_GROUP}
-CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-CONFIGURE_ARGS+= --with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
-CONFIGURE_ARGS+= --disable-doxygen-doc
-CONFIGURE_ARGS+= --disable-doxygen-dot
-CONFIGURE_ARGS+= --disable-doxygen-html --disable-doxygen-xml
-CONFIGURE_ARGS+= --disable-xmltoman
-CONFIGURE_ARGS+= --disable-autoipd
-CONFIGURE_ARGS+= --disable-libevent
-CONFIGURE_ARGS+= --disable-qt3
-CONFIGURE_ARGS+= --disable-qt4
-CONFIGURE_ARGS+= --disable-qt5
-CONFIGURE_ARGS+= --disable-pygobject
-CONFIGURE_ARGS+= --with-distro=none
-
-INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
-INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi
-
INSTALLATION_DIRS+= share/doc/avahi
MAKE_DIRS+= ${PKG_SYSCONFDIR}/services
@@ -104,11 +41,4 @@
${INSTALL_DATA} ${WRKSRC}/docs/README ${DESTDIR}${PREFIX}/share/doc/avahi
${INSTALL_DATA} ${WRKSRC}/docs/TODO ${DESTDIR}${PREFIX}/share/doc/avahi
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libdaemon+= libdaemon>=0.14
-.include "../../devel/libdaemon/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6d1f97d48108 -r 1d1aa287c4d3 net/avahi/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/avahi/Makefile.common Fri Jan 08 14:08:35 2021 +0000
@@ -0,0 +1,85 @@
+# $NetBSD: Makefile.common,v 1.1 2021/01/08 14:08:35 nia Exp $
+# used by net/avahi/Makefile
+# used by net/avahi-ui/Makefile
+
+DISTNAME= avahi-0.8
+CATEGORIES= net
+MASTER_SITES= ${MASTER_SITE_GITHUB:=lathiat/avahi/releases/download/v${PKGVERSION_NOREV}/}
+
+HOMEPAGE= https://avahi.org/
+LICENSE= gnu-lgpl-v2.1
+
+PATCHDIR= ${.CURDIR}/../../net/avahi/patches
+DISTINFO_FILE= ${.CURDIR}/../../net/avahi/distinfo
+
+GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
+USE_PKGINSTALL= YES
+USE_PKGLOCALEDIR= YES
+USE_TOOLS+= pkg-config gmake msgfmt xgettext msgmerge
+
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "NetBSD"
+# Requires --desktop in msgfmt.
+TOOLS_PLATFORM.msgfmt=
+.endif
+
+PKGCONFIG_OVERRIDE+= avahi-client.pc.in
+PKGCONFIG_OVERRIDE+= avahi-compat-howl.pc.in
+PKGCONFIG_OVERRIDE+= avahi-compat-libdns_sd.pc.in
+PKGCONFIG_OVERRIDE+= avahi-core.pc.in
+PKGCONFIG_OVERRIDE+= avahi-glib.pc.in
+PKGCONFIG_OVERRIDE+= avahi-gobject.pc.in
+PKGCONFIG_OVERRIDE+= avahi-libevent.pc.in
+PKGCONFIG_OVERRIDE+= avahi-qt3.pc.in
+PKGCONFIG_OVERRIDE+= avahi-qt4.pc.in
+PKGCONFIG_OVERRIDE+= avahi-qt5.pc.in
+PKGCONFIG_OVERRIDE+= avahi-sharp.pc.in
+PKGCONFIG_OVERRIDE+= avahi-ui-gtk3.pc.in
+PKGCONFIG_OVERRIDE+= avahi-ui-sharp.pc.in
+PKGCONFIG_OVERRIDE+= avahi-ui.pc.in
+
+AVAHI_USER?= avahi
+AVAHI_GROUP?= avahi
+BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
+PLIST_SRC= ${PKGDIR}/PLIST
+PKG_SYSCONFSUBDIR= avahi
+USE_LANGUAGES= c99 c++
+
+CFLAGS.NetBSD+= -D_NETBSD_SOURCE
+CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=600
+# Not yet reported upstream.
+CPPFLAGS.Darwin+= -D__APPLE_USE_RFC_3542
+
+CONFIGURE_ARGS+= --with-avahi-user=${AVAHI_USER}
+CONFIGURE_ARGS+= --with-avahi-group=${AVAHI_GROUP}
+CONFIGURE_ARGS+= --with-avahi_priv_access_group=${REAL_ROOT_GROUP}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
+CONFIGURE_ARGS+= --with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+= --disable-doxygen-doc
+CONFIGURE_ARGS+= --disable-doxygen-dot
+CONFIGURE_ARGS+= --disable-doxygen-html --disable-doxygen-xml
+CONFIGURE_ARGS+= --disable-xmltoman
+CONFIGURE_ARGS+= --disable-autoipd
+CONFIGURE_ARGS+= --disable-libevent
+CONFIGURE_ARGS+= --disable-qt3
+CONFIGURE_ARGS+= --disable-qt4
+CONFIGURE_ARGS+= --disable-qt5
+CONFIGURE_ARGS+= --disable-gtk
+CONFIGURE_ARGS+= --disable-mono
+CONFIGURE_ARGS+= --disable-pygobject
+CONFIGURE_ARGS+= --disable-python
+CONFIGURE_ARGS+= --with-distro=none
+
+INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
+INSTALL_MAKE_FLAGS+= dbusservicedir=${PREFIX}/share/examples/avahi
+
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libdaemon+= libdaemon>=0.14
+.include "../../devel/libdaemon/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
diff -r 6d1f97d48108 -r 1d1aa287c4d3 net/avahi/PLIST
--- a/net/avahi/PLIST Fri Jan 08 12:37:09 2021 +0000
+++ b/net/avahi/PLIST Fri Jan 08 14:08:35 2021 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.19 2020/09/29 10:56:56 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.20 2021/01/08 14:08:35 nia Exp $
bin/avahi-browse
bin/avahi-browse-domains
-${PLIST.ui}bin/avahi-discover-standalone
bin/avahi-publish
bin/avahi-publish-address
Home |
Main Index |
Thread Index |
Old Index