- Make interprogram dependencies respect the 'g' prefix.

- Fix configure on sparc64.

textproc/gdiff/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/07/23 21:58:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/23 23:30:14 naddy Exp $
 
 COMMENT=	"GNU versions of the diff utilities"
 
@@ -8,7 +8,7 @@ PKGNAME=	gdiff-${VERSION}
 CATEGORIES=	textproc
 HOMEPAGE=	http://www.gnu.org/software/diffutils/
 
-# GNU
+# GPL
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
@@ -16,6 +16,11 @@ PERMIT_DISTFILES_CDROM=	Yes
 
 MASTER_SITES=	${MASTER_SITE_GNU:=diffutils/}
 
+# work around optimizer bug in gcc 2.95
+.if ${MACHINE_ARCH} == "sparc64"
+PATCH_LIST=	gcc-patch-* patch-*
+.endif
+
 SEPARATE_BUILD=	simple
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--program-prefix=g

textproc/gdiff/patches/gcc-patch-configure

@@ -0,0 +1,38 @@
+$OpenBSD: gcc-patch-configure,v 1.1 2003/07/23 23:30:14 naddy Exp $
+--- configure.orig	Thu Jul 24 00:41:42 2003
++++ configure	Thu Jul 24 00:44:30 2003
+@@ -8943,6 +8943,8 @@
+ _ACEOF
+ 
+ 
++_SAVE_CFLAGS=$CFLAGS
++CFLAGS=-O0
+  echo "$as_me:$LINENO: checking for working malloc" >&5
+ echo $ECHO_N "checking for working malloc... $ECHO_C" >&6
+ if test "${jm_cv_func_working_malloc+set}" = set; then
+@@ -8986,6 +8988,7 @@
+ fi
+ 
+ fi
++CFLAGS=$_SAVE_CFLAGS
+ echo "$as_me:$LINENO: result: $jm_cv_func_working_malloc" >&5
+ echo "${ECHO_T}$jm_cv_func_working_malloc" >&6
+   if test $jm_cv_func_working_malloc = no; then
+@@ -9003,7 +9006,8 @@
+ #define HAVE_DONE_WORKING_REALLOC_CHECK 1
+ _ACEOF
+ 
+-
++_SAVE_CFLAGS=$CFLAGS
++CFLAGS=-O0
+  echo "$as_me:$LINENO: checking for working realloc" >&5
+ echo $ECHO_N "checking for working realloc... $ECHO_C" >&6
+ if test "${jm_cv_func_working_realloc+set}" = set; then
+@@ -9047,6 +9051,7 @@
+ fi
+ 
+ fi
++CFLAGS=$_SAVE_CFLAGS
+ echo "$as_me:$LINENO: result: $jm_cv_func_working_realloc" >&5
+ echo "${ECHO_T}$jm_cv_func_working_realloc" >&6
+   if test $jm_cv_func_working_realloc = no; then

textproc/gdiff/patches/patch-configure

@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.1 2003/07/23 23:30:14 naddy Exp $
+--- configure.orig	Thu Jul 24 00:12:59 2003
++++ configure	Thu Jul 24 00:13:07 2003
+@@ -3722,7 +3722,7 @@
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define DEFAULT_DIFF_PROGRAM "diff"
++#define DEFAULT_DIFF_PROGRAM "gdiff"
+ _ACEOF
+ 
+