- Update to 2.2.4

- Add convertors/fpc-iconvenc port to bsd.fpc.mk
- pkg-plist fixes

4 files changed, 5 insertions, 55 deletions

diff --git a/x11-toolkits/fpc-gtk1/Makefile b/x11-toolkits/fpc-gtk1/Makefile
index 109393c78586..1d6b6373e7c4 100644
--- a/x11-toolkits/fpc-gtk1/Makefile
+++ b/x11-toolkits/fpc-gtk1/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk1
 
diff --git a/x11-toolkits/fpc-gtk2/Makefile b/x11-toolkits/fpc-gtk2/Makefile
index 86375a3b1124..fa3930823acd 100644
--- a/x11-toolkits/fpc-gtk2/Makefile
+++ b/x11-toolkits/fpc-gtk2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk2
 
diff --git a/x11-toolkits/fpc-gtk2/files/patch-packages-gtk2-src-gtk+-gtk_gtkfilesystem.inc b/x11-toolkits/fpc-gtk2/files/patch-packages-gtk2-src-gtk+-gtk_gtkfilesystem.inc
deleted file mode 100644
index ce27e1dc8582..000000000000
--- a/x11-toolkits/fpc-gtk2/files/patch-packages-gtk2-src-gtk+-gtk_gtkfilesystem.inc
+++ /dev/null
@@ -1,53 +0,0 @@
---- packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc	2009-01-20 15:43:50.000000000 -0500
-+++ packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc	2009-01-20 15:48:04.000000000 -0500
-@@ -115,17 +115,14 @@
- 
- {$IFDEF read_interface_rest}
- 
-+{$ifdef HasGTK_FileSystem}
- 
- { GError enumeration for GtkFileSystem  }
- 
- function GTK_FILE_SYSTEM_ERROR : TGQuark;
- 
--
--
- function gtk_file_system_error_quark:TGQuark;cdecl;external gtklib name 'gtk_file_system_error_quark';
- 
--
--
- { Boxed-type for gtk_file_folder_get_info() results  }
- 
- function GTK_TYPE_FILE_INFO : GType;
-@@ -244,11 +241,16 @@
- { GtkFileSystem modules support  }
- 
- function _gtk_file_system_create(file_system_name:Pchar):PGtkFileSystem;cdecl;external gtklib name '_gtk_file_system_create';
-+
-+{$endif HasGTK_FileSystem}
-+
- {$endif}  {read_interface_rest}
- 
- 
- {$ifdef read_implementation}
- 
-+{$ifdef HasGTK_FileSystem}
-+
- function GTK_FILE_SYSTEM_ERROR : TGQuark;
-   begin
-      GTK_FILE_SYSTEM_ERROR:=gtk_file_system_error_quark;
-@@ -301,12 +303,13 @@
- end;
- 
- 
--
- function GTK_FILE_FOLDER_GET_IFACE(inst : pointer) : PGtkFileSystemIface;
- begin
-    GTK_FILE_FOLDER_GET_IFACE:=G_TYPE_INSTANCE_GET_INTERFACE(inst,GTK_TYPE_FILE_FOLDER);
- end;
- 
-+{$endif HasGTK_FileSystem}
-+
- function gtk_file_path_new_dup(str : Pgchar) : PGtkFilePath;
- begin
-    gtk_file_path_new_dup:=PGtkFilePath(g_strdup(str));
diff --git a/x11-toolkits/fpc-gtk2/pkg-plist b/x11-toolkits/fpc-gtk2/pkg-plist
index 566d9e82f006..b4ec912f912d 100644
--- a/x11-toolkits/fpc-gtk2/pkg-plist
+++ b/x11-toolkits/fpc-gtk2/pkg-plist
@@ -7,6 +7,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2x.ppu
@@ -19,6 +20,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/pango.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2pixbuf.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdk2.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtk2ext.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libglade2.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gtkglext.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/gdkglext.o
@@ -30,6 +32,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2pixbuf.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdk2x.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtk2ext.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libplibglade2.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgtkglext.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/libpgdkglext.a