From b78527376a1d11bef820d5e9fe86d3c524ea6acf Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Sun, 14 Feb 2016 18:42:41 +0000 Subject: [PATCH] - Add LICENSE - Switch to options helpers - Regenerate patches with `make makepatch` --- x11-toolkits/gtkextra2/Makefile | 5 ++++- .../{patch-Makefile.in => patch-gtkextra_Makefile.in} | 6 +++--- ...tch-gtkcolorcombo.c => patch-gtkextra_gtkcolorcombo.c} | 8 ++++---- .../gtkextra2/files/patch-gtkextra_gtkitementry.c | 8 ++++---- 4 files changed, 15 insertions(+), 12 deletions(-) rename x11-toolkits/gtkextra2/files/{patch-Makefile.in => patch-gtkextra_Makefile.in} (85%) rename x11-toolkits/gtkextra2/files/{patch-gtkcolorcombo.c => patch-gtkextra_gtkcolorcombo.c} (74%) diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile index 97863ead0b3f..e5637fb42512 100644 --- a/x11-toolkits/gtkextra2/Makefile +++ b/x11-toolkits/gtkextra2/Makefile @@ -11,6 +11,9 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Useful widget set complementary to GTK+ 2.0 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + USES= gmake libtool pathfix pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes @@ -29,7 +32,7 @@ post-patch: @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/gtkextra/gtkcharsel.c -post-install: +post-install-DOCS-on: .for d in reference tutorial @${MKDIR} ${STAGEDIR}${DOCSDIR}/${d} @(cd ${WRKSRC}/docs/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) diff --git a/x11-toolkits/gtkextra2/files/patch-Makefile.in b/x11-toolkits/gtkextra2/files/patch-gtkextra_Makefile.in similarity index 85% rename from x11-toolkits/gtkextra2/files/patch-Makefile.in rename to x11-toolkits/gtkextra2/files/patch-gtkextra_Makefile.in index 04ee2fb51548..f08e4f7746a1 100644 --- a/x11-toolkits/gtkextra2/files/patch-Makefile.in +++ b/x11-toolkits/gtkextra2/files/patch-gtkextra_Makefile.in @@ -1,6 +1,6 @@ ---- gtkextra/Makefile.in.orig 2011-10-27 00:29:46.287956897 +0200 -+++ gtkextra/Makefile.in 2011-10-27 00:30:31.199394384 +0200 -@@ -1028,11 +1028,11 @@ +--- gtkextra/Makefile.in.orig 2016-02-14 18:23:03 UTC ++++ gtkextra/Makefile.in +@@ -1028,11 +1028,11 @@ uninstall-am: uninstall-gtkextraincludeH $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers} $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list diff --git a/x11-toolkits/gtkextra2/files/patch-gtkcolorcombo.c b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkcolorcombo.c similarity index 74% rename from x11-toolkits/gtkextra2/files/patch-gtkcolorcombo.c rename to x11-toolkits/gtkextra2/files/patch-gtkextra_gtkcolorcombo.c index 459335b5475e..930a338ae03c 100644 --- a/x11-toolkits/gtkextra2/files/patch-gtkcolorcombo.c +++ b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkcolorcombo.c @@ -1,6 +1,6 @@ ---- gtkextra/gtkcolorcombo.c.orig 2011-10-27 00:08:40.655552360 +0200 -+++ gtkextra/gtkcolorcombo.c 2011-10-27 00:09:03.934648236 +0200 -@@ -146,7 +146,7 @@ +--- gtkextra/gtkcolorcombo.c.orig 2004-09-16 17:48:05 UTC ++++ gtkextra/gtkcolorcombo.c +@@ -146,7 +146,7 @@ gtk_color_combo_class_init (GtkColorComb GTK_CLASS_TYPE(object_class), GTK_SIGNAL_OFFSET(GtkColorComboClass, changed), @@ -8,4 +8,4 @@ + gtkextra_VOID__BOXED_BOXED, GTK_TYPE_NONE, 2, GTK_TYPE_INT, GDK_TYPE_COLOR); - + diff --git a/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c index 5c06854cf61f..0810c5207b3a 100644 --- a/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c +++ b/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c @@ -1,6 +1,6 @@ ---- gtkextra/gtkitementry.c.orig 2010-03-13 14:49:00.000000000 +0900 -+++ gtkextra/gtkitementry.c 2010-11-30 21:38:09.000000000 +0900 -@@ -131,7 +131,6 @@ +--- gtkextra/gtkitementry.c.orig 2010-03-13 05:49:00 UTC ++++ gtkextra/gtkitementry.c +@@ -131,7 +131,6 @@ static void gtk_entry_draw_curso static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry, gboolean include_preedit); static void gtk_entry_queue_draw (GtkEntry *entry); @@ -8,7 +8,7 @@ static void gtk_entry_recompute (GtkEntry *entry); static void gtk_entry_get_cursor_locations (GtkEntry *entry, CursorType type, -@@ -1755,16 +1754,6 @@ +@@ -1755,16 +1754,6 @@ gtk_entry_queue_draw (GtkEntry *entry) } static void