Part of Slepp's ProjectsPastebinTURLImagebinFilebin
Feedback -- English French German Japanese
Create Upload Newest Tools Donate
Sign In | Create Account

Miscellany
Monday, January 21st, 2013 at 6:47:41pm UTC 

  1. --- Makefile.orig       2013-01-21 18:28:56.000000000 +0000
  2. +++ Makefile    2013-01-21 17:56:53.000000000 +0000
  3. @@ -1,21 +1,22 @@
  4.  # $NetBSD: Makefile,v 1.38 2012/10/23 17:18:10 asau Exp $
  5.  
  6. -DISTNAME=            avahi-0.6.31
  7. -PKGREVISION=      5
  8. -CATEGORIES=        net
  9. -MASTER_SITES=    http://avahi.org/download/
  10. -
  11. -MAINTAINER=        pkgsrc-users@NetBSD.org
  12. -HOMEPAGE=            http://avahi.org/
  13. -COMMENT=              Facilitate service discovery on a local network
  14. -LICENSE=              gnu-lgpl-v2.1
  15. -
  16. -GNU_CONFIGURE=  YES
  17. -USE_LIBTOOL=      YES
  18. -USE_PKGINSTALL=                YES
  19. -USE_PKGLOCALEDIR=      YES
  20. -USE_TOOLS+=        pkg-config gmake intltool msgfmt xgettext
  21. -MAKE_JOBS_SAFE=                no
  22. +DISTNAME=      avahi-0.6.31
  23. +PKGREVISION=   6
  24. +CATEGORIES=    net
  25. +MASTER_SITES=  http://avahi.org/download/
  26. +
  27. +MAINTAINER=    pkgsrc-users@NetBSD.org
  28. +HOMEPAGE=      http://avahi.org/
  29. +COMMENT=       Facilitate service discovery on a local network
  30. +LICENSE=       gnu-lgpl-v2.1
  31. +
  32. +GNU_CONFIGURE= yes
  33. +USE_LIBTOOL=   yes
  34. +USE_PKGINSTALL=        yes
  35. +USE_TOOLS+=    gmake intltool msgfmt pkg-config xgettext
  36. +MAKE_JOBS_SAFE=        no
  37. +
  38. +USE_PKGLOCALEDIR=      yes
  39.  
  40.  PKGCONFIG_OVERRIDE+=   avahi-client.pc.in
  41.  PKGCONFIG_OVERRIDE+=   avahi-compat-howl.pc.in
  42. @@ -71,17 +72,11 @@
  43.  CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
  44.  CONFIGURE_ARGS+=       --with-dbus-system-socket=${VARBASE}/run/dbus/system_bus_socket
  45.  CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
  46. -CONFIGURE_ARGS+=       --disable-gtk3
  47. -CONFIGURE_ARGS+=       --disable-qt3
  48. -CONFIGURE_ARGS+=       --disable-qt4
  49. -CONFIGURE_ARGS+=       --disable-mono
  50. -CONFIGURE_ARGS+=       --disable-monodoc
  51. -CONFIGURE_ARGS+=       --disable-doxygen-doc
  52. -CONFIGURE_ARGS+=       --disable-doxygen-dot
  53. -CONFIGURE_ARGS+=       --disable-doxygen-html
  54. +# XXX Enabling any of these documentation options doesn't add any PLIST files
  55.  CONFIGURE_ARGS+=       --disable-xmltoman
  56. +CONFIGURE_ARGS+=       --disable-doxygen-doc --disable-doxygen-dot
  57. +CONFIGURE_ARGS+=       --disable-doxygen-xml --disable-doxygen-html
  58.  CONFIGURE_ARGS+=       --disable-autoipd
  59. -CONFIGURE_ARGS+=       --enable-tests
  60.  CONFIGURE_ARGS+=       --with-distro=none
  61.  
  62.  INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples
  63. @@ -105,7 +100,5 @@
  64.  .include "../../sysutils/dbus/buildlink3.mk"
  65.  .include "../../sysutils/desktop-file-utils/desktopdb.mk"
  66.  .include "../../textproc/expat/buildlink3.mk"
  67. -BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.14.0
  68. -.include "../../x11/gtk2/buildlink3.mk"
  69.  .include "../../mk/pthread.buildlink3.mk"
  70.  .include "../../mk/bsd.pkg.mk"
  71. --- distinfo.orig       2013-01-21 18:30:20.000000000 +0000
  72. +++ distinfo    2013-01-21 17:05:36.000000000 +0000
  73. @@ -3,7 +3,7 @@
  74.  SHA1 (avahi-0.6.31.tar.gz) = 7e05bd78572c9088b03b1207a0ad5aba38490684
  75.  RMD160 (avahi-0.6.31.tar.gz) = 122f553ee2d43cdd0185540a63a8e1f587bdb08e
  76.  Size (avahi-0.6.31.tar.gz) = 1268686 bytes
  77. -SHA1 (patch-aa) = 9d48b8358ed5dac5edb379c998d1c907feaf76ed
  78. -SHA1 (patch-ab) = 49110f3c5502a56448ca6ee4412130299697f255
  79. +SHA1 (patch-aa) = 95b883bf14dd1852cdf0ea8a364c57717eebb03f
  80. +SHA1 (patch-ab) = e230ea9d57f40915469486faf4ffaf90ea3ebac3
  81.  SHA1 (patch-ah) = 4b3ffdb927daef8c939527fd5c5893f9f88b3ff3
  82. -SHA1 (patch-ai) = 406b314c8105e28cffb83a92bb80f2dc1b264c3f
  83. +SHA1 (patch-ai) = 48c5fca5683323a30dc646e5eafb1834e7bedaeb
  84. --- buildlink3.mk.orig  2013-01-21 18:28:56.000000000 +0000
  85. +++ buildlink3.mk       2013-01-21 18:27:37.000000000 +0000
  86. @@ -12,9 +12,39 @@
  87.  pkgbase := avahi
  88.  .include "../../mk/pkg-build-options.mk"
  89.  
  90. +
  91.  .if !empty(PKG_BUILD_OPTIONS.avahi:Mgdbm)
  92. -.  include "../../databases/gdbm/buildlink3.mk"
  93. +.include "../../databases/gdbm/buildlink3.mk"
  94.  .endif
  95. +
  96. +.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk2)
  97. +.include "../../x11/gtk2/buildlink3.mk"
  98. +.endif
  99. +
  100. +.if !empty(PKG_BUILD_OPTIONS.avahi:Mgtk3)
  101. +.include "../../x11/gtk3/buildlink3.mk"
  102. +.endif
  103. +
  104. +.if !empty(PKG_BUILD_OPTIONS.avahi:Mintrospection)
  105. +.include "../../devel/gobject-introspection/buildlink3.mk"
  106. +.endif
  107. +
  108. +.if !empty(PKG_BUILD_OPTIONS.avahi:Mmono)
  109. +.include "../../x11/gtk-sharp/buildlink3.mk"
  110. +.endif
  111. +
  112. +.if !empty(PKG_BUILD_OPTIONS.avahi:Mqt3)
  113. +.include "../../x11/qt3-libs/buildlink3.mk"
  114. +.endif
  115. +
  116. +.if !empty(PKG_BUILD_OPTIONS.avahi:Mqt4)
  117. +.include "../../x11/qt4-libs/buildlink3.mk"
  118. +.endif
  119. +
  120. +.if !empty(PKG_BUILD_OPTIONS.avahi:Mpython)
  121. +.include "../../lang/python/application.mk"
  122. +.endif
  123. +
  124.  .include "../../devel/glib2/buildlink3.mk"
  125.  .include "../../sysutils/dbus/buildlink3.mk"
  126.  .include "../../x11/gtk2/buildlink3.mk"
  127. --- PLIST.orig  2013-01-21 18:28:56.000000000 +0000
  128. +++ PLIST       2013-01-21 17:03:56.000000000 +0000
  129. @@ -1,7 +1,7 @@
  130.  @comment $NetBSD: PLIST,v 1.6 2011/05/14 13:04:04 obache Exp $
  131.  bin/avahi-browse
  132.  bin/avahi-browse-domains
  133. -bin/avahi-discover-standalone
  134. +${PLIST.ui}bin/avahi-discover-standalone
  135.  bin/avahi-publish
  136.  bin/avahi-publish-address
  137.  bin/avahi-publish-service
  138. @@ -9,9 +9,9 @@
  139.  bin/avahi-resolve-address
  140.  bin/avahi-resolve-host-name
  141.  bin/avahi-set-host-name
  142. -bin/bshell
  143. -bin/bssh
  144. -bin/bvnc
  145. +${PLIST.ui}bin/bshell
  146. +${PLIST.ui}bin/bssh
  147. +${PLIST.ui}bin/bvnc
  148.  include/avahi-client/client.h
  149.  include/avahi-client/lookup.h
  150.  include/avahi-client/publish.h
  151. @@ -44,18 +44,38 @@
  152.  include/avahi-gobject/ga-record-browser.h
  153.  include/avahi-gobject/ga-service-browser.h
  154.  include/avahi-gobject/ga-service-resolver.h
  155. -include/avahi-ui/avahi-ui.h
  156. +${PLIST.qt3}include/avahi-qt3/qt-watch.h
  157. +${PLIST.qt4}include/avahi-qt4/qt-watch.h
  158. +${PLIST.gtk2}include/avahi-ui/avahi-ui.h
  159. +${PLIST.introspection}lib/girepository-1.0/Avahi-0.6.typelib
  160. +${PLIST.introspection}lib/girepository-1.0/AvahiCore-0.6.typelib
  161.  lib/libavahi-client.la
  162.  lib/libavahi-common.la
  163.  lib/libavahi-core.la
  164.  lib/libavahi-glib.la
  165.  lib/libavahi-gobject.la
  166. -lib/libavahi-ui.la
  167. +${PLIST.qt3}lib/libavahi-qt3.la
  168. +${PLIST.qt4}lib/libavahi-qt4.la
  169. +${PLIST.gtk3}lib/libavahi-ui-gtk3.la
  170. +${PLIST.gtk2}lib/libavahi-ui.la
  171. +${PLIST.mono}lib/mono/avahi-sharp/avahi-sharp.dll
  172. +${PLIST.mono}lib/mono/avahi-ui-sharp/avahi-ui-sharp.dll
  173. +${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll
  174. +${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.config
  175. +${PLIST.mono}lib/mono/gac/avahi-sharp/1.0.0.0__4d116c78973743f5/avahi-sharp.dll.mdb
  176. +${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll
  177. +${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.config
  178. +${PLIST.mono}lib/mono/gac/avahi-ui-sharp/0.0.0.0__4d116c78973743f5/avahi-ui-sharp.dll.mdb
  179.  lib/pkgconfig/avahi-client.pc
  180.  lib/pkgconfig/avahi-core.pc
  181.  lib/pkgconfig/avahi-glib.pc
  182.  lib/pkgconfig/avahi-gobject.pc
  183. -lib/pkgconfig/avahi-ui.pc
  184. +${PLIST.qt3}lib/pkgconfig/avahi-qt3.pc
  185. +${PLIST.qt4}lib/pkgconfig/avahi-qt4.pc
  186. +${PLIST.mono}lib/pkgconfig/avahi-sharp.pc
  187. +${PLIST.gtk3}lib/pkgconfig/avahi-ui-gtk3.pc
  188. +${PLIST.mono}lib/pkgconfig/avahi-ui-sharp.pc
  189. +${PLIST.gtk2}lib/pkgconfig/avahi-ui.pc
  190.  man/man1/avahi-browse-domains.1
  191.  man/man1/avahi-browse.1
  192.  man/man1/avahi-publish-address.1
  193. @@ -65,8 +85,8 @@
  194.  man/man1/avahi-resolve-host-name.1
  195.  man/man1/avahi-resolve.1
  196.  man/man1/avahi-set-host-name.1
  197. -man/man1/bssh.1
  198. -man/man1/bvnc.1
  199. +${PLIST.ui}man/man1/bssh.1
  200. +${PLIST.ui}man/man1/bvnc.1
  201.  man/man5/avahi-daemon.conf.5
  202.  man/man5/avahi.hosts.5
  203.  man/man5/avahi.service.5
  204. @@ -75,10 +95,10 @@
  205.  man/man8/avahi-dnsconfd.action.8
  206.  sbin/avahi-daemon
  207.  sbin/avahi-dnsconfd
  208. -share/applications/bssh.desktop
  209. -share/applications/bvnc.desktop
  210. +${PLIST.ui}share/applications/bssh.desktop
  211. +${PLIST.ui}share/applications/bvnc.desktop
  212.  share/avahi/avahi-service.dtd
  213. -share/avahi/interfaces/avahi-discover.ui
  214. +${PLIST.ui}share/avahi/interfaces/avahi-discover.ui
  215.  share/avahi/service-types
  216.  share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml
  217.  share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml
  218. @@ -101,6 +121,8 @@
  219.  share/examples/avahi/services/sftp-ssh.service
  220.  share/examples/avahi/services/ssh.service
  221.  share/examples/rc.d/avahidaemon
  222. +${PLIST.introspection}share/gir-1.0/Avahi-0.6.gir
  223. +${PLIST.introspection}share/gir-1.0/AvahiCore-0.6.gir
  224.  share/locale/bg/LC_MESSAGES/avahi.mo
  225.  share/locale/ca/LC_MESSAGES/avahi.mo
  226.  share/locale/cs/LC_MESSAGES/avahi.mo
  227. --- options.mk.orig     2013-01-21 18:28:56.000000000 +0000
  228. +++ options.mk  2013-01-21 17:56:03.000000000 +0000
  229. @@ -1,8 +1,9 @@
  230.  # $NetBSD: options.mk,v 1.2 2010/07/24 13:42:12 obache Exp $
  231.  
  232.  PKG_OPTIONS_VAR=       PKG_OPTIONS.avahi
  233. -
  234. -PKG_SUPPORTED_OPTIONS= avahi-howl gdbm python
  235. +PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python qt3 qt4 tests
  236. +PKG_SUGGESTED_OPTIONS+=        gtk2
  237. +PLIST_VARS+=      introspection gtk2 gtk3 mono qt3 qt4 ui
  238.  
  239.  .include "../../mk/bsd.options.mk"
  240.  
  241. @@ -23,6 +24,54 @@
  242.  CONFIGURE_ARGS+=       --disable-gdbm
  243.  .endif
  244.  
  245. +.if !empty(PKG_OPTIONS:Mgtk2)
  246. +BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.14.0
  247. +.include "../../x11/gtk2/buildlink3.mk"
  248. +PLIST.gtk2=        yes
  249. +PLIST.ui=            yes
  250. +.else
  251. +CONFIGURE_ARGS+=       --disable-gtk
  252. +.endif
  253. +
  254. +.if !empty(PKG_OPTIONS:Mgtk3)
  255. +.include "../../x11/gtk3/buildlink3.mk"
  256. +PLIST.gtk3=        yes
  257. +PLIST.ui=            yes
  258. +.else
  259. +CONFIGURE_ARGS+=       --disable-gtk3
  260. +.endif
  261. +
  262. +.if !empty(PKG_OPTIONS:Mintrospection)
  263. +.include "../../devel/gobject-introspection/buildlink3.mk"
  264. +CONFIGURE_ARGS+=       --enable-introspection=yes
  265. +PLIST.introspection=   yes
  266. +.else
  267. +CONFIGURE_ARGS+=       --enable-introspection=no
  268. +.endif
  269. +
  270. +.if !empty(PKG_OPTIONS:Mmono)
  271. +.include "../../x11/gtk-sharp/buildlink3.mk"
  272. +.include "../../lang/mono/buildlink3.mk"
  273. +CONFIGURE_ARGS+=       --disable-monodoc # XXX broken
  274. +PLIST.mono=        yes
  275. +.else
  276. +CONFIGURE_ARGS+=       --disable-mono --disable-monodoc
  277. +.endif
  278. +
  279. +.if !empty(PKG_OPTIONS:Mqt3)
  280. +.include "../../x11/qt3-libs/buildlink3.mk"
  281. +PLIST.qt3=          yes
  282. +.else
  283. +CONFIGURE_ARGS+=       --disable-qt3
  284. +.endif
  285. +
  286. +.if !empty(PKG_OPTIONS:Mqt4)
  287. +.include "../../x11/qt4-libs/buildlink3.mk"
  288. +PLIST.qt4=          yes
  289. +.else
  290. +CONFIGURE_ARGS+=       --disable-qt4
  291. +.endif
  292. +
  293.  ###
  294.  ### Enable python support
  295.  ###
  296. @@ -45,3 +94,7 @@
  297.  CONFIGURE_ARGS+=       --disable-python-dbus
  298.  CONFIGURE_ARGS+=       --disable-pygtk
  299.  .endif
  300. +
  301. +.if !empty(PKG_OPTIONS:Mtests)
  302. +CONFIGURE_ARGS+=       --enable-tests
  303. +.endif
  304. --- patches/patch-aa.orig       2013-01-21 18:29:05.000000000 +0000
  305. +++ patch-aa    2013-01-21 17:04:18.000000000 +0000
  306. @@ -1,5 +1,7 @@
  307.  $NetBSD: patch-aa,v 1.2 2010/07/24 13:42:12 obache Exp $
  308.  
  309. +Add NetBSD support.
  310. +
  311.  --- avahi-core/iface-pfroute.c.orig    2010-06-26 00:14:35.000000000 +0000
  312.  +++ avahi-core/iface-pfroute.c
  313.  @@ -46,6 +46,13 @@
  314. --- patches/patch-ab.new        2013-01-21 18:29:05.000000000 +0000
  315. +++ patch-ab    2013-01-21 17:04:43.000000000 +0000
  316. @@ -1,5 +1,7 @@
  317.  $NetBSD: patch-ab,v 1.3 2012/04/22 15:59:02 wiz Exp $
  318.  
  319. +Build with -lintl.
  320. +
  321.  --- avahi-common/Makefile.in.orig      2012-02-14 22:36:35.000000000 +0000
  322.  +++ avahi-common/Makefile.in
  323.  @@ -639,7 +639,7 @@ clean-libLTLIBRARIES:
  324. --- patches/patch-ai.orig       2013-01-21 18:29:05.000000000 +0000
  325. +++ patch-ai    2013-01-21 17:05:30.000000000 +0000
  326. @@ -1,5 +1,7 @@
  327.  $NetBSD: patch-ai,v 1.2 2010/07/24 13:42:12 obache Exp $
  328.  
  329. +Check lower bounds on port.
  330. +
  331.  --- avahi-core/server.c.orig   2010-06-29 18:51:53.000000000 +0000
  332.  +++ avahi-core/server.c
  333.  @@ -903,6 +903,11 @@ static void dispatch_packet(AvahiServer

Update the Post

Either update this post and resubmit it with changes, or make a new post.

You may also comment on this post.

update paste below
details of the post (optional)

Note: Only the paste content is required, though the following information can be useful to others.

Save name / title?

(space separated, optional)



Please note that information posted here will expire by default in one month. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.

comments powered by Disqus
worth-right
worth-right