[pkgsrc/trunk]: pkgsrc/editors/scite editors/scite: Fix indirect linking (all...

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5447e6b3031
branches:  trunk
changeset: 603925:b5447e6b3031
user:      marino <marino%pkgsrc.org@localhost>
date:      Wed May 16 19:55:02 2012 +0000

description:
editors/scite: Fix indirect linking (all platforms)

Due to the use of pkg-config to generate libraries inside the
gtk/makefile file, the indirect linking fix couldn't be isolated
to only DragonFly.  All platforms will directly link libgmodule-2.0

diffstat:

 editors/scite/distinfo         |   4 ++--
 editors/scite/patches/patch-aa |  15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 4c7d6b722fdb -r b5447e6b3031 editors/scite/distinfo
--- a/editors/scite/distinfo    Wed May 16 19:41:21 2012 +0000
+++ b/editors/scite/distinfo    Wed May 16 19:55:02 2012 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/01/12 11:39:38 drochner Exp $
+$NetBSD: distinfo,v 1.4 2012/05/16 19:55:02 marino Exp $
 
 SHA1 (scite229.tgz) = 153cc063b77d7ad95d265327f76ff6b4ed91c108
 RMD160 (scite229.tgz) = 5afa506eb5848e4bc99ef597ac0c5f1988afdbf9
 Size (scite229.tgz) = 1883704 bytes
-SHA1 (patch-aa) = ebe6ab3fe31fd85c09bb16c39441b69a6690f608
+SHA1 (patch-aa) = d778a33314efdd098d22e5dc7ddb833066584720
diff -r 4c7d6b722fdb -r b5447e6b3031 editors/scite/patches/patch-aa
--- a/editors/scite/patches/patch-aa    Wed May 16 19:41:21 2012 +0000
+++ b/editors/scite/patches/patch-aa    Wed May 16 19:55:02 2012 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.2 2012/01/12 11:39:38 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2012/05/16 19:55:03 marino Exp $
 
---- gtk/makefile.orig  2011-08-01 02:49:29.000000000 +0000
+--- gtk/makefile.orig  2011-09-16 09:14:07.000000000 +0000
 +++ gtk/makefile
-@@ -97,7 +97,7 @@ deps:
+@@ -22,7 +22,7 @@ endif
+ 
+ # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
+ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+-CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
++CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-2.0)
+ CONFIGTHREADS:=
+ gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
+ ifndef prefix
+@@ -99,7 +99,7 @@ deps:
        $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
  
  # make should be run in ../../scintilla/gtk to compile all the lexers.