Tue Sep 26 06:56:23 2017 UTC ()
avahi: Remove qt3 option.


(wiz)
diff -r1.12 -r1.13 pkgsrc/net/avahi/PLIST
diff -r1.9 -r1.10 pkgsrc/net/avahi/options.mk
cvs diff -r1.12 -r1.13 pkgsrc/net/avahi/PLIST (expand / switch to unified diff)

--- pkgsrc/net/avahi/PLIST 2016/08/15 20:23:11 1.12
+++ pkgsrc/net/avahi/PLIST 2017/09/26 06:56:23 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.12 2016/08/15 20:23:11 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.13 2017/09/26 06:56:23 wiz Exp $
2bin/avahi-browse 2bin/avahi-browse
3bin/avahi-browse-domains 3bin/avahi-browse-domains
4${PLIST.ui}bin/avahi-discover-standalone 4${PLIST.ui}bin/avahi-discover-standalone
5bin/avahi-publish 5bin/avahi-publish
6bin/avahi-publish-address 6bin/avahi-publish-address
7bin/avahi-publish-service 7bin/avahi-publish-service
8bin/avahi-resolve 8bin/avahi-resolve
9bin/avahi-resolve-address 9bin/avahi-resolve-address
10bin/avahi-resolve-host-name 10bin/avahi-resolve-host-name
11bin/avahi-set-host-name 11bin/avahi-set-host-name
12${PLIST.ui}bin/bshell 12${PLIST.ui}bin/bshell
13${PLIST.ui}bin/bssh 13${PLIST.ui}bin/bssh
14${PLIST.ui}bin/bvnc 14${PLIST.ui}bin/bvnc
@@ -34,53 +34,50 @@ include/avahi-core/core.h @@ -34,53 +34,50 @@ include/avahi-core/core.h
34include/avahi-core/log.h 34include/avahi-core/log.h
35include/avahi-core/lookup.h 35include/avahi-core/lookup.h
36include/avahi-core/publish.h 36include/avahi-core/publish.h
37include/avahi-core/rr.h 37include/avahi-core/rr.h
38include/avahi-glib/glib-malloc.h 38include/avahi-glib/glib-malloc.h
39include/avahi-glib/glib-watch.h 39include/avahi-glib/glib-watch.h
40include/avahi-gobject/ga-client.h 40include/avahi-gobject/ga-client.h
41include/avahi-gobject/ga-entry-group.h 41include/avahi-gobject/ga-entry-group.h
42include/avahi-gobject/ga-enums.h 42include/avahi-gobject/ga-enums.h
43include/avahi-gobject/ga-error.h 43include/avahi-gobject/ga-error.h
44include/avahi-gobject/ga-record-browser.h 44include/avahi-gobject/ga-record-browser.h
45include/avahi-gobject/ga-service-browser.h 45include/avahi-gobject/ga-service-browser.h
46include/avahi-gobject/ga-service-resolver.h 46include/avahi-gobject/ga-service-resolver.h
47${PLIST.qt3}include/avahi-qt3/qt-watch.h 
48${PLIST.qt}include/avahi-qt4/qt-watch.h 47${PLIST.qt}include/avahi-qt4/qt-watch.h
49${PLIST.gtk2}include/avahi-ui/avahi-ui.h 48${PLIST.gtk2}include/avahi-ui/avahi-ui.h
50${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib 49${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib
51${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib 50${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib
52lib/libavahi-client.la 51lib/libavahi-client.la
53lib/libavahi-common.la 52lib/libavahi-common.la
54lib/libavahi-core.la 53lib/libavahi-core.la
55lib/libavahi-glib.la 54lib/libavahi-glib.la
56lib/libavahi-gobject.la 55lib/libavahi-gobject.la
57${PLIST.qt3}lib/libavahi-qt3.la 
58${PLIST.qt}lib/libavahi-qt4.la 56${PLIST.qt}lib/libavahi-qt4.la
59${PLIST.gtk3}lib/libavahi-ui-gtk3.la 57${PLIST.gtk3}lib/libavahi-ui-gtk3.la
60${PLIST.gtk2}lib/libavahi-ui.la 58${PLIST.gtk2}lib/libavahi-ui.la
61${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll 59${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll
62${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll 60${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll
63${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll 61${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll
64${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.config 62${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.config
65${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb 63${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb
66${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll 64${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll
67${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.config 65${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.config
68${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.mdb 66${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.mdb
69lib/pkgconfig/avahi-client.pc 67lib/pkgconfig/avahi-client.pc
70lib/pkgconfig/avahi-core.pc 68lib/pkgconfig/avahi-core.pc
71lib/pkgconfig/avahi-glib.pc 69lib/pkgconfig/avahi-glib.pc
72lib/pkgconfig/avahi-gobject.pc 70lib/pkgconfig/avahi-gobject.pc
73${PLIST.qt3}lib/pkgconfig/avahi-qt3.pc 
74${PLIST.qt}lib/pkgconfig/avahi-qt4.pc 71${PLIST.qt}lib/pkgconfig/avahi-qt4.pc
75${PLIST.mono}lib/pkgconfig/avahi-sharp.pc 72${PLIST.mono}lib/pkgconfig/avahi-sharp.pc
76${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc 73${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc
77${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc 74${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc
78${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc 75${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc
79man/man1/avahi-browse-domains.1 76man/man1/avahi-browse-domains.1
80man/man1/avahi-browse.1 77man/man1/avahi-browse.1
81man/man1/avahi-publish-address.1 78man/man1/avahi-publish-address.1
82man/man1/avahi-publish-service.1 79man/man1/avahi-publish-service.1
83man/man1/avahi-publish.1 80man/man1/avahi-publish.1
84man/man1/avahi-resolve-address.1 81man/man1/avahi-resolve-address.1
85man/man1/avahi-resolve-host-name.1 82man/man1/avahi-resolve-host-name.1
86man/man1/avahi-resolve.1 83man/man1/avahi-resolve.1
cvs diff -r1.9 -r1.10 pkgsrc/net/avahi/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/net/avahi/Attic/options.mk 2017/01/01 14:43:49 1.9
+++ pkgsrc/net/avahi/Attic/options.mk 2017/09/26 06:56:23 1.10
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: options.mk,v 1.9 2017/01/01 14:43:49 wiz Exp $ 1# $NetBSD: options.mk,v 1.10 2017/09/26 06:56:23 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.avahi 3PKG_OPTIONS_VAR= PKG_OPTIONS.avahi
4PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python qt3 4PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python
5PKG_SUPPORTED_OPTIONS+= qt tests 5PKG_SUPPORTED_OPTIONS+= qt tests
6PKG_SUGGESTED_OPTIONS+= gtk2 6PKG_SUGGESTED_OPTIONS+= gtk2
7PLIST_VARS+= introspection gtk2 gtk3 mono qt3 qt ui 7PLIST_VARS+= introspection gtk2 gtk3 mono qt ui
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Enable compatibility layer for HOWL 12### Enable compatibility layer for HOWL
13### 13###
14.if !empty(PKG_OPTIONS:Mavahi-howl) 14.if !empty(PKG_OPTIONS:Mavahi-howl)
15CONFIGURE_ARGS+= --enable-compat-howl 15CONFIGURE_ARGS+= --enable-compat-howl
16PLIST_SRC+= ${PKGDIR}/PLIST.howl 16PLIST_SRC+= ${PKGDIR}/PLIST.howl
17.endif 17.endif
18 18
19### 19###
20### Enable gdbm support 20### Enable gdbm support
@@ -49,33 +49,26 @@ PLIST.introspection= yes @@ -49,33 +49,26 @@ PLIST.introspection= yes
49.else 49.else
50CONFIGURE_ARGS+= --enable-introspection=no 50CONFIGURE_ARGS+= --enable-introspection=no
51.endif 51.endif
52 52
53.if !empty(PKG_OPTIONS:Mmono) 53.if !empty(PKG_OPTIONS:Mmono)
54.include "../../x11/gtk-sharp/buildlink3.mk" 54.include "../../x11/gtk-sharp/buildlink3.mk"
55.include "../../lang/mono2/buildlink3.mk" 55.include "../../lang/mono2/buildlink3.mk"
56CONFIGURE_ARGS+= --disable-monodoc # XXX broken 56CONFIGURE_ARGS+= --disable-monodoc # XXX broken
57PLIST.mono= yes 57PLIST.mono= yes
58.else 58.else
59CONFIGURE_ARGS+= --disable-mono --disable-monodoc 59CONFIGURE_ARGS+= --disable-mono --disable-monodoc
60.endif 60.endif
61 61
62.if !empty(PKG_OPTIONS:Mqt3) 
63.include "../../x11/qt3-libs/buildlink3.mk" 
64PLIST.qt3= yes 
65.else 
66CONFIGURE_ARGS+= --disable-qt3 
67.endif 
68 
69.if !empty(PKG_OPTIONS:Mqt) 62.if !empty(PKG_OPTIONS:Mqt)
70.include "../../x11/qt4-libs/buildlink3.mk" 63.include "../../x11/qt4-libs/buildlink3.mk"
71PLIST.qt= yes 64PLIST.qt= yes
72.else 65.else
73CONFIGURE_ARGS+= --disable-qt4 66CONFIGURE_ARGS+= --disable-qt4
74.endif 67.endif
75 68
76### 69###
77### Enable python support 70### Enable python support
78### 71###
79.if !empty(PKG_OPTIONS:Mpython) 72.if !empty(PKG_OPTIONS:Mpython)
80PY_PATCHPLIST= yes 73PY_PATCHPLIST= yes
81PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2 74PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2