From 0d5b2a9414381dbccc013c1d471d16a827003156 Mon Sep 17 00:00:00 2001 From: Tong LIU Date: Fri, 3 Aug 2007 03:44:22 +0000 Subject: - Update to 3.2.2 - Assign eclipse@FreeBSD.org as maintainer PR: ports/113435 Submitted by: Rick Petty, tmclaugh Approved by: maintainer timeout (more than 3 months) Approved by: delphij (mentor) --- java/eclipse/Makefile | 12 ++- java/eclipse/distinfo | 6 +- .../files/patch-features-platform-build.xml | 10 +-- .../files/patch-features-platform-source-build.xml | 10 +-- .../patch-features-platform-source-feature.xml | 10 +-- java/eclipse/files/patch-features-rcp-build.xml | 10 +-- .../files/patch-features-rcp-source-build.xml | 10 +-- .../files/post-patch-plugins-swt-gtk-os_custom.h | 97 ---------------------- 8 files changed, 33 insertions(+), 132 deletions(-) delete mode 100644 java/eclipse/files/post-patch-plugins-swt-gtk-os_custom.h (limited to 'java') diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 9e1cddafce9c..a68efa5a25db 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -6,15 +6,14 @@ # PORTNAME= eclipse -PORTVERSION= 3.2.1 -PORTREVISION= 3 +PORTVERSION= 3.2.2 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= R-${PORTVERSION}-200609210945 +MASTER_SITE_SUBDIR= R-${PORTVERSION}-200702121330 DISTNAME= ${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION} DIST_SUBDIR= eclipse -MAINTAINER= dsledge@appriss.com +MAINTAINER= freebsd-eclipse@freebsd.org COMMENT= An open extensible IDE for anything and nothing in particular BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ @@ -55,8 +54,8 @@ USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils .if defined(WITHOUT_CAIRO) MAKE_CAIRO= .else -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -MAKE_CAIRO= make_cairo +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo +MAKE_CAIRO= make_cairo .endif .include @@ -97,7 +96,6 @@ SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla post-patch: @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/os_custom.h" ${FILESDIR}/post-patch-plugins-swt-gtk-os_custom.h @${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/gtk/org/eclipse/swt/browser/Browser.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-Browser.java @${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/org/eclipse/swt/internal/mozilla/XPCOM.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.java @${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.properties diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo index c3c451174f3d..a57e1fd30919 100644 --- a/java/eclipse/distinfo +++ b/java/eclipse/distinfo @@ -1,3 +1,3 @@ -MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 0fe89e9c7cf07a56c4fe8e2d7f5a394b -SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 2d6a0628333d068b6ab678c42f925d71df1c003035543830a30e3ee80fb855c7 -SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 82433420 +MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 5d1b9f6a146ffc59191e513083a6ec86 +SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 84759dc6085e68b31228ce2b226778494481be38681dc8ca5b0e2f226bf963a7 +SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 82487328 diff --git a/java/eclipse/files/patch-features-platform-build.xml b/java/eclipse/files/patch-features-platform-build.xml index 592bb451b083..ed322d0e4976 100644 --- a/java/eclipse/files/patch-features-platform-build.xml +++ b/java/eclipse/files/patch-features-platform-build.xml @@ -1,5 +1,5 @@ ---- features/org.eclipse.platform/build.xml.orig Thu Sep 21 10:55:42 2006 -+++ features/org.eclipse.platform/build.xml Tue Oct 3 14:33:47 2006 +--- features/org.eclipse.platform/build.xml.orig Tue Apr 3 16:32:56 2007 ++++ features/org.eclipse.platform/build.xml Tue Apr 3 17:10:16 2007 @@ -27,6 +27,11 @@ @@ -30,11 +30,11 @@ @@ -391,7 +406,7 @@ - + -- -+ +- ++ diff --git a/java/eclipse/files/patch-features-platform-source-build.xml b/java/eclipse/files/patch-features-platform-source-build.xml index 4191aab66551..c3db0f4aa642 100644 --- a/java/eclipse/files/patch-features-platform-source-build.xml +++ b/java/eclipse/files/patch-features-platform-source-build.xml @@ -1,5 +1,5 @@ ---- features/org.eclipse.platform.source/build.xml.orig Thu Sep 21 10:55:43 2006 -+++ features/org.eclipse.platform.source/build.xml Tue Oct 3 14:44:24 2006 +--- features/org.eclipse.platform.source/build.xml.orig Mon Feb 12 12:45:20 2007 ++++ features/org.eclipse.platform.source/build.xml Tue Apr 3 17:15:03 2007 @@ -27,6 +27,11 @@ @@ -25,11 +25,11 @@ @@ -131,7 +141,7 @@ - + -- -+ +- ++ diff --git a/java/eclipse/files/patch-features-platform-source-feature.xml b/java/eclipse/files/patch-features-platform-source-feature.xml index 953e33efd7d8..1541b1e8234d 100644 --- a/java/eclipse/files/patch-features-platform-source-feature.xml +++ b/java/eclipse/files/patch-features-platform-source-feature.xml @@ -1,9 +1,9 @@ --- features/org.eclipse.platform.source/feature.xml.orig Sat Jul 29 21:49:46 2006 +++ features/org.eclipse.platform.source/feature.xml Sat Jul 29 21:52:58 2006 @@ -28,4 +28,6 @@ - - - -+ -+ + + + ++ ++ diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml index f76a76f03d53..8f6673f62e3c 100644 --- a/java/eclipse/files/patch-features-rcp-build.xml +++ b/java/eclipse/files/patch-features-rcp-build.xml @@ -1,5 +1,5 @@ ---- features/org.eclipse.rcp/build.xml.orig Thu Sep 21 10:55:42 2006 -+++ features/org.eclipse.rcp/build.xml Tue Oct 3 14:51:03 2006 +--- features/org.eclipse.rcp/build.xml.orig Mon Feb 12 12:45:21 2007 ++++ features/org.eclipse.rcp/build.xml Tue Apr 3 17:17:52 2007 @@ -77,6 +77,11 @@ @@ -25,11 +25,11 @@ @@ -225,7 +235,7 @@ - + -- -+ +- ++ diff --git a/java/eclipse/files/patch-features-rcp-source-build.xml b/java/eclipse/files/patch-features-rcp-source-build.xml index a063f9c62697..c91d5effdeb2 100644 --- a/java/eclipse/files/patch-features-rcp-source-build.xml +++ b/java/eclipse/files/patch-features-rcp-source-build.xml @@ -1,5 +1,5 @@ ---- features/org.eclipse.rcp.source/build.xml.orig Thu Sep 21 10:55:42 2006 -+++ features/org.eclipse.rcp.source/build.xml Tue Oct 3 14:56:42 2006 +--- features/org.eclipse.rcp.source/build.xml.orig Mon Feb 12 12:45:21 2007 ++++ features/org.eclipse.rcp.source/build.xml Tue Apr 3 17:20:15 2007 @@ -37,6 +37,11 @@ @@ -25,11 +25,11 @@ @@ -140,7 +150,7 @@ - + -- -+ +- ++ diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-os_custom.h b/java/eclipse/files/post-patch-plugins-swt-gtk-os_custom.h deleted file mode 100644 index 10d6dbb14bfa..000000000000 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-os_custom.h +++ /dev/null @@ -1,97 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h.orig Thu Sep 21 10:57:34 2006 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h Tue Oct 3 15:02:26 2006 -@@ -36,50 +36,50 @@ - #define XRenderFreePicture_LIB "libXrender.so" - #define XRenderSetPictureClipRectangles_LIB "libXrender.so" - #define XRenderSetPictureTransform_LIB "libXrender.so" --#define gtk_entry_text_index_to_layout_index_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_get_expanded_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_get_label_widget_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_new_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_set_expanded_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_set_label_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_set_label_widget_LIB "libgtk-x11-2.0.so.0" --#define gtk_tree_selection_count_selected_rows_LIB "libgtk-x11-2.0.so.0" --#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0" --#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0" --#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0" --#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0" --#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0" --#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0" --#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so.0" --#define gdk_x11_screen_lookup_visual_LIB "libgdk-x11-2.0.so.0" --#define atk_object_add_relationship_LIB "libatk-1.0.so.0" --#define pango_layout_set_auto_dir_LIB "libpango-1.0.so.0" --#define pango_cairo_create_layout_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_layout_path_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_show_layout_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_font_map_create_context_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_font_map_new_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_font_map_get_default_LIB "libpangocairo-1.0.so.0" --#define gdk_cairo_set_source_color_LIB "libgdk-x11-2.0.so.0" --#define gdk_cairo_region_LIB "libgdk-x11-2.0.so.0" -+#define gtk_entry_text_index_to_layout_index_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_get_expanded_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_get_label_widget_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_new_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_set_expanded_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_set_label_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_set_label_widget_LIB "libgtk-x11-2.0.so" -+#define gtk_tree_selection_count_selected_rows_LIB "libgtk-x11-2.0.so" -+#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so" -+#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so" -+#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so" -+#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so" -+#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so" -+#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so" -+#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so" -+#define gdk_x11_screen_lookup_visual_LIB "libgdk-x11-2.0.so" -+#define atk_object_add_relationship_LIB "libatk-1.0.so" -+#define pango_layout_set_auto_dir_LIB "libpango-1.0.so" -+#define pango_cairo_create_layout_LIB "libpangocairo-1.0.so" -+#define pango_cairo_layout_path_LIB "libpangocairo-1.0.so" -+#define pango_cairo_show_layout_LIB "libpangocairo-1.0.so" -+#define pango_cairo_font_map_create_context_LIB "libpangocairo-1.0.so" -+#define pango_cairo_font_map_new_LIB "libpangocairo-1.0.so" -+#define pango_cairo_font_map_get_default_LIB "libpangocairo-1.0.so" -+#define gdk_cairo_set_source_color_LIB "libgdk-x11-2.0.so" -+#define gdk_cairo_region_LIB "libgdk-x11-2.0.so" - - /* Field accessors */ - #define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1 -- cgit v1.2.3