Attachment 175505 Details for Bug 213281 – diff file

[patch] diff file

weechat.diff (text/plain), 8.23 KB, created by Kevin on 2016-10-07 17:38:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin

Created: 2016-10-07 17:38:20 UTC

Size: 8.23 KB

patch

obsolete

>diff -u /usr/ports/irc/weechat.orig/Makefile /usr/ports/irc/weechat/Makefile
>--- /usr/ports/irc/weechat.orig/Makefile	2016-03-24 20:14:58.000000000 -0500
>+++ /usr/ports/irc/weechat/Makefile	2016-10-07 12:24:37.931199000 -0500
>@@ -2,11 +2,11 @@
> # $FreeBSD: tags/RELEASE_10_3_0/irc/weechat/Makefile 404174 2015-12-21 18:35:52Z sunpoet $
> 
> PORTNAME=	weechat
>-PORTVERSION=	1.3
>+PORTVERSION=	1.6
> CATEGORIES=	irc
> MASTER_SITES=	http://weechat.org/files/src/
> 
>-MAINTAINER=	jase@FreeBSD.org
>+MAINTAINER=	kevin@nwabytes.com
> COMMENT=	Lightweight and user friendly ncurses based IRC client
> 
> LICENSE=	GPLv3
>@@ -19,8 +19,8 @@
> 		-DICONV_INCLUDE_PATH=${ICONV_INCLUDE_PATH}
> CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
> 
>-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl \
>-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
>+LIB_DEPENDS+=	libcurl.so:ftp/curl \
>+		libgcrypt.so:security/libgcrypt
> 
> OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA JAVASCRIPT CHARSET BACKTRACE ASPELL \
> 		GNUTLS CA_BUNDLE NLS ICON MANPAGES DOCS
>@@ -38,12 +38,12 @@
> RUBY_DESC=	Ruby scripting language support
> 
> ASPELL_CMAKE_OFF=	-DENABLE_ASPELL=no
>-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
>+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
> 
>-BACKTRACE_LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
>+BACKTRACE_LIB_DEPENDS=	libexecinfo.so:devel/libexecinfo
> 
> CA_BUNDLE_CMAKE_ON=	-DCA_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
>-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
>+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
> CHARSET_CMAKE_OFF=	-DENABLE_CHARSET=no
> 
>@@ -51,11 +51,11 @@
> 
> JAVASCRIPT_CMAKE_OFF=	-DENABLE_JAVASCRIPT=no
> JAVASCRIPT_CMAKE_ON=	-DENABLE_JAVASCRIPT=yes
>-JAVASCRIPT_LIB_DEPENDS=	libv8.so:${PORTSDIR}/lang/v8
>+JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8
> 
> GNUTLS_CMAKE_OFF=	-DENABLE_GNUTLS=no
> GNUTLS_USES=		pkgconfig
>-GNUTLS_LIB_DEPENDS=	libgnutls.so.28:${PORTSDIR}/security/gnutls
>+GNUTLS_LIB_DEPENDS=	libgnutls.so.28:security/gnutls
> 
> LUA_CMAKE_OFF=		-DENABLE_LUA=no
> LUA_CMAKE_ON=		-DBSD_LUA_LIBDIR=${LUA_LIBDIR} \
>@@ -74,7 +74,7 @@
> PYTHON_CMAKE_OFF=	-DENABLE_PYTHON=no
> PYTHON_CMAKE_ON=	-DBSD_PYTHON_CMD=${PYTHON_CMD} \
> 			-DBSD_PYTHON_VER=${PYTHON_VERSION}
>-PYTHON_USES=		python
>+PYTHON_USES=		${PYTHON_CMD}
> 
> RUBY_CMAKE_OFF=		-DENABLE_RUBY=no
> RUBY_CMAKE_ON=		-DBSD_RUBY_CMD=${RUBY} \
>@@ -90,10 +90,10 @@
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
>-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
>-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
>-		asciidoc:${PORTSDIR}/textproc/asciidoc \
>-		source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight
>+BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
>+		docbook-xsl>=0:textproc/docbook-xsl \
>+		asciidoc:textproc/asciidoc \
>+		source-highlight>=3.1.5:textproc/source-highlight
> .endif
> 
> post-patch:
>diff -u /usr/ports/irc/weechat.orig/distinfo /usr/ports/irc/weechat/distinfo
>--- /usr/ports/irc/weechat.orig/distinfo	2016-03-24 20:14:58.000000000 -0500
>+++ /usr/ports/irc/weechat/distinfo	2016-10-07 11:53:35.777760000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (weechat-1.3.tar.bz2) = 703dd771f74a2391bab656992712331d9151a227ac3210393a4ecf6458605148
>-SIZE (weechat-1.3.tar.bz2) = 2402422
>+SHA256 (weechat-1.6.tar.bz2) = 73eca5212fadb7056f5f72d9dfc96453dea0342c963d1f1ca36c84def5653c34
>+SIZE (weechat-1.6.tar.bz2) = 2558398
>Common subdirectories: /usr/ports/irc/weechat.orig/files and /usr/ports/irc/weechat/files
>diff -u /usr/ports/irc/weechat.orig/pkg-plist /usr/ports/irc/weechat/pkg-plist
>--- /usr/ports/irc/weechat.orig/pkg-plist	2016-03-24 20:14:58.000000000 -0500
>+++ /usr/ports/irc/weechat/pkg-plist	2016-10-07 12:17:18.148211000 -0500
>@@ -1,82 +1,33 @@
> bin/weechat
> bin/weechat-curses
> include/weechat/weechat-plugin.h
>-lib/weechat/plugins/alias.so
>-lib/weechat/plugins/exec.so
>-lib/weechat/plugins/fifo.so
>-lib/weechat/plugins/irc.so
>-lib/weechat/plugins/logger.so
>-lib/weechat/plugins/relay.so
>-lib/weechat/plugins/script.so
>-lib/weechat/plugins/trigger.so
>-lib/weechat/plugins/xfer.so
>-libdata/pkgconfig/weechat.pc
>-%%MANPAGES%%man/man1/weechat.1.gz
>-%%MANPAGES%%man/de/man1/weechat.1.gz
>-%%MANPAGES%%man/fr/man1/weechat.1.gz
>-%%MANPAGES%%man/it/man1/weechat.1.gz
>-%%MANPAGES%%man/ja/man1/weechat.1.gz
>-%%MANPAGES%%man/pl/man1/weechat.1.gz
>-%%MANPAGES%%man/ru/man1/weechat.1.gz
>-%%ASPELL%%lib/weechat/plugins/aspell.so
>-%%CHARSET%%lib/weechat/plugins/charset.so
>-%%JAVASCRIPT%%lib/weechat/plugins/javascript.so
>-%%LUA%%lib/weechat/plugins/lua.so
>-%%PERL%%lib/weechat/plugins/perl.so
>-%%PYTHON%%lib/weechat/plugins/python.so
>-%%RUBY%%lib/weechat/plugins/ruby.so
>-%%TCL%%lib/weechat/plugins/tcl.so
>-%%DOCS%%%%DOCSDIR%%/weechat_dev.en.html
>-%%DOCS%%%%DOCSDIR%%/weechat_dev.fr.html
>-%%DOCS%%%%DOCSDIR%%/weechat_dev.ja.html
>-%%DOCS%%%%DOCSDIR%%/weechat_faq.de.html
>-%%DOCS%%%%DOCSDIR%%/weechat_faq.en.html
>-%%DOCS%%%%DOCSDIR%%/weechat_faq.fr.html
>-%%DOCS%%%%DOCSDIR%%/weechat_faq.it.html
>-%%DOCS%%%%DOCSDIR%%/weechat_faq.ja.html
>-%%DOCS%%%%DOCSDIR%%/weechat_faq.pl.html
>-%%DOCS%%%%DOCSDIR%%/weechat_plugin_api.en.html
>-%%DOCS%%%%DOCSDIR%%/weechat_plugin_api.fr.html
>-%%DOCS%%%%DOCSDIR%%/weechat_plugin_api.it.html
>-%%DOCS%%%%DOCSDIR%%/weechat_plugin_api.ja.html
>-%%DOCS%%%%DOCSDIR%%/weechat_quickstart.de.html
>-%%DOCS%%%%DOCSDIR%%/weechat_quickstart.en.html
>-%%DOCS%%%%DOCSDIR%%/weechat_quickstart.es.html
>-%%DOCS%%%%DOCSDIR%%/weechat_quickstart.fr.html
>-%%DOCS%%%%DOCSDIR%%/weechat_quickstart.ja.html
>-%%DOCS%%%%DOCSDIR%%/weechat_quickstart.it.html
>-%%DOCS%%%%DOCSDIR%%/weechat_quickstart.pl.html
>-%%DOCS%%%%DOCSDIR%%/weechat_quickstart.ru.html
>-%%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.en.html
>-%%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.fr.html
>-%%DOCS%%%%DOCSDIR%%/weechat_relay_protocol.ja.html
>-%%DOCS%%%%DOCSDIR%%/weechat_scripting.de.html
>-%%DOCS%%%%DOCSDIR%%/weechat_scripting.en.html
>-%%DOCS%%%%DOCSDIR%%/weechat_scripting.fr.html
>-%%DOCS%%%%DOCSDIR%%/weechat_scripting.it.html
>-%%DOCS%%%%DOCSDIR%%/weechat_scripting.ja.html
>-%%DOCS%%%%DOCSDIR%%/weechat_scripting.pl.html
>-%%DOCS%%%%DOCSDIR%%/weechat_tester.de.html
>-%%DOCS%%%%DOCSDIR%%/weechat_tester.en.html
>-%%DOCS%%%%DOCSDIR%%/weechat_tester.fr.html
>-%%DOCS%%%%DOCSDIR%%/weechat_tester.ja.html
>-%%DOCS%%%%DOCSDIR%%/weechat_tester.it.html
>-%%DOCS%%%%DOCSDIR%%/weechat_tester.pl.html
>-%%DOCS%%%%DOCSDIR%%/weechat_user.de.html
>-%%DOCS%%%%DOCSDIR%%/weechat_user.en.html
>-%%DOCS%%%%DOCSDIR%%/weechat_user.fr.html
>-%%DOCS%%%%DOCSDIR%%/weechat_user.it.html
>-%%DOCS%%%%DOCSDIR%%/weechat_user.ja.html
>-%%DOCS%%%%DOCSDIR%%/weechat_user.pl.html
>-%%ICON%%share/icons/hicolor/32x32/apps/weechat.png
>-%%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/de/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/es/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/fr/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/it/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/ja/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo
>-%%NLS%%share/locale/tr/LC_MESSAGES/weechat.mo
>+%%LUA_LIBDIR%%/weechat/plugins/alias.so
>+%%LUA_LIBDIR%%/weechat/plugins/aspell.so
>+%%LUA_LIBDIR%%/weechat/plugins/charset.so
>+%%LUA_LIBDIR%%/weechat/plugins/exec.so
>+%%LUA_LIBDIR%%/weechat/plugins/fifo.so
>+%%LUA_LIBDIR%%/weechat/plugins/irc.so
>+%%LUA_LIBDIR%%/weechat/plugins/logger.so
>+%%LUA_LIBDIR%%/weechat/plugins/lua.so
>+%%LUA_LIBDIR%%/weechat/plugins/perl.so
>+%%LUA_LIBDIR%%/weechat/plugins/python.so
>+%%LUA_LIBDIR%%/weechat/plugins/relay.so
>+%%LUA_LIBDIR%%/weechat/plugins/ruby.so
>+%%LUA_LIBDIR%%/weechat/plugins/script.so
>+%%LUA_LIBDIR%%/weechat/plugins/tcl.so
>+%%LUA_LIBDIR%%/weechat/plugins/trigger.so
>+%%LUA_LIBDIR%%/weechat/plugins/xfer.so
>+%%LUA_LIBDIR%%data/pkgconfig/weechat.pc
>+share/icons/hicolor/32x32/apps/weechat.png
>+share/locale/cs/LC_MESSAGES/weechat.mo
>+share/locale/de/LC_MESSAGES/weechat.mo
>+share/locale/es/LC_MESSAGES/weechat.mo
>+share/locale/fr/LC_MESSAGES/weechat.mo
>+share/locale/hu/LC_MESSAGES/weechat.mo
>+share/locale/it/LC_MESSAGES/weechat.mo
>+share/locale/ja/LC_MESSAGES/weechat.mo
>+share/locale/pl/LC_MESSAGES/weechat.mo
>+share/locale/pt/LC_MESSAGES/weechat.mo
>+share/locale/pt_BR/LC_MESSAGES/weechat.mo
>+share/locale/ru/LC_MESSAGES/weechat.mo
>+share/locale/tr/LC_MESSAGES/weechat.mo

Actions: View | Diff

Attachments on bug 213281: 175505