From owner-svn-ports-all@FreeBSD.ORG Wed Jun 25 09:56:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABFD8B3A; Wed, 25 Jun 2014 09:56:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C7242268; Wed, 25 Jun 2014 09:56:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5P9uJjC020945; Wed, 25 Jun 2014 09:56:19 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5P9uFBe020924; Wed, 25 Jun 2014 09:56:15 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201406250956.s5P9uFBe020924@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 25 Jun 2014 09:56:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359214 - in head/net-p2p: verlihub-plugins verlihub-plugins-chatroom verlihub-plugins-floodprotect verlihub-plugins-forbid verlihub-plugins-iplog verlihub-plugins-isp verlihub-plugins-... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jun 2014 09:56:19 -0000 Author: danfe Date: Wed Jun 25 09:56:15 2014 New Revision: 359214 URL: http://svnweb.freebsd.org/changeset/ports/359214 QAT: https://qat.redports.org/buildarchive/r359214/ Log: - Fix the build of verlihub-plugins-luascript: careless patching with sed(1) resulted in wrong HAVE_LUA_5_0 (instead of correct HAVE_LUA_5_1) macro to be defined in generated `config.h' header file - Stagify and cleanup all verlihub-plugins* ports while I'm at here Modified: head/net-p2p/verlihub-plugins-chatroom/Makefile head/net-p2p/verlihub-plugins-chatroom/pkg-descr head/net-p2p/verlihub-plugins-floodprotect/Makefile head/net-p2p/verlihub-plugins-floodprotect/pkg-descr head/net-p2p/verlihub-plugins-forbid/Makefile head/net-p2p/verlihub-plugins-forbid/pkg-descr head/net-p2p/verlihub-plugins-iplog/Makefile head/net-p2p/verlihub-plugins-iplog/pkg-descr head/net-p2p/verlihub-plugins-isp/Makefile head/net-p2p/verlihub-plugins-isp/pkg-descr head/net-p2p/verlihub-plugins-luascript/Makefile head/net-p2p/verlihub-plugins-luascript/pkg-descr head/net-p2p/verlihub-plugins-messanger/Makefile head/net-p2p/verlihub-plugins-messanger/pkg-descr head/net-p2p/verlihub-plugins-stats/Makefile head/net-p2p/verlihub-plugins-stats/pkg-descr head/net-p2p/verlihub-plugins/Makefile head/net-p2p/verlihub-plugins/Makefile.plugins Modified: head/net-p2p/verlihub-plugins-chatroom/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-chatroom/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-chatroom/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= chatroom @@ -11,7 +11,6 @@ MAINTAINER= me@skylord.ru PLUGIN_DESC= Chatroom -NO_STAGE= yes .include .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins" .include Modified: head/net-p2p/verlihub-plugins-chatroom/pkg-descr ============================================================================== --- head/net-p2p/verlihub-plugins-chatroom/pkg-descr Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-chatroom/pkg-descr Wed Jun 25 09:56:15 2014 (r359214) @@ -5,5 +5,5 @@ It is written in c++, has relatively low and has many useful features. It also uses a MySQL Database. Additional functionality is available through a versatile 'plugin' system. - + WWW: http://www.verlihub-project.org/ Modified: head/net-p2p/verlihub-plugins-floodprotect/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-floodprotect/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-floodprotect/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= floodprotect @@ -12,7 +12,6 @@ MAINTAINER= me@skylord.ru PLUGIN_NAME= floodprot PLUGIN_DESC= Floodprotect -NO_STAGE= yes .include .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins" DISTNAME= ${PLUGIN_NAME} Modified: head/net-p2p/verlihub-plugins-floodprotect/pkg-descr ============================================================================== --- head/net-p2p/verlihub-plugins-floodprotect/pkg-descr Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-floodprotect/pkg-descr Wed Jun 25 09:56:15 2014 (r359214) @@ -5,5 +5,5 @@ It is written in c++, has relatively low and has many useful features. It also uses a MySQL Database. Additional functionality is available through a versatile 'plugin' system. - + WWW: http://www.verlihub-project.org/ Modified: head/net-p2p/verlihub-plugins-forbid/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-forbid/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-forbid/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= forbid @@ -11,7 +11,6 @@ MAINTAINER= me@skylord.ru PLUGIN_DESC= ForbiddenWords -NO_STAGE= yes .include .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins" .include Modified: head/net-p2p/verlihub-plugins-forbid/pkg-descr ============================================================================== --- head/net-p2p/verlihub-plugins-forbid/pkg-descr Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-forbid/pkg-descr Wed Jun 25 09:56:15 2014 (r359214) @@ -5,5 +5,5 @@ It is written in c++, has relatively low and has many useful features. It also uses a MySQL Database. Additional functionality is available through a versatile 'plugin' system. - + WWW: http://www.verlihub-project.org/ Modified: head/net-p2p/verlihub-plugins-iplog/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-iplog/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-iplog/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= iplog @@ -11,7 +11,6 @@ MAINTAINER= me@skylord.ru PLUGIN_DESC= IPLog -NO_STAGE= yes .include .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins" .include Modified: head/net-p2p/verlihub-plugins-iplog/pkg-descr ============================================================================== --- head/net-p2p/verlihub-plugins-iplog/pkg-descr Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-iplog/pkg-descr Wed Jun 25 09:56:15 2014 (r359214) @@ -5,5 +5,5 @@ It is written in c++, has relatively low and has many useful features. It also uses a MySQL Database. Additional functionality is available through a versatile 'plugin' system. - + WWW: http://www.verlihub-project.org/ Modified: head/net-p2p/verlihub-plugins-isp/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-isp/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-isp/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= isp @@ -12,7 +12,6 @@ PLUGIN_DESC= ISP PLIST_FILES= share/verlihub/default_pi_isp.sql -NO_STAGE= yes .include .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins" .include Modified: head/net-p2p/verlihub-plugins-isp/pkg-descr ============================================================================== --- head/net-p2p/verlihub-plugins-isp/pkg-descr Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-isp/pkg-descr Wed Jun 25 09:56:15 2014 (r359214) @@ -5,5 +5,5 @@ It is written in c++, has relatively low and has many useful features. It also uses a MySQL Database. Additional functionality is available through a versatile 'plugin' system. - + WWW: http://www.verlihub-project.org/ Modified: head/net-p2p/verlihub-plugins-luascript/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-luascript/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-luascript/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= luascript @@ -9,8 +9,6 @@ MASTER_SITES= SF/verlihub/VH_Lua/${DISTV MAINTAINER= me@skylord.ru -BROKEN= Fails to build - PLUGIN_NAME= lua PLUGIN_DESC= LuaScript @@ -21,15 +19,14 @@ CXXFLAGS+= ${LDFLAGS} CPPFLAGS+= -I${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} -OPTIONS_DEFINE= SOCKET -SOCKET_DESC= Build with LuaSocket support - PLIST_FILES= share/verlihub/scripts/ptokax.lua.inc \ share/verlihub/scripts/ptokaxtest.lua \ share/verlihub/scripts/script.lua PLIST_DIRS= share/verlihub/scripts -NO_STAGE= yes +OPTIONS_DEFINE= SOCKET +SOCKET_DESC= Build with LuaSocket support + .include .if ${PORT_OPTIONS:MSOCKET} @@ -44,7 +41,7 @@ post-patch:: -e 's|-lluamime|${LUA_MODLIBDIR}/mime/core.so|g' \ ${WRKSRC}/configure .endif - @${REINPLACE_CMD} -e 's|llua50|llua-${LUA_VER}|g' \ + @${REINPLACE_CMD} -e 's|llua5\.1|llua-${LUA_VER}|g' \ ${WRKSRC}/configure .include Modified: head/net-p2p/verlihub-plugins-luascript/pkg-descr ============================================================================== --- head/net-p2p/verlihub-plugins-luascript/pkg-descr Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-luascript/pkg-descr Wed Jun 25 09:56:15 2014 (r359214) @@ -5,5 +5,5 @@ It is written in c++, has relatively low and has many useful features. It also uses a MySQL Database. Additional functionality is available through a versatile 'plugin' system. - + WWW: http://www.verlihub-project.org/ Modified: head/net-p2p/verlihub-plugins-messanger/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-messanger/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-messanger/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= messanger @@ -11,7 +11,6 @@ MAINTAINER= me@skylord.ru PLUGIN_DESC= Messanger -NO_STAGE= yes .include .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins" .include Modified: head/net-p2p/verlihub-plugins-messanger/pkg-descr ============================================================================== --- head/net-p2p/verlihub-plugins-messanger/pkg-descr Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-messanger/pkg-descr Wed Jun 25 09:56:15 2014 (r359214) @@ -5,5 +5,5 @@ It is written in c++, has relatively low and has many useful features. It also uses a MySQL Database. Additional functionality is available through a versatile 'plugin' system. - + WWW: http://www.verlihub-project.org/ Modified: head/net-p2p/verlihub-plugins-stats/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins-stats/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-stats/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= stats @@ -11,7 +11,6 @@ MAINTAINER= me@skylord.ru PLUGIN_DESC= Statistics -NO_STAGE= yes .include .include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins" .include Modified: head/net-p2p/verlihub-plugins-stats/pkg-descr ============================================================================== --- head/net-p2p/verlihub-plugins-stats/pkg-descr Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins-stats/pkg-descr Wed Jun 25 09:56:15 2014 (r359214) @@ -5,5 +5,5 @@ It is written in c++, has relatively low and has many useful features. It also uses a MySQL Database. Additional functionality is available through a versatile 'plugin' system. - + WWW: http://www.verlihub-project.org/ Modified: head/net-p2p/verlihub-plugins/Makefile ============================================================================== --- head/net-p2p/verlihub-plugins/Makefile Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins/Makefile Wed Jun 25 09:56:15 2014 (r359214) @@ -1,4 +1,4 @@ -# Created by: Skylord +# Created by: Mikle Davidkin # $FreeBSD$ PORTNAME= verlihub @@ -24,9 +24,6 @@ RUN_DEPENDS= \ ${LOCALBASE}/lib/libstats_pi.so:${PORTSDIR}/net-p2p/verlihub-plugins-stats NO_BUILD= yes - -NO_STAGE= yes -do-install: - @${DO_NADA} +NO_INSTALL= yes .include Modified: head/net-p2p/verlihub-plugins/Makefile.plugins ============================================================================== --- head/net-p2p/verlihub-plugins/Makefile.plugins Wed Jun 25 09:48:02 2014 (r359213) +++ head/net-p2p/verlihub-plugins/Makefile.plugins Wed Jun 25 09:56:15 2014 (r359214) @@ -31,15 +31,12 @@ post-patch:: @${REINPLACE_CMD} -e 's,echo aout,echo elf,' ${WRKSRC}/configure post-build:: - @${SED} -e 's,%%PLUGIN_DESC%%,${PLUGIN_DESC},' < ${PKGMESSAGE_TEMPLATE} \ - > ${PKGMESSAGE} + @${SED} -e 's,%%PLUGIN_DESC%%,${PLUGIN_DESC},' < \ + ${PKGMESSAGE_TEMPLATE} > ${PKGMESSAGE} post-install:: - @${MKDIR} ${PREFIX}/etc/verlihub/plugins - @${LN} -sf ${PREFIX}/lib/lib${PLUGIN_NAME}_pi.so \ - ${PREFIX}/etc/verlihub/plugins/lib${PLUGIN_NAME}_pi.so - @if [ -f ${PKGMESSAGE} ]; then \ - ${CAT} ${PKGMESSAGE}; \ - fi + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/verlihub/plugins + ${LN} -sf ../../../lib/lib${PLUGIN_NAME}_pi.so \ + ${STAGEDIR}${PREFIX}/etc/verlihub/plugins @${ECHO_CMD} '@unexec rmdir %D/etc/verlihub/plugins 2>/dev/null || true' >> ${TMPPLIST} @${ECHO_CMD} '@unexec rmdir %D/etc/verlihub 2>/dev/null || true' >> ${TMPPLIST}