- Add LICENSE

- Respect PORTEXAMPLES
- Convert to new options target helper
- Use BROKEN_RUBY21 and BROKEN_RUBY22
- Use USES=tar:tgz
- Sort PLIST

2 files changed, 26 insertions, 28 deletions

diff --git a/archivers/ruby-zip/Makefile b/archivers/ruby-zip/Makefile
index 6260b3caf5f9..f330b4c2f3ce 100644
--- a/archivers/ruby-zip/Makefile
+++ b/archivers/ruby-zip/Makefile
@@ -7,38 +7,36 @@ CATEGORIES=	archivers ruby
 MASTER_SITES=	SF/ruby${PORTNAME}/ruby${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby module for reading and writing ZIP files
 
-USE_RUBY=	yes
+LICENSE=	BSD2CLAUSE RUBY
+LICENSE_COMB=	dual
+
+BROKEN_RUBY21=	yes
+BROKEN_RUBY22=	yes
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-WRKSRC=		${WRKDIR}/rubyzip-${PORTVERSION}
 NO_BUILD=	yes
+USE_RUBY=	yes
+USES=		tar:tgz
+WRKSRC=		${WRKDIR}/rubyzip-${PORTVERSION}
 
 DOCS=		ChangeLog NEWS README TODO
-EXAMPLES=	samples/*
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/zip
 	${INSTALL_DATA} ${WRKSRC}/lib/zip/*.rb ${STAGEDIR}${RUBY_SITELIBDIR}/zip
-	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
-.endfor
-	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
-.endfor
-
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_VER} == 2.1
-BROKEN=		Does not build with Ruby 2.1
-.endif
-
-.include <bsd.port.post.mk>
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/
+
+do-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
+
+.include <bsd.port.mk>
diff --git a/archivers/ruby-zip/pkg-plist b/archivers/ruby-zip/pkg-plist
index 9fc9f0a70725..76405789947f 100644
--- a/archivers/ruby-zip/pkg-plist
+++ b/archivers/ruby-zip/pkg-plist
@@ -4,13 +4,13 @@
 %%RUBY_SITELIBDIR%%/zip/zip.rb
 %%RUBY_SITELIBDIR%%/zip/zipfilesystem.rb
 %%RUBY_SITELIBDIR%%/zip/ziprequire.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example_filesystem.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtkRubyzip.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/write_simple.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/zipfind.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/qtzip.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/example.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/example_filesystem.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gtkRubyzip.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/qtzip.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/write_simple.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/zipfind.rb