Index: Makefile
===================================================================
--- Makefile	(revision 518557)
+++ Makefile	(working copy)
@@ -22,12 +22,8 @@
 
 INFO=		cln
 
-.include <bsd.port.pre.mk>
+CPPFLAGS_aarch64=	-DNO_ASM
+CPPFLAGS_armv6=	-DNO_ASM
+CPPFLAGS_armv7=	-DNO_ASM
 
-.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
-CPPFLAGS+=	-DNO_ASM
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_base_low_cl__low__div.cc \
-		${PATCHDIR}/extra-patch-src_base_low_cl__low__mul.cc
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/extra-patch-src_base_low_cl__low__div.cc
===================================================================
--- files/extra-patch-src_base_low_cl__low__div.cc	(revision 518557)
+++ files/extra-patch-src_base_low_cl__low__div.cc	(nonexistent)
@@ -1,11 +0,0 @@
---- src/base/low/cl_low_div.cc.orig	2011-04-08 21:07:28 UTC
-+++ src/base/low/cl_low_div.cc
-@@ -207,7 +207,7 @@ uint32 divu_6432_3232_(uint32 xhi, uint32 xlo, uint32 
- #endif
- 
- #ifdef NEED_VAR_divu_64_rest
--uint64 divu_64_rest;
-+extern "C" uint64 divu_64_rest = 0;
- #endif
- 
- #ifdef NEED_FUNCTION_divu_6464_6464_

Property changes on: files/extra-patch-src_base_low_cl__low__div.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/extra-patch-src_base_low_cl__low__mul.cc
===================================================================
--- files/extra-patch-src_base_low_cl__low__mul.cc	(revision 518557)
+++ files/extra-patch-src_base_low_cl__low__mul.cc	(nonexistent)
@@ -1,16 +0,0 @@
---- src/base/low/cl_low_mul.cc.orig	2011-04-08 21:06:30 UTC
-+++ src/base/low/cl_low_mul.cc
-@@ -50,11 +50,11 @@ uint64 mulu32_w (uint32 arg1, uint32 arg2)
- 
- 
- #ifdef NEED_VAR_mulu64_high
--uint64 mulu64_high;
-+extern "C" uint64 mulu64_high;
- #endif
- 
- #ifdef NEED_FUNCTION_mulu64_
--uint64 mulu64_high;
-+extern "C" uint64 mulu64_high = 0;
- namespace cln {
- extern "C" uint64 mulu64_ (uint64 x, uint64 y);
- uint64 mulu64_ (uint64 x, uint64 y)

Property changes on: files/extra-patch-src_base_low_cl__low__mul.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/patch-src_base_low_cl__low__div.cc
===================================================================
Index: files/patch-src_base_low_cl__low__mul.cc
===================================================================