svn commit: r366567 - in head: archivers archivers/rubygem-bzip2 archivers/rubygem-bzip2-ruby sysutils/puppet sysutils/puppet27

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Aug 29 21:30:38 2014
New Revision: 366567
URL: http://svnweb.freebsd.org/changeset/ports/366567
QAT: https://qat.redports.org/buildarchive/r366567/

Log:
  - Respect rubygems naming: rename archivers/rubygem-bzip2 to archivers/rubygem-bzip2-ruby
  - Cleanup Makefile
  - Bump PORTREVISION for dependency change

Added:
  head/archivers/rubygem-bzip2-ruby/
     - copied from r366564, head/archivers/rubygem-bzip2/
Deleted:
  head/archivers/rubygem-bzip2/
Modified:
  head/archivers/Makefile
  head/archivers/rubygem-bzip2-ruby/Makefile
  head/sysutils/puppet/Makefile
  head/sysutils/puppet27/Makefile

Modified: head/archivers/Makefile
==============================================================================
--- head/archivers/Makefile	Fri Aug 29 21:27:28 2014	(r366566)
+++ head/archivers/Makefile	Fri Aug 29 21:30:38 2014	(r366567)
@@ -171,7 +171,7 @@
     SUBDIR += ruby-zip
     SUBDIR += rubygem-archive-tar-minitar
     SUBDIR += rubygem-archive-zip
-    SUBDIR += rubygem-bzip2
+    SUBDIR += rubygem-bzip2-ruby
     SUBDIR += rubygem-libarchive
     SUBDIR += rubygem-minitar
     SUBDIR += rubygem-rubyzip

Modified: head/archivers/rubygem-bzip2-ruby/Makefile
==============================================================================
--- head/archivers/rubygem-bzip2/Makefile	Fri Aug 29 21:11:37 2014	(r366564)
+++ head/archivers/rubygem-bzip2-ruby/Makefile	Fri Aug 29 21:30:38 2014	(r366567)
@@ -1,12 +1,11 @@
 # Created by: Steve Wills <swills at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	bzip2
+PORTNAME=	bzip2-ruby
 PORTVERSION=	0.2.7
 PORTREVISION=	2
 CATEGORIES=	archivers rubygems
 MASTER_SITES=	RG
-DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 
 MAINTAINER=	ruby at FreeBSD.org
 COMMENT=	Ruby C bindings to libbzip2
@@ -16,7 +15,6 @@ LICENSE_COMB=	dual
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
-GEM_NAME=	${PORTNAME}-ruby-${PORTVERSION}
 RUBYGEM_AUTOPLIST=	yes
 
 .include <bsd.port.mk>

Modified: head/sysutils/puppet/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile	Fri Aug 29 21:27:28 2014	(r366566)
+++ head/sysutils/puppet/Makefile	Fri Aug 29 21:30:38 2014	(r366567)
@@ -3,7 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -52,7 +52,7 @@ BROKEN=	PACKAGE_ROOT option patch is inc
 
 .if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
-RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
+RUN_DEPENDS+=	rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby
 .endif
 
 post-patch:

Modified: head/sysutils/puppet27/Makefile
==============================================================================
--- head/sysutils/puppet27/Makefile	Fri Aug 29 21:27:28 2014	(r366566)
+++ head/sysutils/puppet27/Makefile	Fri Aug 29 21:30:38 2014	(r366567)
@@ -3,6 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	2.7.26
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	27
@@ -44,7 +45,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
 EXTRA_PATCHES+=	${FILESDIR}/optpatch-package_origin
-RUN_DEPENDS+=	rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2
+RUN_DEPENDS+=	rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby
 .endif
 
 .if ${PORT_OPTIONS:MPACKAGE_ROOT}