Date: Mon, 29 May 2006 13:13:59 GMT From: Piotr Smyrak <piotr.smyrak@heron.pl> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/98087: [patch] update irc/xchat-gnome from 0.5 to 0.11 Message-ID: <200605291313.k4TDDxPf010210@www.freebsd.org> Resent-Message-ID: <200605291320.k4TDKBWc013134@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98087 >Category: ports >Synopsis: [patch] update irc/xchat-gnome from 0.5 to 0.11 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 29 13:20:10 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Piotr Smyrak >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: FreeBSD psmyrak.intra 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed May 17 13:49:12 CEST 2006 root@psmyrak.intra:/usr/obj/usr/src/sys/JOB i386 >Description: The following patch updates the unmaintained port of irc/xchat-gnome to newer version 0.11 from and old 0.5. >How-To-Repeat: N/A >Fix: diff -Naru xchat-gnome.orig/Makefile xchat-gnome/Makefile --- xchat-gnome.orig/MakefileWed May 24 10:54:32 2006 +++ xchat-gnome/MakefileThu May 25 16:47:32 2006 @@ -6,10 +6,10 @@ # 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/ +#http://flapjack.navi.cx/releases/xchat-gnome/ PKGNAMESUFFIX=-gnome DISTNAME=${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} @@ -22,25 +22,48 @@ USE_GMAKE=yes USE_GNOME=gnomehack libgnomeui GNU_CONFIGURE=yes +INSTALLS_OMF=yes CONFIGURE_ENV=CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CONFIGURE_ARGS=--enable-nls \ +CONFIGURE_ARGS=\ +--enable-nls \ --enable-ipv6 \ ---enable-gnomefe +--enable-gnomefe \ +--disable-static -GCONF_SCHEMAS=apps_xchat.schemas notification.schemas urlscraper.schemas +GCONF_SCHEMAS=apps_xchat.schemas notification.schemas \ +urlscraper.schemas xchat_gnome_url_handler.schemas CONFLICTS=xchat-1* xchat2-2* +OPTIONS=\ +LIBSEXY"Enable build with libsexy" off \ +NOTIFY"Enable libnotify via D-BUS support"on \ +PERL"Enable Perl support"on \ +PYTHON"Enable Python support"off \ +SOCKS"Enable Socks5 proxy support"off \ +TCL"Enable support for TCL" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_NOTIFY) +LIB_DEPENDS+=dbus-1.2:${PORTSDIR}/devel/dbus +LIB_DEPENDS+=notify.1:${PORTSDIR}/devel/libnotify +PLIST_SUB+=NOTIFY="" +.endif + +.if defined(WITH_LIBSEXY) +LIB_DEPENDS+=sexy.1:${PORTSDIR}/x11-toolkits/libsexy +.endif + .if defined(WITH_SOCKS) BUILD_DEPENDS+=${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks +.else +CONFIGURE_ARGS+=--disable-socks .endif -# openssl in now default in configure - .if defined(WITH_PYTHON) -USE_PYTHON=yes CONFIGURE_ARGS+=--enable-python PLIST_SUB+=PYTHON="" .else @@ -57,16 +80,10 @@ -L${LOCALBASE}/lib/tcl8.3" PLIST_SUB+=TCL="" .else -CONFIGURE_ARGS+=--enable-tcl=no +CONFIGURE_ARGS+=--disable-tcl PLIST_SUB+=TCL="@comment " .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -BROKEN=does not build on 4.X -.endif - .if ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL) CONFIGURE_ARGS+=--disable-perl PLIST_SUB+=PERL="@comment " @@ -76,30 +93,12 @@ PLIST_SUB+=PERL="" .endif -pre-everything:: -.if !defined(WITH_PYTHON) || !defined(WITH_SOCKS) || !defined(WITH_TCL) -@${ECHO_MSG} "You may specify the following on the command line:" -@${ECHO_MSG} "" -.endif -.if !defined(WITH_PYTHON) -@${ECHO_MSG} "WITH_PYTHON=yes for Python support" -.endif -.if !defined(WITH_SOCKS) -@${ECHO_MSG} "WITH_SOCKS=yes for SOCKS5 proxy support" -.endif -.if !defined(WITH_TCL) -@${ECHO_MSG} "WITH_TCL=yes for tcl support" -.endif -.if !defined(WITHOUT_PERL) -@${ECHO_MSG} "WITHOUT_PERL=yes to disable Perl support" -.endif - post-patch: @${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \ ${WRKSRC}/configure # Create plugins directory even when no plugins are installed post-install: -@${MKDIR} ${PREFIX}/lib/xchat/plugins +@${MKDIR} ${PREFIX}/lib/xchat-gnome/plugins .include <bsd.port.post.mk> diff -Naru xchat-gnome.orig/distinfo xchat-gnome/distinfo --- xchat-gnome.orig/distinfoWed May 24 10:54:32 2006 +++ xchat-gnome/distinfoWed Apr 19 13:11:00 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 -Naru xchat-gnome.orig/files/extra--patch-help_C_Makefile.in xchat-gnome/files/extra--patch-help_C_Makefile.in --- xchat-gnome.orig/files/extra--patch-help_C_Makefile.inThu Jan 1 01:00:00 1970 +++ xchat-gnome/files/extra--patch-help_C_Makefile.inThu Feb 23 10:03:00 2006 @@ -0,0 +1,11 @@ +--- help/C/Makefile.in.origThu Feb 23 10:01:06 2006 ++++ help/C/Makefile.inThu Feb 23 10:01:26 2006 +@@ -341,7 +341,7 @@ + xml_files = $(entities) $(docname).xml + EXTRA_DIST = $(xml_files) $(omffile) + CLEANFILES = omf_timestamp $(omffile:.omf=.omf.out) +-omf_dest_dir = $(datadir)/omf/@PACKAGE@ ++omf_dest_dir = $(datadir)/gnome/omf/@PACKAGE@ + scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper + all: all-recursive + diff -Naru xchat-gnome.orig/files/extra--patch-help_omf.make xchat-gnome/files/extra--patch-help_omf.make --- xchat-gnome.orig/files/extra--patch-help_omf.makeThu Jan 1 01:00:00 1970 +++ xchat-gnome/files/extra--patch-help_omf.makeThu Feb 23 10:02:00 2006 @@ -0,0 +1,11 @@ +--- help/omf.make.origThu Feb 23 09:59:24 2006 ++++ help/omf.makeThu Feb 23 09:59:48 2006 +@@ -27,7 +27,7 @@ + # Version: 0.1.2 (last updated: March 20, 2002) + # + +-omf_dest_dir=$(datadir)/omf/@PACKAGE@ ++omf_dest_dir=$(datadir)/gnome/omf/@PACKAGE@ + scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper + CLEANFILES += $(omffile:.omf=.omf.out) + diff -Naru xchat-gnome.orig/pkg-plist xchat-gnome/pkg-plist --- xchat-gnome.orig/pkg-plistWed May 24 10:54:32 2006 +++ xchat-gnome/pkg-plistThu May 25 16:53:56 2006 @@ -1,42 +1,31 @@ -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 +%%PYTHON%%lib/xchat-gnome/plugins/python.la +%%PYTHON%%lib/xchat-gnome/plugins/python.so +%%TCL%%lib/xchat-gnome/plugins/tcl.la +%%TCL%%lib/xchat-gnome/plugins/tcl.so +lib/xchat-gnome/plugins/autoaway.la +lib/xchat-gnome/plugins/autoaway.so +%%NOTIFY%%lib/xchat-gnome/plugins/dbus.la +%%NOTIFY%%lib/xchat-gnome/plugins/dbus.so +lib/xchat-gnome/plugins/netmonitor.la +lib/xchat-gnome/plugins/netmonitor.so +%%NOTIFY%%lib/xchat-gnome/plugins/notification.la +%%NOTIFY%%lib/xchat-gnome/plugins/notification.so +lib/xchat-gnome/plugins/notifyosd.la +lib/xchat-gnome/plugins/notifyosd.so +%%PERL%%lib/xchat-gnome/plugins/perl.la +%%PERL%%lib/xchat-gnome/plugins/perl.so +lib/xchat-gnome/plugins/soundnotification.la +lib/xchat-gnome/plugins/soundnotification.so +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 +39,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 +54,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 +68,45 @@ 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 +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 +@exec mkdir -p %D/lib/xchat-gnome/plugins +@dirrm share/xchat-gnome @dirrmtry share/applications -@dirrm lib/xchat/plugins -@dirrm lib/xchat +@dirrm lib/xchat-gnome/plugins +@dirrm lib/xchat-gnome >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605291313.k4TDDxPf010210>