2 files changed, 77 insertions, 76 deletions
diff --git a/freebsd/Makefile b/freebsd/Makefile
index c46155c..3d02d14 100644
--- a/freebsd/Makefile
+++ b/freebsd/Makefile
@@ -57,6 +57,7 @@ PLIST_SUB+=	GTK="" PROGRAM_PREFIX=g
 
 OPTIONS_DEFINE=	LEXILLA MALLOC_REPLACEMENT TECO_INTEGER_32
 OPTIONS_DEFAULT=LEXILLA
+OPTIONS_SUB=	yes
 
 LEXILLA_DESC=Build with Lexilla lexer support (larger)
 MALLOC_REPLACEMENT_DESC=Force replacement of system malloc()
diff --git a/freebsd/pkg-plist b/freebsd/pkg-plist
index c200eea..106bf73 100644
--- a/freebsd/pkg-plist
+++ b/freebsd/pkg-plist
@@ -11,83 +11,83 @@ man/man7/%%PROGRAM_PREFIX%%sciteco.7.gz
 %%DATADIR%%/lib/fnkeys.tes
 %%DATADIR%%/lib/getopt.tes
 %%DATADIR%%/lib/lexer.tes
-%%DATADIR%%/lib/lexers/abaqus.tes
-%%DATADIR%%/lib/lexers/ada.tes
-%%DATADIR%%/lib/lexers/asciidoc.tes
-%%DATADIR%%/lib/lexers/asl.tes
-%%DATADIR%%/lib/lexers/asm.tes
-%%DATADIR%%/lib/lexers/ave.tes
-%%DATADIR%%/lib/lexers/avs.tes
-%%DATADIR%%/lib/lexers/awk.tes
-%%DATADIR%%/lib/lexers/baan.tes
-%%DATADIR%%/lib/lexers/bash.tes
-%%DATADIR%%/lib/lexers/batch.tes
-%%DATADIR%%/lib/lexers/blitzbasic.tes
-%%DATADIR%%/lib/lexers/c.tes
-%%DATADIR%%/lib/lexers/caml.tes
-%%DATADIR%%/lib/lexers/ch.tes
-%%DATADIR%%/lib/lexers/cmake.tes
-%%DATADIR%%/lib/lexers/cobol.tes
-%%DATADIR%%/lib/lexers/cpp.tes
-%%DATADIR%%/lib/lexers/cs.tes
-%%DATADIR%%/lib/lexers/d.tes
-%%DATADIR%%/lib/lexers/devicetree.tes
-%%DATADIR%%/lib/lexers/diff.tes
-%%DATADIR%%/lib/lexers/docbook.tes
-%%DATADIR%%/lib/lexers/eiffel.tes
-%%DATADIR%%/lib/lexers/f77.tes
-%%DATADIR%%/lib/lexers/f95.tes
-%%DATADIR%%/lib/lexers/flagship.tes
-%%DATADIR%%/lib/lexers/flash.tes
-%%DATADIR%%/lib/lexers/freebasic.tes
-%%DATADIR%%/lib/lexers/gap.tes
-%%DATADIR%%/lib/lexers/go.tes
-%%DATADIR%%/lib/lexers/gob.tes
-%%DATADIR%%/lib/lexers/html.tes
-%%DATADIR%%/lib/lexers/idl.tes
-%%DATADIR%%/lib/lexers/inno.tes
-%%DATADIR%%/lib/lexers/java.tes
-%%DATADIR%%/lib/lexers/js.tes
-%%DATADIR%%/lib/lexers/kix.tes
-%%DATADIR%%/lib/lexers/lisp.tes
-%%DATADIR%%/lib/lexers/lout.tes
-%%DATADIR%%/lib/lexers/lua.tes
-%%DATADIR%%/lib/lexers/make.tes
-%%DATADIR%%/lib/lexers/mako.tes
-%%DATADIR%%/lib/lexers/markdown.tes
-%%DATADIR%%/lib/lexers/matlab.tes
-%%DATADIR%%/lib/lexers/mmixal.tes
-%%DATADIR%%/lib/lexers/octave.tes
-%%DATADIR%%/lib/lexers/oscript.tes
-%%DATADIR%%/lib/lexers/pascal.tes
-%%DATADIR%%/lib/lexers/perl.tes
-%%DATADIR%%/lib/lexers/php.tes
-%%DATADIR%%/lib/lexers/pike.tes
-%%DATADIR%%/lib/lexers/pov.tes
-%%DATADIR%%/lib/lexers/powerpro.tes
-%%DATADIR%%/lib/lexers/purebasic.tes
-%%DATADIR%%/lib/lexers/python.tes
-%%DATADIR%%/lib/lexers/r.tes
-%%DATADIR%%/lib/lexers/rc.tes
-%%DATADIR%%/lib/lexers/rebol.tes
-%%DATADIR%%/lib/lexers/rust.tes
-%%DATADIR%%/lib/lexers/scheme.tes
-%%DATADIR%%/lib/lexers/specman.tes
-%%DATADIR%%/lib/lexers/spice.tes
-%%DATADIR%%/lib/lexers/swift.tes
-%%DATADIR%%/lib/lexers/systemverilog.tes
-%%DATADIR%%/lib/lexers/tacl.tes
-%%DATADIR%%/lib/lexers/tal.tes
-%%DATADIR%%/lib/lexers/tcl.tes
-%%DATADIR%%/lib/lexers/test.tes
-%%DATADIR%%/lib/lexers/vala.tes
-%%DATADIR%%/lib/lexers/vb.tes
-%%DATADIR%%/lib/lexers/verilog.tes
-%%DATADIR%%/lib/lexers/vhdl.tes
-%%DATADIR%%/lib/lexers/vxml.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/abaqus.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/ada.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/asciidoc.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/asl.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/asm.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/ave.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/avs.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/awk.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/baan.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/bash.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/batch.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/blitzbasic.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/c.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/caml.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/ch.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/cmake.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/cobol.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/cpp.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/cs.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/d.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/devicetree.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/diff.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/docbook.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/eiffel.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/f77.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/f95.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/flagship.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/flash.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/freebasic.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/gap.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/go.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/gob.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/html.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/idl.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/inno.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/java.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/js.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/kix.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/lisp.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/lout.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/lua.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/make.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/mako.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/markdown.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/matlab.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/mmixal.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/octave.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/oscript.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/pascal.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/perl.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/php.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/pike.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/pov.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/powerpro.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/purebasic.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/python.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/r.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/rc.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/rebol.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/rust.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/scheme.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/specman.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/spice.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/swift.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/systemverilog.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/tacl.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/tal.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/tcl.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/test.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/vala.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/vb.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/verilog.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/vhdl.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/vxml.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/xml.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/yaml.tes
 %%DATADIR%%/lib/lexers/woman.tes
-%%DATADIR%%/lib/lexers/xml.tes
-%%DATADIR%%/lib/lexers/yaml.tes
 %%DATADIR%%/lib/session.tes
 %%DATADIR%%/lib/string.tes
 %%DATADIR%%/lib/women/grosciteco.tes.1.woman