From c3d8037aeba75366ed06e02fbc981e15b46e7d0a Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 12 Apr 2005 03:26:56 +0000
Subject: At Kris's request, back out the MACHINE_ARCH spelling correction
until after 5.4-RELEASE.
---
devel/gindent/Makefile | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'devel/gindent')
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 494df9e826d3..a61e1e08a17e 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -7,7 +7,17 @@
#
PORTNAME= gindent
+<<<<<<< Makefile
+<<<<<<< Makefile
PORTVERSION= 2.2.9
+PORTREVISION= 0
+=======
+PORTVERSION= 2.2.8a
+PORTREVISION= 3
+>>>>>>> 1.29
+=======
+PORTVERSION= 2.2.9
+>>>>>>> 1.30
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= indent
--
cgit v1.2.3