- Update to version 0.11 - update master site url - add dependency on libsexy - add WITH_DBUS knob - add INSTALLS_ICONS to ensure icon cache is updated - knobify ipv6 support
On Thu, May 18, 2006 2:06 pm, Khairil Yusof wrote: > This one applies cleanly to current port, includes most updates as > original except: > > * keeps --enable-nls > * adds OMF help files > * doesn't include configure patch for tcl (not sure if this is still > needed). > > > The configure patch is definitely needed to add tcl support. While it does build without the patch, the tcl plugin is _not_ built because configure does not detect tcl. As far as nls goes, it seems to be enabled by default. INSTALLS_OMF couldn't hurt though. -Tim
This one applies cleanly to current port, includes most updates as original except: * keeps --enable-nls * adds OMF help files * doesn't include configure patch for tcl (not sure if this is still needed). ---- patch starts -- diff -urP xchat-gnome/Makefile xchat-gnome-devel/Makefile --- xchat-gnome/Makefile Mon May 15 08:45:23 2006 +++ xchat-gnome-devel/Makefile Thu May 18 17:57:55 2006 @@ -6,16 +6,17 @@ # PORTNAME= xchat -PORTVERSION= 0.5 -PORTREVISION= 2 +PORTVERSION= 0.11 CATEGORIES= irc gnome ipv6 -MASTER_SITES= http://flapjack.navi.cx/releases/xchat-gnome/ +MASTER_SITES= http://releases.navi.cx/xchat-gnome/ PKGNAMESUFFIX= -gnome DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= An IRC client for GNOME 2 (development version) +LIB_DEPENDS= sexy:${PORTSDIR}/x11-toolkits/libsexy + USE_X_PREFIX= yes USE_GETTEXT= yes USE_BZIP2= yes @@ -25,16 +26,30 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-nls \ - --enable-ipv6 \ - --enable-gnomefe + --disable-ipv6 GCONF_SCHEMAS= apps_xchat.schemas notification.schemas urlscraper.schemas -CONFLICTS= xchat-1* xchat2-2* +INSTALLS_OMF= yes + +.if !defined(WITHOUT_DBUS) +LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus +CONFIGURE_ARGS+= --enable-dbus +USE_GNOME+= gconf2 +GCONF_SCHEMAS+= xchat_gnome_url_handler.schemas +PLIST_SUB+= DBUS="" +.else +CONFIGURE_ARGS+=--disable-dbus +PLIST_SUB+= DBUS="@comment " +.endif .if defined(WITH_SOCKS) BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+= --enable-socks +.endif + +.if !defined(WITHOUT_IPV6) +CONFIGURE_ARGS+= --enable-ipv6 .endif # openssl in now default in configure diff -urP xchat-gnome/distinfo xchat-gnome-devel/distinfo --- xchat-gnome/distinfo Tue Jan 24 09:51:32 2006 +++ xchat-gnome-devel/distinfo Thu May 18 13:02:36 2006 @@ -1,3 +1,3 @@ -MD5 (xchat-gnome-0.5.tar.bz2) = 5b2a8a3abae883f68695d9bcf65a568b -SHA256 (xchat-gnome-0.5.tar.bz2) = 173f4f08ec8dbd6807b8af399e88d79d64346e84b3c38eda4825c2635570d845 -SIZE (xchat-gnome-0.5.tar.bz2) = 2203619 +MD5 (xchat-gnome-0.11.tar.bz2) = dd0d52c7abd419b7559e32a35fea70f4 +SHA256 (xchat-gnome-0.11.tar.bz2) = f3efb3895aea5dab0905ad4965be43694a5b20e25448cee944e3a19f0036c2db +SIZE (xchat-gnome-0.11.tar.bz2) = 1281509 diff -urP xchat-gnome/pkg-plist xchat-gnome-devel/pkg-plist --- xchat-gnome/pkg-plist Wed Mar 1 16:49:28 2006 +++ xchat-gnome-devel/pkg-plist Thu May 18 17:34:39 2006 @@ -1,42 +1,35 @@ -bin/xchat bin/xchat-gnome -%%PERL%%lib/xchat/plugins/perl.la -%%PERL%%lib/xchat/plugins/perl.so -%%PYTHON%%lib/xchat/plugins/python.la -%%PYTHON%%lib/xchat/plugins/python.so -%%TCL%%lib/xchat/plugins/tcl.la -%%TCL%%lib/xchat/plugins/tcl.so -lib/xchat/plugins/notification.la -lib/xchat/plugins/notification.so -lib/xchat/plugins/urlscraper.la -lib/xchat/plugins/urlscraper.so +bin/xchat-gnome-remote +lib/xchat-gnome/plugins/autoaway.a +lib/xchat-gnome/plugins/autoaway.la +lib/xchat-gnome/plugins/autoaway.so +lib/xchat-gnome/plugins/dbus.a +lib/xchat-gnome/plugins/dbus.la +lib/xchat-gnome/plugins/dbus.so +lib/xchat-gnome/plugins/netmonitor.a +lib/xchat-gnome/plugins/netmonitor.la +lib/xchat-gnome/plugins/netmonitor.so +lib/xchat-gnome/plugins/notification.a +lib/xchat-gnome/plugins/notification.la +lib/xchat-gnome/plugins/notification.so +lib/xchat-gnome/plugins/perl.a +lib/xchat-gnome/plugins/perl.la +lib/xchat-gnome/plugins/perl.so +lib/xchat-gnome/plugins/python.a +lib/xchat-gnome/plugins/python.la +lib/xchat-gnome/plugins/python.so +lib/xchat-gnome/plugins/soundnotification.a +lib/xchat-gnome/plugins/soundnotification.la +lib/xchat-gnome/plugins/soundnotification.so +lib/xchat-gnome/plugins/urlscraper.a +lib/xchat-gnome/plugins/urlscraper.la +lib/xchat-gnome/plugins/urlscraper.so share/applications/xchat-gnome.desktop -share/applications/xchat.desktop -share/pixmaps/xchat-gnome.png -share/pixmaps/xchat.png -share/xchat/channel-list.glade -share/xchat/color.png -share/xchat/connect-dialog.glade -share/xchat/dcc.png -share/xchat/dcc-window.glade -share/xchat/global-message.png -share/xchat/irc.png -share/xchat/irc-network-editor.glade -share/xchat/newdata.png -share/xchat/nicksaid.png -share/xchat/plugin-manager.png -share/xchat/preferences-dialog.glade -share/xchat/servers.png -share/xchat/setup-dialog.glade -share/xchat/soap.png -share/xchat/stock_down.png -share/xchat/stock_link.png -share/xchat/stock_up.png -share/xchat/toilet-paper.png -share/xchat/topic-change.glade -share/xchat/xchat-gnome-small.png -share/xchat/xchat-gnome.glade -share/xchat/xchat-gnome-ui.xml +share/gnome/help/xchat-gnome/C/figures/xchat-gnome_main_window.png +share/gnome/help/xchat-gnome/C/legal.xml +share/gnome/help/xchat-gnome/C/xchat-gnome.xml +share/icons/hicolor/48x48/apps/xchat-gnome.png +share/icons/hicolor/icon-theme.cache share/locale/am/LC_MESSAGES/xchat-gnome.mo share/locale/az/LC_MESSAGES/xchat-gnome.mo share/locale/bg/LC_MESSAGES/xchat-gnome.mo @@ -50,9 +43,12 @@ share/locale/eu/LC_MESSAGES/xchat-gnome.mo share/locale/fi/LC_MESSAGES/xchat-gnome.mo share/locale/fr/LC_MESSAGES/xchat-gnome.mo +share/locale/gl/LC_MESSAGES/xchat-gnome.mo share/locale/hi/LC_MESSAGES/xchat-gnome.mo +share/locale/hu/LC_MESSAGES/xchat-gnome.mo share/locale/it/LC_MESSAGES/xchat-gnome.mo share/locale/ja/LC_MESSAGES/xchat-gnome.mo +share/locale/ka/LC_MESSAGES/xchat-gnome.mo share/locale/ko/LC_MESSAGES/xchat-gnome.mo share/locale/lt/LC_MESSAGES/xchat-gnome.mo share/locale/lv/LC_MESSAGES/xchat-gnome.mo @@ -62,6 +58,7 @@ share/locale/nl/LC_MESSAGES/xchat-gnome.mo share/locale/no/LC_MESSAGES/xchat-gnome.mo share/locale/pa/LC_MESSAGES/xchat-gnome.mo +share/locale/pl/LC_MESSAGES/xchat-gnome.mo share/locale/pt/LC_MESSAGES/xchat-gnome.mo share/locale/pt_BR/LC_MESSAGES/xchat-gnome.mo share/locale/ru/LC_MESSAGES/xchat-gnome.mo @@ -75,15 +72,62 @@ share/locale/wa/LC_MESSAGES/xchat-gnome.mo share/locale/zh_CN/LC_MESSAGES/xchat-gnome.mo share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo -share/xchat/about.png -share/xchat/book.png -share/xchat/hop.png -share/xchat/op.png -share/xchat/purple.png -share/xchat/red.png -share/xchat/voice.png -@exec mkdir -p %D/lib/xchat/plugins -@dirrm share/xchat -@dirrmtry share/applications +share/omf/xchat-gnome/xchat-gnome-C.omf +share/xchat-gnome/channel-list.glade +share/xchat-gnome/color.png +share/xchat-gnome/connect-dialog.glade +share/xchat-gnome/dcc-window.glade +share/xchat-gnome/dcc.png +share/xchat-gnome/effects.png +share/xchat-gnome/global-message.png +share/xchat-gnome/hop.png +share/xchat-gnome/irc-network-editor.glade +share/xchat-gnome/irc.png +share/xchat-gnome/logout.png +share/xchat-gnome/message.wav +share/xchat-gnome/newdata.png +share/xchat-gnome/nicksaid.png +share/xchat-gnome/notauthorized.png +share/xchat-gnome/op.png +share/xchat-gnome/plugin-manager.png +share/xchat-gnome/preferences-dialog.glade +share/xchat-gnome/preferences-keybindings.png +share/xchat-gnome/purple.png +share/xchat-gnome/red.png +share/xchat-gnome/servers.png +share/xchat-gnome/setup-dialog.glade +share/xchat-gnome/soap.png +share/xchat-gnome/spellcheck.png +share/xchat-gnome/stock_down.png +share/xchat-gnome/stock_link.png +share/xchat-gnome/stock_up.png +share/xchat-gnome/toilet-paper.png +share/xchat-gnome/topic-change.glade +share/xchat-gnome/users.png +share/xchat-gnome/voice.png +share/xchat-gnome/wrap.png +share/xchat-gnome/xchat-gnome-ui.xml +share/xchat-gnome/xchat-gnome.glade +share/xchat-gnome/xchat-gnome.png +@dirrm share/xchat-gnome +@dirrm share/omf/xchat-gnome +@dirrm share/omf +@dirrm share/icons/hicolor/48x48/apps +@dirrm share/icons/hicolor/48x48 +@dirrm share/icons/hicolor +@dirrm share/icons +@dirrm share/gnome/help/xchat-gnome/C/figures +@dirrm share/gnome/help/xchat-gnome/C +@dirrm share/gnome/help/xchat-gnome +@dirrm share/gnome/help +@dirrm share/gnome +@dirrm share/applications @dirrm lib/xchat/plugins +@dirrm lib/xchat-gnome/plugins +@dirrm lib/xchat-gnome @dirrm lib/xchat +@dirrm etc/gconf/schemas +@dirrm etc/gconf/gconf.xml.defaults +@dirrm etc/gconf ++@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true ++@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true --- patch ends ---
Khairil, your patch got linewrapped. Can you or Tim send me a latest version of the patch, which satisfies all the points raised in this PR? Thank you! -- Pav Lucistnik <pav@oook.cz> <pav@FreeBSD.org> "Well, she turned me into a newt!" "A newt?" "I got better."
Responsible Changed From-To: freebsd-ports-bugs->pav Grab
On Thu, May 18, 2006 5:23 pm, Pav Lucistnik wrote: > Khairil, your patch got linewrapped. > > > Can you or Tim send me a latest version of the patch, which satisfies > all the points raised in this PR? Thank you! > > -- > Pav Lucistnik <pav@oook.cz> > <pav@FreeBSD.org> > > > "Well, she turned me into a newt!" "A newt?" "I got better." > > Added INSTALLS_OMF=yes.
Your port missed few dependencies which I have now added to the port: - gnomedocutils - libnotify for osd plugin Please tell me if you want to have libnotify always in, or have a knob for it Also, configure wants libsexy 0.1.7, but our ports tree have 0.1.5 at the moment. The PR with libsexy update is pending upon maintainer approval. I will block xchat-gnome update upon updating of that port. -- Pav Lucistnik <pav@oook.cz> <pav@FreeBSD.org> - Hocumms Razor states that the most obvious, though possible not conceviable, answer to a problem is most likely the correct one. - unless you are playing zelda.
On Fri, May 19, 2006 3:50 am, Pav Lucistnik wrote: > Your port missed few dependencies which I have now added to the port: > > > - gnomedocutils > - libnotify for osd plugin > > > Please tell me if you want to have libnotify always in, or have a knob > for it > > Also, configure wants libsexy 0.1.7, but our ports tree have 0.1.5 at > the moment. The PR with libsexy update is pending upon maintainer approval. The dependency on libnotify needs to always be in. I think this port is not likely to be used outside of gnome anyway because of the number of dependencies on gnome stuff, and if gnome2 is installed libnotify will be present. (which is the excuse I'll use for missing that dependency ;) For libsexy, I have tested both 0.1.5 in fbsd ports and 0.1.8 from ports/97139 with this port. xchat-gnome compiles fine with 0.1.5 installed. The only thing that changes with libnotify >=0.1.7 is that URLs in the topic and such can be clicked to open them in a browser. It would be fine by me to wait for libsexy to be updated, but it's not necessary for the port to work. -Tim
Tim Welch pí¹e v pá 19. 05. 2006 v 06:41 -0500: > For libsexy, I have tested both 0.1.5 in fbsd ports and 0.1.8 from > ports/97139 with this port. xchat-gnome compiles fine with 0.1.5 checking for LIBSEXY... configure: WARNING: Library requirements (libsexy >= 0.1.7) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them. So looks like it does not compile with libsexy 0.1.5 at all. -- Pav Lucistnik <pav@oook.cz> <pav@FreeBSD.org> Time flies like an arrow. Fruit flies like a banana.
> >> For libsexy, I have tested both 0.1.5 in fbsd ports and 0.1.8 from >> ports/97139 with this port. xchat-gnome compiles fine with 0.1.5 > > checking for LIBSEXY... configure: WARNING: Library requirements (libsexy > >= 0.1.7) not met; consider adjusting the PKG_CONFIG_PATH > environment variable if your libraries are in a nonstandard prefix so > pkg-config can find them. > > So looks like it does not compile with libsexy 0.1.5 at all. > I get the same warning, but it does compile & run fine (just without libsexy support).
State Changed From-To: open->closed Committed, thanks!