Index: distinfo
===================================================================
--- distinfo	(revision 158)
+++ distinfo	(working copy)
@@ -12,3 +12,4 @@
 SHA1 (patch-ag) = a6c586cdfbad923a3497fa4ab0c73840dc035737
 SHA1 (patch-ah) = d60b5304109f64f70146a222f6eb1deeb58dd6ac
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
+SHA1 (patch-aj) = 7e2ea36fbcfc4d72c8581583b083f804db7949eb
Index: options.mk
===================================================================
--- options.mk	(revision 158)
+++ options.mk	(working copy)
@@ -20,3 +20,5 @@
 .else
 CONFIGURE_ARGS+=	--without-tcltk
 .endif
+
+MAKE_ENV+=		NO_R_TO_GCC_LINKER=1
Index: patches/patch-aj
===================================================================
--- patches/patch-aj	(revision 0)
+++ patches/patch-aj	(revision 0)
@@ -0,0 +1,14 @@
+--- progress.c.orig	2008-12-20 05:54:30.000000000 +0000
++++ progress.c	2009-06-01 19:41:44.000000000 +0000
+@@ -52,7 +52,11 @@
+ 	memset(&sa, 0, sizeof(sa));
+ 	sa.sa_handler = progress_interval;
+ 	sigemptyset(&sa.sa_mask);
++#ifdef SA_RESTART
+ 	sa.sa_flags = SA_RESTART;
++#else /* QNX */
++	sa.sa_flags = 0;
++#endif
+ 	sigaction(SIGALRM, &sa, NULL);
+ 
+ 	v.it_interval.tv_sec = 1;
Index: patches/patch-ak
===================================================================
--- patches/patch-ak	(revision 0)
+++ patches/patch-ak	(revision 0)
@@ -0,0 +1,14 @@
+--- builtin-log.c.orig	2008-12-20 05:54:30.000000000 +0000
++++ builtin-log.c	2009-06-01 19:53:30.000000000 +0000
+@@ -182,7 +182,11 @@
+ 	memset(&sa, 0, sizeof(sa));
+ 	sa.sa_handler = early_output;
+ 	sigemptyset(&sa.sa_mask);
++#ifdef SA_RESTART
+ 	sa.sa_flags = SA_RESTART;
++#else /* QNX */
++	sa.sa_flags = 0;
++#endif
+ 	sigaction(SIGALRM, &sa, NULL);
+ 
+ 	/*