aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-p2p/verlihub-plugins-chatroom/Makefile7
-rw-r--r--net-p2p/verlihub-plugins-floodprotect/Makefile9
-rw-r--r--net-p2p/verlihub-plugins-forbid/Makefile7
-rw-r--r--net-p2p/verlihub-plugins-iplog/Makefile7
-rw-r--r--net-p2p/verlihub-plugins-isp/Makefile7
-rw-r--r--net-p2p/verlihub-plugins-luascript/Makefile10
-rw-r--r--net-p2p/verlihub-plugins-messanger/Makefile7
-rw-r--r--net-p2p/verlihub-plugins-stats/Makefile7
-rw-r--r--net-p2p/verlihub-plugins/Makefile.plugins17
-rw-r--r--net-p2p/verlihub/Makefile5
-rw-r--r--net-p2p/verlihub/files/patch-src__casyncconn.cpp18
11 files changed, 52 insertions, 49 deletions
diff --git a/net-p2p/verlihub-plugins-chatroom/Makefile b/net-p2p/verlihub-plugins-chatroom/Makefile
index caba2dac77eb..b7aefe0a521d 100644
--- a/net-p2p/verlihub-plugins-chatroom/Makefile
+++ b/net-p2p/verlihub-plugins-chatroom/Makefile
@@ -3,7 +3,7 @@
PORTNAME= chatroom
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_Chatroom/${DISTVERSION}
@@ -11,6 +11,5 @@ MAINTAINER= me@skylord.ru
PLUGIN_DESC= Chatroom
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
-.include <bsd.port.post.mk>
+.include "../verlihub-plugins/Makefile.plugins"
+.include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins-floodprotect/Makefile b/net-p2p/verlihub-plugins-floodprotect/Makefile
index 850e257bc784..46c643d39e1b 100644
--- a/net-p2p/verlihub-plugins-floodprotect/Makefile
+++ b/net-p2p/verlihub-plugins-floodprotect/Makefile
@@ -3,16 +3,15 @@
PORTNAME= floodprotect
PORTVERSION= 1.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/OldFiles
+DISTNAME= ${PLUGIN_NAME}
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>
+.include "../verlihub-plugins/Makefile.plugins"
+.include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins-forbid/Makefile b/net-p2p/verlihub-plugins-forbid/Makefile
index 334da7c6e3e7..e5eddf513dd4 100644
--- a/net-p2p/verlihub-plugins-forbid/Makefile
+++ b/net-p2p/verlihub-plugins-forbid/Makefile
@@ -3,7 +3,7 @@
PORTNAME= forbid
PORTVERSION= 1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_Forbid/${DISTVERSION}
@@ -11,6 +11,5 @@ MAINTAINER= me@skylord.ru
PLUGIN_DESC= ForbiddenWords
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
-.include <bsd.port.post.mk>
+.include "../verlihub-plugins/Makefile.plugins"
+.include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins-iplog/Makefile b/net-p2p/verlihub-plugins-iplog/Makefile
index 3fd0c156c719..03df9cc63bcd 100644
--- a/net-p2p/verlihub-plugins-iplog/Makefile
+++ b/net-p2p/verlihub-plugins-iplog/Makefile
@@ -3,7 +3,7 @@
PORTNAME= iplog
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_IPLog/${DISTVERSION}
@@ -11,6 +11,5 @@ MAINTAINER= me@skylord.ru
PLUGIN_DESC= IPLog
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
-.include <bsd.port.post.mk>
+.include "../verlihub-plugins/Makefile.plugins"
+.include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins-isp/Makefile b/net-p2p/verlihub-plugins-isp/Makefile
index 09ad3f9ef3b8..8c6ea446a0c3 100644
--- a/net-p2p/verlihub-plugins-isp/Makefile
+++ b/net-p2p/verlihub-plugins-isp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= isp
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_ISP/${DISTVERSION}
@@ -13,6 +13,5 @@ PLUGIN_DESC= ISP
PLIST_FILES= share/verlihub/default_pi_isp.sql
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
-.include <bsd.port.post.mk>
+.include "../verlihub-plugins/Makefile.plugins"
+.include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins-luascript/Makefile b/net-p2p/verlihub-plugins-luascript/Makefile
index fe6e40a82c3f..651424c80f4b 100644
--- a/net-p2p/verlihub-plugins-luascript/Makefile
+++ b/net-p2p/verlihub-plugins-luascript/Makefile
@@ -3,7 +3,7 @@
PORTNAME= luascript
PORTVERSION= 1.8.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
PKGNAMEPREFIX= verlihub-plugins-
MASTER_SITES= SF/verlihub/VH_Lua/${DISTVERSION}
@@ -28,6 +28,7 @@ PLIST_DIRS= share/verlihub/scripts
OPTIONS_DEFINE= SOCKET
SOCKET_DESC= Build with LuaSocket support
+.include "../verlihub-plugins/Makefile.plugins"
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSOCKET}
@@ -44,11 +45,6 @@ post-patch::
.endif
@${REINPLACE_CMD} -e 's|llua5\.1|llua-${LUA_VER}|g' \
${WRKSRC}/configure
-
-.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>
+.include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins-messanger/Makefile b/net-p2p/verlihub-plugins-messanger/Makefile
index 95be44420b7c..cabf2cb00406 100644
--- a/net-p2p/verlihub-plugins-messanger/Makefile
+++ b/net-p2p/verlihub-plugins-messanger/Makefile
@@ -3,7 +3,7 @@
PORTNAME= messanger
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_Messanger/${DISTVERSION}
@@ -11,6 +11,5 @@ MAINTAINER= me@skylord.ru
PLUGIN_DESC= Messanger
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
-.include <bsd.port.post.mk>
+.include "../verlihub-plugins/Makefile.plugins"
+.include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins-stats/Makefile b/net-p2p/verlihub-plugins-stats/Makefile
index 6b20c35a962b..b3f0f6ab7391 100644
--- a/net-p2p/verlihub-plugins-stats/Makefile
+++ b/net-p2p/verlihub-plugins-stats/Makefile
@@ -3,7 +3,7 @@
PORTNAME= stats
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-p2p
MASTER_SITES= SF/verlihub/VH_Stats/${DISTVERSION}
@@ -11,6 +11,5 @@ MAINTAINER= me@skylord.ru
PLUGIN_DESC= Statistics
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/net-p2p/verlihub-plugins/Makefile.plugins"
-.include <bsd.port.post.mk>
+.include "../verlihub-plugins/Makefile.plugins"
+.include <bsd.port.mk>
diff --git a/net-p2p/verlihub-plugins/Makefile.plugins b/net-p2p/verlihub-plugins/Makefile.plugins
index df19a5204080..7c67b56519c5 100644
--- a/net-p2p/verlihub-plugins/Makefile.plugins
+++ b/net-p2p/verlihub-plugins/Makefile.plugins
@@ -6,30 +6,29 @@
PLUGIN_NAME?= ${PORTNAME}
PKGNAMEPREFIX= verlihub-plugins-
-DISTNAME= ${PLUGIN_NAME}-${PORTVERSION}
+DISTNAME?= ${PLUGIN_NAME}-${PORTVERSION}
WRKSRC?= ${WRKDIR}/${PLUGIN_NAME}
-COMMENT?= ${PLUGIN_DESC} plugin for the VerliHub - a Direct Connect protocol server
+COMMENT?= ${PLUGIN_DESC} plugin for 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= any
GNU_CONFIGURE= yes
-CFLAGS+= -fPIC
+INSTALL_TARGET= install-strip
+USES+= libtool
+USE_GCC= any
PLIST_FILES+= lib/lib${PLUGIN_NAME}_pi.a \
- lib/lib${PLUGIN_NAME}_pi.la \
lib/lib${PLUGIN_NAME}_pi.so \
lib/lib${PLUGIN_NAME}_pi.so.0 \
+ lib/lib${PLUGIN_NAME}_pi.so.0.0.0 \
etc/verlihub/plugins/lib${PLUGIN_NAME}_pi.so
+PLIST_DIRSTRY+= etc/verlihub/plugins etc/verlihub
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGMESSAGE_TEMPLATE= ${PORTSDIR}/net-p2p/verlihub-plugins/pkg-message.plugins
-post-patch::
- @${REINPLACE_CMD} -e 's,echo aout,echo elf,' ${WRKSRC}/configure
-
post-build::
@${SED} -e 's,%%PLUGIN_DESC%%,${PLUGIN_DESC},' < \
${PKGMESSAGE_TEMPLATE} > ${PKGMESSAGE}
@@ -38,5 +37,3 @@ post-install::
@${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}
diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile
index eff28d748fa1..bca1adb91284 100644
--- a/net-p2p/verlihub/Makefile
+++ b/net-p2p/verlihub/Makefile
@@ -3,7 +3,7 @@
PORTNAME= verlihub
DISTVERSION= 0.9.8e-r2
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/Verlihub/${DISTVERSION}
@@ -18,9 +18,8 @@ LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP \
libpcre.so:${PORTSDIR}/devel/pcre
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib
USE_RC_SUBR= verlihub
-USE_GCC= any
USES= libtool
USE_MYSQL= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/verlihub/files/patch-src__casyncconn.cpp b/net-p2p/verlihub/files/patch-src__casyncconn.cpp
new file mode 100644
index 000000000000..bdeb9be6407e
--- /dev/null
+++ b/net-p2p/verlihub/files/patch-src__casyncconn.cpp
@@ -0,0 +1,18 @@
+--- src/casyncconn.cpp.orig 2009-07-10 20:23:05.000000000 +0200
++++ src/casyncconn.cpp 2014-09-08 18:37:50.000000000 +0200
+@@ -90,7 +90,6 @@
+ cAsyncConn::cAsyncConn(int desc, cAsyncSocketServer *s, tConnType ct):
+ cObj("cAsyncConn"),
+ mSockDesc(desc),
+- mIterator(0),
+ ok(desc>0),
+ mWritable(true),
+ mExtraPoll(0),
+@@ -147,7 +146,6 @@
+ mBufReadPos(0),
+ mRegFlag(0),
+ mCloseAfter(0,0),
+- mIterator(0),
+ ok(false),
+ mWritable(true),
+ mExtraPoll(0),
generated by cgit (git 2.34.1) at 2024-11-07 20:56:34 +0800