diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index b910b85d019a..bab6c8f03b4a 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -11,11 +11,15 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	XSL DocBook stylesheets
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
 RUN_DEPENDS=	docbook>=0:textproc/docbook \
 		xmlcatmgr:textproc/xmlcatmgr
 
-USES=	tar:bzip2
+USES=		tar:bzip2
+NO_ARCH=	yes
 NO_BUILD=	yes
 
 INSTDIR=	share/xsl/docbook
@@ -30,6 +34,7 @@ OPTIONS_DEFINE=	ECLIPSE EPUB EXTENSIONS HIGHLIGHTING HTMLHELP JAVAHELP \
 OPTIONS_DEFAULT=	ECLIPSE EPUB EXTENSIONS HIGHLIGHTING HTMLHELP JAVAHELP \
 			PROFILING ROUNDTRIP SLIDES TEMPLATE TESTS TOOLS WEBSITE \
 			XHTML11
+OPTIONS_SUB=	yes
 
 ECLIPSE_DESC=		Eclipse modules
 EPUB_DESC=		Epub modules
@@ -54,108 +59,31 @@ DXVERSIONS=	1.36 1.37 1.38 1.39 1.40 1.41 1.42 1.43 1.44 1.45 1.46 1.47 \
 		1.64.1 1.65.0 1.65.1 1.66.0 1.66.1 1.67.0 1.67.2 1.68.0 \
 		1.68.1 1.69.0 1.69.1 1.70.0 1.70.1 1.71.0 1.71.1 current
 
+DOCS_DISTFILES=	${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}:doc
+
+ECLIPSE_VARS=		MODULES+=eclipse
+EPUB_VARS=		MODULES+=epub
+EXTENSIONS_VARS=	MODULES+=extensions
+HIGHLIGHTING_VARS=	MODULES+=highlighting
+HTMLHELP_VARS=		MODULES+=htmlhelp
+JAVAHELP_VARS=		MODULES+=javahelp
+PROFILING_VARS=		MODULES+=profiling
+ROUNDTRIP_VARS=		MODULES+=roundtrip
+SLIDES_VARS=		MODULES+=slides
+TEMPLATE_VARS=		MODULES+=template
+TESTS_VARS=		MODULES+=tests
+TOOLS_VARS=		MODULES+=tools
+WEBSITE_VARS=		MODULES+=website
+XHTML11_VARS=		MODULES+=xhtml-1_1
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}:doc
-.endif
-
-.if ${PORT_OPTIONS:MECLIPSE}
-PLIST_SUB+=	ECLIPSE=""
-MODULES+=	eclipse
-.else
-PLIST_SUB+=	ECLIPSE="@comment "
-.endif
-.if ${PORT_OPTIONS:MEPUB}
-PLIST_SUB+=	EPUB=""
-MODULES+=	epub
-.else
-PLIST_SUB+=	EPUB="@comment "
-.endif
-.if ${PORT_OPTIONS:MEXTENSIONS}
-PLIST_SUB+=	EXTENSIONS=""
-MODULES+=	extensions
-.else
-PLIST_SUB+=	EXTENSIONS="@comment "
-.endif
-.if ${PORT_OPTIONS:MHIGHLIGHTING}
-PLIST_SUB+=	HIGHLIGHTING=""
-MODULES+=	highlighting
-.else
-PLIST_SUB+=	HIGHLIGHTING="@comment "
-.endif
-.if ${PORT_OPTIONS:MHTMLHELP}
-PLIST_SUB+=	HTMLHELP=""
-MODULES+=	htmlhelp
-.else
-PLIST_SUB+=	HTMLHELP="@comment "
-.endif
-.if ${PORT_OPTIONS:MJAVAHELP}
-PLIST_SUB+=	JAVAHELP=""
-MODULES+=	javahelp
-.else
-PLIST_SUB+=	JAVAHELP="@comment "
-.endif
-.if ${PORT_OPTIONS:MPROFILING}
-PLIST_SUB+=	PROFILING=""
-MODULES+=	profiling
-.else
-PLIST_SUB+=	PROFILING="@comment "
-.endif
-.if ${PORT_OPTIONS:MROUNDTRIP}
-PLIST_SUB+=	ROUNDTRIP=""
-MODULES+=	roundtrip
-.else
-PLIST_SUB+=	ROUNDTRIP="@comment "
-.endif
-.if ${PORT_OPTIONS:MSLIDES}
-PLIST_SUB+=	SLIDES=""
-MODULES+=	slides
-.else
-PLIST_SUB+=	SLIDES="@comment "
-.endif
-.if ${PORT_OPTIONS:MTEMPLATE}
-PLIST_SUB+=	TEMPLATE=""
-MODULES+=	template
-.else
-PLIST_SUB+=	TEMPLATE="@comment "
-.endif
-.if ${PORT_OPTIONS:MTESTS}
-PLIST_SUB+=	TESTS=""
-MODULES+=	tests
-.else
-PLIST_SUB+=	TESTS="@comment "
-.endif
-.if ${PORT_OPTIONS:MTOOLS}
-PLIST_SUB+=	TOOLS=""
-MODULES+=	tools
-.else
-PLIST_SUB+=	TOOLS="@comment "
-.endif
-.if ${PORT_OPTIONS:MWEBSITE}
-PLIST_SUB+=	WEBSITE=""
-MODULES+=	website
-.else
-PLIST_SUB+=	WEBSITE="@comment "
-.endif
-.if ${PORT_OPTIONS:MXHTML11}
-PLIST_SUB+=	XHTML11=""
-MODULES+=	xhtml-1_1
-.else
-PLIST_SUB+=	XHTML11="@comment "
-.endif
-
 post-extract:
 	${FIND} ${WRKSRC} \( -name '.*' -or -name '*.sh' -or -name '*.LOG' \) -delete
 	${FIND} ${WRKSRC}/extensions -type d -mindepth 1 -maxdepth 1 -print0 |\
 		${XARGS} -0 ${RM} -r
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc && ${TAR} -cf - . |\
-		${TAR} -xf - -C${STAGEDIR}${DOCSDIR})
-.endif
 .for m in ${MODULES}
 		${MKDIR} ${STAGEDIR}${PREFIX}/${INSTDIR}/${m}
 		dirs=$$(${FIND} ${WRKSRC}/${m} -type d | ${SED} 's|^${WRKSRC}/${m}||g'); \
@@ -176,4 +104,8 @@ do-install:
 			${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${INSTDIR}; \
 		done
 
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>