2 files changed, 66 insertions, 63 deletions

diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index a0963082babb..8d98596e036f 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -23,10 +23,11 @@ CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib \
 		--enable-nsl-fork --enable-persistent-cookies \
 		--enable-cjk --enable-file-upload --enable-justify-elts \
 		--enable-libjs --enable-read-eta --enable-source-cache
-#--enable-prettysrc \
-#--enable-color-style
+# experimental optional configure args
+#   --enable-prettysrc --enable-color-style
+#
 MAKEFILE=	makefile
-MAKE_ARGS=	helpdir=${PREFIX}/${LYNX_HELP} docdir=${PREFIX}/${LYNX_DOC} \
+MAKE_ARGS=	helpdir=${PREFIX}/${LYNX_HELP} docdir=${PREFIX}/${LYNX_DOC}
 PLIST_SUB=	LYNX_LIB=${LYNX_LIB} LYNX_DOC=${LYNX_DOC} LYNX_HELP=${LYNX_HELP}
 
 INSTALL_TARGET=	install-full
@@ -37,8 +38,8 @@ LYNX_DOC=	share/doc/lynx
 LYNX_HELP=	share/lynx_help
 
 post-install:
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_DOC}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_HELP}
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_LIB}/lynx.cfg
+	@/usr/sbin/chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_DOC}
+	@/usr/sbin/chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_HELP}
+	@/usr/sbin/chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_LIB}/lynx.cfg
 
 .include <bsd.port.mk>
diff --git a/japanese/lynx-current/pkg-plist b/japanese/lynx-current/pkg-plist
index 4cfc857d82dc..e710c244f9f2 100644
--- a/japanese/lynx-current/pkg-plist
+++ b/japanese/lynx-current/pkg-plist
@@ -1,58 +1,60 @@
 bin/lynx
