diff options
author | wiz <wiz@pkgsrc.org> | 2020-03-23 15:56:55 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2020-03-23 15:56:55 +0000 |
commit | 082c76373422a006d5ebfb5f2155b5d184d79e6c (patch) | |
tree | b1b66a8423a8c5f0c8a3959164e7e9967e2ba520 /net/avahi | |
parent | 137bb5411ca00dbbdbb5982be38b640dd90d568d (diff) | |
download | pkgsrc-082c76373422a006d5ebfb5f2155b5d184d79e6c.tar.gz |
avahi: remove (default-off) gtk2 option
The gtk3 option still remains, and this package has too many options already.
(Also, the gtk2 and python didn't work cleanly with each other.)
Diffstat (limited to 'net/avahi')
-rw-r--r-- | net/avahi/Makefile | 4 | ||||
-rw-r--r-- | net/avahi/PLIST | 7 | ||||
-rw-r--r-- | net/avahi/buildlink3.mk | 6 | ||||
-rw-r--r-- | net/avahi/options.mk | 15 |
4 files changed, 8 insertions, 24 deletions
diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 6c53ece63d4..5c02c410513 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2020/03/23 09:22:07 nia Exp $ +# $NetBSD: Makefile,v 1.92 2020/03/23 15:56:55 wiz Exp $ DISTNAME= avahi-0.6.32 PKGREVISION= 22 @@ -19,6 +19,8 @@ USE_PKGLOCALEDIR= YES USE_TOOLS+= pkg-config gmake intltool msgfmt xgettext MAKE_JOBS_SAFE= no +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 diff --git a/net/avahi/PLIST b/net/avahi/PLIST index dc8a341994c..94728df4328 100644 --- a/net/avahi/PLIST +++ b/net/avahi/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2020/03/23 11:49:58 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.18 2020/03/23 15:56:55 wiz Exp $ bin/avahi-browse bin/avahi-browse-domains ${PLIST.ui}bin/avahi-discover-standalone @@ -53,7 +53,6 @@ lib/libavahi-core.la lib/libavahi-glib.la lib/libavahi-gobject.la ${PLIST.gtk3}lib/libavahi-ui-gtk3.la -${PLIST.gtk2}lib/libavahi-ui.la ${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll ${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll ${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll @@ -69,7 +68,6 @@ lib/pkgconfig/avahi-gobject.pc ${PLIST.mono}lib/pkgconfig/avahi-sharp.pc ${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc ${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc -${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc man/man1/avahi-browse-domains.1 man/man1/avahi-browse.1 man/man1/avahi-publish-address.1 @@ -79,8 +77,6 @@ man/man1/avahi-resolve-address.1 man/man1/avahi-resolve-host-name.1 man/man1/avahi-resolve.1 man/man1/avahi-set-host-name.1 -${PLIST.gtk2}man/man1/bssh.1 -${PLIST.gtk2}man/man1/bvnc.1 man/man5/avahi-daemon.conf.5 man/man5/avahi.hosts.5 man/man5/avahi.service.5 @@ -92,7 +88,6 @@ sbin/avahi-dnsconfd ${PLIST.ui}share/applications/bssh.desktop ${PLIST.ui}share/applications/bvnc.desktop share/avahi/avahi-service.dtd -${PLIST.gtk2}${PLIST.ui}share/avahi/interfaces/avahi-discover.ui share/avahi/service-types share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml diff --git a/net/avahi/buildlink3.mk b/net/avahi/buildlink3.mk index ac5cbac33e3..982df8b01b1 100644 --- a/net/avahi/buildlink3.mk +++ b/net/avahi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.43 2020/03/10 22:08:56 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2020/03/23 15:56:55 wiz Exp $ BUILDLINK_TREE+= avahi @@ -16,10 +16,6 @@ pkgbase := avahi . include "../../databases/gdbm/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk2) -.include "../../x11/gtk2/buildlink3.mk" -.endif - .if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk3) .include "../../x11/gtk3/buildlink3.mk" .endif diff --git a/net/avahi/options.mk b/net/avahi/options.mk index aa1498690b3..5c194e19e72 100644 --- a/net/avahi/options.mk +++ b/net/avahi/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.16 2020/03/23 09:22:07 nia Exp $ +# $NetBSD: options.mk,v 1.17 2020/03/23 15:56:55 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.avahi -PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python +PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk3 mono python PKG_SUPPORTED_OPTIONS+= tests PKG_SUGGESTED_OPTIONS+= gtk3 -PLIST_VARS+= introspection gtk2 gtk3 mono ui +PLIST_VARS+= introspection gtk3 mono ui .include "../../mk/bsd.options.mk" @@ -25,15 +25,6 @@ PLIST_SRC+= ${PKGDIR}/PLIST.howl CONFIGURE_ARGS+= --disable-gdbm .endif -.if !empty(PKG_OPTIONS:Mgtk2) -BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.14.0 -.include "../../x11/gtk2/buildlink3.mk" -PLIST.gtk2= yes -PLIST.ui= yes -.else -CONFIGURE_ARGS+= --disable-gtk -.endif - .if !empty(PKG_OPTIONS:Mgtk3) .include "../../x11/gtk3/buildlink3.mk" PLIST.gtk3= yes |