- Added post-extract on Makefiles.units. It remove the svn directories from

  some fpc ports.
- Added PORTREVISION for each port
- Fixed pkg-plist on fpc-gtk2 and fpc-gtk ports
- Fixed the gtk, glib and gdk libraries linking for fpc-gtk
- Removed obsolete patches from fpc-gtk. Now it's using ${REINPLACE_CMD}
- Removed post-extract from fpc-fcl. I just added it to makefiles.units file

Approved by:	garga (mentor)

4 files changed, 6 insertions, 36 deletions

diff --git a/x11-toolkits/fpc-gtk/Makefile b/x11-toolkits/fpc-gtk/Makefile
index f159156adeaf..8df9c8fa9804 100644
--- a/x11-toolkits/fpc-gtk/Makefile
+++ b/x11-toolkits/fpc-gtk/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits lang
 PKGNAMESUFFIX=	-gtk
 
@@ -26,4 +27,9 @@ EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 OPT=-CX -Fu${WRKDIR}/${WRKUNITDIR}/*
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|gtk12|gtk-12|g' ${WRKDIR}/${WRKUNITDIR}/gtk/gtk.pp
+	@${REINPLACE_CMD} -e 's|glib12|glib-12|g' ${WRKDIR}/${WRKUNITDIR}/glib/glib.pp
+	@${REINPLACE_CMD} -e 's|gdk12|gdk-12|g' ${WRKDIR}/${WRKUNITDIR}/gdk/gdk.pp
+
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-glib_glib.pp b/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-glib_glib.pp
deleted file mode 100644
index dce7672da336..000000000000
--- a/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-glib_glib.pp
+++ /dev/null
@@ -1,13 +0,0 @@
---- packages/extra/gtk/glib/glib.pp	Sat Jul 15 12:26:06 2006
-+++ packages/extra/gtk/glib/glib.pp	Sat Jul 15 12:27:13 2006
-@@ -45,8 +45,8 @@
-   {$else}
-     const
-      {$ifdef FreeBSD}
--      glibdll='glib12';
--      {$linklib glib12}
-+      glibdll='glib-12';
-+      {$linklib glib-12}
-      {$else}
-      {$ifdef darwin}
-       glibdll='glib-1.2.0';
diff --git a/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp b/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp
deleted file mode 100644
index 21cdfb10310a..000000000000
--- a/x11-toolkits/fpc-gtk/files/patch-fpc-packages-extra-gtk-gtk_gtk.pp
+++ /dev/null
@@ -1,13 +0,0 @@
---- packages/extra/gtk/gtk/gtk.pp	Sat Jul 15 12:40:22 2006
-+++ packages/extra/gtk/gtk/gtk.pp	Sat Jul 15 12:40:36 2006
-@@ -49,8 +49,8 @@
-   {$else}
-     const
-     {$ifdef FreeBSD}
--      gtkdll='gtk12';
--      {$linklib gtk12}
-+      gtkdll='gtk-12';
-+      {$linklib gtk-12}
-     {$else}
-     {$ifdef darwin}
-       {$define gtkdarwin}
diff --git a/x11-toolkits/fpc-gtk/pkg-plist b/x11-toolkits/fpc-gtk/pkg-plist
index f990a9cc7ecf..0dd2e70bdca3 100644
--- a/x11-toolkits/fpc-gtk/pkg-plist
+++ b/x11-toolkits/fpc-gtk/pkg-plist
@@ -52,16 +52,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk/libpgtkglarea.a
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/wcprops
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/wcprops
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/text-base
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/props
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp/prop-base
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/tmp
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/text-base
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/props
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn/prop-base
-%%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial/.svn
 %%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk/tutorial
 %%PORTDOCS%%@dirrm share/examples/fpc-2.0.2/gtk
 %%PORTDOCS%%@dirrmtry share/examples/fpc-2.0.2