CVS commit: pkgsrc/devel

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Jul  2 14:41:24 UTC 2016

Modified Files:
        pkgsrc/devel/libindicator: distinfo
        pkgsrc/devel/libindicator-tools: Makefile
Added Files:
        pkgsrc/devel/libindicator/patches: patch-tools_Makefile.in

Log Message:
Fix dependency of libindicator-tools.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libindicator/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libindicator-tools/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libindicator/patches/patch-tools_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libindicator/distinfo
diff -u pkgsrc/devel/libindicator/distinfo:1.1 pkgsrc/devel/libindicator/distinfo:1.2
--- pkgsrc/devel/libindicator/distinfo:1.1      Fri May 20 21:32:24 2016
+++ pkgsrc/devel/libindicator/distinfo  Sat Jul  2 14:41:24 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2016/05/20 21:32:24 youri Exp $
+$NetBSD: distinfo,v 1.2 2016/07/02 14:41:24 joerg Exp $
 
 SHA1 (libindicator-12.10.1.tar.gz) = 25c8a0a150651ee6b2198df3f36fcbb49f0295c2
 RMD160 (libindicator-12.10.1.tar.gz) = c5353a3ee5b9b24fac0cb2a7b620a23c406055af
 Size (libindicator-12.10.1.tar.gz) = 427764 bytes
 SHA1 (patch-configure) = 3af0c7c242613fac3727620dcca1aa5e51d0fa6f
+SHA1 (patch-tools_Makefile.in) = 9988879025dd4cc541407958e83b0d69eea1926c

Index: pkgsrc/devel/libindicator-tools/Makefile
diff -u pkgsrc/devel/libindicator-tools/Makefile:1.1 pkgsrc/devel/libindicator-tools/Makefile:1.2
--- pkgsrc/devel/libindicator-tools/Makefile:1.1        Fri May 20 22:23:43 2016
+++ pkgsrc/devel/libindicator-tools/Makefile    Sat Jul  2 14:41:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/05/20 22:23:43 youri Exp $
+# $NetBSD: Makefile,v 1.2 2016/07/02 14:41:24 joerg Exp $
 
 USE_GTK_VERSION=2
 
@@ -10,5 +10,6 @@ PKGNAME=      ${DISTNAME:S/-/-tools-/}
 
 INSTALL_DIRS=  tools
 
+.include "../../devel/libindicator/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/devel/libindicator/patches/patch-tools_Makefile.in
diff -u /dev/null pkgsrc/devel/libindicator/patches/patch-tools_Makefile.in:1.1
--- /dev/null   Sat Jul  2 14:41:24 2016
+++ pkgsrc/devel/libindicator/patches/patch-tools_Makefile.in   Sat Jul  2 14:41:24 2016
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_Makefile.in,v 1.1 2016/07/02 14:41:24 joerg Exp $
+
+--- tools/Makefile.in.orig     2016-07-02 13:52:36.000000000 +0000
++++ tools/Makefile.in
+@@ -291,7 +291,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-@USE_GTK3_FALSE@INDICATOR_LIB = -lindicator
++@USE_GTK3_FALSE@INDICATOR_LIB = ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lindicator
+ @USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3
+ @USE_GTK3_FALSE@VER = 
+ @USE_GTK3_TRUE@VER = 3