aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/ruby-hikidoc/Makefile31
-rw-r--r--textproc/ruby-hikidoc/distinfo2
-rw-r--r--textproc/ruby-hikidoc/pkg-descr5
-rw-r--r--www/tdiary/Makefile3
6 files changed, 3 insertions, 40 deletions
diff --git a/MOVED b/MOVED
index f6772d97b187..b93d6cd0ebf4 100644
--- a/MOVED
+++ b/MOVED
@@ -6181,3 +6181,4 @@ www/emacs-w3m-emacs21||2014-06-27|Removed: dependent on editors/emacs21
www/emacs-w3m-emacs22||2014-06-27|Removed: dependent on editors/emacs22
devel/ode-devel|devel/ode|2014-06-27|Has expired: Outdated by devel/ode
java/eclipse-devel|java/eclipse|2014-06-29|Concentrate maintenance effort on newer java/eclipse
+textproc/ruby-hikidoc|textproc/rubygem-hikidoc|2014-06-29|Use textproc/rubygem-hikidoc instead
diff --git a/textproc/Makefile b/textproc/Makefile
index fdf1419ed173..e356655769ce 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1265,7 +1265,6 @@
SUBDIR += ruby-diff
SUBDIR += ruby-escape
SUBDIR += ruby-format
- SUBDIR += ruby-hikidoc
SUBDIR += ruby-html-fillinform
SUBDIR += ruby-html-template
SUBDIR += ruby-htmlrepair
diff --git a/textproc/ruby-hikidoc/Makefile b/textproc/ruby-hikidoc/Makefile
deleted file mode 100644
index 18f71580f6be..000000000000
--- a/textproc/ruby-hikidoc/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= hikidoc
-PORTVERSION= 0.0.6
-CATEGORIES= textproc ruby
-MASTER_SITES= RF
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-EXTRACT_SUFX= .tgz
-DIST_SUBDIR= ${RUBY_PKGNAMEPREFIX:S|${RUBY_SUFFIX}-||}
-
-MAINTAINER= tota@FreeBSD.org
-COMMENT= A text-to-HTML conversion tool for web writers
-
-USE_RUBY= yes
-USE_RUBY_SETUP= yes
-RUBY_SHEBANG_FILES= bin/hikidoc
-
-PORTDOCS= NEWS NEWS.ja README README.ja \
- TextFormattingRules TextFormattingRules.ja
-
-PLIST_FILES= bin/hikidoc \
- %%RUBY_SITELIBDIR%%/hikidoc.rb
-
-post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
- @${INSTALL_DATA} ${INSTALL_WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/textproc/ruby-hikidoc/distinfo b/textproc/ruby-hikidoc/distinfo
deleted file mode 100644
index 6e3891db50ee..000000000000
--- a/textproc/ruby-hikidoc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ruby/hikidoc-0.0.6.tgz) = c248335b90efab89cf5a029195f23248c7f9f1b23a42889056bc08891dddb5dc
-SIZE (ruby/hikidoc-0.0.6.tgz) = 26370
diff --git a/textproc/ruby-hikidoc/pkg-descr b/textproc/ruby-hikidoc/pkg-descr
deleted file mode 100644
index 06bf8b685b59..000000000000
--- a/textproc/ruby-hikidoc/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-'HikiDoc' is a text-to-HTML conversion tool for web writers. HikiDoc
-allows you to write using an easy-to-read, easy-to-write plain text
-format, then convert it to structurally valid HTML (or XHTML).
-
-WWW: http://rubyforge.org/projects/hikidoc/
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index fa0f9d689dc6..ed66f4f48255 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tdiary
PORTVERSION= 4.0.3
+PORTREVISION= 1
CATEGORIES?= www ruby
MASTER_SITES= http://www.tdiary.org/download/
DISTNAME= ${PORTNAME}-full-v${PORTVERSION}
@@ -13,7 +14,7 @@ COMMENT= Web-based diary system (like weblog) written in Ruby
LICENSE= GPLv2
RUN_DEPENDS= rubygem-fastimage>=1.6.0:${PORTSDIR}/graphics/rubygem-fastimage \
- hikidoc:${PORTSDIR}/textproc/ruby-hikidoc \
+ rubygem-hikidoc>=0:${PORTSDIR}/textproc/rubygem-hikidoc \
rubygem-multi_json>=1.8.4:${PORTSDIR}/devel/rubygem-multi_json \
rubygem-rack>=0:${PORTSDIR}/www/rubygem-rack