diff --git a/devel/libds/Makefile b/devel/libds/Makefile
index e7fef09c40e7..8505e8ddc55a 100644
--- a/devel/libds/Makefile
+++ b/devel/libds/Makefile
@@ -1,44 +1,32 @@
 # Created by: Peter Bozarov (kingofgib@users.sourceforge.net)
 # $FreeBSD$
 
-PORTNAME=		libds
-PORTVERSION=		1.0
-CATEGORIES=		devel
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-2.1
-DISTNAME=		libds-2.1
+PORTNAME=	libds
+PORTVERSION=	1.0
+CATEGORIES=	devel
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-2.1
+DISTNAME=	libds-2.1
 
-MAINTAINER= ports@FreeBSD.org
-COMMENT=		ANSI Generic Data Structures Library
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	ANSI Generic Data Structures Library
 
-USE_LDCONFIG=		yes
-ALL_TARGET=		gcc
+USE_LDCONFIG=	yes
+ALL_TARGET=	gcc
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-MAN3=	libds.3
 HTML=	avltree.html heap.html parray.html set.html hashtbl.html \
 	index.html queue.html stack.html
 
 # Copy header file and libraries.
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ds.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/libds.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libds.so ${PREFIX}/lib/libds.so.1
-
-# Make symbolic link to the shared library
-# Install man pages.
-# Install HTML pages.
-post-install:
-	${LN} -sf ${PREFIX}/lib/libds.so.1 ${PREFIX}/lib/libds.so
-.for i in ${MAN3}
-	${INSTALL_MAN} ${WRKSRC}/${i} ${PREFIX}/man/man3/${i}
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/libds
+	${INSTALL_DATA} ${WRKSRC}/ds.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/libds.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libds.so ${STAGEDIR}${PREFIX}/lib/libds.so.1
+	${LN} -sf libds.so.1 ${STAGEDIR}${PREFIX}/lib/libds.so
+	${INSTALL_MAN} ${WRKSRC}/libds.3 ${STAGEDIR}${PREFIX}/man/man3
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${HTML}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libds/${i}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libds/pkg-plist b/devel/libds/pkg-plist
index 83c1294d43d1..859bd1b57052 100644
--- a/devel/libds/pkg-plist
+++ b/devel/libds/pkg-plist
@@ -1,13 +1,14 @@
 include/ds.h
 lib/libds.a
-lib/libds.so.1
 lib/libds.so
-%%PORTDOCS%%share/doc/libds/avltree.html
-%%PORTDOCS%%share/doc/libds/hashtbl.html
-%%PORTDOCS%%share/doc/libds/heap.html
-%%PORTDOCS%%share/doc/libds/index.html
-%%PORTDOCS%%share/doc/libds/parray.html
-%%PORTDOCS%%share/doc/libds/queue.html
-%%PORTDOCS%%share/doc/libds/set.html
-%%PORTDOCS%%share/doc/libds/stack.html
-%%PORTDOCS%%@dirrmtry share/doc/libds
+lib/libds.so.1
+man/man3/libds.3.gz
+%%PORTDOCS%%%%DOCSDIR%%/avltree.html
+%%PORTDOCS%%%%DOCSDIR%%/hashtbl.html
+%%PORTDOCS%%%%DOCSDIR%%/heap.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/parray.html
+%%PORTDOCS%%%%DOCSDIR%%/queue.html
+%%PORTDOCS%%%%DOCSDIR%%/set.html
+%%PORTDOCS%%%%DOCSDIR%%/stack.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%