summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarino <marino@pkgsrc.org>2012-05-16 19:57:56 +0000
committermarino <marino@pkgsrc.org>2012-05-16 19:57:56 +0000
commita3f72c6129f5d32590da74da55063985918b0985 (patch)
treee5065b3372aea031bc6549e5d02fcc81dec9b432
parent7136029b33ee4c0ca785a24f314f23bf22600b6b (diff)
downloadpkgsrc-a3f72c6129f5d32590da74da55063985918b0985.tar.gz
comms/multisync-gui: Fix indirect linking on DragonFly
The Scons script had to be modified to accept LDFLAGS environment variable. This was piggy-backed to existing patch.
-rw-r--r--comms/multisync-gui/Makefile4
-rw-r--r--comms/multisync-gui/distinfo4
-rw-r--r--comms/multisync-gui/patches/patch-aa5
3 files changed, 8 insertions, 5 deletions
diff --git a/comms/multisync-gui/Makefile b/comms/multisync-gui/Makefile
index 4053398cfb2..cdf70747029 100644
--- a/comms/multisync-gui/Makefile
+++ b/comms/multisync-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/04/27 12:31:38 obache Exp $
+# $NetBSD: Makefile,v 1.18 2012/05/16 19:57:56 marino Exp $
#
DISTNAME= multisync-gui-0.91.0
@@ -17,6 +17,8 @@ HAS_CONFIGURE= yes
REPLACE_PYTHON= waf
+LDFLAGS.DragonFly= -lgthread-2.0
+
.include "../../lang/python/application.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/comms/multisync-gui/distinfo b/comms/multisync-gui/distinfo
index 8be81f5b94f..e919750e921 100644
--- a/comms/multisync-gui/distinfo
+++ b/comms/multisync-gui/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/02/16 17:35:30 hans Exp $
+$NetBSD: distinfo,v 1.3 2012/05/16 19:57:56 marino Exp $
SHA1 (multisync-gui-0.91.0.tar.gz) = 03b32007dab9945ee08affe6ac59be34f565adcb
RMD160 (multisync-gui-0.91.0.tar.gz) = 7522f28e217acefde9076229da81ab4df627e2af
Size (multisync-gui-0.91.0.tar.gz) = 112933 bytes
-SHA1 (patch-aa) = 13417a99cfeb6d50bbe3c9cafbe970e870e0b417
+SHA1 (patch-aa) = 65b9735de7fec54ac2cd8cf34801f8185c51c2a6
SHA1 (patch-configure) = 8802f1d38d4f159e42ab5ce1730488c4095375ba
diff --git a/comms/multisync-gui/patches/patch-aa b/comms/multisync-gui/patches/patch-aa
index 7e1e4a76abc..6370fab11e0 100644
--- a/comms/multisync-gui/patches/patch-aa
+++ b/comms/multisync-gui/patches/patch-aa
@@ -1,11 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/27 17:44:14 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2012/05/16 19:57:56 marino Exp $
--- src/wscript.orig 2006-11-06 20:36:21.000000000 +0100
+++ src/wscript
-@@ -16,6 +16,8 @@ def build(bld):
+@@ -16,6 +16,9 @@ def build(bld):
obj_gui.find_sources_in_dirs('. plugins')
obj_gui.defines='HAVE_CONFIG_H=1'
obj_gui.uselib = 'GLIB GTK GLADE OPENSYNC OPENSYNCENGINE'
++ obj_gui.env['LINKFLAGS'] += [os.getenv('LDFLAGS')]
+ obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('LOCALBASE') + '/lib']
+ obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('X11BASE') + '/lib']