aboutsummaryrefslogtreecommitdiffstats
path: root/irc
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2014-06-22 18:44:29 +0800
committertijl <tijl@FreeBSD.org>2014-06-22 18:44:29 +0800
commite7a4eb9e29e66ac9f7798911ff902349859d865e (patch)
tree2e1c942caa79a250b3baeb557ee3445960e10d70 /irc
parent0f278c761cdc81c112e454be9157c352f91e876b (diff)
downloadfreebsd-ports-gnome-e7a4eb9e29e66ac9f7798911ff902349859d865e.tar.gz
freebsd-ports-gnome-e7a4eb9e29e66ac9f7798911ff902349859d865e.tar.zst
freebsd-ports-gnome-e7a4eb9e29e66ac9f7798911ff902349859d865e.zip
Add 4 new sed commands to USES=libtool. The first two apply some of the
changes that Debian made to their libtool. The first command applies to libtool versions 1.4 and up. The second command is somewhat more elaborate but essentially it uses the sed hold space to move an "elif...fi" block down. It applies to 2.x. Together these reduce overlinking to unpatched .la files (from ports that don't have USES=libtool yet but also .la files in the work directory). The third and fourth command fix relinking. During staging libtool may relink libA when it links to another library in the work directory libB. The reason is that libA created during build phase has its runpath set to the location of libB in the work directory. This allows running an executable that links to libA from within the work directory. The relink removes this extra runpath. When libtool relinks libA it replaces "libB.la" on the linker command line with "-L${STAGEDIR}${PREFIX}/lib -lB" with the intention to link to libB in the stage directory but this -L flag isn't necessarily the first so another libB may be linked instead. The two sed commands make relink the same as a normal link. This means libtool will relink with libraries from the work directory using a path similar to "../srcB/.libs/libB.so" without -L flags. This applies to libtool 1.4 and up. Earlier versions don't seem to relink libraries. (This fixes ports like devel/apr1 so they link with freshly built libraries instead of installed libraries.) Fix all ports with missing libraries. Additionally: archivers/rpm4: USES=patchfix. databases/gdbm: INSTALL_TARGET=install-strip. devel/gnome-vfs: remove patch that doesn't change anything. devel/ois: INSTALL_TARGET=install-strip and use standard USE_AUTOTOOLS. devel/zziplib: INSTALL_TARGET=install-strip, MAKE_CMD. multimedia/mjpegtools: remove USE_AUTOTOOLS, use modern compiler on i386 instead of disabling optimisations. net/libnetdude: disable static plugins. PR: 190941 Exp-run: antoine Approved by: portmgr (antoine)
Diffstat (limited to 'irc')
-rw-r--r--irc/xchat/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 8e088904cf2a..430b57488480 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -32,9 +32,6 @@ OPTIONS_RADIO_SPELL= GTKSPELL LIBSEXY
GTKSPELL_DESC= Spell check support via gtkspell
LIBSEXY_DESC= Spell check support via libsexy
-.if defined(WITH_PYTHON)
-.endif
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDBUS}
@@ -100,6 +97,8 @@ PLIST_SUB+= TCL="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
${WRKSRC}/src/common/*.[ch]
+ @${REINPLACE_CMD} '/xchat_LDADD =/s/$$/ -lgmodule-2.0/' \
+ ${WRKSRC}/src/fe-gtk/Makefile.in
# Create plugins directory even when no plugins are installed
post-install: