Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Nov 2014 19:08:27 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r373090 - in head/x11-toolkits/gtk20: . files
Message-ID:  <201411221908.sAMJ8REA039193@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Sat Nov 22 19:08:26 2014
New Revision: 373090
URL: https://svnweb.freebsd.org/changeset/ports/373090
QAT: https://qat.redports.org/buildarchive/r373090/

Log:
  Update to 2.24.25.
  
  While here drop :keepla from USES=libtool.
  
  PR:		191177
  Submitted by:	dcarmich@dcarmichael.net

Modified:
  head/x11-toolkits/gtk20/Makefile
  head/x11-toolkits/gtk20/distinfo
  head/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
  head/x11-toolkits/gtk20/pkg-plist

Modified: head/x11-toolkits/gtk20/Makefile
==============================================================================
--- head/x11-toolkits/gtk20/Makefile	Sat Nov 22 18:47:37 2014	(r373089)
+++ head/x11-toolkits/gtk20/Makefile	Sat Nov 22 19:08:26 2014	(r373090)
@@ -3,8 +3,8 @@
 #   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.237 2013/03/04 17:44:38 kwm Exp $
 
 PORTNAME=	gtk
-PORTVERSION=	2.24.22
-PORTREVISION?=	4
+PORTVERSION=	2.24.25
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,7 +27,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/mime/ma
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		python:${PORTSDIR}/lang/python
 
-USES+=		gettext gmake libtool:keepla pathfix perl5 pkgconfig
+USES+=		gettext gmake libtool pathfix perl5 pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	atk pango gdkpixbuf2 introspection:build \
 		gtk-update-icon-cache
@@ -51,7 +51,7 @@ DEBUG_CONFIGURE_ON=	--enable-debug=yes
 
 .include <bsd.port.options.mk>
 
-PLIST_SUB+=	LIBGAILVER=18.0.1 LIBGVER=0.2400.22
+PLIST_SUB+=	LIBGAILVER=18.0.1 LIBGVER=0.2400.25
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${GREP} -l lgmodule | \

Modified: head/x11-toolkits/gtk20/distinfo
==============================================================================
--- head/x11-toolkits/gtk20/distinfo	Sat Nov 22 18:47:37 2014	(r373089)
+++ head/x11-toolkits/gtk20/distinfo	Sat Nov 22 19:08:26 2014	(r373090)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.24.22.tar.xz) = b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f
-SIZE (gnome2/gtk+-2.24.22.tar.xz) = 13376344
+SHA256 (gnome2/gtk+-2.24.25.tar.xz) = 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3
+SIZE (gnome2/gtk+-2.24.25.tar.xz) = 13327832

Modified: head/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
==============================================================================
--- head/x11-toolkits/gtk20/files/patch-gtk_Makefile.in	Sat Nov 22 18:47:37 2014	(r373089)
+++ head/x11-toolkits/gtk20/files/patch-gtk_Makefile.in	Sat Nov 22 19:08:26 2014	(r373090)
@@ -1,12 +1,12 @@
---- gtk/Makefile.in.orig	2012-01-24 23:53:56.800847574 -0500
-+++ gtk/Makefile.in	2012-01-24 23:53:56.889849878 -0500
-@@ -71,8 +71,7 @@
+--- gtk/Makefile.in.orig	2014-11-22 19:37:00.502352813 +0100
++++ gtk/Makefile.in	2014-11-22 19:37:54.646349246 +0100
+@@ -116,8 +116,7 @@
  @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = --add-include-path=$(top_builddir)/gdk/x11
  @HAVE_INTROSPECTION_TRUE@am__append_16 = Gtk-2.0.gir
  @HAVE_INTROSPECTION_TRUE@am__append_17 = $(gir_DATA) $(typelibs_DATA)
 -bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \
 -	gtk-update-icon-cache$(EXEEXT)
 +bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT)
- @OS_WIN32_TRUE@am__append_18 = \
- @OS_WIN32_TRUE@	$(GTK_UPDATE_ICON_CACHE_MANIFEST)
- 
+ subdir = gtk
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \

Modified: head/x11-toolkits/gtk20/pkg-plist
==============================================================================
--- head/x11-toolkits/gtk20/pkg-plist	Sat Nov 22 18:47:37 2014	(r373089)
+++ head/x11-toolkits/gtk20/pkg-plist	Sat Nov 22 19:08:26 2014	(r373090)
@@ -264,49 +264,29 @@ include/gtk-unix-print-2.0/gtk/gtkunixpr
 lib/girepository-1.0/Gdk-2.0.typelib
 lib/girepository-1.0/GdkX11-2.0.typelib
 lib/girepository-1.0/Gtk-2.0.typelib
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so
-%%CUPS%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
 %%CUPS%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.so
-lib/gtk-2.0/modules/libferret.la
 lib/gtk-2.0/modules/libferret.so
-lib/gtk-2.0/modules/libgail.la
 lib/gtk-2.0/modules/libgail.so
-lib/libgailutil.la
 lib/libgailutil.so
 lib/libgailutil.so.18
 lib/libgailutil.so.%%LIBGAILVER%%
-lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.0
 lib/libgdk-x11-2.0.so.%%LIBGVER%%
-lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
 lib/libgtk-x11-2.0.so.%%LIBGVER%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411221908.sAMJ8REA039193>