summaryrefslogtreecommitdiffstats
path: root/devel/apr/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'devel/apr/Makefile')
-rw-r--r--devel/apr/Makefile7
1 files changed, 0 insertions, 7 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 31febb4..d6dbcdc 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -45,13 +45,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${PORTVERSION} \
.include <bsd.port.pre.mk>
-<<<<<<< Makefile
-#.if ${OSVERSION} < 500000
-#BROKEN= "Configure fails on 4.x"
-#.endif
-
-=======
->>>>>>> 1.37
.if defined(APR_UTIL_WITHOUT_THREADS)
CONFIGURE_ARGS+= --disable-threads
APR_UTIL_CONF_ARGS+= --disable-threads
OpenPOWER on IntegriCloud