Wed May 16 19:57:56 2012 UTC ()
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.


(marino)
diff -r1.17 -r1.18 pkgsrc/comms/multisync-gui/Makefile
diff -r1.2 -r1.3 pkgsrc/comms/multisync-gui/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/comms/multisync-gui/patches/patch-aa
cvs diff -r1.17 -r1.18 pkgsrc/comms/multisync-gui/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/multisync-gui/Makefile 2012/04/27 12:31:38 1.17
+++ pkgsrc/comms/multisync-gui/Makefile 2012/05/16 19:57:56 1.18
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1# $NetBSD: Makefile,v 1.17 2012/04/27 12:31:38 obache Exp $ 1# $NetBSD: Makefile,v 1.18 2012/05/16 19:57:56 marino Exp $
2# 2#
3 3
4DISTNAME= multisync-gui-0.91.0 4DISTNAME= multisync-gui-0.91.0
5PKGREVISION= 13 5PKGREVISION= 13
6CATEGORIES= comms 6CATEGORIES= comms
7MASTER_SITES= http://www.opensync.org/raw-attachment/wiki/releases/0.2x/download/ 7MASTER_SITES= http://www.opensync.org/raw-attachment/wiki/releases/0.2x/download/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.opensync.org/ 10HOMEPAGE= http://www.opensync.org/
11COMMENT= GUI for libopensync 11COMMENT= GUI for libopensync
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
17 17
18REPLACE_PYTHON= waf 18REPLACE_PYTHON= waf
19 19
 20LDFLAGS.DragonFly= -lgthread-2.0
 21
20.include "../../lang/python/application.mk" 22.include "../../lang/python/application.mk"
21.include "../../devel/glib2/buildlink3.mk" 23.include "../../devel/glib2/buildlink3.mk"
22.include "../../textproc/libxml2/buildlink3.mk" 24.include "../../textproc/libxml2/buildlink3.mk"
23.include "../../x11/gtk2/buildlink3.mk" 25.include "../../x11/gtk2/buildlink3.mk"
24.include "../../devel/libglade/buildlink3.mk" 26.include "../../devel/libglade/buildlink3.mk"
25.include "../../comms/libopensync/buildlink3.mk" 27.include "../../comms/libopensync/buildlink3.mk"
26.include "../../sysutils/desktop-file-utils/desktopdb.mk" 28.include "../../sysutils/desktop-file-utils/desktopdb.mk"
27.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/comms/multisync-gui/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/multisync-gui/distinfo 2012/02/16 17:35:30 1.2
+++ pkgsrc/comms/multisync-gui/distinfo 2012/05/16 19:57:56 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2012/02/16 17:35:30 hans Exp $ 1$NetBSD: distinfo,v 1.3 2012/05/16 19:57:56 marino Exp $
2 2
3SHA1 (multisync-gui-0.91.0.tar.gz) = 03b32007dab9945ee08affe6ac59be34f565adcb 3SHA1 (multisync-gui-0.91.0.tar.gz) = 03b32007dab9945ee08affe6ac59be34f565adcb
4RMD160 (multisync-gui-0.91.0.tar.gz) = 7522f28e217acefde9076229da81ab4df627e2af 4RMD160 (multisync-gui-0.91.0.tar.gz) = 7522f28e217acefde9076229da81ab4df627e2af
5Size (multisync-gui-0.91.0.tar.gz) = 112933 bytes 5Size (multisync-gui-0.91.0.tar.gz) = 112933 bytes
6SHA1 (patch-aa) = 13417a99cfeb6d50bbe3c9cafbe970e870e0b417 6SHA1 (patch-aa) = 65b9735de7fec54ac2cd8cf34801f8185c51c2a6
7SHA1 (patch-configure) = 8802f1d38d4f159e42ab5ce1730488c4095375ba 7SHA1 (patch-configure) = 8802f1d38d4f159e42ab5ce1730488c4095375ba
cvs diff -r1.1.1.1 -r1.2 pkgsrc/comms/multisync-gui/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/comms/multisync-gui/patches/patch-aa 2009/02/27 17:44:14 1.1.1.1
+++ pkgsrc/comms/multisync-gui/patches/patch-aa 2012/05/16 19:57:56 1.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: patch-aa,v 1.1.1.1 2009/02/27 17:44:14 drochner Exp $ 1$NetBSD: patch-aa,v 1.2 2012/05/16 19:57:56 marino Exp $
2 2
3--- src/wscript.orig 2006-11-06 20:36:21.000000000 +0100 3--- src/wscript.orig 2006-11-06 20:36:21.000000000 +0100
4+++ src/wscript 4+++ src/wscript
5@@ -16,6 +16,8 @@ def build(bld): 5@@ -16,6 +16,9 @@ def build(bld):
6 obj_gui.find_sources_in_dirs('. plugins') 6 obj_gui.find_sources_in_dirs('. plugins')
7 obj_gui.defines='HAVE_CONFIG_H=1' 7 obj_gui.defines='HAVE_CONFIG_H=1'
8 obj_gui.uselib = 'GLIB GTK GLADE OPENSYNC OPENSYNCENGINE' 8 obj_gui.uselib = 'GLIB GTK GLADE OPENSYNC OPENSYNCENGINE'
 9+ obj_gui.env['LINKFLAGS'] += [os.getenv('LDFLAGS')]
9+ obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('LOCALBASE') + '/lib'] 10+ obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('LOCALBASE') + '/lib']
10+ obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('X11BASE') + '/lib'] 11+ obj_gui.env['LINKFLAGS'] += ['-Wl,-R' + os.getenv('X11BASE') + '/lib']
11  12
12 Common.install_files('MULTISYNC_DATA', '', 'multisync-gui.glade') 13 Common.install_files('MULTISYNC_DATA', '', 'multisync-gui.glade')
13 else: 14 else: