Use two different approaches for 4.X and 5.X for the printf(size_t) problem.

Reported by:	bento via kris

6 files changed, 40 insertions, 2 deletions

diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 8928fe4..64121df 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -27,4 +27,12 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lgnuregex"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES+=	${FILESDIR}/current-src_backends_libgbf_am_gbf-am-project.c
+.else
+EXTRA_PATCHES+=	${FILESDIR}/stable-src_backends_libgbf_am_gbf-am-project.c
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c b/devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c
new file mode 100644
index 0000000..10ae4be
--- /dev/null
+++ b/devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c
@@ -0,0 +1,11 @@
+--- src/backends/libgbf_am/gbf-am-project.c.orig	Fri May  2 06:12:51 2003
++++ src/backends/libgbf_am/gbf-am-project.c	Sat Jan 31 13:22:04 2004
+@@ -1750,7 +1750,7 @@
+ 
+ 		switch (status) {
+ 		    case G_IO_STATUS_NORMAL:
+-			    DEBUG (g_message ("wrote %d bytes", bytes_written));
++			    DEBUG (g_message ("wrote %zu bytes", bytes_written));
+ 			    
+ 			    if (data->input.length < data->input.size) {
+ 				    /* don't remove the source */
diff --git a/devel/gnome-build/files/patch-src_backends_libgbf_am_gbf-am-project.c b/devel/gnome-build/files/stable-src_backends_libgbf_am_gbf-am-project.c
index 262756b..262756b 100644
--- a/devel/gnome-build/files/patch-src_backends_libgbf_am_gbf-am-project.c
+++ b/devel/gnome-build/files/stable-src_backends_libgbf_am_gbf-am-project.c
diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile
index 8928fe4..64121df 100644
--- a/devel/gnomebuild/Makefile
+++ b/devel/gnomebuild/Makefile
@@ -27,4 +27,12 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lgnuregex"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+EXTRA_PATCHES+=	${FILESDIR}/current-src_backends_libgbf_am_gbf-am-project.c
+.else
+EXTRA_PATCHES+=	${FILESDIR}/stable-src_backends_libgbf_am_gbf-am-project.c
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/gnomebuild/files/current-src_backends_libgbf_am_gbf-am-project.c b/devel/gnomebuild/files/current-src_backends_libgbf_am_gbf-am-project.c
new file mode 100644
index 0000000..10ae4be
--- /dev/null
+++ b/devel/gnomebuild/files/current-src_backends_libgbf_am_gbf-am-project.c
@@ -0,0 +1,11 @@
+--- src/backends/libgbf_am/gbf-am-project.c.orig	Fri May  2 06:12:51 2003
++++ src/backends/libgbf_am/gbf-am-project.c	Sat Jan 31 13:22:04 2004
+@@ -1750,7 +1750,7 @@
+ 
+ 		switch (status) {
+ 		    case G_IO_STATUS_NORMAL:
+-			    DEBUG (g_message ("wrote %d bytes", bytes_written));
++			    DEBUG (g_message ("wrote %zu bytes", bytes_written));
+ 			    
+ 			    if (data->input.length < data->input.size) {
+ 				    /* don't remove the source */
diff --git a/devel/gnomebuild/files/patch-src_backends_libgbf_am_gbf-am-project.c b/devel/gnomebuild/files/stable-src_backends_libgbf_am_gbf-am-project.c
index 262756b..262756b 100644
--- a/devel/gnomebuild/files/patch-src_backends_libgbf_am_gbf-am-project.c
+++ b/devel/gnomebuild/files/stable-src_backends_libgbf_am_gbf-am-project.c