Attachment 101276 Details for Bug 140704 – file.diff

[patch] file.diff

file.diff (text/plain), 14.06 KB, created by Mikle Davidkin on 2009-11-19 19:00:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikle Davidkin

Created: 2009-11-19 19:00:04 UTC

Size: 14.06 KB

patch

obsolete

>diff -ur /usr/home/skylord/old/verlihub/Makefile ./verlihub/Makefile
>--- /usr/home/skylord/old/verlihub/Makefile	2009-11-13 12:32:38.000000000 +0300
>+++ ./verlihub/Makefile	2009-11-18 16:47:17.000000000 +0300
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	verlihub
>-DISTVERSION=	0.9.8e-r1
>+DISTVERSION=	0.9.8e-r2
> PORTEPOCH=	1
> CATEGORIES=	net-p2p
> MASTER_SITES=	SF/${PORTNAME}/Verlihub/${DISTVERSION}
>diff -ur /usr/home/skylord/old/verlihub/distinfo ./verlihub/distinfo
>--- /usr/home/skylord/old/verlihub/distinfo	2009-11-13 12:32:38.000000000 +0300
>+++ ./verlihub/distinfo	2009-11-18 16:48:24.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (verlihub-0.9.8e-r1.tar.gz) = 663ef7254b79d382c3943e5c0409b640
>-SHA256 (verlihub-0.9.8e-r1.tar.gz) = 1b3e981717f5e0c972778f48918ba54cb1a4b833426854c8e3eb295effc2c01d
>-SIZE (verlihub-0.9.8e-r1.tar.gz) = 729317
>+MD5 (verlihub-0.9.8e-r2.tar.gz) = bbf67b6714d26fc5389d880edba61511
>+SHA256 (verlihub-0.9.8e-r2.tar.gz) = 3b5132eb3a78b486e2bfd09166dc3206c89bdc8dbfaf98805dfa803cd7574516
>+SIZE (verlihub-0.9.8e-r2.tar.gz) = 743769
>diff -ur /usr/home/skylord/old/verlihub/files/patch-thublink ./verlihub/files/patch-thublink
>--- /usr/home/skylord/old/verlihub/files/patch-thublink	2009-11-13 12:32:38.000000000 +0300
>+++ ./verlihub/files/patch-thublink	2009-11-18 17:17:47.000000000 +0300
>@@ -200,9 +200,10 @@
>  		return 0;
>  	}
> +	return true;
>- }
>- 
>- /** No descriptions */
>+ 	#else
>+ 	return 0;
>+ 	#endif
>+
> Index: casyncconn.h
> ===================================================================
> RCS file: /cvsroot/verlihub/verlihub/src/casyncconn.h,v
>diff -ur /usr/home/skylord/old/verlihub/files/pkg-message.in ./verlihub/files/pkg-message.in
>--- /usr/home/skylord/old/verlihub/files/pkg-message.in	2009-11-13 12:32:39.000000000 +0300
>+++ ./verlihub/files/pkg-message.in	2009-11-19 18:14:41.000000000 +0300
>@@ -22,7 +22,7 @@
> If you upgrade from version prior to 0.9.8e please note the 
> following:
> 
>-    - Database charset is now set explicitly to UTF8 - velihub
>+    - Database charset is now set explicitly to UTF8 - verlihub
>       will alter all tables during the first run. So if you have
>       used custom charset you should deal with it (backup, i.e.)
>       before the first run!
>diff -ur /usr/home/skylord/old/verlihub-plugins/Makefile ./verlihub-plugins/Makefile
>--- /usr/home/skylord/old/verlihub-plugins/Makefile	2008-06-06 17:53:47.000000000 +0400
>+++ ./verlihub-plugins/Makefile	2009-11-19 19:33:51.000000000 +0300
>@@ -7,14 +7,14 @@
> 
> PORTNAME=	verlihub
> PORTVERSION=	1.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p
> MASTER_SITES=	# empty
> PKGNAMESUFFIX=	-plugins
> DISTFILES=	# empty
> EXTRACT_ONLY=	# empty
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> COMMENT=	Meta-port for VerliHub plugins
> 
> RUN_DEPENDS=	\
>diff -ur /usr/home/skylord/old/verlihub-plugins/Makefile.plugins ./verlihub-plugins/Makefile.plugins
>--- /usr/home/skylord/old/verlihub-plugins/Makefile.plugins	2009-08-22 04:32:18.000000000 +0400
>+++ ./verlihub-plugins/Makefile.plugins	2009-11-19 18:56:13.000000000 +0300
>@@ -6,14 +6,15 @@
> PLUGIN_NAME?=	${PORTNAME}
> 
> PKGNAMEPREFIX=	verlihub-plugins-
>-MASTER_SITES=	SF/verlihub/OldFiles
>-DISTNAME=	${PLUGIN_NAME}
>+DISTNAME=	${PLUGIN_NAME}-${PORTVERSION}
>+WRKSRC?=	${WRKDIR}/${PLUGIN_NAME}
> 
> COMMENT?=	${PLUGIN_DESC} plugin for the VerliHub - a Direct Connect protocol server
> 
> BUILD_DEPENDS+=	${LOCALBASE}/bin/verlihub:${PORTSDIR}/net-p2p/verlihub
> RUN_DEPENDS+=	${LOCALBASE}/bin/verlihub:${PORTSDIR}/net-p2p/verlihub
> 
>+USE_GCC=	4.2+
> GNU_CONFIGURE=	yes
> 
> PLIST_FILES+=	lib/lib${PLUGIN_NAME}_pi.a \
>diff -ur /usr/home/skylord/old/verlihub-plugins/pkg-message.plugins ./verlihub-plugins/pkg-message.plugins
>--- /usr/home/skylord/old/verlihub-plugins/pkg-message.plugins	2009-11-19 16:54:02.000000000 +0300
>+++ ./verlihub-plugins/pkg-message.plugins	2009-11-19 14:17:27.000000000 +0300
>@@ -4,7 +4,6 @@
> You need to restart your hub or manually load plugin with
> plugman commands.
> 
>-Visit http://www.verlihub-project.org/ for online manuals or 
>-http://www.verlihubforums.com/ for the project's forums.
>+Visit http://www.verlihub-project.org/ for online support.
> 
> -------------------------------------------------------------------
>diff -ur /usr/home/skylord/old/verlihub-plugins-chatroom/Makefile ./verlihub-plugins-chatroom/Makefile
>--- /usr/home/skylord/old/verlihub-plugins-chatroom/Makefile	2008-06-06 17:53:48.000000000 +0400
>+++ ./verlihub-plugins-chatroom/Makefile	2009-11-19 19:33:21.000000000 +0300
>@@ -7,10 +7,11 @@
> 
> PORTNAME=	chatroom
> PORTVERSION=	1.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p
>+MASTER_SITES=	SF/verlihub/VH_Chatroom/${DISTVERSION}
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> 
> PLUGIN_DESC=	Chatroom
> 
>diff -ur /usr/home/skylord/old/verlihub-plugins-chatroom/distinfo ./verlihub-plugins-chatroom/distinfo
>--- /usr/home/skylord/old/verlihub-plugins-chatroom/distinfo	2007-07-05 11:01:10.000000000 +0400
>+++ ./verlihub-plugins-chatroom/distinfo	2009-11-19 18:24:51.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (chatroom.tar.gz) = f3773e78512c3e56a71be2249df0c0f7
>-SHA256 (chatroom.tar.gz) = bba9ce7841245c13d8d4138c85158a161cfd262beffb940d848bc163cdc17b82
>-SIZE (chatroom.tar.gz) = 339122
>+MD5 (chatroom-1.1.tar.gz) = f3773e78512c3e56a71be2249df0c0f7
>+SHA256 (chatroom-1.1.tar.gz) = bba9ce7841245c13d8d4138c85158a161cfd262beffb940d848bc163cdc17b82
>+SIZE (chatroom-1.1.tar.gz) = 339122
>diff -ur /usr/home/skylord/old/verlihub-plugins-floodprotect/Makefile ./verlihub-plugins-floodprotect/Makefile
>--- /usr/home/skylord/old/verlihub-plugins-floodprotect/Makefile	2008-06-06 17:53:48.000000000 +0400
>+++ ./verlihub-plugins-floodprotect/Makefile	2009-11-19 19:34:21.000000000 +0300
>@@ -7,14 +7,16 @@
> 
> PORTNAME=	floodprotect
> PORTVERSION=	1.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p
>+MASTER_SITES=	SF/verlihub/OldFiles
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> 
> PLUGIN_NAME=	floodprot
> PLUGIN_DESC=	Floodprotect
> 
> .include <bsd.port.pre.mk>
> .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
>+DISTNAME=	${PLUGIN_NAME}
> .include <bsd.port.post.mk>
>diff -ur /usr/home/skylord/old/verlihub-plugins-forbid/Makefile ./verlihub-plugins-forbid/Makefile
>--- /usr/home/skylord/old/verlihub-plugins-forbid/Makefile	2008-06-06 17:53:48.000000000 +0400
>+++ ./verlihub-plugins-forbid/Makefile	2009-11-19 19:34:37.000000000 +0300
>@@ -7,10 +7,11 @@
> 
> PORTNAME=	forbid
> PORTVERSION=	1.3
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p
>+MASTER_SITES=	SF/verlihub/VH_Forbid/${DISTVERSION}
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> 
> PLUGIN_DESC=	ForbiddenWords
> 
>diff -ur /usr/home/skylord/old/verlihub-plugins-forbid/distinfo ./verlihub-plugins-forbid/distinfo
>--- /usr/home/skylord/old/verlihub-plugins-forbid/distinfo	2007-07-05 11:05:01.000000000 +0400
>+++ ./verlihub-plugins-forbid/distinfo	2009-11-19 18:40:01.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (forbid.tar.gz) = 92d8d81077a918dd5375ef343c9a5bd7
>-SHA256 (forbid.tar.gz) = 6770f74b7d19c49d6547392ff4afd0c2ab4ec7884c947ad48259e4ab85c49b79
>-SIZE (forbid.tar.gz) = 291291
>+MD5 (forbid-1.3.tar.gz) = 92d8d81077a918dd5375ef343c9a5bd7
>+SHA256 (forbid-1.3.tar.gz) = 6770f74b7d19c49d6547392ff4afd0c2ab4ec7884c947ad48259e4ab85c49b79
>+SIZE (forbid-1.3.tar.gz) = 291291
>diff -ur /usr/home/skylord/old/verlihub-plugins-iplog/Makefile ./verlihub-plugins-iplog/Makefile
>--- /usr/home/skylord/old/verlihub-plugins-iplog/Makefile	2008-06-06 17:53:48.000000000 +0400
>+++ ./verlihub-plugins-iplog/Makefile	2009-11-19 19:34:48.000000000 +0300
>@@ -7,10 +7,11 @@
> 
> PORTNAME=	iplog
> PORTVERSION=	1.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p
>+MASTER_SITES=	SF/verlihub/VH_IPLog/${DISTVERSION}
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> 
> PLUGIN_DESC=	IPLog
> 
>diff -ur /usr/home/skylord/old/verlihub-plugins-iplog/distinfo ./verlihub-plugins-iplog/distinfo
>--- /usr/home/skylord/old/verlihub-plugins-iplog/distinfo	2007-07-05 11:05:59.000000000 +0400
>+++ ./verlihub-plugins-iplog/distinfo	2009-11-19 18:41:54.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (iplog.tar.gz) = d94bdf7fc7c3e23811de442f48aca6aa
>-SHA256 (iplog.tar.gz) = 3941e028472e054245b37bf85d7912cd84753a6cbf16a141e16b8884ab1f38a5
>-SIZE (iplog.tar.gz) = 404685
>+MD5 (iplog-1.1.tar.gz) = d94bdf7fc7c3e23811de442f48aca6aa
>+SHA256 (iplog-1.1.tar.gz) = 3941e028472e054245b37bf85d7912cd84753a6cbf16a141e16b8884ab1f38a5
>+SIZE (iplog-1.1.tar.gz) = 404685
>diff -ur /usr/home/skylord/old/verlihub-plugins-isp/Makefile ./verlihub-plugins-isp/Makefile
>--- /usr/home/skylord/old/verlihub-plugins-isp/Makefile	2008-06-06 17:53:48.000000000 +0400
>+++ ./verlihub-plugins-isp/Makefile	2009-11-19 19:35:18.000000000 +0300
>@@ -6,11 +6,11 @@
> #
> 
> PORTNAME=	isp
>-PORTVERSION=	0.9
>-PORTREVISION=	1
>+PORTVERSION=	1.1
> CATEGORIES=	net-p2p
>+MASTER_SITES=	SF/verlihub/VH_ISP/${DISTVERSION}
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> 
> PLUGIN_DESC=	ISP
> 
>diff -ur /usr/home/skylord/old/verlihub-plugins-isp/distinfo ./verlihub-plugins-isp/distinfo
>--- /usr/home/skylord/old/verlihub-plugins-isp/distinfo	2007-07-05 11:08:29.000000000 +0400
>+++ ./verlihub-plugins-isp/distinfo	2009-11-19 18:41:46.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (isp.tar.gz) = 539caa419421b20ca1351108641d6acb
>-SHA256 (isp.tar.gz) = 7107a177601dc019f2c1e4edcbc6cdb9e886312ebb4b61df8f4eb609d810ce81
>-SIZE (isp.tar.gz) = 233355
>+MD5 (isp-1.1.tar.gz) = 320f862ec78accdf55c73cc0657a0270
>+SHA256 (isp-1.1.tar.gz) = 708c16da22cf8f6146364625bc1b80209cb01ad88d621fca94fa357aa0a35a73
>+SIZE (isp-1.1.tar.gz) = 233836
>diff -ur /usr/home/skylord/old/verlihub-plugins-luascript/Makefile ./verlihub-plugins-luascript/Makefile
>--- /usr/home/skylord/old/verlihub-plugins-luascript/Makefile	2008-06-06 17:53:49.000000000 +0400
>+++ ./verlihub-plugins-luascript/Makefile	2009-11-19 19:35:36.000000000 +0300
>@@ -6,28 +6,45 @@
> #
> 
> PORTNAME=	luascript
>-PORTVERSION=	1.6
>-PORTREVISION=	1
>+PORTVERSION=	1.8.1
> CATEGORIES=	net-p2p
>+PKGNAMEPREFIX=	verlihub-plugins-
>+MASTER_SITES=	SF/verlihub/VH_Lua/${DISTVERSION}
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> 
> PLUGIN_NAME=	lua
> PLUGIN_DESC=	LuaScript
> 
> USE_LUA=	5.1
>+
>+WRKSRC=		${WRKDIR}/${DISTNAME}
> CONFIGURE_ENV=	CXXFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
> CPPFLAGS=	-I${LUA_INCDIR}
> LDFLAGS=	-L${LUA_LIBDIR}
> 
>-PLIST_FILES=	share/verlihub/scripts/google.lua \
>-		share/verlihub/scripts/lua4to5.lua.inc \
>-		share/verlihub/scripts/ptokax.lua.inc \
>+OPTIONS=	SOCKET "Build with LuaSocket support" Off
>+
>+PLIST_FILES=	share/verlihub/scripts/ptokax.lua.inc \
> 		share/verlihub/scripts/ptokaxtest.lua \
>-		share/verlihub/scripts/script.lua \
>-		share/verlihub/scripts/trivia.lua
>+		share/verlihub/scripts/script.lua
> PLIST_DIRS=	share/verlihub/scripts
> 
>+.include <bsd.port.options.mk>
>+
>+.if defined(WITH_SOCKET)
>+LUA_COMPS+=	socket:lib
>+CONFIGURE_ARGS+=	--with-luasocket
>+
>+post-patch::
>+	@${REINPLACE_CMD} -e 's|-lluasocket|${LUA_MODLIBDIR}/socket/core.so|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|-lluamime|${LUA_MODLIBDIR}/mime/core.so|g' ${WRKSRC}/configure
>+.endif
>+
> .include <bsd.port.pre.mk>
> .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
>+
>+post-patch::
>+	@${REINPLACE_CMD} -e 's|for libpath in /|for libpath in ${PREFIX} /|g' ${WRKSRC}/config_lua
>+
> .include <bsd.port.post.mk>
>diff -ur /usr/home/skylord/old/verlihub-plugins-luascript/distinfo ./verlihub-plugins-luascript/distinfo
>--- /usr/home/skylord/old/verlihub-plugins-luascript/distinfo	2007-07-05 11:06:19.000000000 +0400
>+++ ./verlihub-plugins-luascript/distinfo	2009-11-19 13:39:59.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (lua.tar.gz) = 949a765e56f8531a37c181c94df41fa0
>-SHA256 (lua.tar.gz) = 9e79c46cefd5d83297a2c369ec98d3d12a2f05b9e2d7ebb44f59da4d46b00c3b
>-SIZE (lua.tar.gz) = 492324
>+MD5 (lua-1.8.1.tar.gz) = 1c7f71106e6a0897b3ae99aa412ca680
>+SHA256 (lua-1.8.1.tar.gz) = 212497706b69de53189e6bc1945698fb9c08bf167bb473b6e65c5afb1cc8e384
>+SIZE (lua-1.8.1.tar.gz) = 425122
>diff -ur /usr/home/skylord/old/verlihub-plugins-messanger/Makefile ./verlihub-plugins-messanger/Makefile
>--- /usr/home/skylord/old/verlihub-plugins-messanger/Makefile	2008-06-06 17:53:49.000000000 +0400
>+++ ./verlihub-plugins-messanger/Makefile	2009-11-19 19:36:12.000000000 +0300
>@@ -7,10 +7,11 @@
> 
> PORTNAME=	messanger
> PORTVERSION=	1.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p
>+MASTER_SITES=	SF/verlihub/VH_Messanger/${DISTVERSION}
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> 
> PLUGIN_DESC=	Messanger
> 
>diff -ur /usr/home/skylord/old/verlihub-plugins-messanger/distinfo ./verlihub-plugins-messanger/distinfo
>--- /usr/home/skylord/old/verlihub-plugins-messanger/distinfo	2007-07-05 11:06:38.000000000 +0400
>+++ ./verlihub-plugins-messanger/distinfo	2009-11-19 18:44:00.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (messanger.tar.gz) = b8adb29fdc80247a8ca52f52bc5b6a5b
>-SHA256 (messanger.tar.gz) = 7d17cf4e731ae7754c763fc4e6cf5df70bed4393c9f2214840fd20f7ecd2a93d
>-SIZE (messanger.tar.gz) = 243196
>+MD5 (messanger-1.2.tar.gz) = b8adb29fdc80247a8ca52f52bc5b6a5b
>+SHA256 (messanger-1.2.tar.gz) = 7d17cf4e731ae7754c763fc4e6cf5df70bed4393c9f2214840fd20f7ecd2a93d
>+SIZE (messanger-1.2.tar.gz) = 243196
>diff -ur /usr/home/skylord/old/verlihub-plugins-stats/Makefile ./verlihub-plugins-stats/Makefile
>--- /usr/home/skylord/old/verlihub-plugins-stats/Makefile	2008-06-06 17:53:49.000000000 +0400
>+++ ./verlihub-plugins-stats/Makefile	2009-11-19 19:36:19.000000000 +0300
>@@ -7,10 +7,11 @@
> 
> PORTNAME=	stats
> PORTVERSION=	1.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p
>+MASTER_SITES=	SF/verlihub/VH_Stats/${DISTVERSION}
> 
>-MAINTAINER=	skylord@vt.net.ru
>+MAINTAINER=	me@skylord.ru
> 
> PLUGIN_DESC=	Statistics
> 
>diff -ur /usr/home/skylord/old/verlihub-plugins-stats/distinfo ./verlihub-plugins-stats/distinfo
>--- /usr/home/skylord/old/verlihub-plugins-stats/distinfo	2007-07-05 11:06:56.000000000 +0400
>+++ ./verlihub-plugins-stats/distinfo	2009-11-19 18:47:03.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (stats.tar.gz) = 2aacad97f65873a2f30c19e873fde948
>-SHA256 (stats.tar.gz) = 4a6f5e8e8383424718122c0049e39afa33e2175fe53de533faef0400e31429e8
>-SIZE (stats.tar.gz) = 221046
>+MD5 (stats-1.1.tar.gz) = 2aacad97f65873a2f30c19e873fde948
>+SHA256 (stats-1.1.tar.gz) = 4a6f5e8e8383424718122c0049e39afa33e2175fe53de533faef0400e31429e8
>+SIZE (stats-1.1.tar.gz) = 221046
>Only in .: verlihub_all.patch

Actions: View | Diff

Attachments on bug 140704: 101276