Replace deprecated G_CONST_RETURN with plain "const".

Bump PKGREVISION.

4 files changed, 14 insertions, 29 deletions

diff --git a/x11/libunique/Makefile b/x11/libunique/Makefile
index a433926b1e6..8c996ff4da1 100644
--- a/x11/libunique/Makefile
+++ b/x11/libunique/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/02/06 12:42:18 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2012/02/14 06:03:11 obache Exp $
 #
 
 DISTNAME=	libunique-1.1.6
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libunique/1.1/}
 
@@ -23,6 +23,17 @@ PKGCONFIG_OVERRIDE+=	unique.pc.in
 # for more detail, see also PR#41475.
 TOOLS_NOOP+=	gtkdoc-rebase
 
+SUBST_CLASSES+=		g_const
+SUBST_STAGE.g_const=	post-configure
+SUBST_MESSAGE.g_const=	Replace deprecated G_CONST_RETURN with plain "const".
+SUBST_FILES.g_const=	unique/uniqueapp.c
+SUBST_FILES.g_const+=	unique/uniquebackend.c
+SUBST_FILES.g_const+=	unique/uniquebackend.h
+SUBST_FILES.g_const+=	unique/uniqueinternals.h
+SUBST_FILES.g_const+=	unique/uniquemessage.c
+SUBST_FILES.g_const+=	unique/uniquemessage.h
+SUBST_SED.g_const=	-e 's/G_CONST_RETURN /const /g'
+
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Mclang)
diff --git a/x11/libunique/distinfo b/x11/libunique/distinfo
index d3e7a6bbd37..cd55755f267 100644
--- a/x11/libunique/distinfo
+++ b/x11/libunique/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.7 2012/02/03 00:57:59 sbd Exp $
+$NetBSD: distinfo,v 1.8 2012/02/14 06:03:11 obache Exp $
 
 SHA1 (libunique-1.1.6.tar.gz) = ff9a50781291212d97df0d21ac4bbdbd8443d210
 RMD160 (libunique-1.1.6.tar.gz) = 15ae8cc81f978554395fcb194ecb11c7bc6a1938
 Size (libunique-1.1.6.tar.gz) = 450569 bytes
 SHA1 (patch-aa) = 03304df00cc8a793c4937f32daa4cd0719d7e8c0
-SHA1 (patch-unique_Makefile.am) = 6b1678c82fb8a96b6e0c43c9229910faee187b72
-SHA1 (patch-unique_Makefile.in) = 3c4032b13f96284e0ca4a5386b2d969f5acc0622
 SHA1 (patch-unique_dbus_uniquebackend-dbus.c) = 4599bba61aa6ff585016330a89b506cac72a03e9
diff --git a/x11/libunique/patches/patch-unique_Makefile.am b/x11/libunique/patches/patch-unique_Makefile.am
deleted file mode 100644
index f71d5dd26b7..00000000000
--- a/x11/libunique/patches/patch-unique_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-unique_Makefile.am,v 1.1 2012/02/03 00:58:00 sbd Exp $
-
---- unique/Makefile.am.orig	2009-11-12 13:53:10.000000000 +0000
-+++ unique/Makefile.am
-@@ -19,7 +19,6 @@ INCLUDES = -I$(top_srcdir)
- AM_CPPFLAGS = \
- 	-DG_DISABLE_SINGLE_INCLUDES	\
- 	-DGTK_DISABLE_SINGLE_INCLUDES	\
--	-DG_DISABLE_DEPRECATED		\
- 	-DGTK_DISABLE_DEPRECATED	\
- 	-DG_LOG_DOMAIN=\"Unique\"	\
- 	-DPREFIX=\""$(prefix)"\"	\
diff --git a/x11/libunique/patches/patch-unique_Makefile.in b/x11/libunique/patches/patch-unique_Makefile.in
deleted file mode 100644
index e5b630bfc53..00000000000
--- a/x11/libunique/patches/patch-unique_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-unique_Makefile.in,v 1.1 2012/02/03 00:58:00 sbd Exp $
-
---- unique/Makefile.in.orig	2009-11-12 13:57:58.000000000 +0000
-+++ unique/Makefile.in
-@@ -394,7 +394,6 @@ INCLUDES = -I$(top_srcdir)
- AM_CPPFLAGS = \
- 	-DG_DISABLE_SINGLE_INCLUDES	\
- 	-DGTK_DISABLE_SINGLE_INCLUDES	\
--	-DG_DISABLE_DEPRECATED		\
- 	-DGTK_DISABLE_DEPRECATED	\
- 	-DG_LOG_DOMAIN=\"Unique\"	\
- 	-DPREFIX=\""$(prefix)"\"	\