aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwxs <wxs@FreeBSD.org>2008-07-24 10:57:09 +0800
committerwxs <wxs@FreeBSD.org>2008-07-24 10:57:09 +0800
commit35a1e40a7bdcdf3df3a9f61b62254f5029723563 (patch)
tree82f9eb4a060d83d4c727e4225f0896d7122affd1 /net
parentef944e4ef2649e714b1473745bc1d98b00c0a1ad (diff)
downloadfreebsd-ports-graphics-35a1e40a7bdcdf3df3a9f61b62254f5029723563.tar.gz
freebsd-ports-graphics-35a1e40a7bdcdf3df3a9f61b62254f5029723563.tar.zst
freebsd-ports-graphics-35a1e40a7bdcdf3df3a9f61b62254f5029723563.zip
Stop net/silc-irssi-plugin from installing an unnecessary symlink which
causes duplicate /me messages to appear. Bump PORTREVISION of net/silc-irssi-plugin because of this.
Diffstat (limited to 'net')
-rw-r--r--net/silc-client/Makefile5
-rw-r--r--net/silc-client/files/extra-patch-apps__irssi__src__fe-common__Makefile.in11
-rw-r--r--net/silc-irssi-plugin/Makefile2
-rw-r--r--net/silc-irssi-plugin/pkg-plist1
4 files changed, 16 insertions, 3 deletions
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 9da2afdf9ff..f60464c8dd0 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -46,7 +46,10 @@ CONFIGURE_ARGS+= --with-silc-plugin=${PREFIX}/lib/irssi \
CFLAGS+= -fPIC
RUN_DEPENDS= irssi:${PORTSDIR}/irc/irssi
# We don't want to install the man page and configuration file for this case
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-apps__irssi__Makefile.in
+# Also, the port makes an extra symlink which causes IRSSI to load the plugin
+# twice. This causes weird behavior such as /me output showing up twice.
+EXTRA_PATCHES= ${FILESDIR}/extra-patch-apps__irssi__Makefile.in \
+ ${FILESDIR}/extra-patch-apps__irssi__src__fe-common__Makefile.in
.else
MAN1= silc.1
.endif
diff --git a/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__Makefile.in b/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__Makefile.in
new file mode 100644
index 00000000000..20df2c9830d
--- /dev/null
+++ b/net/silc-client/files/extra-patch-apps__irssi__src__fe-common__Makefile.in
@@ -0,0 +1,11 @@
+--- apps/irssi/src/fe-common/silc/Makefile.in.orig 2008-07-23 21:08:35.000000000 -0400
++++ apps/irssi/src/fe-common/silc/Makefile.in 2008-07-23 21:08:47.000000000 -0400
+@@ -651,8 +651,6 @@
+ libfe_common_silc.a: libfe_common_silc.la
+ cp .libs/libfe_common_silc.a .
+
+-@SILCPLUGIN_TRUE@install-data-hook: libfe_common_silc.la
+-@SILCPLUGIN_TRUE@ -ln -s libfe_common_silc.so $(DESTDIR)$(moduledir)/libfe_silc.so
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net/silc-irssi-plugin/Makefile b/net/silc-irssi-plugin/Makefile
index fd43f0bae02..fb6eba04793 100644
--- a/net/silc-irssi-plugin/Makefile
+++ b/net/silc-irssi-plugin/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net irc
COMMENT= SILC plugin for IRSSI
diff --git a/net/silc-irssi-plugin/pkg-plist b/net/silc-irssi-plugin/pkg-plist
index 5d0f9990da8..4c750eb52ee 100644
--- a/net/silc-irssi-plugin/pkg-plist
+++ b/net/silc-irssi-plugin/pkg-plist
@@ -1,7 +1,6 @@
lib/irssi/modules/libfe_common_silc.a
lib/irssi/modules/libfe_common_silc.la
lib/irssi/modules/libfe_common_silc.so
-lib/irssi/modules/libfe_silc.so
lib/irssi/modules/libsilc_core.a
lib/irssi/modules/libsilc_core.la
lib/irssi/modules/libsilc_core.so