diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 10:51:34 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 10:51:34 +0000 |
| commit | 7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch) | |
| tree | 961839899dce7f75292a08c079f548973bdbd40d /x11-toolkits | |
| parent | 85544f2c01be814e0af1ebee1076012e7ed60bb0 (diff) | |
| download | ports-7887c684adab042fed1bfcba2e91589ecd17c4a8.tar.gz ports-7887c684adab042fed1bfcba2e91589ecd17c4a8.zip | |
Notes
Diffstat (limited to 'x11-toolkits')
25 files changed, 303 insertions, 497 deletions
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile index 59c585617359..b3225311c9f5 100644 --- a/x11-toolkits/gtk-sharp10/Makefile +++ b/x11-toolkits/gtk-sharp10/Makefile @@ -34,6 +34,8 @@ post-patch: @${REINPLACE_CMD} -e 's|enable_gda=yes|enable_gda=no|g ; \ s|enable_gnomedb=yes|enable_gnomedb=no|g ; \ s|libgtkhtml-3.8|libgtkhtml-3.14|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/glib/glue/slist.c ${WRKSRC}/glib/glue/list.c pre-su-install: ${MKDIR} ${LOCALBASE}/share/gapi diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile index cd3cb1ca7b38..9e2f8b5f9589 100644 --- a/x11-toolkits/gtk-sharp20/Makefile +++ b/x11-toolkits/gtk-sharp20/Makefile @@ -30,6 +30,8 @@ USE_GNOME= gnomehack gtk20 libglade2 post-patch: @${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \ 's|^#!/usr/bin/perl|#!${PERL}|' + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/glib/glue/*.c .include "${.CURDIR}/../../lang/mono/bsd.mono.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 581ea098bd00..f5be83f1c297 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -1,24 +1,14 @@ -# New ports collection makefile for: gtk13 -# Date Created: 28 Sep 1997 -# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> -# +# Created by: Vanilla I. Shu <vanilla@MinJe.com.TW> # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.224 2011/06/16 17:36:39 kwm Exp $ -# +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.237 2013/03/04 17:44:38 kwm Exp $ # Remember to update graphics/gtk-update-icon-cache too. PORTNAME= gtk -PORTVERSION= 2.24.6 -PORTREVISION?= 2 +PORTVERSION= 2.24.17 +PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ - ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ - ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ - http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -26,10 +16,12 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (previous stable version) LICENSE= LGPL20 -LICENSE_FILE= ${WRKSRC}/COPYING + USE_XZ= yes LATEST_LINK= gtk20 +PORTSCOUT= limitw:0,even + .if !defined(REFERENCE_PORT) BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection @@ -52,16 +44,13 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN1= gtk-query-immodules-2.0.1 -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=yes -.endif - -OPTIONS= CUPS "Enable cups printing support" on +OPTIONS_DEFINE= CUPS DEBUG +OPTIONS_DEFAULT=CUPS .include <bsd.port.options.mk> -.if defined(WITH_CUPS) -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client +.if ${PORT_OPTIONS:MCUPS} +LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+=--enable-cups=auto PLIST_SUB+= CUPS:="" .else @@ -69,6 +58,10 @@ CONFIGURE_ARGS+=--disable-cups PLIST_SUB+= CUPS:="@comment " .endif +.if ${PORT_OPTIONS:MDEBUG} +CONFIGURE_ARGS+=--enable-debug=yes +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @@ -80,7 +73,7 @@ post-patch: pre-configure: .if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) - @${ECHO_CMD} "${PKGNAME}: Needs cairo build with X11 support." + @${ECHO_CMD} "${PKGNAME}: Needs cairo with X11 support enabled." @${FALSE} .endif @@ -93,6 +86,7 @@ post-install: @${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 + @${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/modules ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \ ${PREFIX}/man/man1 diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 164f01198946..e95c6ae937b6 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/gtk+-2.24.6.tar.xz) = 8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca -SIZE (gnome2/gtk+-2.24.6.tar.xz) = 13173032 +SHA256 (gnome2/gtk+-2.24.17.tar.xz) = e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415 +SIZE (gnome2/gtk+-2.24.17.tar.xz) = 13288028 diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in index 9846a2751331..87071ff8df9f 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -1,9 +1,5 @@ -Stock icons. This was removed in 2.21.x, however it is used by atleast firefox. - -https://bugzilla.gnome.org/show_bug.cgi?id=629878 - ---- gtk/Makefile.in.orig 2011-03-04 12:02:32.000000000 +0100 -+++ gtk/Makefile.in 2011-03-04 12:03:28.000000000 +0100 +--- 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 @@ @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 @@ -14,277 +10,3 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878 @OS_WIN32_TRUE@am__append_18 = \ @OS_WIN32_TRUE@ $(GTK_UPDATE_ICON_CACHE_MANIFEST) -@@ -1358,9 +1357,9 @@ - # gtk-update-icon-cache.exe doesn't require any special privileges. - @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest - gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) --gtk_query_immodules_2_0_LDADD = $(LDADDS) -+gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) - gtk_query_immodules_2_0_SOURCES = queryimmodules.c --gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) -+gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) - gtk_update_icon_cache_SOURCES = updateiconcache.c - STOCK_ICONS = \ - stock-icons/16/document-open-recent.png \ -@@ -1601,7 +1600,171 @@ - stock-icons/24/folder-remote.png \ - stock-icons/24/user-home.png \ - stock-icons/24/user-desktop.png \ -- stock-icons/24/text-x-generic.png -+ stock-icons/24/text-x-generic.png \ -+ stock-icons/16/gtk-quit.png \ -+ stock-icons/16/gtk-info.png \ -+ stock-icons/16/gtk-file.png \ -+ stock-icons/16/gtk-open.png \ -+ stock-icons/16/gtk-print-preview.png \ -+ stock-icons/16/gtk-print.png \ -+ stock-icons/16/gtk-properties.png \ -+ stock-icons/16/gtk-revert-to-saved-ltr.png \ -+ stock-icons/16/gtk-revert-to-saved-rtl.png \ -+ stock-icons/16/gtk-save-as.png \ -+ stock-icons/16/gtk-new.png \ -+ stock-icons/16/gtk-harddisk.png \ -+ stock-icons/16/gtk-clear.png \ -+ stock-icons/16/gtk-copy.png \ -+ stock-icons/16/gtk-cut.png \ -+ stock-icons/16/gtk-delete.png \ -+ stock-icons/16/gtk-find-and-replace.png \ -+ stock-icons/16/gtk-find.png \ -+ stock-icons/16/gtk-paste.png \ -+ stock-icons/16/gtk-redo-ltr.png \ -+ stock-icons/16/gtk-redo-rtl.png \ -+ stock-icons/16/gtk-select-all.png \ -+ stock-icons/16/gtk-undo-ltr.png \ -+ stock-icons/16/gtk-undo-rtl.png \ -+ stock-icons/16/gtk-directory.png \ -+ stock-icons/16/gtk-unindent-ltr.png \ -+ stock-icons/16/gtk-unindent-rtl.png \ -+ stock-icons/16/gtk-indent-ltr.png \ -+ stock-icons/16/gtk-indent-rtl.png \ -+ stock-icons/16/gtk-justify-center.png \ -+ stock-icons/16/gtk-justify-fill.png \ -+ stock-icons/16/gtk-justify-left.png \ -+ stock-icons/16/gtk-justify-right.png \ -+ stock-icons/16/gtk-bold.png \ -+ stock-icons/16/gtk-italic.png \ -+ stock-icons/16/gtk-strikethrough.png \ -+ stock-icons/16/gtk-underline.png \ -+ stock-icons/16/gtk-goto-bottom.png \ -+ stock-icons/16/gtk-go-down.png \ -+ stock-icons/16/gtk-goto-first-ltr.png \ -+ stock-icons/16/gtk-home.png \ -+ stock-icons/16/gtk-jump-to-ltr.png \ -+ stock-icons/16/gtk-jump-to-rtl.png \ -+ stock-icons/16/gtk-goto-last-ltr.png \ -+ stock-icons/16/gtk-go-forward-ltr.png \ -+ stock-icons/16/gtk-go-back-ltr.png \ -+ stock-icons/16/gtk-goto-top.png \ -+ stock-icons/16/gtk-go-up.png \ -+ stock-icons/16/gtk-about.png \ -+ stock-icons/16/gtk-help.png \ -+ stock-icons/16/gtk-missing-image.png \ -+ stock-icons/16/gtk-add.png \ -+ stock-icons/16/gtk-remove.png \ -+ stock-icons/16/gtk-floppy.png \ -+ stock-icons/16/gtk-cdrom.png \ -+ stock-icons/16/gtk-media-pause.png \ -+ stock-icons/16/gtk-media-play-ltr.png \ -+ stock-icons/16/gtk-media-play-rtl.png \ -+ stock-icons/16/gtk-media-stop.png \ -+ stock-icons/16/gtk-media-record.png \ -+ stock-icons/16/gtk-media-rewind-ltr.png \ -+ stock-icons/16/gtk-media-forward-ltr.png \ -+ stock-icons/16/gtk-media-previous-ltr.png \ -+ stock-icons/16/gtk-media-next-ltr.png \ -+ stock-icons/16/gtk-network.png \ -+ stock-icons/16/gtk-print-error.png \ -+ stock-icons/16/gtk-print-report.png \ -+ stock-icons/16/gtk-print-paused.png \ -+ stock-icons/16/gtk-print-warning.png \ -+ stock-icons/16/gtk-stop.png \ -+ stock-icons/16/gtk-execute.png \ -+ stock-icons/16/gtk-spell-check.png \ -+ stock-icons/16/gtk-fullscreen.png \ -+ stock-icons/16/gtk-refresh.png \ -+ stock-icons/16/gtk-leave-fullscreen.png \ -+ stock-icons/16/gtk-sort-ascending.png \ -+ stock-icons/16/gtk-sort-descending.png \ -+ stock-icons/16/gtk-close.png \ -+ stock-icons/16/gtk-zoom-fit.png \ -+ stock-icons/16/gtk-zoom-in.png \ -+ stock-icons/16/gtk-zoom-100.png \ -+ stock-icons/16/gtk-zoom-out.png \ -+ stock-icons/24/gtk-quit.png \ -+ stock-icons/24/gtk-info.png \ -+ stock-icons/24/gtk-file.png \ -+ stock-icons/24/gtk-open.png \ -+ stock-icons/24/gtk-print-preview.png \ -+ stock-icons/24/gtk-print.png \ -+ stock-icons/24/gtk-properties.png \ -+ stock-icons/24/gtk-revert-to-saved-ltr.png \ -+ stock-icons/24/gtk-revert-to-saved-rtl.png \ -+ stock-icons/24/gtk-save-as.png \ -+ stock-icons/24/gtk-new.png \ -+ stock-icons/24/gtk-harddisk.png \ -+ stock-icons/24/gtk-clear.png \ -+ stock-icons/24/gtk-copy.png \ -+ stock-icons/24/gtk-cut.png \ -+ stock-icons/24/gtk-delete.png \ -+ stock-icons/24/gtk-find-and-replace.png \ -+ stock-icons/24/gtk-find.png \ -+ stock-icons/24/gtk-paste.png \ -+ stock-icons/24/gtk-redo-ltr.png \ -+ stock-icons/24/gtk-redo-rtl.png \ -+ stock-icons/24/gtk-select-all.png \ -+ stock-icons/24/gtk-undo-ltr.png \ -+ stock-icons/24/gtk-undo-rtl.png \ -+ stock-icons/24/gtk-directory.png \ -+ stock-icons/24/gtk-unindent-ltr.png \ -+ stock-icons/24/gtk-unindent-rtl.png \ -+ stock-icons/24/gtk-indent-ltr.png \ -+ stock-icons/24/gtk-indent-rtl.png \ -+ stock-icons/24/gtk-justify-center.png \ -+ stock-icons/24/gtk-justify-fill.png \ -+ stock-icons/24/gtk-justify-left.png \ -+ stock-icons/24/gtk-justify-right.png \ -+ stock-icons/24/gtk-bold.png \ -+ stock-icons/24/gtk-italic.png \ -+ stock-icons/24/gtk-strikethrough.png \ -+ stock-icons/24/gtk-underline.png \ -+ stock-icons/24/gtk-goto-bottom.png \ -+ stock-icons/24/gtk-go-down.png \ -+ stock-icons/24/gtk-goto-first-ltr.png \ -+ stock-icons/24/gtk-home.png \ -+ stock-icons/24/gtk-jump-to-ltr.png \ -+ stock-icons/24/gtk-jump-to-rtl.png \ -+ stock-icons/24/gtk-goto-last-ltr.png \ -+ stock-icons/24/gtk-go-forward-ltr.png \ -+ stock-icons/24/gtk-go-back-ltr.png \ -+ stock-icons/24/gtk-goto-top.png \ -+ stock-icons/24/gtk-go-up.png \ -+ stock-icons/24/gtk-about.png \ -+ stock-icons/24/gtk-help.png \ -+ stock-icons/24/gtk-missing-image.png \ -+ stock-icons/24/gtk-add.png \ -+ stock-icons/24/gtk-remove.png \ -+ stock-icons/24/gtk-floppy.png \ -+ stock-icons/24/gtk-cdrom.png \ -+ stock-icons/24/gtk-media-pause.png \ -+ stock-icons/24/gtk-media-play-ltr.png \ -+ stock-icons/24/gtk-media-play-rtl.png \ -+ stock-icons/24/gtk-media-stop.png \ -+ stock-icons/24/gtk-media-record.png \ -+ stock-icons/24/gtk-media-rewind-ltr.png \ -+ stock-icons/24/gtk-media-forward-ltr.png \ -+ stock-icons/24/gtk-media-previous-ltr.png \ -+ stock-icons/24/gtk-media-next-ltr.png \ -+ stock-icons/24/gtk-network.png \ -+ stock-icons/24/gtk-print-error.png \ -+ stock-icons/24/gtk-print-report.png \ -+ stock-icons/24/gtk-print-paused.png \ -+ stock-icons/24/gtk-print-warning.png \ -+ stock-icons/24/gtk-stop.png \ -+ stock-icons/24/gtk-execute.png \ -+ stock-icons/24/gtk-spell-check.png \ -+ stock-icons/24/gtk-fullscreen.png \ -+ stock-icons/24/gtk-refresh.png \ -+ stock-icons/24/gtk-leave-fullscreen.png \ -+ stock-icons/24/gtk-sort-ascending.png \ -+ stock-icons/24/gtk-sort-descending.png \ -+ stock-icons/24/gtk-close.png \ -+ stock-icons/24/gtk-zoom-fit.png \ -+ stock-icons/24/gtk-zoom-in.png \ -+ stock-icons/24/gtk-zoom-100.png \ -+ stock-icons/24/gtk-zoom-out.png - - @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ - @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -@@ -2873,6 +3036,88 @@ - && $(LN_S) folder.png user-desktop.png \ - && $(RM) user-home.png.png \ - && $(LN_S) folder.png user-home.png \ -+ && $(LN_S) application-exit.png gtk-quit.png \ -+ && $(LN_S) dialog-info.png gtk-info.png \ -+ && $(LN_S) document-new.png gtk-file.png \ -+ && $(LN_S) document-open.png gtk-open.png \ -+ && $(LN_S) document-print-preview.png gtk-print-preview.png \ -+ && $(LN_S) document-print.png gtk-print.png \ -+ && $(LN_S) document-properties.png gtk-properties.png \ -+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ -+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ -+ && $(LN_S) document-save-as.png gtk-save-as.png \ -+ && $(LN_S) document-x-generic.png gtk-new.png \ -+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ -+ && $(LN_S) edit-clear.png gtk-clear.png \ -+ && $(LN_S) edit-copy.png gtk-copy.png \ -+ && $(LN_S) edit-cut.png gtk-cut.png \ -+ && $(LN_S) edit-delete.png gtk-delete.png \ -+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ -+ && $(LN_S) edit-find.png gtk-find.png \ -+ && $(LN_S) edit-paste.png gtk-paste.png \ -+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ -+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ -+ && $(LN_S) edit-select-all.png gtk-select-all.png \ -+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ -+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ -+ && $(LN_S) folder.png gtk-directory.png \ -+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ -+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ -+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ -+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ -+ && $(LN_S) format-justify-center.png gtk-justify-center.png \ -+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ -+ && $(LN_S) format-justify-left.png gtk-justify-left.png \ -+ && $(LN_S) format-justify-right.png gtk-justify-right.png \ -+ && $(LN_S) format-text-bold.png gtk-bold.png \ -+ && $(LN_S) format-text-italic.png gtk-italic.png \ -+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ -+ && $(LN_S) format-text-underline.png gtk-underline.png \ -+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ -+ && $(LN_S) go-down.png gtk-go-down.png \ -+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ -+ && $(LN_S) go-home.png gtk-home.png \ -+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ -+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ -+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ -+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ -+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ -+ && $(LN_S) go-top.png gtk-goto-top.png \ -+ && $(LN_S) go-up.png gtk-go-up.png \ -+ && $(LN_S) help-about.png gtk-about.png \ -+ && $(LN_S) help-contents.png gtk-help.png \ -+ && $(LN_S) image-missing.png gtk-missing-image.png \ -+ && $(LN_S) list-add.png gtk-add.png \ -+ && $(LN_S) list-remove.png gtk-remove.png \ -+ && $(LN_S) media-floppy.png gtk-floppy.png \ -+ && $(LN_S) media-optical.png gtk-cdrom.png \ -+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ -+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ -+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ -+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ -+ && $(LN_S) media-record.png gtk-media-record.png \ -+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ -+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ -+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ -+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ -+ && $(LN_S) network-idle.png gtk-network.png \ -+ && $(LN_S) printer-error.png gtk-print-error.png \ -+ && $(LN_S) printer-info.png gtk-print-report.png \ -+ && $(LN_S) printer-paused.png gtk-print-paused.png \ -+ && $(LN_S) printer-warning.png gtk-print-warning.png \ -+ && $(LN_S) process-stop.png gtk-stop.png \ -+ && $(LN_S) system-run.png gtk-execute.png \ -+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ -+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ -+ && $(LN_S) view-refresh.png gtk-refresh.png \ -+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ -+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ -+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ -+ && $(LN_S) window-close.png gtk-close.png \ -+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ -+ && $(LN_S) zoom-in.png gtk-zoom-in.png \ -+ && $(LN_S) zoom-original.png gtk-zoom-100.png \ -+ && $(LN_S) zoom-out.png gtk-zoom-out.png \ - ) done \ - && touch stamp-icons - diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index a4ac7f4e6b0f..61b5c73f8dce 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -627,6 +627,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/modules @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders +@exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/modules @dirrmtry lib/gtk-2.0/modules @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/printbackends @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index cc1cd9385d17..158df3b0e5ca 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,23 +1,13 @@ -# New ports collection makefile for: gtk13 -# Date Created: 28 Sep 1997 -# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> -# +# Created by: Vanilla I. Shu <vanilla@MinJe.com.TW> # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.35 2011/06/07 13:19:12 kwm Exp $ -# +# $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.53 2013/01/07 13:35:02 kwm Exp $ PORTNAME= gtk -PORTVERSION= 3.0.12 -PORTREVISION?= 2 +PORTVERSION= 3.6.4 +PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ - ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ - ftp://ftp.gimp.org/pub/%SUBDIR%/ \ - ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ - http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} -MASTER_SITE_SUBDIR= gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME +MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome3 @@ -25,15 +15,17 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LICENSE= LGPL20 -LICENSE_FILE= ${WRKSRC}/COPYING + USE_XZ= yes LATEST_LINK= gtk30 .if !defined(REFERENCE_PORT) -BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \ + ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ - ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ + ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk USE_GMAKE= yes USE_PERL5_BUILD=yes @@ -44,27 +36,26 @@ USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --enable-static --enable-xinput=yes -CONFIGURE_ARGS+=--enable-gtk2-dependency -CONFIGURE_ENV= INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0` ac_cv_path_SED="${SED}" -CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \ - -I${LOCALBASE}/include +CONFIGURE_ARGS= --enable-static +CONFIGURE_ARGS+=--enable-gtk2-dependency --disable-packagekit +CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV= INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0` ac_cv_path_SED="${SED}" -GLIB_SCHEMAS= org.gtk.Settings.FileChooser.gschema.xml +GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ + org.gtk.Settings.ColorChooser.gschema.xml \ + org.gtk.Settings.FileChooser.gschema.xml MAN1= gtk-query-immodules-3.0.1 -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug=yes -.endif - -OPTIONS= CUPS "Enable cups printing support" on +OPTIONS_DEFINE= CUPS COLORD DEBUG +OPTIONS_DEFAULT=CUPS COLORD +COLORD_DESC= Color profile support .include <bsd.port.options.mk> -.if defined(WITH_CUPS) -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client +.if ${PORT_OPTIONS:MCUPS} +LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client CONFIGURE_ARGS+=--enable-cups=auto PLIST_SUB+= CUPS="" .else @@ -72,6 +63,17 @@ CONFIGURE_ARGS+=--disable-cups PLIST_SUB+= CUPS="@comment " .endif +.if ${PORT_OPTIONS:MDEBUG} +CONFIGURE_ARGS+= --enable-debug=yes +.endif + +.if ${PORT_OPTIONS:MCOLORD} +LIB_DEPENDS+= colord:${PORTSDIR}/graphics/colord +CONFIGURE_ARGS+=--enable-colord +.else +CONFIGURE_ARGS+=--disable-colord +.endif + post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @@ -83,7 +85,7 @@ post-patch: pre-configure: .if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) - @${ECHO_CMD} "${PKGNAME}: Needs cairo build with X11 support." + @${ECHO_CMD} "${PKGNAME}: Needs cairo with X11 support enabled." @${FALSE} .endif diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 756ce8730956..ce56379d420d 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gtk+-3.0.12.tar.xz) = 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9 -SIZE (gnome3/gtk+-3.0.12.tar.xz) = 13104092 +SHA256 (gnome3/gtk+-3.6.4.tar.xz) = dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1 +SIZE (gnome3/gtk+-3.6.4.tar.xz) = 13275488 diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in index 8f328a491e85..610efe8e57b7 100644 --- a/x11-toolkits/gtk30/files/patch-Makefile.in +++ b/x11-toolkits/gtk30/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2011-02-02 00:09:55.000000000 +0000 -+++ Makefile.in 2011-02-02 00:10:16.000000000 +0000 -@@ -418,7 +418,7 @@ +--- Makefile.in.orig 2011-09-15 18:04:34.000000000 +0200 ++++ Makefile.in 2011-09-15 18:05:12.000000000 +0200 +@@ -422,7 +422,7 @@ || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ && DISPLAY=:$$XID && export DISPLAY --SRC_SUBDIRS = gdk gtk modules demos tests perf examples -+SRC_SUBDIRS = gdk gtk modules demos perf examples +-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples ++SRC_SUBDIRS = gdk gtk libgail-util modules demos perf examples SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} MAINTAINERCLEANFILES = \ diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure deleted file mode 100644 index 2e625d30e19a..000000000000 --- a/x11-toolkits/gtk30/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.orig 2011-03-21 20:08:47.000000000 +0100 -+++ configure 2011-03-21 20:10:50.000000000 +0100 -@@ -23728,9 +23728,9 @@ - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} -+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} -+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in index 281bb69f5ddd..6eefe2bc7016 100644 --- a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in @@ -1,12 +1,10 @@ ---- docs/reference/gtk/Makefile.in.orig 2011-02-01 22:06:23.000000000 +0000 -+++ docs/reference/gtk/Makefile.in 2011-02-01 22:07:12.000000000 +0000 -@@ -735,8 +735,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_F - +--- docs/reference/gtk/Makefile.in.orig 2012-09-25 07:07:36.000000000 +0000 ++++ docs/reference/gtk/Makefile.in 2012-09-25 07:08:14.000000000 +0000 +@@ -822,7 +822,6 @@ ######################################################################## man_MANS = \ -- gtk-query-immodules-3.0.1 \ -- gtk-update-icon-cache.1 -+ gtk-query-immodules-3.0.1 + gtk-query-immodules-3.0.1 \ +- gtk-update-icon-cache.1 \ + gtk-launch.1 - MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES) - all: all-am + @ENABLE_MAN_TRUE@XSLTPROC_FLAGS = \ diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 53b8c9e7043f..a7b16ff8af33 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -1,7 +1,9 @@ +bin/gtk-launch bin/gtk-query-immodules-3.0 bin/gtk3-demo +bin/gtk3-demo-application +bin/gtk3-widget-factory etc/gtk-3.0/im-multipress.conf -include/gail-3.0/gail/gailwidget.h include/gail-3.0/libgail-util/gail-util.h include/gail-3.0/libgail-util/gailmisc.h include/gail-3.0/libgail-util/gailtextutil.h @@ -33,17 +35,18 @@ include/gtk-3.0/gdk/gdkselection.h include/gtk-3.0/gdk/gdktestutils.h include/gtk-3.0/gdk/gdkthreads.h include/gtk-3.0/gdk/gdktypes.h +include/gtk-3.0/gdk/gdkversionmacros.h include/gtk-3.0/gdk/gdkvisual.h include/gtk-3.0/gdk/gdkwindow.h include/gtk-3.0/gdk/gdkx.h include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h include/gtk-3.0/gdk/x11/gdkx11cursor.h include/gtk-3.0/gdk/x11/gdkx11device-core.h -include/gtk-3.0/gdk/x11/gdkx11device-xi.h include/gtk-3.0/gdk/x11/gdkx11device-xi2.h +include/gtk-3.0/gdk/x11/gdkx11device.h include/gtk-3.0/gdk/x11/gdkx11devicemanager-core.h -include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi.h include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi2.h +include/gtk-3.0/gdk/x11/gdkx11devicemanager.h include/gtk-3.0/gdk/x11/gdkx11display.h include/gtk-3.0/gdk/x11/gdkx11displaymanager.h include/gtk-3.0/gdk/x11/gdkx11dnd.h @@ -54,9 +57,27 @@ include/gtk-3.0/gdk/x11/gdkx11selection.h include/gtk-3.0/gdk/x11/gdkx11utils.h include/gtk-3.0/gdk/x11/gdkx11visual.h include/gtk-3.0/gdk/x11/gdkx11window.h -include/gtk-3.0/gtk/gtkcellarea.h -include/gtk-3.0/gtk/gtkcellareabox.h -include/gtk-3.0/gtk/gtkcellareacontext.h +include/gtk-3.0/gtk/deprecated/gtkcolorsel.h +include/gtk-3.0/gtk/deprecated/gtkcolorseldialog.h +include/gtk-3.0/gtk/deprecated/gtkfontsel.h +include/gtk-3.0/gtk/deprecated/gtkhandlebox.h +include/gtk-3.0/gtk/deprecated/gtkhbbox.h +include/gtk-3.0/gtk/deprecated/gtkhbox.h +include/gtk-3.0/gtk/deprecated/gtkhpaned.h +include/gtk-3.0/gtk/deprecated/gtkhscale.h +include/gtk-3.0/gtk/deprecated/gtkhscrollbar.h +include/gtk-3.0/gtk/deprecated/gtkhseparator.h +include/gtk-3.0/gtk/deprecated/gtkhsv.h +include/gtk-3.0/gtk/deprecated/gtkrc.h +include/gtk-3.0/gtk/deprecated/gtkstyle.h +include/gtk-3.0/gtk/deprecated/gtktable.h +include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h +include/gtk-3.0/gtk/deprecated/gtkvbbox.h +include/gtk-3.0/gtk/deprecated/gtkvbox.h +include/gtk-3.0/gtk/deprecated/gtkvpaned.h +include/gtk-3.0/gtk/deprecated/gtkvscale.h +include/gtk-3.0/gtk/deprecated/gtkvscrollbar.h +include/gtk-3.0/gtk/deprecated/gtkvseparator.h include/gtk-3.0/gtk/gtk.h include/gtk-3.0/gtk/gtkaboutdialog.h include/gtk-3.0/gtk/gtkaccelgroup.h @@ -64,6 +85,7 @@ include/gtk-3.0/gtk/gtkaccellabel.h include/gtk-3.0/gtk/gtkaccelmap.h include/gtk-3.0/gtk/gtkaccessible.h include/gtk-3.0/gtk/gtkaction.h +include/gtk-3.0/gtk/gtkactionable.h include/gtk-3.0/gtk/gtkactiongroup.h include/gtk-3.0/gtk/gtkactivatable.h include/gtk-3.0/gtk/gtkadjustment.h @@ -73,6 +95,7 @@ include/gtk-3.0/gtk/gtkappchooserbutton.h include/gtk-3.0/gtk/gtkappchooserdialog.h include/gtk-3.0/gtk/gtkappchooserwidget.h include/gtk-3.0/gtk/gtkapplication.h +include/gtk-3.0/gtk/gtkapplicationwindow.h include/gtk-3.0/gtk/gtkarrow.h include/gtk-3.0/gtk/gtkaspectframe.h include/gtk-3.0/gtk/gtkassistant.h @@ -85,6 +108,9 @@ include/gtk-3.0/gtk/gtkbuildable.h include/gtk-3.0/gtk/gtkbuilder.h include/gtk-3.0/gtk/gtkbutton.h include/gtk-3.0/gtk/gtkcalendar.h +include/gtk-3.0/gtk/gtkcellarea.h +include/gtk-3.0/gtk/gtkcellareabox.h +include/gtk-3.0/gtk/gtkcellareacontext.h include/gtk-3.0/gtk/gtkcelleditable.h include/gtk-3.0/gtk/gtkcelllayout.h include/gtk-3.0/gtk/gtkcellrenderer.h @@ -101,12 +127,15 @@ include/gtk-3.0/gtk/gtkcheckbutton.h include/gtk-3.0/gtk/gtkcheckmenuitem.h include/gtk-3.0/gtk/gtkclipboard.h include/gtk-3.0/gtk/gtkcolorbutton.h -include/gtk-3.0/gtk/gtkcolorsel.h -include/gtk-3.0/gtk/gtkcolorseldialog.h +include/gtk-3.0/gtk/gtkcolorchooser.h +include/gtk-3.0/gtk/gtkcolorchooserdialog.h +include/gtk-3.0/gtk/gtkcolorchooserwidget.h +include/gtk-3.0/gtk/gtkcolorutils.h include/gtk-3.0/gtk/gtkcombobox.h include/gtk-3.0/gtk/gtkcomboboxtext.h include/gtk-3.0/gtk/gtkcontainer.h include/gtk-3.0/gtk/gtkcssprovider.h +include/gtk-3.0/gtk/gtkcsssection.h include/gtk-3.0/gtk/gtkdebug.h include/gtk-3.0/gtk/gtkdialog.h include/gtk-3.0/gtk/gtkdnd.h @@ -125,36 +154,34 @@ include/gtk-3.0/gtk/gtkfilechooserwidget.h include/gtk-3.0/gtk/gtkfilefilter.h include/gtk-3.0/gtk/gtkfixed.h include/gtk-3.0/gtk/gtkfontbutton.h -include/gtk-3.0/gtk/gtkfontsel.h +include/gtk-3.0/gtk/gtkfontchooser.h +include/gtk-3.0/gtk/gtkfontchooserdialog.h +include/gtk-3.0/gtk/gtkfontchooserwidget.h include/gtk-3.0/gtk/gtkframe.h include/gtk-3.0/gtk/gtkgradient.h include/gtk-3.0/gtk/gtkgrid.h -include/gtk-3.0/gtk/gtkhandlebox.h -include/gtk-3.0/gtk/gtkhbbox.h -include/gtk-3.0/gtk/gtkhbox.h -include/gtk-3.0/gtk/gtkhpaned.h -include/gtk-3.0/gtk/gtkhscale.h -include/gtk-3.0/gtk/gtkhscrollbar.h -include/gtk-3.0/gtk/gtkhseparator.h -include/gtk-3.0/gtk/gtkhsv.h include/gtk-3.0/gtk/gtkiconfactory.h include/gtk-3.0/gtk/gtkicontheme.h include/gtk-3.0/gtk/gtkiconview.h -include/gtk-3.0/gtk/gtkinfobar.h include/gtk-3.0/gtk/gtkimage.h include/gtk-3.0/gtk/gtkimagemenuitem.h include/gtk-3.0/gtk/gtkimcontext.h +include/gtk-3.0/gtk/gtkimcontextinfo.h include/gtk-3.0/gtk/gtkimcontextsimple.h include/gtk-3.0/gtk/gtkimmodule.h include/gtk-3.0/gtk/gtkimmulticontext.h +include/gtk-3.0/gtk/gtkinfobar.h include/gtk-3.0/gtk/gtkinvisible.h include/gtk-3.0/gtk/gtklabel.h include/gtk-3.0/gtk/gtklayout.h +include/gtk-3.0/gtk/gtklevelbar.h include/gtk-3.0/gtk/gtklinkbutton.h include/gtk-3.0/gtk/gtkliststore.h +include/gtk-3.0/gtk/gtklockbutton.h include/gtk-3.0/gtk/gtkmain.h include/gtk-3.0/gtk/gtkmenu.h include/gtk-3.0/gtk/gtkmenubar.h +include/gtk-3.0/gtk/gtkmenubutton.h include/gtk-3.0/gtk/gtkmenuitem.h include/gtk-3.0/gtk/gtkmenushell.h include/gtk-3.0/gtk/gtkmenutoolbutton.h @@ -166,6 +193,7 @@ include/gtk-3.0/gtk/gtknotebook.h include/gtk-3.0/gtk/gtknumerableicon.h include/gtk-3.0/gtk/gtkoffscreenwindow.h include/gtk-3.0/gtk/gtkorientable.h +include/gtk-3.0/gtk/gtkoverlay.h include/gtk-3.0/gtk/gtkpagesetup.h include/gtk-3.0/gtk/gtkpaned.h include/gtk-3.0/gtk/gtkpapersize.h @@ -180,7 +208,6 @@ include/gtk-3.0/gtk/gtkradiobutton.h include/gtk-3.0/gtk/gtkradiomenuitem.h include/gtk-3.0/gtk/gtkradiotoolbutton.h include/gtk-3.0/gtk/gtkrange.h -include/gtk-3.0/gtk/gtkrc.h include/gtk-3.0/gtk/gtkrecentaction.h include/gtk-3.0/gtk/gtkrecentchooser.h include/gtk-3.0/gtk/gtkrecentchooserdialog.h @@ -193,6 +220,7 @@ include/gtk-3.0/gtk/gtkscalebutton.h include/gtk-3.0/gtk/gtkscrollable.h include/gtk-3.0/gtk/gtkscrollbar.h include/gtk-3.0/gtk/gtkscrolledwindow.h +include/gtk-3.0/gtk/gtksearchentry.h include/gtk-3.0/gtk/gtkselection.h include/gtk-3.0/gtk/gtkseparator.h include/gtk-3.0/gtk/gtkseparatormenuitem.h @@ -207,14 +235,11 @@ include/gtk-3.0/gtk/gtkspinner.h include/gtk-3.0/gtk/gtkstatusbar.h include/gtk-3.0/gtk/gtkstatusicon.h include/gtk-3.0/gtk/gtkstock.h -include/gtk-3.0/gtk/gtkstyle.h include/gtk-3.0/gtk/gtkstylecontext.h include/gtk-3.0/gtk/gtkstyleproperties.h include/gtk-3.0/gtk/gtkstyleprovider.h include/gtk-3.0/gtk/gtkswitch.h include/gtk-3.0/gtk/gtksymboliccolor.h -include/gtk-3.0/gtk/gtktable.h -include/gtk-3.0/gtk/gtktearoffmenuitem.h include/gtk-3.0/gtk/gtktestutils.h include/gtk-3.0/gtk/gtktextattributes.h include/gtk-3.0/gtk/gtktextbuffer.h @@ -248,16 +273,11 @@ include/gtk-3.0/gtk/gtktreestore.h include/gtk-3.0/gtk/gtktreeview.h include/gtk-3.0/gtk/gtktreeviewcolumn.h include/gtk-3.0/gtk/gtktypebuiltins.h +include/gtk-3.0/gtk/gtktypes.h include/gtk-3.0/gtk/gtkuimanager.h -include/gtk-3.0/gtk/gtkvbbox.h -include/gtk-3.0/gtk/gtkvbox.h include/gtk-3.0/gtk/gtkversion.h include/gtk-3.0/gtk/gtkviewport.h include/gtk-3.0/gtk/gtkvolumebutton.h -include/gtk-3.0/gtk/gtkvpaned.h -include/gtk-3.0/gtk/gtkvscale.h -include/gtk-3.0/gtk/gtkvscrollbar.h -include/gtk-3.0/gtk/gtkvseparator.h include/gtk-3.0/gtk/gtkwidget.h include/gtk-3.0/gtk/gtkwidgetpath.h include/gtk-3.0/gtk/gtkwindow.h @@ -270,9 +290,6 @@ include/gtk-3.0/unix-print/gtk/gtkunixprint.h lib/girepository-1.0/Gdk-3.0.typelib lib/girepository-1.0/GdkX11-3.0.typelib lib/girepository-1.0/Gtk-3.0.typelib -@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.a -@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.la -@comment lib/gtk-3.0/%%GTK3_VERSION%%/engines/libpixmap.so lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.a lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.la lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.so @@ -316,12 +333,6 @@ lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.a lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.la lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so -lib/gtk-3.0/modules/libferret.a -lib/gtk-3.0/modules/libferret.la -lib/gtk-3.0/modules/libferret.so -lib/gtk-3.0/modules/libgail.a -lib/gtk-3.0/modules/libgail.la -lib/gtk-3.0/modules/libgail.so lib/libgailutil-3.a lib/libgailutil-3.la lib/libgailutil-3.so @@ -346,6 +357,8 @@ share/gir-1.0/GdkX11-3.0.gir share/gir-1.0/Gtk-3.0.gir share/gtk-3.0/demo/alphatest.png share/gtk-3.0/demo/apple-red.png +share/gtk-3.0/demo/application.c +share/gtk-3.0/demo/application.ui share/gtk-3.0/demo/appwindow.c share/gtk-3.0/demo/assistant.c share/gtk-3.0/demo/background.jpg @@ -355,6 +368,17 @@ share/gtk-3.0/demo/changedisplay.c share/gtk-3.0/demo/clipboard.c share/gtk-3.0/demo/colorsel.c share/gtk-3.0/demo/combobox.c +share/gtk-3.0/demo/css_accordion.c +share/gtk-3.0/demo/css_accordion.css +share/gtk-3.0/demo/css_basics.c +share/gtk-3.0/demo/css_basics.css +share/gtk-3.0/demo/css_multiplebgs.c +share/gtk-3.0/demo/css_multiplebgs.css +share/gtk-3.0/demo/css_pixbufs.c +share/gtk-3.0/demo/css_pixbufs.css +share/gtk-3.0/demo/css_shadows.c +share/gtk-3.0/demo/css_shadows.css +share/gtk-3.0/demo/cssview.css share/gtk-3.0/demo/demo.ui share/gtk-3.0/demo/dialog.c share/gtk-3.0/demo/drawingarea.c @@ -362,6 +386,7 @@ share/gtk-3.0/demo/editable_cells.c share/gtk-3.0/demo/entry_buffer.c share/gtk-3.0/demo/entry_completion.c share/gtk-3.0/demo/expander.c +share/gtk-3.0/demo/fancy.css share/gtk-3.0/demo/floppybuddy.gif share/gtk-3.0/demo/gnome-applets.png share/gtk-3.0/demo/gnome-calendar.png @@ -372,21 +397,26 @@ share/gtk-3.0/demo/gnome-gimp.png share/gtk-3.0/demo/gnome-gmush.png share/gtk-3.0/demo/gnome-gsame.png share/gtk-3.0/demo/gnu-keys.png +share/gtk-3.0/demo/gtk-logo-24.png +share/gtk-3.0/demo/gtk-logo-48.png share/gtk-3.0/demo/gtk-logo-rgb.gif share/gtk-3.0/demo/hypertext.c share/gtk-3.0/demo/iconview.c share/gtk-3.0/demo/iconview_edit.c share/gtk-3.0/demo/images.c share/gtk-3.0/demo/infobar.c -share/gtk-3.0/demo/list_store.c share/gtk-3.0/demo/links.c +share/gtk-3.0/demo/list_store.c share/gtk-3.0/demo/menus.c +share/gtk-3.0/demo/menus.ui share/gtk-3.0/demo/offscreen_window.c share/gtk-3.0/demo/offscreen_window2.c +share/gtk-3.0/demo/overlay.c share/gtk-3.0/demo/panes.c share/gtk-3.0/demo/pickers.c share/gtk-3.0/demo/pixbufs.c share/gtk-3.0/demo/printing.c +share/gtk-3.0/demo/reset.css share/gtk-3.0/demo/rotated_text.c share/gtk-3.0/demo/search_entry.c share/gtk-3.0/demo/sizegroup.c @@ -394,9 +424,14 @@ share/gtk-3.0/demo/spinner.c share/gtk-3.0/demo/stock_browser.c share/gtk-3.0/demo/textscroll.c share/gtk-3.0/demo/textview.c +share/gtk-3.0/demo/theming_custom_css.c +share/gtk-3.0/demo/theming_style_classes.c +share/gtk-3.0/demo/theming.ui share/gtk-3.0/demo/toolpalette.c +share/gtk-3.0/demo/transparent.c share/gtk-3.0/demo/tree_store.c share/gtk-3.0/demo/ui_manager.c +share/gtk-3.0/gtkbuilder.rng share/locale/af/LC_MESSAGES/gtk30-properties.mo share/locale/af/LC_MESSAGES/gtk30.mo share/locale/am/LC_MESSAGES/gtk30-properties.mo @@ -447,6 +482,8 @@ share/locale/el/LC_MESSAGES/gtk30-properties.mo share/locale/el/LC_MESSAGES/gtk30.mo share/locale/en/LC_MESSAGES/gtk30-properties.mo share/locale/en/LC_MESSAGES/gtk30.mo +share/locale/en@shaw/LC_MESSAGES/gtk30-properties.mo +share/locale/en@shaw/LC_MESSAGES/gtk30.mo share/locale/en_CA/LC_MESSAGES/gtk30-properties.mo share/locale/en_CA/LC_MESSAGES/gtk30.mo share/locale/en_GB/LC_MESSAGES/gtk30-properties.mo @@ -499,12 +536,16 @@ share/locale/kg/LC_MESSAGES/gtk30-properties.mo share/locale/kg/LC_MESSAGES/gtk30.mo share/locale/kk/LC_MESSAGES/gtk30-properties.mo share/locale/kk/LC_MESSAGES/gtk30.mo +share/locale/km/LC_MESSAGES/gtk30-properties.mo +share/locale/km/LC_MESSAGES/gtk30.mo share/locale/kn/LC_MESSAGES/gtk30-properties.mo share/locale/kn/LC_MESSAGES/gtk30.mo share/locale/ko/LC_MESSAGES/gtk30-properties.mo share/locale/ko/LC_MESSAGES/gtk30.mo share/locale/ku/LC_MESSAGES/gtk30-properties.mo share/locale/ku/LC_MESSAGES/gtk30.mo +share/locale/ky/LC_MESSAGES/gtk30-properties.mo +share/locale/ky/LC_MESSAGES/gtk30.mo share/locale/lg/LC_MESSAGES/gtk30-properties.mo share/locale/lg/LC_MESSAGES/gtk30.mo share/locale/li/LC_MESSAGES/gtk30-properties.mo @@ -615,40 +656,13 @@ share/locale/zh_TW/LC_MESSAGES/gtk30-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk30.mo share/themes/Default/gtk-3.0/gtk-keys.css share/themes/Emacs/gtk-3.0/gtk-keys.css -share/themes/Raleigh/gtk-3.0/gtk.css @exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true @unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true -@dirrm share/themes/Raleigh/gtk-3.0 -@dirrmtry share/themes/Raleigh @dirrm share/themes/Emacs/gtk-3.0 @dirrmtry share/themes/Emacs @dirrm share/themes/Default/gtk-3.0 @dirrmtry share/themes/Default @dirrmtry share/themes -@dirrm share/gtk-3.0/demo -@dirrm share/gtk-3.0 -@dirrm include/gtk-3.0/unix-print/gtk -@dirrm include/gtk-3.0/unix-print -@dirrm include/gtk-3.0/gtk -@dirrm include/gtk-3.0/gdk/x11 -@dirrm include/gtk-3.0/gdk -@dirrm include/gtk-3.0 -@dirrm include/gail-3.0/libgail-util -@dirrm include/gail-3.0/gail -@dirrm include/gail-3.0 -@dirrm etc/gtk-3.0 -@exec /bin/mkdir -p %D/lib/gtk-3.0/modules -@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines -@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/loaders -@dirrmtry lib/gtk-3.0/modules -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/printbackends -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/modules -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/loaders -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/immodules -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/engines -@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%% -@dirrmtry lib/gtk-3.0 -@exec %D/bin/gtk-query-immodules-3.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/yi/LC_MESSAGES @@ -691,8 +705,12 @@ share/themes/Raleigh/gtk-3.0/gtk.css @dirrmtry share/locale/mai @dirrmtry share/locale/lg/LC_MESSAGES @dirrmtry share/locale/lg +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk @dirrmtry share/locale/kg/LC_MESSAGES @@ -703,6 +721,8 @@ share/themes/Raleigh/gtk-3.0/gtk.css @dirrmtry share/locale/ia @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES @@ -721,3 +741,26 @@ share/themes/Raleigh/gtk-3.0/gtk.css @dirrmtry share/locale/as @dirrmtry share/locale/ang/LC_MESSAGES @dirrmtry share/locale/ang +@dirrm share/gtk-3.0/demo +@dirrm share/gtk-3.0 +@exec /bin/mkdir -p %D/lib/gtk-3.0/modules +@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines +@exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/loaders +@dirrm lib/gtk-3.0/modules +@dirrm lib/gtk-3.0/%%GTK3_VERSION%%/printbackends +@dirrm lib/gtk-3.0/%%GTK3_VERSION%%/loaders +@dirrm lib/gtk-3.0/%%GTK3_VERSION%%/immodules +@dirrm lib/gtk-3.0/%%GTK3_VERSION%%/engines +@dirrm lib/gtk-3.0/%%GTK3_VERSION%% +@dirrm lib/gtk-3.0 +@exec %D/bin/gtk-query-immodules-3.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache 2>/dev/null || /usr/bin/true +@dirrm include/gtk-3.0/unix-print/gtk +@dirrm include/gtk-3.0/unix-print +@dirrm include/gtk-3.0/gtk/deprecated +@dirrm include/gtk-3.0/gtk +@dirrm include/gtk-3.0/gdk/x11 +@dirrm include/gtk-3.0/gdk +@dirrm include/gtk-3.0 +@dirrm include/gail-3.0/libgail-util +@dirrm include/gail-3.0 +@dirrm etc/gtk-3.0 diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile index cc1fdc2be78c..bbe10a47a549 100644 --- a/x11-toolkits/gtkada/Makefile +++ b/x11-toolkits/gtkada/Makefile @@ -27,4 +27,7 @@ CC= gnatgcc CONFIGURE_ARGS+= --disable-nls +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' ${WRKSRC}/src/misc.c + .include <bsd.port.mk> diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile index 727847a7dfd7..036716e87606 100644 --- a/x11-toolkits/gtkextra2/Makefile +++ b/x11-toolkits/gtkextra2/Makefile @@ -31,6 +31,8 @@ PORTDOCS= * post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/gtkextra/gtkcharsel.c post-install: .if ${PORT_OPTIONS:MDOCS} diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile index ced7785a2a60..bd4a384b0c8c 100644 --- a/x11-toolkits/gtkmm20/Makefile +++ b/x11-toolkits/gtkmm20/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: gtkmm2 -# Date created: 30 September 2002 -# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> -# +# Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # $FreeBSD$ # $MCom: ports/x11-toolkits/gtkmm20/Makefile,v 1.11 2006/09/10 00:51:17 mezz Exp $ @@ -36,6 +33,9 @@ post-patch: ${WRKSRC}/glib/src/*.ccg ${WRKSRC}/glib/glibmm/*.* \ ${WRKSRC}/gtk/src/*.* ${WRKSRC}/gtk/gtkmm/*.* \ ${WRKSRC}/demos/gtk-demo/*.cc + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/glib/glibmm/*.cc ${WRKSRC}/glib/glibmm/*.h \ + ${WRKSRC}/gtk/gtkmm/textbuffer.cc .for d in docs examples tests @${REINPLACE_CMD} -e '/^SUBDIRS =/s/${d}//' ${WRKSRC}/Makefile.in .endfor diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 6e378a0ebe62..16fc24d6995a 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: gtkmm2 -# Date created: 30 September 2002 -# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> -# +# Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at> # $FreeBSD$ # $MCom: ports/x11-toolkits/gtkmm30/Makefile,v 1.16 2011/05/09 18:18:38 kwm Exp $ -# PORTNAME= gtkmm PORTVERSION= 3.0.1 @@ -21,10 +17,6 @@ LATEST_LINK= gtkmm30 .if !defined(REFERENCE_PORT) -LIB_DEPENDS= glibmm-2.4.1:${PORTSDIR}/devel/glibmm \ - cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \ - atkmm-1.6.2:${PORTSDIR}/accessibility/atkmm \ - pangomm-1.4.1:${PORTSDIR}/x11-toolkits/pangomm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes @@ -32,7 +24,7 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack gtk30 ltverhack +USE_GNOME= gnomehack gtk30 ltverhack atkmm pangomm CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-documentation \ diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile index b62d6218ea03..19d2b8c68a39 100644 --- a/x11-toolkits/libgtk-java/Makefile +++ b/x11-toolkits/libgtk-java/Makefile @@ -36,9 +36,10 @@ MAKE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} post-patch: @${REINPLACE_CMD} -e 's|sed -i|${SED} -i.bak -e|' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|
||' ${WRKSRC}/gtk2-java.pc.in @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/src/jni/org_gnu_gtk_Gtk.c do-install: ${MKDIR} ${PREFIX}/lib diff --git a/x11-toolkits/libgtksourceviewmm/Makefile b/x11-toolkits/libgtksourceviewmm/Makefile index 5dbe37bc0d6d..9a06b35c8f7f 100644 --- a/x11-toolkits/libgtksourceviewmm/Makefile +++ b/x11-toolkits/libgtksourceviewmm/Makefile @@ -25,4 +25,9 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBAS}/lib CONFIGURE_ARGS= --disable-docs +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/gtksourceview/gtksourceviewmm/sourceiter.cc \ + ${WRKSRC}/tests/test-search.cpp + .include <bsd.port.mk> diff --git a/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c b/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c index e777a6c7a823..ade97c5add94 100644 --- a/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c +++ b/x11-toolkits/libzvt/files/patch-gnome-pty-helper.c @@ -1,10 +1,13 @@ ---- libzvt/gnome-pty-helper.c -+++ libzvt/gnome-pty-helper.c -@@ -50,7 +50,6 @@ +--- libzvt/gnome-pty-helper.c.orig 2002-06-05 06:07:33.000000000 +0000 ++++ libzvt/gnome-pty-helper.c 2013-03-06 13:40:00.000000000 +0000 +@@ -50,9 +50,8 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <utmp.h> #include <grp.h> - #include <glib/galloca.h> +-#include <glib/galloca.h> ++#include <glib.h> #include "gnome-pty.h" + #include "gnome-login-support.h" + diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 98a5fcbd92ca..d22134d2b2e8 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -1,23 +1,18 @@ -# New ports collection makefile for: pango -# Date Created: 18 July 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.163 2011/04/05 17:29:19 kwm Exp $ -# +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.167 2012/06/06 21:18:48 kwm Exp $ PORTNAME= pango -PORTVERSION= 1.28.4 -PORTREVISION?= 1 +PORTVERSION= 1.30.1 +PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= GNOME \ - ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ +MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An open-source framework for the layout and rendering of i18n text -USE_BZIP2= yes +USE_XZ= yes .if !defined(REFERENCE_PORT) @@ -34,13 +29,10 @@ MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GNOME= gnomehack glib20 ltverhack referencehack -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ - --enable-static -# Hmm.. tough one. Found this one when I had graphics/hdf installed -# (which installs glist.h) which is picked up before the glib-2.0 -# stuff, with Bad Results[tm] -# -GLIB2_CFLAGS= `pkg-config glib-2.0 --cflags` +USE_PKGCONFIG= build +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + PLIST_SUB= VERSION="1.6.0" FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf @@ -48,26 +40,19 @@ FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir MAN1= pango-view.1 pango-querymodules.1 -.if defined(WITHOUT_X11) -CONFIGURE_ARGS+= --with-x=no -CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \ - ${GLIB2_CFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -PLIST_SUB+= X11="@comment " -.else +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MX11} USE_XORG+= xft xrender -CPPFLAGS+= -I${LOCALBASE}/include/freetype2 \ - ${GLIB2_CFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= X11="" +.else +CONFIGURE_ARGS+= --with-x=no +PLIST_SUB+= X11="@comment " .endif -.include <bsd.port.pre.mk> - -post-patch: - @${REINPLACE_CMD} -e 's|have_introspection=true|have_introspection=false|g' \ - ${WRKSRC}/configure - -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 1adfc864270d..4d62edcdb228 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/pango-1.28.4.tar.bz2) = 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f -SIZE (gnome2/pango-1.28.4.tar.bz2) = 1503441 +SHA256 (gnome2/pango-1.30.1.tar.xz) = 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe +SIZE (gnome2/pango-1.30.1.tar.xz) = 1162828 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index a85d35545893..09ff8cfe5c43 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -105,6 +105,72 @@ share/gir-1.0/Pango-1.0.gir share/gir-1.0/PangoCairo-1.0.gir share/gir-1.0/PangoFT2-1.0.gir %%X11%%share/gir-1.0/PangoXft-1.0.gir +share/gtk-doc/html/pango/PangoEngineLang.html +share/gtk-doc/html/pango/PangoEngineShape.html +share/gtk-doc/html/pango/PangoFcDecoder.html +share/gtk-doc/html/pango/PangoFcFont.html +share/gtk-doc/html/pango/PangoFcFontMap.html +share/gtk-doc/html/pango/PangoMarkupFormat.html +share/gtk-doc/html/pango/annotation-glossary.html +share/gtk-doc/html/pango/api-index-1-10.html +share/gtk-doc/html/pango/api-index-1-12.html +share/gtk-doc/html/pango/api-index-1-14.html +share/gtk-doc/html/pango/api-index-1-16.html +share/gtk-doc/html/pango/api-index-1-18.html +share/gtk-doc/html/pango/api-index-1-2.html +share/gtk-doc/html/pango/api-index-1-20.html +share/gtk-doc/html/pango/api-index-1-22.html +share/gtk-doc/html/pango/api-index-1-24.html +share/gtk-doc/html/pango/api-index-1-26.html +share/gtk-doc/html/pango/api-index-1-28.html +share/gtk-doc/html/pango/api-index-1-30.html +share/gtk-doc/html/pango/api-index-1-4.html +share/gtk-doc/html/pango/api-index-1-6.html +share/gtk-doc/html/pango/api-index-1-8.html +share/gtk-doc/html/pango/api-index-deprecated.html +share/gtk-doc/html/pango/api-index-full.html +share/gtk-doc/html/pango/home.png +share/gtk-doc/html/pango/index.html +share/gtk-doc/html/pango/index.sgml +share/gtk-doc/html/pango/layout.gif +share/gtk-doc/html/pango/left.png +share/gtk-doc/html/pango/lowlevel.html +share/gtk-doc/html/pango/pango-ATSUI-Fonts.html +share/gtk-doc/html/pango/pango-Bidirectional-Text.html +share/gtk-doc/html/pango/pango-Cairo-Rendering.html +share/gtk-doc/html/pango/pango-CoreText-Fonts.html +share/gtk-doc/html/pango/pango-Coverage-Maps.html +share/gtk-doc/html/pango/pango-Engines.html +share/gtk-doc/html/pango/pango-Fonts.html +share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html +share/gtk-doc/html/pango/pango-Glyph-Storage.html +share/gtk-doc/html/pango/pango-Layout-Objects.html +share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html +share/gtk-doc/html/pango/pango-Modules.html +share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html +share/gtk-doc/html/pango/pango-Scripts-and-Languages.html +share/gtk-doc/html/pango/pango-Tab-Stops.html +share/gtk-doc/html/pango/pango-Text-Attributes.html +share/gtk-doc/html/pango/pango-Text-Processing.html +share/gtk-doc/html/pango/pango-Version-Checking.html +share/gtk-doc/html/pango/pango-Vertical-Text.html +share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html +share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html +share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html +share/gtk-doc/html/pango/pango-hierarchy.html +share/gtk-doc/html/pango/pango-pango-renderer.html +share/gtk-doc/html/pango/pango-querymodules.html +share/gtk-doc/html/pango/pango.devhelp2 +share/gtk-doc/html/pango/pango.html +share/gtk-doc/html/pango/rendering.html +share/gtk-doc/html/pango/right.png +share/gtk-doc/html/pango/rotated-text.png +share/gtk-doc/html/pango/style.css +share/gtk-doc/html/pango/tools.html +share/gtk-doc/html/pango/up.png +@dirrm share/gtk-doc/html/pango +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc @dirrm lib/pango/%%VERSION%%/modules @dirrm lib/pango/%%VERSION%% @dirrm lib/pango diff --git a/x11-toolkits/phat/Makefile b/x11-toolkits/phat/Makefile index d09db58a0d2d..aefa4656fa42 100644 --- a/x11-toolkits/phat/Makefile +++ b/x11-toolkits/phat/Makefile @@ -23,6 +23,7 @@ USE_PKGCONFIG= build post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ + -e 's|-Werror||g' \ ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile index bdd7346a9cd1..000c5628d861 100644 --- a/x11-toolkits/py-gnome-desktop/Makefile +++ b/x11-toolkits/py-gnome-desktop/Makefile @@ -1,10 +1,6 @@ -# New ports collection makefile for: py-gnome-desktop -# Date created: 20 January 2006 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/x11-toolkits/py-gnome-desktop/Makefile,v 1.103 2010/09/30 06:27:40 kwm Exp $ -# PORTNAME= gnome-desktop PORTVERSION= 2.32.0 @@ -19,7 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A set of Python bindings used by modules in the GNOME Desktop -BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy +BUILD_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy \ + metacity<2.34.0:${PORTSDIR}/x11-wm/metacity LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index ce237d8b6efb..8deaca866685 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -19,6 +19,7 @@ QT_DIST= yes MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes +USE_PKGCONFIG= build USE_LDCONFIG= ${PREFIX}/lib/qt4 USE_XORG= xrender xrandr xinerama inputproto xfixes \ sm xcursor xext x11 ice xi xt |