-etc/lynx.cfg.sample
-lib/lynx_help/Lynx_users_guide.html
-lib/lynx_help/about_lynx.html
-lib/lynx_help/keystrokes/alt_edit_help.html
-lib/lynx_help/keystrokes/bookmark_help.html
-lib/lynx_help/keystrokes/cookie_help.html
-lib/lynx_help/keystrokes/dired_help.html
-lib/lynx_help/keystrokes/edit_help.html
-lib/lynx_help/keystrokes/environments.html
-lib/lynx_help/keystrokes/follow_help.html
-lib/lynx_help/keystrokes/gopher_types_help.html
-lib/lynx_help/keystrokes/history_help.html
-lib/lynx_help/keystrokes/keystroke_help.html
-lib/lynx_help/keystrokes/movement_help.html
-lib/lynx_help/keystrokes/option_help.html
-lib/lynx_help/keystrokes/other_help.html
-lib/lynx_help/keystrokes/print_help.html
-lib/lynx_help/keystrokes/scrolling_help.html
-lib/lynx_help/keystrokes/test_display.html
-lib/lynx_help/keystrokes/visited_help.html
-lib/lynx_help/keystrokes/xterm_help.html
-lib/lynx_help/lynx-dev.html
-lib/lynx_help/lynx_help_main.html
-lib/lynx_help/lynx_url_support.html
-share/doc/lynx/CHANGES
-share/doc/lynx/COPYHEADER
-share/doc/lynx/COPYING
-share/doc/lynx/PROBLEMS
-share/doc/lynx/README
-share/doc/lynx/samples/blue-background.lss
-share/doc/lynx/samples/cernrules.txt
-share/doc/lynx/samples/jumpsUnix.html
-share/doc/lynx/samples/jumpsVMS.html
-share/doc/lynx/samples/lynx-keymaps
-share/doc/lynx/samples/lynx.cfg
-share/doc/lynx/samples/lynx.com
-share/doc/lynx/samples/lynx.lss
-share/doc/lynx/samples/mailcap
-share/doc/lynx/samples/mild-colors.lss
-share/doc/lynx/samples/mime.types
-share/doc/lynx/test/ALT88592.html
-share/doc/lynx/test/ISO_LATIN1_test.html
-share/doc/lynx/test/README.txt
-share/doc/lynx/test/TestComment.html
-share/doc/lynx/test/c1.html
-share/doc/lynx/test/iso8859-1.html
-share/doc/lynx/test/iso88592.html
-share/doc/lynx/test/raw8bit.html
-share/doc/lynx/test/sgml.html
-share/doc/lynx/test/spaces.html
-share/doc/lynx/test/tabtest.html
-share/doc/lynx/test/unicode.html
-@dirrm share/doc/lynx/test
-@dirrm share/doc/lynx/samples
-@dirrm share/doc/lynx
-@dirrm lib/lynx_help/keystrokes
-@dirrm lib/lynx_help
+%%LYNX_LIB%%/lynx.cfg
+%%LYNX_LIB%%/lynx.cfg.default
+%%LYNX_HELP%%/Lynx_users_guide.html
+%%LYNX_HELP%%/about_lynx.html
+%%LYNX_HELP%%/keystrokes/alt_edit_help.html
+%%LYNX_HELP%%/keystrokes/bashlike_edit_help.html
+%%LYNX_HELP%%/keystrokes/bookmark_help.html
+%%LYNX_HELP%%/keystrokes/cookie_help.html
+%%LYNX_HELP%%/keystrokes/dired_help.html
+%%LYNX_HELP%%/keystrokes/edit_help.html
+%%LYNX_HELP%%/keystrokes/environments.html
+%%LYNX_HELP%%/keystrokes/follow_help.html
+%%LYNX_HELP%%/keystrokes/gopher_types_help.html
+%%LYNX_HELP%%/keystrokes/history_help.html
+%%LYNX_HELP%%/keystrokes/keystroke_help.html
+%%LYNX_HELP%%/keystrokes/movement_help.html
+%%LYNX_HELP%%/keystrokes/option_help.html
+%%LYNX_HELP%%/keystrokes/other_help.html
+%%LYNX_HELP%%/keystrokes/print_help.html
+%%LYNX_HELP%%/keystrokes/scrolling_help.html
+%%LYNX_HELP%%/keystrokes/test_display.html
+%%LYNX_HELP%%/keystrokes/visited_help.html
+%%LYNX_HELP%%/keystrokes/xterm_help.html
+%%LYNX_HELP%%/lynx-dev.html
+%%LYNX_HELP%%/lynx_help_main.html
+%%LYNX_HELP%%/lynx_url_support.html
+%%LYNX_DOC%%/CHANGES
+%%LYNX_DOC%%/COPYHEADER
+%%LYNX_DOC%%/COPYING
+%%LYNX_DOC%%/PROBLEMS
+%%LYNX_DOC%%/README
+%%LYNX_DOC%%/samples/blue-background.lss
+%%LYNX_DOC%%/samples/cernrules.txt
+%%LYNX_DOC%%/samples/installdirs.html
+%%LYNX_DOC%%/samples/jumpsUnix.html
+%%LYNX_DOC%%/samples/jumpsVMS.html
+%%LYNX_DOC%%/samples/lynx-keymaps
+%%LYNX_DOC%%/samples/lynx.com
+%%LYNX_DOC%%/samples/lynx.lss
+%%LYNX_DOC%%/samples/mailcap
+%%LYNX_DOC%%/samples/mild-colors.lss
+%%LYNX_DOC%%/samples/mime.types
+%%LYNX_DOC%%/test/ALT88592.html
+%%LYNX_DOC%%/test/ISO_LATIN1_test.html
+%%LYNX_DOC%%/test/README.txt
+%%LYNX_DOC%%/test/TestComment.html
+%%LYNX_DOC%%/test/c1.html
+%%LYNX_DOC%%/test/iso8859-1.html
+%%LYNX_DOC%%/test/iso88592.html
+%%LYNX_DOC%%/test/raw8bit.html
+%%LYNX_DOC%%/test/sgml.html
+%%LYNX_DOC%%/test/spaces.html
+%%LYNX_DOC%%/test/tabtest.html
+%%LYNX_DOC%%/test/unicode.html
+@dirrm %%LYNX_DOC%%/test
+@dirrm %%LYNX_DOC%%/samples
+@dirrm %%LYNX_DOC%%
+@dirrm %%LYNX_HELP%%/keystrokes
+@dirrm %%LYNX_HELP%%