[Midnightbsd-cvs] mports [15788] trunk/x11-toolkits/gtk20: 2.24.22 gtk

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Dec 24 23:19:14 EST 2013


Revision: 15788
          http://svnweb.midnightbsd.org/mports/?rev=15788
Author:   laffer1
Date:     2013-12-24 23:18:53 -0500 (Tue, 24 Dec 2013)
Log Message:
-----------
2.24.22 gtk

Modified Paths:
--------------
    trunk/x11-toolkits/gtk20/Makefile
    trunk/x11-toolkits/gtk20/distinfo
    trunk/x11-toolkits/gtk20/pkg-plist

Removed Paths:
-------------
    trunk/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h

Modified: trunk/x11-toolkits/gtk20/Makefile
===================================================================
--- trunk/x11-toolkits/gtk20/Makefile	2013-12-24 21:39:28 UTC (rev 15787)
+++ trunk/x11-toolkits/gtk20/Makefile	2013-12-25 04:18:53 UTC (rev 15788)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	gtk
-PORTVERSION=	2.24.19
+PORTVERSION=	2.24.22
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -23,17 +23,15 @@
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_PYTHON=	2.5-2.7
-MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-USE_GETTEXT=	yes
+USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
+USES=		gettext gmake pathfix pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite xau xdmcp xproto
-CONFIGURE_ARGS=	--enable-static --with-xinput=yes
+CONFIGURE_ARGS=	--with-xinput=yes
 CPPFLAGS+=	-I${LOCALBASE}/include/freetype2 \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -77,8 +75,8 @@
 	@${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 post-install:
-	-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
-		${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
+#-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
+#		${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
 	@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
 	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
 	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders

Modified: trunk/x11-toolkits/gtk20/distinfo
===================================================================
--- trunk/x11-toolkits/gtk20/distinfo	2013-12-24 21:39:28 UTC (rev 15787)
+++ trunk/x11-toolkits/gtk20/distinfo	2013-12-25 04:18:53 UTC (rev 15788)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.24.19.tar.xz) = 15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8
-SIZE (gnome2/gtk+-2.24.19.tar.xz) = 13374160
+SHA256 (gnome2/gtk+-2.24.22.tar.xz) = b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f
+SIZE (gnome2/gtk+-2.24.22.tar.xz) = 13376344

Deleted: trunk/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
===================================================================
--- trunk/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h	2013-12-24 21:39:28 UTC (rev 15787)
+++ trunk/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h	2013-12-25 04:18:53 UTC (rev 15788)
@@ -1,13 +0,0 @@
---- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
-+++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
-@@ -29,7 +29,9 @@
- #ifndef __GTK_SIGNAL_H__
- #define __GTK_SIGNAL_H__
- 
--#include <gtk/gtk.h>
-+#include <gtk/gtkenums.h>
-+#include <gtk/gtktypeutils.h>
-+#include <gtk/gtkobject.h>
- #include <gtk/gtkmarshal.h>
- 
- G_BEGIN_DECLS

Modified: trunk/x11-toolkits/gtk20/pkg-plist
===================================================================
--- trunk/x11-toolkits/gtk20/pkg-plist	2013-12-24 21:39:28 UTC (rev 15787)
+++ trunk/x11-toolkits/gtk20/pkg-plist	2013-12-25 04:18:53 UTC (rev 15788)
@@ -265,66 +265,46 @@
 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.a
 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.a
 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.a
 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.a
 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.a
 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.a
 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.a
 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.a
 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.a
 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.a
 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.a
 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.a
 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.a
 %%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.a
 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.a
 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.a
 lib/gtk-2.0/modules/libferret.la
 lib/gtk-2.0/modules/libferret.so
-lib/gtk-2.0/modules/libgail.a
 lib/gtk-2.0/modules/libgail.la
 lib/gtk-2.0/modules/libgail.so
-lib/libgailutil.a
 lib/libgailutil.la
 lib/libgailutil.so
 lib/libgailutil.so.18
-lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.0
-lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
@@ -636,7 +616,8 @@
 @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
 @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
 @dirrmtry lib/gtk-2.0
- at exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
+ at unexec /bin/rm -f %D/lib/gtk-2.0/%%GTK2_VERSION%%/immodules.cache
+ at exec %D/bin/gtk-query-immodules-2.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES



More information about the Midnightbsd-cvs mailing list