- Update MASTER_SITES and unbreak this port

- Respect PORTEXAMPLES
- Add EXAMPLES option
- Convert to new options target helper
- Silence patch message
- Use BROKEN_RUBY22
- Strip shared library
- Pet portlint: fix diff header of patch files
- Bump PORTREVISION for package change

3 files changed, 26 insertions, 27 deletions

diff --git a/audio/ruby-audiofile/Makefile b/audio/ruby-audiofile/Makefile
index c03ad0697b39..5455de722bdc 100644
--- a/audio/ruby-audiofile/Makefile
+++ b/audio/ruby-audiofile/Makefile
@@ -3,48 +3,47 @@
 
 PORTNAME=	audiofile
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio ruby
-MASTER_SITES=	SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}:audiofile \
+		SF/ruby-${PORTNAME}/cddb/${CDDB_VER}:cddb
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${CDDB_DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:audiofile \
+		cddb-${CDDB_VER}${EXTRACT_SUFX}:cddb
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding to the audiofile library
 
-BROKEN=		Unfetchable
 LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
 
+BROKEN_RUBY22=	yes
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-CDDB_DISTNAME=	cddb-0.2
+CDDB_VER=	0.2
 CDDB_WRKSRC=	${WRKDIR}/example
 
 INSTALL_TARGET=	site-install
 REINPLACE_ARGS=	-i ""
 
-DOCS=		audiofile.rd
-
-OPTIONS_DEFINE=	DOCS
-
 post-patch:
-	${REINPLACE_CMD} -E -e "s,/home/jaredj/ruby-lib/(cddb),\1,g" \
-		${CDDB_WRKSRC}/wavcddb
+	@${REINPLACE_CMD} -E -e "s,/home/jaredj/ruby-lib/(cddb),\1,g" ${CDDB_WRKSRC}/wavcddb
 
 post-install:
-	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/cddb
-	${INSTALL_DATA} ${WRKSRC}/test.rb ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
-	${INSTALL_DATA} ${CDDB_WRKSRC}/* ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/cddb/
-	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${RUBY_MODDOCDIR}/
+	${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/audiofile.so
 
-.include <bsd.port.pre.mk>
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/audiofile.rd ${STAGEDIR}${RUBY_MODDOCDIR}/
 
-.if ${RUBY_VER} >= 2.2
-BROKEN=		Does not build
-.endif
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/cddb/
+	${INSTALL_DATA} ${WRKSRC}/test.rb ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
+	${INSTALL_DATA} ${CDDB_WRKSRC}/* ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/cddb/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/ruby-audiofile/files/patch-audiofile.c b/audio/ruby-audiofile/files/patch-audiofile.c
index 46614d7f00e6..88dcdd9a8ca8 100644
--- a/audio/ruby-audiofile/files/patch-audiofile.c
+++ b/audio/ruby-audiofile/files/patch-audiofile.c
@@ -1,5 +1,5 @@
---- audiofile.c.orig	2003-08-10 00:29:57.000000000 +0100
-+++ audiofile.c	2011-04-18 06:58:15.000000000 +0100
+--- audiofile.c.orig	2003-08-09 23:29:57 UTC
++++ audiofile.c
 @@ -161,7 +161,7 @@
  
              /* get mode into a C-string */
diff --git a/audio/ruby-audiofile/pkg-plist b/audio/ruby-audiofile/pkg-plist
index 57a7dada2814..d9c6d367c3fa 100644
--- a/audio/ruby-audiofile/pkg-plist
+++ b/audio/ruby-audiofile/pkg-plist
@@ -1,6 +1,6 @@
 %%RUBY_SITEARCHLIBDIR%%/audiofile.so
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/audiofile.rd
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cddb/batch-oggenc
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cddb/cddb.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cddb/wavcddb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/cddb/batch-oggenc
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/cddb/cddb.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/cddb/wavcddb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test.rb