diff options
| -rw-r--r-- | www/Makefile | 1 | ||||
| -rw-r--r-- | www/tdiary-devel/Makefile | 44 | ||||
| -rw-r--r-- | www/tdiary-devel/distinfo | 4 | ||||
| -rw-r--r-- | www/tdiary-devel/files/tdiaryinst.rb.in | 4 | ||||
| -rw-r--r-- | www/tdiary-devel/pkg-descr | 5 | ||||
| -rw-r--r-- | www/tdiary-devel/pkg-plist | 1 |
6 files changed, 33 insertions, 26 deletions
diff --git a/www/Makefile b/www/Makefile index e2bdcb3dd028..483ddfbeef75 100644 --- a/www/Makefile +++ b/www/Makefile @@ -740,6 +740,7 @@ SUBDIR += tasks SUBDIR += tclhttpd SUBDIR += tdiary + SUBDIR += tdiary-devel SUBDIR += thttpd SUBDIR += thumbnail_index SUBDIR += tidy diff --git a/www/tdiary-devel/Makefile b/www/tdiary-devel/Makefile index e5134a5f1769..46ced4c7e41c 100644 --- a/www/tdiary-devel/Makefile +++ b/www/tdiary-devel/Makefile @@ -1,50 +1,56 @@ -# New ports collection makefile for: tdiary -# Date created: 21 May 2003 +# New ports collection makefile for: tdiary-devel +# Date created: 9 June 2005 # Whom: Fumihiko Kimura <jfkimura@yahoo.co.jp> # # $FreeBSD$ # PORTNAME= tdiary -PORTVERSION= 2.0.1 +PORTVERSION= 2.1.1 CATEGORIES?= www ruby -MASTER_SITES= \ - ${MASTER_SITE_SOURCEFORGE} \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.tdiary.org/download/ MASTER_SITE_SUBDIR= ${PORTNAME} +PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-full-${PORTVERSION} MAINTAINER= jfkimura@yahoo.co.jp COMMENT= A Web-based diary system (like weblog) written in Ruby -NO_BUILD= yes -CONFLICTS?= ja-tdiary-* -PKGMESSAGE= ${WRKDIR}/pkg-message -USE_RUBY= yes -.if !defined(WITHOUT_RUBY_FEATURES) -USE_RUBY_FEATURES= fileutils -.endif +NO_BUILD= yes +CONFLICTS?= ja-tdiary-devel-[0-9]* +PKGMESSAGE= ${WRKDIR}/pkg-message +USE_RUBY= yes +RUBY_VER= 1.8 RUBY_SHEBANG_FILES= index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \ - misc/plugin/windex.rb \ - misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb + misc/plugin/windex.rb misc/plugin/rast-register.rb \ + misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb \ + misc/plugin/pingback/pb.rb misc/plugin/xmlrpc/xmlrpc.rb -TDIARYDIR= ${EXAMPLESDIR} +PLIST_FILES= ${TDIARYDIR:S|${LOCALBASE}/||}/tdiaryinst.rb +TDIARYDIR= ${EXAMPLESDIR}${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + .if !defined(TDIARY_LANG) TDIARY_LANG= tdiary.conf-en .endif - .if defined(WITH_TDIARY_UCONV) RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv .endif .if defined(WITH_TDIARY_NORA) RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora .endif +.include <bsd.port.pre.mk> + +.if ${RUBY_VERSION_CODE} < 182 +IGNORE= Needs ruby 1.8.2 or higher, install lang/ruby18 and try again +.endif do-install: @-${MKDIR} ${TDIARYDIR} @${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \ + -e 's,@@@@TDIARY@@@@,${PORTNAME}${PKGNAMESUFFIX},g' \ -e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \ ${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb @${CP} -pR ${WRKSRC}/ ${TDIARYDIR} @@ -54,13 +60,15 @@ do-install: .else @${ECHO_MSG} "===> TDIARY : Japanese Language messages support" @${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%J]")' ${TDIARYDIR}/tdiary.conf.sample + @${ECHO_MSG} + @${ECHO_MSG} "===> When you install in home directory, let's choose plugin of 'jdate.rb' to just display 'YOUBI'." .endif @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TDIARYDIR} post-install: @cd ${WRKSRC} && ${FIND} . -type f -o -type l | ${SED} -e 's,^\.,${TDIARYDIR:S|${LOCALBASE}/||},' >> ${TMPPLIST} @cd ${WRKSRC} && ${FIND} . -type d -depth | ${SED} -e 's,^\.,@dirrm ${TDIARYDIR:S|${LOCALBASE}/||},' >> ${TMPPLIST} - @${SED} -e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} + @${SED} -e 's|%%EXAMPLESDIR%%|${TDIARYDIR}|' < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/tdiary-devel/distinfo b/www/tdiary-devel/distinfo index 1602b5cd1db5..bea73049d39e 100644 --- a/www/tdiary-devel/distinfo +++ b/www/tdiary-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (tdiary-full-2.0.1.tar.gz) = 05e75ef43bf89aa46c926acc825a5039 -SIZE (tdiary-full-2.0.1.tar.gz) = 1704264 +MD5 (tdiary-full-2.1.1.tar.gz) = 74bf1819643c512c6f0af1bc6599c1c5 +SIZE (tdiary-full-2.1.1.tar.gz) = 2138225 diff --git a/www/tdiary-devel/files/tdiaryinst.rb.in b/www/tdiary-devel/files/tdiaryinst.rb.in index b391504c7e10..faf8520e7ad1 100644 --- a/www/tdiary-devel/files/tdiaryinst.rb.in +++ b/www/tdiary-devel/files/tdiaryinst.rb.in @@ -14,7 +14,7 @@ require 'find' require 'tempfile' # -$OPT_TDIARYMASTER = "@@@@PREFIX@@@@/share/examples/tdiary" +$OPT_TDIARYMASTER = "@@@@PREFIX@@@@/share/examples/@@@@TDIARY@@@@" $OPT_LANG = '@@@@LANG@@@@' module FileUtils16 @@ -215,7 +215,7 @@ class TdiaryInstall def copyBaseFile FileUtils16.cp_r("#{@tdiarymaster}/doc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) - FileUtils16.cp_r("#{@tdiarymaster}/erb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) +# FileUtils16.cp_r("#{@tdiarymaster}/erb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) FileUtils16.cp_r("#{@tdiarymaster}/misc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) FileUtils16.cp_r("#{@tdiarymaster}/plugin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) FileUtils16.cp_r("#{@tdiarymaster}/skel", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions) diff --git a/www/tdiary-devel/pkg-descr b/www/tdiary-devel/pkg-descr index cdcc8f8482cd..3497bb3b4fe4 100644 --- a/www/tdiary-devel/pkg-descr +++ b/www/tdiary-devel/pkg-descr @@ -1,9 +1,8 @@ tDiary is a Web-based interface system that works as a personal diary. It is possible for diary readers to add comments to your diary. - - require Ruby 1.6.3 or later - - currently supported: Japanese, English - + - require Ruby 1.8.2 or later + - currently supported: Japanese, English tDiary is developed on http://sourceforge.net/projects/tdiary/ . See URL for more information. diff --git a/www/tdiary-devel/pkg-plist b/www/tdiary-devel/pkg-plist deleted file mode 100644 index 61131e7ddb35..000000000000 --- a/www/tdiary-devel/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%EXAMPLESDIR%%/tdiaryinst.rb |