aboutsummaryrefslogtreecommitdiff
path: root/devel/gindent/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gindent/Makefile')
-rw-r--r--devel/gindent/Makefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index 4cf6e8c1f5ac..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
@@ -18,7 +28,7 @@ COMMENT= GNU indent
USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DBERKELEY_DEFAULTS=1" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --program-prefix=g