25 files changed, 1 insertions, 2 deletions
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index cf5996557414..3bb4dda8cb51 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -32,9 +32,8 @@ MAKE_ARGS+=	PREFIX="${STAGEDIR}${LOCALBASE}" \
 		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${APEL_VERSION_SPECIFIC_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
-OPTINOS_DEFAULT=	DOCS
+OPTIONS_DEFAULT=DOCS
 
-.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if ${EMACS_VER:C/\..*//} >= 23
diff --git a/editors/apel/files/patch-ac b/editors/apel/files/patch-APEL-MK
index a602fff48d9f..a602fff48d9f 100644
--- a/editors/apel/files/patch-ac
+++ b/editors/apel/files/patch-APEL-MK
diff --git a/editors/bpatch/files/patch-aa b/editors/bpatch/files/patch-Makefile
index 9be47a63af6f..9be47a63af6f 100644
--- a/editors/bpatch/files/patch-aa
+++ b/editors/bpatch/files/patch-Makefile
diff --git a/editors/bpatch/files/patch-ab b/editors/bpatch/files/patch-bpatch.c
index 5b2ad8225f32..5b2ad8225f32 100644
--- a/editors/bpatch/files/patch-ab
+++ b/editors/bpatch/files/patch-bpatch.c
diff --git a/editors/bvi/files/patch-ab b/editors/bvi/files/patch-io.c
index 2503c09c8149..2503c09c8149 100644
--- a/editors/bvi/files/patch-ab
+++ b/editors/bvi/files/patch-io.c
diff --git a/editors/flim/files/patch-aa b/editors/flim/files/patch-FLIM-CFG
index 450d2b6f8af6..450d2b6f8af6 100644
--- a/editors/flim/files/patch-aa
+++ b/editors/flim/files/patch-FLIM-CFG
diff --git a/editors/flim/files/patch-ac b/editors/flim/files/patch-mime-en.texi
index 5c237662fd29..5c237662fd29 100644
--- a/editors/flim/files/patch-ac
+++ b/editors/flim/files/patch-mime-en.texi
diff --git a/editors/flim/files/patch-ad b/editors/flim/files/patch-mime-ja.texi
index 25bba1ca109f..25bba1ca109f 100644
--- a/editors/flim/files/patch-ad
+++ b/editors/flim/files/patch-mime-ja.texi
diff --git a/editors/gnotepad+/files/patch-aa b/editors/gnotepad+/files/patch-Makefile.in
index 8a6d751bb623..8a6d751bb623 100644
--- a/editors/gnotepad+/files/patch-aa
+++ b/editors/gnotepad+/files/patch-Makefile.in
diff --git a/editors/nedit/files/patch-aa b/editors/nedit/files/patch-Makefile
index f2e9fc0158cb..f2e9fc0158cb 100644
--- a/editors/nedit/files/patch-aa
+++ b/editors/nedit/files/patch-Makefile
diff --git a/editors/nedit/files/patch-ad b/editors/nedit/files/patch-doc_nc.man
index 12cdc67f5583..12cdc67f5583 100644
--- a/editors/nedit/files/patch-ad
+++ b/editors/nedit/files/patch-doc_nc.man
diff --git a/editors/nedit/files/patch-ac b/editors/nedit/files/patch-makefiles_Makefile.freebsd
index ee6893bd2899..ee6893bd2899 100644
--- a/editors/nedit/files/patch-ac
+++ b/editors/nedit/files/patch-makefiles_Makefile.freebsd
diff --git a/editors/nedit/files/patch-ab b/editors/nedit/files/patch-source_Makefile.common
index f10542e16308..f10542e16308 100644
--- a/editors/nedit/files/patch-ab
+++ b/editors/nedit/files/patch-source_Makefile.common
diff --git a/editors/nvi-m17n/files/patch-ac b/editors/nvi-m17n/files/patch-include_sys_queue.h
index 283366a97955..283366a97955 100644
--- a/editors/nvi-m17n/files/patch-ac
+++ b/editors/nvi-m17n/files/patch-include_sys_queue.h
diff --git a/editors/semi/files/patch-ac b/editors/semi/files/patch-SEMI-CFG
index 2c7aa48962d6..2c7aa48962d6 100644
--- a/editors/semi/files/patch-ac
+++ b/editors/semi/files/patch-SEMI-CFG
diff --git a/editors/semi/files/patch-aa b/editors/semi/files/patch-mime-ui-en.texi
index 2634e47e7c17..2634e47e7c17 100644
--- a/editors/semi/files/patch-aa
+++ b/editors/semi/files/patch-mime-ui-en.texi
diff --git a/editors/semi/files/patch-ab b/editors/semi/files/patch-mime-ui-ja.texi
index 4e926a4d6024..4e926a4d6024 100644
--- a/editors/semi/files/patch-ab
+++ b/editors/semi/files/patch-mime-ui-ja.texi
diff --git a/editors/uemacs/files/patch-aa b/editors/uemacs/files/patch-Makefile
index c99bac366539..c99bac366539 100644
--- a/editors/uemacs/files/patch-aa
+++ b/editors/uemacs/files/patch-Makefile
diff --git a/editors/uemacs/files/patch-ab b/editors/uemacs/files/patch-freebsd_estruct.h
index ec8b19672881..ec8b19672881 100644
--- a/editors/uemacs/files/patch-ab
+++ b/editors/uemacs/files/patch-freebsd_estruct.h
diff --git a/editors/uemacs/files/patch-af b/editors/uemacs/files/patch-freebsd_makefile
index 714cfa903fd4..714cfa903fd4 100644
--- a/editors/uemacs/files/patch-af
+++ b/editors/uemacs/files/patch-freebsd_makefile
diff --git a/editors/uemacs/files/patch-ae b/editors/uemacs/files/patch-h_epath.h
index 0d567efcbbcc..0d567efcbbcc 100644
--- a/editors/uemacs/files/patch-ae
+++ b/editors/uemacs/files/patch-h_epath.h
diff --git a/editors/uemacs/files/patch-ac b/editors/uemacs/files/patch-src_bind.c
index e511ee39a9f2..e511ee39a9f2 100644
--- a/editors/uemacs/files/patch-ac
+++ b/editors/uemacs/files/patch-src_bind.c
diff --git a/editors/uemacs/files/patch-ad b/editors/uemacs/files/patch-src_lock.c
index ac37d4230303..ac37d4230303 100644
--- a/editors/uemacs/files/patch-ad
+++ b/editors/uemacs/files/patch-src_lock.c
diff --git a/editors/uemacs/files/patch-ag b/editors/uemacs/files/patch-src_unix.c
index b595477251ed..b595477251ed 100644
--- a/editors/uemacs/files/patch-ag
+++ b/editors/uemacs/files/patch-src_unix.c
diff --git a/editors/vigor/files/patch-aa b/editors/vigor/files/patch-Makefile.in
index 0f5d0fab8073..0f5d0fab8073 100644
--- a/editors/vigor/files/patch-aa
+++ b/editors/vigor/files/patch-Makefile.in