Wed Jun 13 10:34:18 2018 UTC ()
gtk3: bump PKGREVISION for cups default change


(wiz)
diff -r1.115 -r1.116 pkgsrc/x11/gtk3/Makefile
cvs diff -r1.115 -r1.116 pkgsrc/x11/gtk3/Makefile (switch to unified diff)

--- pkgsrc/x11/gtk3/Makefile 2018/04/27 15:08:55 1.115
+++ pkgsrc/x11/gtk3/Makefile 2018/06/13 10:34:18 1.116
@@ -1,105 +1,106 @@ @@ -1,105 +1,106 @@
1# $NetBSD: Makefile,v 1.115 2018/04/27 15:08:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.116 2018/06/13 10:34:18 wiz Exp $
2 2
3DISTNAME= gtk+-3.22.30 3DISTNAME= gtk+-3.22.30
4PKGNAME= ${DISTNAME:S/gtk/gtk3/} 4PKGNAME= ${DISTNAME:S/gtk/gtk3/}
 5PKGREVISION= 1
5CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gtk.org/ 11HOMEPAGE= https://www.gtk.org/
11COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces 12COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
15USE_TOOLS+= gmake perl pkg-config bash xgettext msgmerge 16USE_TOOLS+= gmake perl pkg-config bash xgettext msgmerge
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18PTHREAD_AUTO_VARS= yes 19PTHREAD_AUTO_VARS= yes
19TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 20TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
20TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools 21TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools
21# There is no logic in gettext.mk to detect the native version of xgettext, 22# There is no logic in gettext.mk to detect the native version of xgettext,
22# and we do need it to be compiled with Glade support. 23# and we do need it to be compiled with Glade support.
23_TOOLS_USE_PKGSRC.xgettext=yes 24_TOOLS_USE_PKGSRC.xgettext=yes
24 25
25GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
26# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh 27# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh
27CONFIG_SHELL= ${TOOLS_PATH.bash} 28CONFIG_SHELL= ${TOOLS_PATH.bash}
28CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 29CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
29# Work around build problems, disable unstable PAPI, PR #41608: 30# Work around build problems, disable unstable PAPI, PR #41608:
30CONFIGURE_ARGS+= --disable-papi 31CONFIGURE_ARGS+= --disable-papi
31# Avoid regeneration of Makefile.in after configure.ac patch 32# Avoid regeneration of Makefile.in after configure.ac patch
32CONFIGURE_ARGS+= --disable-maintainer-mode 33CONFIGURE_ARGS+= --disable-maintainer-mode
33MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 34MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
34TEST_TARGET= check 35TEST_TARGET= check
35 36
36PKGCONFIG_OVERRIDE+= gdk-3.0.pc.in 37PKGCONFIG_OVERRIDE+= gdk-3.0.pc.in
37PKGCONFIG_OVERRIDE+= gtk+-3.0.pc.in 38PKGCONFIG_OVERRIDE+= gtk+-3.0.pc.in
38PKGCONFIG_OVERRIDE+= gtk+-unix-print-3.0.pc.in 39PKGCONFIG_OVERRIDE+= gtk+-unix-print-3.0.pc.in
39PKGCONFIG_OVERRIDE+= gail-3.0.pc.in 40PKGCONFIG_OVERRIDE+= gail-3.0.pc.in
40 41
41INSTALLATION_DIRS+= lib/gtk-3.0/immodules 42INSTALLATION_DIRS+= lib/gtk-3.0/immodules
42INSTALLATION_DIRS+= lib/gtk-3.0/modules 43INSTALLATION_DIRS+= lib/gtk-3.0/modules
43INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems 44INSTALLATION_DIRS+= lib/gtk-3.0/3.0.0/filesystems
44 45
45BUILD_DIRS= . demos/gtk-demo 46BUILD_DIRS= . demos/gtk-demo
46 47
47.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
48 49
49# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms 50# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms
50# which do not have it. 51# which do not have it.
51.if ${OPSYS} == "SunOS" 52.if ${OPSYS} == "SunOS"
52BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep 53BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep
53TOOLS_PATH.grep= ${PREFIX}/bin/ggrep 54TOOLS_PATH.grep= ${PREFIX}/bin/ggrep
54.endif 55.endif
55# isnan and isinf are part of libc, not libm on DragonFly 56# isnan and isinf are part of libc, not libm on DragonFly
56# conf tests fail detection due to conflicting definitions, just skip them 57# conf tests fail detection due to conflicting definitions, just skip them
57CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes 58CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes
58CONFIGURE_ENV.DragonFly+= ac_cv_func_isnan=yes 59CONFIGURE_ENV.DragonFly+= ac_cv_func_isnan=yes
59 60
60CFLAGS.SunOS+= -std=gnu99 61CFLAGS.SunOS+= -std=gnu99
61 62
62CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" 63CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
63 64
64# We remove the module databases during post-install since we create them 65# We remove the module databases during post-install since we create them
65# anew in the +INSTALL script as part of the POST-INSTALL action. 66# anew in the +INSTALL script as part of the POST-INSTALL action.
66# 67#
67post-install: 68post-install:
68 ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB} 69 ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB}
69 70
70FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache" 71FILES_SUBST+= GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache"
71FILES_SUBST+= ICON_THEME_DIR="${PREFIX}/share/icons" 72FILES_SUBST+= ICON_THEME_DIR="${PREFIX}/share/icons"
72INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl 73INSTALL_TEMPLATES+= ../../x11/gtk2/files/icon-cache.tmpl
73 74
74_BUILDING_GTK3= yes 75_BUILDING_GTK3= yes
75.include "modules.mk" 76.include "modules.mk"
76 77
77.include "../../databases/shared-mime-info/buildlink3.mk" 78.include "../../databases/shared-mime-info/buildlink3.mk"
78BUILDLINK_API_DEPENDS.atk+= atk>=2.15.1 79BUILDLINK_API_DEPENDS.atk+= atk>=2.15.1
79.include "../../devel/atk/buildlink3.mk" 80.include "../../devel/atk/buildlink3.mk"
80.include "../../devel/gettext-lib/buildlink3.mk" 81.include "../../devel/gettext-lib/buildlink3.mk"
81BUILDLINK_API_DEPENDS.glib2+= glib2>=2.49.4 82BUILDLINK_API_DEPENDS.glib2+= glib2>=2.49.4
82.include "../../devel/glib2/buildlink3.mk" 83.include "../../devel/glib2/buildlink3.mk"
83BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.30.0 84BUILDLINK_API_DEPENDS.gdk-pixbuf2+= gdk-pixbuf2>=2.30.0
84.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 85.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
85BUILDLINK_DEPMETHOD.gobject-introspection:= build 86BUILDLINK_DEPMETHOD.gobject-introspection:= build
86BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.39.0 87BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.39.0
87.include "../../devel/gobject-introspection/buildlink3.mk" 88.include "../../devel/gobject-introspection/buildlink3.mk"
88 89
89.include "options.mk" 90.include "options.mk"
90 91
91.include "../../devel/glib2/schemas.mk" 92.include "../../devel/glib2/schemas.mk"
92 93
93BUILDLINK_API_DEPENDS.pango+= pango>=1.37.3 94BUILDLINK_API_DEPENDS.pango+= pango>=1.37.3
94.include "../../devel/pango/buildlink3.mk" 95.include "../../devel/pango/buildlink3.mk"
95.include "../../fonts/fontconfig/buildlink3.mk" 96.include "../../fonts/fontconfig/buildlink3.mk"
96BUILDLINK_API_DEPENDS.cairo+= cairo>=1.14.0 97BUILDLINK_API_DEPENDS.cairo+= cairo>=1.14.0
97.include "../../graphics/cairo/buildlink3.mk" 98.include "../../graphics/cairo/buildlink3.mk"
98.include "../../graphics/cairo-gobject/buildlink3.mk" 99.include "../../graphics/cairo-gobject/buildlink3.mk"
99.include "../../graphics/freetype2/buildlink3.mk" 100.include "../../graphics/freetype2/buildlink3.mk"
100BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.2nb2 101BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.2nb2
101.include "../../graphics/libepoxy/buildlink3.mk" 102.include "../../graphics/libepoxy/buildlink3.mk"
102.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 103.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
103.include "../../sysutils/desktop-file-utils/desktopdb.mk" 104.include "../../sysutils/desktop-file-utils/desktopdb.mk"
104 105
105.include "../../mk/bsd.pkg.mk" 106.include "../../mk/bsd.pkg.mk"