Date: Sun, 14 Apr 2013 16:50:19 +0100 (BST) From: Chris Rees <crees@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/177856: [PATCH] Update and move port: devel/ruby-term-ansicolor Message-ID: <20130414155019.A7DA81FB21@pegasus.bayofrum.net> Resent-Message-ID: <201304141600.r3EG00lL092418@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177856
>Category: ports
>Synopsis: [PATCH] Update and move port: devel/ruby-term-ansicolor
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 14 16:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r247189: Sat Feb 23 15:20:18 GMT 2013 root@pegasus.bayofrum.net:/usr/obj/usr/home/crees/workspace/src/stable/9/sys/PEGASUS amd64
>Description:
term-ansicolor is now a rubygem, so I've also moved the port accordingly.
I *think* svn patch should handle the move correctly, or I don't mind committing it since I have the wrkdir here already.
>How-To-Repeat:
>Fix:
--- ruby-term-ansicolor.rubygem.diff begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 315799)
+++ Makefile (working copy)
@@ -3945,7 +3945,6 @@
SUBDIR += ruby-statgrab
SUBDIR += ruby-subversion
SUBDIR += ruby-sysvipc
- SUBDIR += ruby-term-ansicolor
SUBDIR += ruby-tzfile
SUBDIR += ruby-wirble
SUBDIR += rubygem-abstract
@@ -4154,6 +4153,7 @@
SUBDIR += rubygem-sysinfo
SUBDIR += rubygem-systemu
SUBDIR += rubygem-templater
+ SUBDIR += rubygem-term-ansicolor
SUBDIR += rubygem-test
SUBDIR += rubygem-test-unit
SUBDIR += rubygem-thor
Index: ruby-term-ansicolor/Makefile
===================================================================
--- ruby-term-ansicolor/Makefile (revision 315799)
+++ ruby-term-ansicolor/Makefile (working copy)
@@ -1,39 +0,0 @@
-# New ports collection makefile for: ruby-term-ansicolor
-# Date created: 2007-01-12
-# Whom: Cheng-Lung Sung <clsung@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= term-ansicolor
-PORTVERSION= 1.0.4
-CATEGORIES= devel ruby
-MASTER_SITES= RF
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-EXTRACT_SUFX= .tgz
-DIST_SUBDIR= ruby
-
-MAINTAINER= clsung@FreeBSD.org
-COMMENT= Term::ANSIColor for Ruby
-
-USE_RUBY= yes
-RUBY_SETUP= install.rb
-
-NO_BUILD= yes
-
-DOCS= doc-main.txt
-EXAMPLES= examples/*
-
-do-install:
- @cd ${INSTALL_WRKSRC}; \
- ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP}
-
-post-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${RUBY_MODDOCDIR}
- ${MKDIR} ${RUBY_MODEXAMPLESDIR}
- ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${RUBY_MODDOCDIR}
- ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${RUBY_MODEXAMPLESDIR}
-.endif
-
-.include <bsd.port.mk>
Index: ruby-term-ansicolor/distinfo
===================================================================
--- ruby-term-ansicolor/distinfo (revision 315799)
+++ ruby-term-ansicolor/distinfo (working copy)
@@ -1,2 +0,0 @@
-SHA256 (ruby/term-ansicolor-1.0.4.tgz) = aef5c6e40d9abe61872d0e749e9d1c417b3bc84809c224a82293bb52a9f8ce40
-SIZE (ruby/term-ansicolor-1.0.4.tgz) = 12287
Index: ruby-term-ansicolor/pkg-descr
===================================================================
--- ruby-term-ansicolor/pkg-descr (revision 315799)
+++ ruby-term-ansicolor/pkg-descr (working copy)
@@ -1,11 +0,0 @@
-Small Ruby library that colors strings using ANSI escape sequences.
-It's possible to use constants:
-
- include Term::ANSIColor
- print red, bold, "red bold", reset, "\n"
-
- or
-
- print red(bold("red bold")), "\n"
-
-WWW: http://term-ansicolor.rubyforge.org/
Index: ruby-term-ansicolor/pkg-plist
===================================================================
--- ruby-term-ansicolor/pkg-plist (revision 315799)
+++ ruby-term-ansicolor/pkg-plist (working copy)
@@ -1,9 +0,0 @@
-%%RUBY_SITELIBDIR%%/term/ansicolor.rb
-%%RUBY_SITELIBDIR%%/term/ansicolor/version.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cdiff.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc-main.txt
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-@dirrmtry %%RUBY_SITELIBDIR%%/term/ansicolor
-@dirrmtry %%RUBY_SITELIBDIR%%/term
Index: rubygem-term-ansicolor/Makefile
===================================================================
--- rubygem-term-ansicolor/Makefile (working copy)
+++ rubygem-term-ansicolor/Makefile (working copy)
@@ -1,39 +1,32 @@
-# New ports collection makefile for: ruby-term-ansicolor
-# Date created: 2007-01-12
-# Whom: Cheng-Lung Sung <clsung@FreeBSD.org>
-#
+# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= term-ansicolor
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.4
CATEGORIES= devel ruby
-MASTER_SITES= RF
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-EXTRACT_SUFX= .tgz
-DIST_SUBDIR= ruby
+MASTER_SITES= RG
MAINTAINER= clsung@FreeBSD.org
COMMENT= Term::ANSIColor for Ruby
USE_RUBY= yes
-RUBY_SETUP= install.rb
+USE_RUBYGEMS= yes
+RUBYGEM_AUTOPLIST= yes
-NO_BUILD= yes
+PORTEXAMPLES= cdiff decolor
-DOCS= doc-main.txt
-EXAMPLES= examples/*
+.include <bsd.port.options.mk>
-do-install:
- @cd ${INSTALL_WRKSRC}; \
- ${SETENV} ${MAKE_ENV} ${RUBY} ${RUBY_FLAGS} ${RUBY_SETUP}
+post-patch:
+# Chop out the cdiff and decolor binaries; these should be installed to
+# EXAMPLESDIR
+ ${REINPLACE_CMD} -e '/^- [cd][de][ic][fo][fl]o*r*$$/d' \
+ ${WRKSRC}/term-ansicolor-${PORTVERSION}.gemspec
post-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${RUBY_MODDOCDIR}
- ${MKDIR} ${RUBY_MODEXAMPLESDIR}
- ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${RUBY_MODDOCDIR}
- ${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/,} ${RUBY_MODEXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+ ${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_SCRIPT} ${PORTEXAMPLES:S,^,${WRKSRC}/bin/,} ${EXAMPLESDIR}/
.endif
.include <bsd.port.mk>
Index: rubygem-term-ansicolor/distinfo
===================================================================
--- rubygem-term-ansicolor/distinfo (working copy)
+++ rubygem-term-ansicolor/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (ruby/term-ansicolor-1.0.4.tgz) = aef5c6e40d9abe61872d0e749e9d1c417b3bc84809c224a82293bb52a9f8ce40
-SIZE (ruby/term-ansicolor-1.0.4.tgz) = 12287
+SHA256 (rubygem/term-ansicolor-1.1.4.gem) = 195d10f2ff32214b722acc50b9ab9670dff944a2b0eb34c427324d56d2ac4911
+SIZE (rubygem/term-ansicolor-1.1.4.gem) = 20480
Index: rubygem-term-ansicolor/pkg-plist
===================================================================
--- rubygem-term-ansicolor/pkg-plist (revision 315799)
+++ rubygem-term-ansicolor/pkg-plist (working copy)
@@ -1,9 +0,0 @@
-%%RUBY_SITELIBDIR%%/term/ansicolor.rb
-%%RUBY_SITELIBDIR%%/term/ansicolor/version.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cdiff.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/example.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc-main.txt
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-@dirrmtry %%RUBY_SITELIBDIR%%/term/ansicolor
-@dirrmtry %%RUBY_SITELIBDIR%%/term
--- ruby-term-ansicolor.rubygem.diff ends here ---
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130414155019.A7DA81FB21>