2 files changed, 9 insertions, 90 deletions

diff --git a/textproc/ruby-formvalidator/Makefile b/textproc/ruby-formvalidator/Makefile
index 9cfa01b36a18..1602fa82a933 100644
--- a/textproc/ruby-formvalidator/Makefile
+++ b/textproc/ruby-formvalidator/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://grub.ath.cx/formvalidator/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A Ruby module to validate data coming in from HTML forms
 
 USE_RUBY=	yes
@@ -35,9 +35,14 @@ do-install:
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
 	${CP} -R ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
+	@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} ${DOCS} ${RUBY_MODDOCDIR}/)
+
+	@${FIND} -ds ${RUBY_MODDOCDIR} -type f -print | ${SED} -E -e \
+		's,^${PREFIX}/?,,' >> ${TMPPLIST}
+	@${FIND} -ds ${RUBY_MODDOCDIR} -type d -print | ${SED} -E -e \
+		's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/doc/ruby18/ 2>/dev/null || true" \
+		>> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/ruby-formvalidator/pkg-plist b/textproc/ruby-formvalidator/pkg-plist
index 67c9f47856d4..651f8f4afe4e 100644
--- a/textproc/ruby-formvalidator/pkg-plist
+++ b/textproc/ruby-formvalidator/pkg-plist
@@ -8,89 +8,3 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/standard.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/profiles
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/CHANGELOG
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator.src/M000001.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator.src/M000002.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator.src/M000003.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator.src/M000004.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator.src/M000005.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator.src/M000006.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src/M000035.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src/M000036.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src/M000037.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src/M000038.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src/M000039.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src/M000040.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src/M000041.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src/M000042.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000022.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000023.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000024.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000025.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000026.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000027.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000028.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000029.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000030.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000031.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000032.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000033.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src/M000034.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000043.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000044.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000045.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000046.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000047.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000048.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000049.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000050.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000051.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000052.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000053.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000054.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000055.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000056.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000057.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000058.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src/M000059.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000007.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000008.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000009.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000010.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000011.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000012.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000013.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000014.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000015.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000016.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000017.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000018.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000019.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000020.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src/M000021.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/created.rid
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/README_rdoc.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/formvalidator_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_class_index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_file_index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/FormValidator/InputProfile.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Filters.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/FormValidator/Constraints.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/FormValidator/ConstraintHelpers.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/FormValidator.src
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/FormValidator
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%