Attachment 159188 Details for Bug 201850 – net-im_mcabber.diff

[patch] net-im_mcabber.diff

net-im_mcabber.diff (text/plain), 10.18 KB, created by tkato432 on 2015-07-24 18:37:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-07-24 18:37:06 UTC

Size: 10.18 KB

patch

obsolete

>diff -urN /usr/ports/net-im/mcabber/Makefile net-im/mcabber/Makefile
>--- /usr/ports/net-im/mcabber/Makefile	2015-06-16 08:33:48.767690000 +0900
>+++ net-im/mcabber/Makefile	2015-07-25 00:00:00.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/net-im/mcabber/Makefile 389696 2015-06-15 12:11:00Z amdmi3 $
> 
> PORTNAME=	mcabber
>-PORTVERSION=	0.10.2
>-PORTREVISION=	7
>+PORTVERSION=	1.0.0
> CATEGORIES=	net-im
> MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/
> 
>@@ -11,50 +10,50 @@
> COMMENT=	Small Jabber console client
> 
> LICENSE=	GPLv2
>-LICENSE_FILE=	${WRKSRC}/COPYING
>+#LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
> 
>-USES=		gettext iconv libtool ncurses pkgconfig shebangfix tar:bzip2
>-SHEBANG_FILES=	contrib/cicq2mcabber.pl \
>-		contrib/events/mcnotify.py
>+USES=		gettext iconv libtool ncurses pathfix pkgconfig tar:bzip2
>+USE_GNOME=	glib20
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-sigwinch --libdir=${PREFIX}/lib
>+CONFIGURE_ARGS=	--disable-hgcset --enable-sigwinch
>+INSTALL_TARGET=	install-strip
>+USE_LDCONFIG=	yes
>+
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
>-USE_LDCONFIG=	yes
>-USE_GNOME=	glib20
> 
>-OPTIONS_DEFINE=	GPGME OTR
>-OPTIONS_RADIO=	SPELL
>+OPTIONS_DEFINE=		EXAMPLES GPGME OTR
>+OPTIONS_RADIO=		SPELL
> OPTIONS_RADIO_SPELL=	ASPELL ENCHANT
>-OPTIONS_SUB=	yes
>+OPTIONS_SUB=		yes
> 
>-GPGME_DESC=	Use security/gpgme for PGP support
>-OTR_DESC=	Off-the-record messaging support
>-ENCHANT_DESC=	Spell checking via enchant
>-
>-GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
>-GPGME_CONFIGURE_ENABLE=	gpgme
> ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
> ASPELL_CONFIGURE_ENABLE=aspell
>+ENCHANT_DESC=		Spell checking support via Enchant
> ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
> ENCHANT_CONFIGURE_ENABLE=enchant
>-OTR_LIB_DEPENDS=	libotr.so.2:${PORTSDIR}/security/libotr3 \
>-			libgcrypt.so:${PORTSDIR}/security/libgcrypt
>+GPGME_DESC=		OpenPGP support via GPGME
>+GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
>+GPGME_CONFIGURE_ENABLE=	gpgme
>+OTR_DESC=		Off-the-record messaging support
>+OTR_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
>+			libotr.so:${PORTSDIR}/security/libotr
> OTR_CONFIGURE_ENABLE=	otr
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|$$"$${datadir}"|"$${datadir}"|;s|-O2||'\
>-		-e 's|$$"$${libdir}|"$${libdir}|g' ${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
>-		${WRKSRC}/Makefile.*
>+	@${REINPLACE_CMD} -e \
>+		's|$$"$${libdir}|"$${libdir}| ; \
>+		 s|-O2 $$CFLAGS|$$CFLAGS|' ${WRKSRC}/configure
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mcabber/*.so
>-	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}/
>-	@${INSTALL} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
>-	@${CP} -R ${WRKSRC}/contrib ${STAGEDIR}${DATADIR}/
>-	${INSTALL_DATA} ${WRKSRC}/mcabberrc.example ${STAGEDIR}${EXAMPLESDIR}/mcabberrc
>+	(cd ${WRKSRC} && ${INSTALL_DATA} mcabber.desktop \
>+		${STAGEDIR}${PREFIX}/share/applications)
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} mcabberrc.example \
>+		${STAGEDIR}${EXAMPLESDIR}/mcabberrc)
>+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} contrib \
>+		${STAGEDIR}${EXAMPLESDIR})
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/net-im/mcabber/distinfo net-im/mcabber/distinfo
>--- /usr/ports/net-im/mcabber/distinfo	2014-06-21 17:42:51.000000000 +0900
>+++ net-im/mcabber/distinfo	2015-07-25 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (mcabber-0.10.2.tar.bz2) = e246d153f93a75b4f45879f447434db070503c9903bf3f995af396b3b94586f8
>-SIZE (mcabber-0.10.2.tar.bz2) = 604378
>+SHA256 (mcabber-1.0.0.tar.bz2) = 5476bcba395e0b9527823f5a9bce725151756f685ce2dcf6fad3dbe50a157032
>+SIZE (mcabber-1.0.0.tar.bz2) = 602173
>diff -urN /usr/ports/net-im/mcabber/pkg-descr net-im/mcabber/pkg-descr
>--- /usr/ports/net-im/mcabber/pkg-descr	2015-06-16 08:33:48.769094000 +0900
>+++ net-im/mcabber/pkg-descr	2015-07-25 00:00:00.000000000 +0900
>@@ -1,16 +1,13 @@
> Mcabber is a small Jabber console client.
> 
> Here are some of the features of mcabber:
>- o   SSL support.
>-
>- o   History  logging: If enabled (see the CONFIGURATION FILE section),
>-     mcabber can save discussions to history log files.
>-
>- o   Commands completion: If possible, mcabber will try to complete your
>-     command line if you hit the Tab key.
>-
>- o   External actions: Some events (like receiving a message) can trig-
>-     ger an external action, for example a  shell  script  (you  need  to
>-     enable  it  in  your  configuration  file).
>+ - SSL support
>+ - History logging: If enabled (see the CONFIGURATION FILE section),
>+   mcabber can save discussions to history log files
>+ - Commands completion: If possible, mcabber will try to complete your
>+   command line if you hit the Tab key
>+ - External actions: Some events (like receiving a message) can trigger
>+   an external action, for example a shell script (you need to enable
>+   it in your configuration file)
> 
> WWW: http://www.lilotux.net/~mikael/mcabber/
>diff -urN /usr/ports/net-im/mcabber/pkg-plist net-im/mcabber/pkg-plist
>--- /usr/ports/net-im/mcabber/pkg-plist	2014-11-22 17:05:38.000000000 +0900
>+++ net-im/mcabber/pkg-plist	2015-07-25 00:00:00.000000000 +0900
>@@ -8,7 +8,6 @@
> include/mcabber/fifo.h
> include/mcabber/hbuf.h
> include/mcabber/help.h
>-include/mcabber/hgcset.h
> include/mcabber/histolog.h
> include/mcabber/hooks.h
> include/mcabber/logprint.h
>@@ -31,51 +30,27 @@
> include/mcabber/xmpp_muc.h
> include/mcabber/xmpp_s10n.h
> lib/mcabber/libbeep.so
>-lib/mcabber/libxttitle.so
>-lib/mcabber/liburlregex.so
> lib/mcabber/libfifo.so
>+lib/mcabber/liburlregex.so
>+lib/mcabber/libxttitle.so
> libdata/pkgconfig/mcabber.pc
> man/man1/mcabber.1.gz
> share/applications/mcabber.desktop
>-%%EXAMPLESDIR%%/mcabberrc
>-%%DATADIR%%/help/en/hlp.txt
>-%%DATADIR%%/help/en/hlp_add.txt
>-%%DATADIR%%/help/en/hlp_alias.txt
>-%%DATADIR%%/help/en/hlp_authorization.txt
>-%%DATADIR%%/help/en/hlp_bind.txt
>-%%DATADIR%%/help/en/hlp_buffer.txt
>-%%DATADIR%%/help/en/hlp_chat_disable.txt
>-%%DATADIR%%/help/en/hlp_clear.txt
>-%%DATADIR%%/help/en/hlp_color.txt
>-%%DATADIR%%/help/en/hlp_connect.txt
>-%%DATADIR%%/help/en/hlp_del.txt
>-%%DATADIR%%/help/en/hlp_disconnect.txt
>-%%DATADIR%%/help/en/hlp_echo.txt
>-%%DATADIR%%/help/en/hlp_event.txt
>-%%DATADIR%%/help/en/hlp_group.txt
>-%%DATADIR%%/help/en/hlp_help.txt
>-%%DATADIR%%/help/en/hlp_iline.txt
>-%%DATADIR%%/help/en/hlp_info.txt
>-%%DATADIR%%/help/en/hlp_module.txt
>-%%DATADIR%%/help/en/hlp_move.txt
>-%%DATADIR%%/help/en/hlp_msay.txt
>-%%DATADIR%%/help/en/hlp_otr.txt
>-%%DATADIR%%/help/en/hlp_otrpolicy.txt
>-%%DATADIR%%/help/en/hlp_pgp.txt
>-%%DATADIR%%/help/en/hlp_quit.txt
>-%%DATADIR%%/help/en/hlp_rawxml.txt
>-%%DATADIR%%/help/en/hlp_rename.txt
>-%%DATADIR%%/help/en/hlp_request.txt
>-%%DATADIR%%/help/en/hlp_room.txt
>-%%DATADIR%%/help/en/hlp_roster.txt
>-%%DATADIR%%/help/en/hlp_say.txt
>-%%DATADIR%%/help/en/hlp_say_to.txt
>-%%DATADIR%%/help/en/hlp_screen_refresh.txt
>-%%DATADIR%%/help/en/hlp_set.txt
>-%%DATADIR%%/help/en/hlp_source.txt
>-%%DATADIR%%/help/en/hlp_status.txt
>-%%DATADIR%%/help/en/hlp_status_to.txt
>-%%DATADIR%%/help/en/hlp_version.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cicq2mcabber.pl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/events/eventcmd
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/events/eventcmd.osd
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/events/eventcmd.pastebin
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/events/mcnotify-osx.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/events/mcnotify.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/filter_statusmsg.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/merge_history.py
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/themes/light.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/themes/light2.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/themes/mikael-256.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/themes/oliver.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/vim/mcabber_log-ftdetect.vim
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/vim/mcabber_log-syntax.vim
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mcabberrc
> %%DATADIR%%/help/cs/hlp.txt
> %%DATADIR%%/help/cs/hlp_add.txt
> %%DATADIR%%/help/cs/hlp_alias.txt
>@@ -152,6 +127,44 @@
> %%DATADIR%%/help/de/hlp_status.txt
> %%DATADIR%%/help/de/hlp_status_to.txt
> %%DATADIR%%/help/de/hlp_version.txt
>+%%DATADIR%%/help/en/hlp.txt
>+%%DATADIR%%/help/en/hlp_add.txt
>+%%DATADIR%%/help/en/hlp_alias.txt
>+%%DATADIR%%/help/en/hlp_authorization.txt
>+%%DATADIR%%/help/en/hlp_bind.txt
>+%%DATADIR%%/help/en/hlp_buffer.txt
>+%%DATADIR%%/help/en/hlp_chat_disable.txt
>+%%DATADIR%%/help/en/hlp_clear.txt
>+%%DATADIR%%/help/en/hlp_color.txt
>+%%DATADIR%%/help/en/hlp_connect.txt
>+%%DATADIR%%/help/en/hlp_del.txt
>+%%DATADIR%%/help/en/hlp_disconnect.txt
>+%%DATADIR%%/help/en/hlp_echo.txt
>+%%DATADIR%%/help/en/hlp_event.txt
>+%%DATADIR%%/help/en/hlp_group.txt
>+%%DATADIR%%/help/en/hlp_help.txt
>+%%DATADIR%%/help/en/hlp_iline.txt
>+%%DATADIR%%/help/en/hlp_info.txt
>+%%DATADIR%%/help/en/hlp_module.txt
>+%%DATADIR%%/help/en/hlp_move.txt
>+%%DATADIR%%/help/en/hlp_msay.txt
>+%%DATADIR%%/help/en/hlp_otr.txt
>+%%DATADIR%%/help/en/hlp_otrpolicy.txt
>+%%DATADIR%%/help/en/hlp_pgp.txt
>+%%DATADIR%%/help/en/hlp_quit.txt
>+%%DATADIR%%/help/en/hlp_rawxml.txt
>+%%DATADIR%%/help/en/hlp_rename.txt
>+%%DATADIR%%/help/en/hlp_request.txt
>+%%DATADIR%%/help/en/hlp_room.txt
>+%%DATADIR%%/help/en/hlp_roster.txt
>+%%DATADIR%%/help/en/hlp_say.txt
>+%%DATADIR%%/help/en/hlp_say_to.txt
>+%%DATADIR%%/help/en/hlp_screen_refresh.txt
>+%%DATADIR%%/help/en/hlp_set.txt
>+%%DATADIR%%/help/en/hlp_source.txt
>+%%DATADIR%%/help/en/hlp_status.txt
>+%%DATADIR%%/help/en/hlp_status_to.txt
>+%%DATADIR%%/help/en/hlp_version.txt
> %%DATADIR%%/help/fr/hlp.txt
> %%DATADIR%%/help/fr/hlp_add.txt
> %%DATADIR%%/help/fr/hlp_alias.txt
>@@ -380,16 +393,3 @@
> %%DATADIR%%/help/uk/hlp_status.txt
> %%DATADIR%%/help/uk/hlp_status_to.txt
> %%DATADIR%%/help/uk/hlp_version.txt
>-%%DATADIR%%/contrib/events/eventcmd.osd
>-%%DATADIR%%/contrib/events/eventcmd
>-%%DATADIR%%/contrib/events/eventcmd.pastebin
>-%%DATADIR%%/contrib/events/mcnotify.py
>-%%DATADIR%%/contrib/themes/light.txt
>-%%DATADIR%%/contrib/themes/light2.txt
>-%%DATADIR%%/contrib/themes/oliver.txt
>-%%DATADIR%%/contrib/themes/mikael-256.txt
>-%%DATADIR%%/contrib/vim/mcabber_log-ftdetect.vim
>-%%DATADIR%%/contrib/vim/mcabber_log-syntax.vim
>-%%DATADIR%%/contrib/cicq2mcabber.pl
>-%%DATADIR%%/contrib/filter_statusmsg.py
>-%%DATADIR%%/contrib/merge_history.py

Actions: View | Diff

Attachments on bug 201850: 159188