Index: head/lang/siod/Makefile
===================================================================
--- head/lang/siod/Makefile	(revision 565477)
+++ head/lang/siod/Makefile	(revision 565478)
@@ -1,70 +1,77 @@
 # Created by: jkoshy
 # $FreeBSD$
 
 PORTNAME=	siod
 PORTVERSION=	3.6.2
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://people.delphiforums.com/gjc/
 DISTNAME=	siod
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}	# Upstream aren't versioned :(
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Small footprint implementation of the Scheme programming language
 
 LICENSE=	LGPL21	# Declared inside slib.c
 
 USES=		uidfix tar:tgz dos2unix
 
-USE_LDCONFIG=	${PREFIX}/lib/siod
+USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/siod
 
 DOS2UNIX_FILES=	sql_oracle.c ss.c
-OPTIONS_DEFINE=	SQL_SYBASE GD NDBM REGEX SS
+OPTIONS_DEFINE=	SQL_SYBASE GD NDBM REGEX SS DOCS
 OPTIONS_DEFAULT=NDBM REGEX SS
 SQL_SYBASE_DESC=Build Sybase (and MS-SQL) client-module (using FreeTDS)
 SS_DESC=	Sockets support - required for any network programs
 NDBM_DESC=	Support for NDBM-databases
 NO_WRKSUBDIR=	yes
 EXTRACT_AFTER_ARGS=--exclude md5\* --exclude regex.h --exclude reg????*.c
 CFLAGS+=	-Werror
 MAKE_ARGS=	VPATH=${WRKSRC} MODULES=${MODULES:Q}
 MAKEFILE=	${FILESDIR}/BSDmakefile
 MAKE_ENV=	MKDIR=${MKDIR:Q} STAGEDIR=${STAGEDIR:Q}
 MAKE_ENV+=	MAN1PREFIX=${MAN1PREFIX} PREFIX=${PREFIX:Q}
 MAKE_ENV+=	INSTALL_MAN=${INSTALL_MAN:Q} INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 MAKE_ENV+=	INSTALL_DATA=${INSTALL_DATA:Q}
 
 MODULES=	tar parser_pratt
 
 SQL_SYBASE_LIB_DEPENDS=	libct.so:databases/freetds	# Or freetds-devel
 GD_LIB_DEPENDS=		libgd.so:graphics/gd	# Or ukrainian/gd
 REGEX_LIB_DEPENDS=	libgnuregex.so:devel/libgnuregex
 OPTIONS_SUB=	yes
 
 .if "${PREFIX}" != "/usr/local"
 post-patch:
 	${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/slib.c
 .endif
 
 post-build:
 	${REINPLACE_CMD} -e 's|\./siod|env LD_LIBRARY_PATH=lib siod/siod|g' \
 		-e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/makefile
 	${MAKE} -C ${WRKSRC} -f makefile build_driver
 
 .include <bsd.port.options.mk>
-MODULES+=	${SELECTED_OPTIONS:tl}
+MODULES+=	${SELECTED_OPTIONS:NDOCS:tl}
 
 do-configure:
 	${MKDIR} ${WRKSRC}/lib
 	${LN} -sf ${FILESDIR}/BSDmakefile.lib ${WRKSRC}/lib/BSDmakefile
 .for s in ${MODULES}
 	${MKDIR} ${WRKSRC}/$s
 	${SED} "s,%%MODULE%%,$s,g" ${FILESDIR}/BSDmakefile.module > \
 	    ${WRKSRC}/$s/BSDmakefile
 .endfor
 .for s in siod sample
 	${MKDIR} ${WRKSRC}/$s
 	${SED} "s,%%PROG%%,$s,g" ${FILESDIR}/BSDmakefile.prog >	\
 	    ${WRKSRC}/$s/BSDmakefile
 .endfor
+
+post-install-DOCS-off:
+	${RM} ${STAGEDIR}${PREFIX}/lib/siod/siod.html
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${PREFIX}/lib/siod/siod.html ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/lang/siod/pkg-plist
===================================================================
--- head/lang/siod/pkg-plist	(revision 565477)
+++ head/lang/siod/pkg-plist	(revision 565478)
@@ -1,58 +1,58 @@
 bin/csiod
 bin/snapshot-dir
 bin/snapshot-compare
 bin/http-get
 bin/cp-build
 bin/ftp-cp
 bin/ftp-put
 bin/ftp-test
 bin/ftp-get
 bin/http-stress
 bin/proxy-server
 bin/siod
 lib/siod/fork-test.scm
 lib/siod/http-server.scm
 lib/siod/http-stress.scm
 lib/siod/http.scm
 lib/siod/maze-support.scm
 lib/siod/pratt.scm
 lib/siod/siod.scm
 lib/siod/smtp.scm
 lib/siod/sql_oracle.scm
 lib/siod/sql_rdb.scm
 lib/siod/sql_sybase.scm
 lib/siod/cgi-echo.scm
 lib/siod/find-files.scm
 lib/siod/hello.scm
 lib/siod/parser_pratt.scm
 lib/siod/pop3.scm
 lib/siod/selfdoc.scm
 lib/siod/sample.c
-lib/siod/siod.html
+%%PORTDOCS%%%%DOCSDIR%%/siod.html
 lib/siod/piechart.scm
 lib/siod/cgi.scm
 lib/siod/ftp.scm
 lib/siod/sql_msql.scm
 %%GD%%lib/siod/gd.so
 %%NDBM%%lib/siod/ndbm.so
 %%SS%%lib/siod/ss.so
 lib/siod/tar.so
 %%SQL_SYBASE%%lib/siod/sql_sybase.so
 %%REGEX%%lib/siod/regex.so
 lib/siod/parser_pratt.so
 lib/libsiod.a
 lib/libsiod.so
 lib/libsiod.so.3
 include/siod.h
 man/man1/cp-build.1.gz
 man/man1/csiod.1.gz
 man/man1/ftp-cp.1.gz
 man/man1/ftp-get.1.gz
 man/man1/ftp-put.1.gz
 man/man1/ftp-test.1.gz
 man/man1/http-get.1.gz
 man/man1/http-stress.1.gz
 man/man1/proxy-server.1.gz
 man/man1/siod.1.gz
 man/man1/snapshot-compare.1.gz
 man/man1/snapshot-dir.1.gz