diff options
author | rene <rene@FreeBSD.org> | 2014-06-21 17:31:43 +0800 |
---|---|---|
committer | rene <rene@FreeBSD.org> | 2014-06-21 17:31:43 +0800 |
commit | edfdb4298a9ff3b3c481f45ad5e55e85491e021d (patch) | |
tree | 535fcbc1323b915b0c6aa08f389f8a1a4272c49f /www | |
parent | 297dff11bd8ebd9a2786d1d78283650f3462cf0a (diff) | |
download | freebsd-ports-gnome-edfdb4298a9ff3b3c481f45ad5e55e85491e021d.tar.gz freebsd-ports-gnome-edfdb4298a9ff3b3c481f45ad5e55e85491e021d.tar.zst freebsd-ports-gnome-edfdb4298a9ff3b3c481f45ad5e55e85491e021d.zip |
Remove expired ports:
2014-06-20 mail/sastatd: Superseded by sysutils/p5-Tail-Stat
2014-06-20 www/mod_ruby: Only for threadless ruby
2014-06-20 textproc/eruby: Only for threadless ruby, use ruby-gem erubis instead
2014-06-20 mail/p5-FuzzyOcr: Unmaintained upstream, no ports depending on it. Use mail/p5-FuzzyOcr-devel instead
2014-06-21 devel/bugzilla40
2014-06-21 devel/bugzilla42
Diffstat (limited to 'www')
-rw-r--r-- | www/Makefile | 1 | ||||
-rw-r--r-- | www/mod_ruby/Makefile | 71 | ||||
-rw-r--r-- | www/mod_ruby/distinfo | 2 | ||||
-rw-r--r-- | www/mod_ruby/files/patch-aa-git | 247 | ||||
-rw-r--r-- | www/mod_ruby/files/patch-connection.c | 20 | ||||
-rw-r--r-- | www/mod_ruby/files/patch-httpd.conf | 10 | ||||
-rw-r--r-- | www/mod_ruby/pkg-descr | 5 | ||||
-rw-r--r-- | www/mod_ruby/pkg-message | 17 | ||||
-rw-r--r-- | www/mod_ruby/pkg-plist | 36 |
9 files changed, 0 insertions, 409 deletions
diff --git a/www/Makefile b/www/Makefile index 85d918809b8e..0b6b40a59951 100644 --- a/www/Makefile +++ b/www/Makefile @@ -523,7 +523,6 @@ SUBDIR += mod_reproxy SUBDIR += mod_rivet SUBDIR += mod_rpaf2 - SUBDIR += mod_ruby SUBDIR += mod_scgi SUBDIR += mod_security SUBDIR += mod_setenvifplus diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile deleted file mode 100644 index 6adf1e0cd922..000000000000 --- a/www/mod_ruby/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# Created by: Akinori MUSHA aka knu <knu@idaemons.org> -# $FreeBSD$ - -PORTNAME= mod_ruby -PORTVERSION= 1.3.0 -PORTREVISION= 3 -CATEGORIES= www ruby -MASTER_SITES= ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/ -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} -DIST_SUBDIR= ruby - -MAINTAINER= ruby@FreeBSD.org -COMMENT= An Apache module that embeds Ruby interpreter within - -BROKEN= broken with ruby1.9 threads -DEPRECATED= Only for threadless ruby -EXPIRATION_DATE= 2014-06-20 - -USES= perl5 -USE_APACHE= 22 -USE_RUBY= yes -USE_PERL5= build - -CONFIGURE_ARGS= --with-apxs="${APXS}" \ - --with-apr-includes="`${LOCALBASE}/bin/apr-1-config --includedir`" -CFLAGS+= -DONIG_ESCAPE_REGEX_T_COLLISION -MAKE_ARGS= RUBY="${RUBY}" -INSTALL_TARGET= site-install - -RUBY_RD_FILES= # empty - -DOCS_EN= COPYING ChangeLog LEGAL LICENSE.apreq NOTICE \ - README.en doc/default.css doc/*.en.* -DOCS_JA= README.ja doc/default.css doc/*.ja.* - -OPTIONS_DEFINE= PTHREADS DOCS EXAMPLES -OPTIONS_DEFAULT= -NO_OPTIONS_SORT=yes -OPTIONS_SUB=yes -PTHREADS_DESC= Build threaded module - -.include <bsd.port.options.mk> - -do-configure: - cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} \ - configure.rb ${CONFIGURE_ARGS} -.if ${PORT_OPTIONS:MPTHREADS} -# dirty hack to force mod_ruby.so linked with lpthread.so, otherwise unresolved -# symbols happen - ${REINPLACE_CMD} -e 's|-pthread|-pthread -lpthread|' ${WRKSRC}/Makefile - -PKGNAMESUFFIX= -pthreads -.endif - -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja -.for f in ${DOCS_EN} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ -.endfor -.for f in ${DOCS_JA} - ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/ -.endfor -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/httpd.conf \ - ${STAGEDIR}${EXAMPLESDIR}/httpd.conf -.endif - -.include <bsd.port.mk> diff --git a/www/mod_ruby/distinfo b/www/mod_ruby/distinfo deleted file mode 100644 index 4879b2578bda..000000000000 --- a/www/mod_ruby/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (ruby/mod_ruby-1.3.0.tar.gz) = 6c82120ddc20d87f2bf066f60899eb71cd7791f03526084f942d050432c9411e -SIZE (ruby/mod_ruby-1.3.0.tar.gz) = 114246 diff --git a/www/mod_ruby/files/patch-aa-git b/www/mod_ruby/files/patch-aa-git deleted file mode 100644 index 908a634e11f9..000000000000 --- a/www/mod_ruby/files/patch-aa-git +++ /dev/null @@ -1,247 +0,0 @@ -diff -ur mod_ruby-1.3.0/Makefile.in mod_ruby/Makefile.in ---- mod_ruby-1.3.0/Makefile.in 2008-11-08 05:15:36.000000000 +0100 -+++ Makefile.in 2010-02-17 14:25:57.000000000 +0100 -@@ -16,6 +16,7 @@ - bindir = @bindir@ - datadir = @datadir@ - libdir = @libdir@ -+rubylibprefix = @rubylibprefix@ - rubylibdir = @rubylibdir@ - archdir = @archdir@ - sitedir = @sitedir@ -@@ -29,6 +30,7 @@ - LD = @LD@ - RANLIB = @RANLIB@ - RUBY = @RUBY@ -+RUBY_BASE_NAME = @RUBY_BASE_NAME@ - RM = @RM@ - - CFLAGS = @CFLAGS@ -I. -I$(hdrdir) -I$(hdrdir)/$(arch) $(APACHE_INCLUDES) $(LIBAPREQ_INCLUDES) @DEFS@ -diff -ur mod_ruby-1.3.0/autoconf.rb mod_ruby/autoconf.rb ---- mod_ruby-1.3.0/autoconf.rb 2008-11-08 05:15:36.000000000 +0100 -+++ autoconf.rb 2010-02-17 14:25:57.000000000 +0100 -@@ -243,6 +243,8 @@ - $bindir = CONFIG["bindir"].sub(prefix, "$(exec_prefix)").sub(drive, '') - $datadir = CONFIG["datadir"].sub(prefix, "$(prefix)").sub(drive, '') - $libdir = CONFIG["libdir"].sub(prefix, "$(exec_prefix)").sub(drive, '') -+$RUBY_BASE_NAME = CONFIG["RUBY_BASE_NAME"] -+$rubylibprefix = CONFIG["rubylibprefix"] - $archdir = $archdir.sub(prefix, "$(prefix)").sub(drive, '') - $sitelibdir = $sitelibdir.sub(prefix, "$(prefix)").sub(drive, '') - $sitearchdir = $sitearchdir.sub(prefix, "$(prefix)").sub(drive, '') -@@ -416,6 +418,7 @@ - AC_SUBST("bindir") - AC_SUBST("datadir") - AC_SUBST("libdir") -+AC_SUBST("rubylibprefix") - AC_SUBST("rubylibdir") - AC_SUBST("archdir") - AC_SUBST("sitedir") -@@ -429,6 +432,7 @@ - AC_SUBST("LD") - AC_SUBST("RANLIB") - AC_SUBST("RUBY") -+AC_SUBST("RUBY_BASE_NAME") - AC_SUBST("RM") - - AC_SUBST("CFLAGS") -diff -ur mod_ruby-1.3.0/configure.rb mod_ruby/configure.rb ---- mod_ruby-1.3.0/configure.rb 2008-11-08 05:15:36.000000000 +0100 -+++ configure.rb 2010-02-17 14:25:57.000000000 +0100 -@@ -221,6 +221,8 @@ - $bindir = CONFIG["bindir"].sub(prefix, "$(exec_prefix)").sub(drive, '') - $datadir = CONFIG["datadir"].sub(prefix, "$(prefix)").sub(drive, '') - $libdir = CONFIG["libdir"].sub(prefix, "$(exec_prefix)").sub(drive, '') -+$RUBY_BASE_NAME = CONFIG["RUBY_BASE_NAME"] -+$rubylibprefix = CONFIG["rubylibprefix"] - $archdir = $archdir.sub(prefix, "$(prefix)").sub(drive, '') - $sitelibdir = $sitelibdir.sub(prefix, "$(prefix)").sub(drive, '') - $sitearchdir = $sitearchdir.sub(prefix, "$(prefix)").sub(drive, '') -@@ -394,6 +396,7 @@ - AC_SUBST("bindir") - AC_SUBST("datadir") - AC_SUBST("libdir") -+AC_SUBST("rubylibprefix") - AC_SUBST("rubylibdir") - AC_SUBST("archdir") - AC_SUBST("sitedir") -@@ -407,6 +410,7 @@ - AC_SUBST("LD") - AC_SUBST("RANLIB") - AC_SUBST("RUBY") -+AC_SUBST("RUBY_BASE_NAME") - AC_SUBST("RM") - - AC_SUBST("CFLAGS") -diff -ur mod_ruby-1.3.0/lib/apache/erb-run.rb mod_ruby/lib/apache/erb-run.rb ---- mod_ruby-1.3.0/lib/apache/erb-run.rb 2005-08-03 03:32:41.000000000 +0200 -+++ lib/apache/erb-run.rb 2010-02-17 14:25:57.000000000 +0100 -@@ -97,7 +97,7 @@ - r.allowed |= (1 << M_POST) - return DECLINED - end -- if r.finfo.mode == 0 -+ if r.finfo.nil? || r.finfo.mode == 0 - return NOT_FOUND - end - -diff -ur mod_ruby-1.3.0/lib/apache/eruby-run.rb mod_ruby/lib/apache/eruby-run.rb ---- mod_ruby-1.3.0/lib/apache/eruby-run.rb 2007-04-04 10:02:18.000000000 +0200 -+++ lib/apache/eruby-run.rb 2010-02-17 14:25:57.000000000 +0100 -@@ -89,7 +89,7 @@ - r.allowed |= (1 << M_POST) - return DECLINED - end -- if r.finfo.mode == 0 -+ if r.finfo.nil? || r.finfo.mode == 0 - return NOT_FOUND - end - return OK -diff -ur mod_ruby-1.3.0/lib/apache/ruby-run.rb mod_ruby/lib/apache/ruby-run.rb ---- mod_ruby-1.3.0/lib/apache/ruby-run.rb 2005-08-03 03:32:41.000000000 +0200 -+++ lib/apache/ruby-run.rb 2010-02-17 14:25:57.000000000 +0100 -@@ -62,7 +62,7 @@ - r.allowed |= (1 << M_POST) - return DECLINED - end -- if r.finfo.mode == 0 -+ if r.finfo.nil? || r.finfo.mode == 0 - return NOT_FOUND - end - if r.allow_options & OPT_EXECCGI == 0 -@@ -80,6 +80,7 @@ - r.setup_cgi_env - filename = r.filename.dup - filename.untaint -+ filename.freeze # to avoid SecurityError in 1.9 - Apache.chdir_file(filename) - return filename - end -diff -ur mod_ruby-1.3.0/mod_ruby.c mod_ruby/mod_ruby.c ---- mod_ruby-1.3.0/mod_ruby.c 2008-11-08 05:34:48.000000000 +0100 -+++ mod_ruby.c 2010-02-17 14:25:57.000000000 +0100 -@@ -658,7 +658,6 @@ - RETSIGTYPE (*sigterm_handler)_((int)); - #endif - #ifdef RUBY_VM -- void Init_prelude(void); - RUBY_INIT_STACK; - #else - VALUE stack_start; -@@ -703,12 +702,14 @@ - #endif - - ruby_init_loadpath(); --#ifdef RUBY_VM -- Init_prelude(); --#endif -- default_load_path = GET_LOAD_PATH(); -+ { -+ char *argv[] = { "ruby", "-e", "" }; -+ ruby_options(3, argv); -+ } -+ default_load_path = rb_ary_dup(GET_LOAD_PATH()); - rb_global_variable(&default_load_path); - rb_define_variable("$0", &progname); -+ rb_define_variable("$PROGRAM_NAME", &progname); - list = (char **) conf->load_path->elts; - n = conf->load_path->nelts; - for (i = 0; i < n; i++) { -@@ -734,6 +735,7 @@ - } - } - -+#ifndef RUBY_VM - static void dso_unload(void *handle) - { - #if defined(_WIN32) -@@ -747,16 +749,24 @@ - #endif - } - --static void ruby_finalize_interpreter() -+static void ruby_unload_libraries() - { - RUBY_EXTERN VALUE ruby_dln_librefs; - int i; - -- ruby_finalize(); - for (i = 0; i < RARRAY_LEN(ruby_dln_librefs); i++) { - dso_unload((void *) NUM2LONG(RARRAY_PTR(ruby_dln_librefs)[i])); - } - } -+#endif -+ -+static void ruby_finalize_interpreter() -+{ -+ ruby_finalize(); -+#ifndef RUBY_VM -+ ruby_unload_libraries(); -+#endif -+} - - #if APR_HAS_THREADS - static void* APR_THREAD_FUNC ruby_thread_start(apr_thread_t *t, void *data) -@@ -1006,8 +1016,7 @@ - - static VALUE kill_threads(VALUE arg) - { -- extern VALUE rb_thread_list(); -- VALUE threads = rb_thread_list(); -+ VALUE threads = rb_protect_funcall(rb_cThread, rb_intern("list"), NULL, 0); - VALUE main_thread = rb_thread_main(); - VALUE th; - int i; -diff -ur mod_ruby-1.3.0/mod_ruby.h mod_ruby/mod_ruby.h ---- mod_ruby-1.3.0/mod_ruby.h 2008-11-08 13:57:19.000000000 +1000 -+++ mod_ruby.h 2011-08-09 00:52:48.000000000 +1100 -@@ -47,8 +47,7 @@ - - #define IO_PATH(fptr) (StringValuePtr(fptr->pathv)) - --VALUE rb_get_load_path(void); --#define GET_LOAD_PATH() (rb_get_load_path()) -+#define GET_LOAD_PATH() (rb_gv_get("$:")) - #define SET_LOAD_PATH(path) (rb_gv_set("$:", path)) - - #else -diff -ur mod_ruby-1.3.0/request.c mod_ruby/request.c ---- mod_ruby-1.3.0/request.c 2008-11-08 04:57:19.000000000 +0100 -+++ request.c 2010-02-17 14:25:57.000000000 +0100 -@@ -788,7 +788,7 @@ - return data->notes; - } - --#ifdef APACHE2 -+#if defined(APACHE2) && !defined(RUBY_VM) - - #ifdef WIN32 - typedef int mode_t; -@@ -859,12 +859,17 @@ - - static VALUE request_finfo(VALUE self) - { -- VALUE cStat; - request_data *data; -- struct stat *st; - - data = get_request_data(self); - if (NIL_P(data->finfo)) { -+#ifdef RUBY_VM -+ data->finfo = rb_protect_funcall(rb_cFile, rb_intern("stat"), NULL, 1, -+ rb_str_new2(data->request->filename)); -+#else -+ VALUE cStat; -+ struct stat *st; -+ - cStat = rb_const_get(rb_cFile, rb_intern("Stat")); - data->finfo = Data_Make_Struct(cStat, struct stat, NULL, free, st); - #ifdef APACHE2 -@@ -884,6 +889,7 @@ - #else /* Apache 1.x */ - *st = data->request->finfo; - #endif -+#endif - } - return data->finfo; - } diff --git a/www/mod_ruby/files/patch-connection.c b/www/mod_ruby/files/patch-connection.c deleted file mode 100644 index 3a38f5506ebf..000000000000 --- a/www/mod_ruby/files/patch-connection.c +++ /dev/null @@ -1,20 +0,0 @@ ---- connection.c.orig 2007-07-31 09:03:53.000000000 +0200 -+++ connection.c 2009-06-30 12:55:06.000000000 +0200 -@@ -81,7 +81,7 @@ - Data_Get_Struct(self, conn_rec, conn); - Check_Type(val, T_STRING); - conn->user = ap_pstrndup(conn->pool, -- RSTRING(val)->ptr, RSTRING(val)->len); -+ RSTRING_PTR(val), RSTRING_LEN(val)); - return val; - } - -@@ -92,7 +92,7 @@ - Data_Get_Struct(self, conn_rec, conn); - Check_Type(val, T_STRING); - conn->ap_auth_type = ap_pstrndup(conn->pool, -- RSTRING(val)->ptr, RSTRING(val)->len); -+ RSTRING_PTR(val), RSTRING_LEN(val)); - return val; - } - #endif diff --git a/www/mod_ruby/files/patch-httpd.conf b/www/mod_ruby/files/patch-httpd.conf deleted file mode 100644 index c052e7ef0235..000000000000 --- a/www/mod_ruby/files/patch-httpd.conf +++ /dev/null @@ -1,10 +0,0 @@ ---- examples/httpd.conf.orig Thu Jun 21 16:50:34 2001 -+++ examples/httpd.conf Tue Apr 23 05:57:33 2002 -@@ -1,6 +1,6 @@ - # Note: /usr/local/apache/libexec/mod_ruby.so is just an example. - # You should specify the correct path to mod_ruby.so. --LoadModule ruby_module /usr/local/apache/libexec/mod_ruby.so -+LoadModule ruby_module libexec/apache/mod_ruby.so - - # # If ClearModuleList is used in your httpd.conf, you should use AddModule - # # to activate the ruby module. diff --git a/www/mod_ruby/pkg-descr b/www/mod_ruby/pkg-descr deleted file mode 100644 index 3d6dd83558d2..000000000000 --- a/www/mod_ruby/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -mod_ruby embeds the Ruby interpreter into the Apache web server, -allowing Ruby CGI scripts to be executed natively. These scripts will -start up much faster than without mod_ruby. - -Author: Shugo Maeda diff --git a/www/mod_ruby/pkg-message b/www/mod_ruby/pkg-message deleted file mode 100644 index 7f75e605dcdb..000000000000 --- a/www/mod_ruby/pkg-message +++ /dev/null @@ -1,17 +0,0 @@ -************************************************************ -Please edit your Apache configuration file to enable and set -up this module. - -Look at the file ${PREFIX}/share/examples/mod_ruby/httpd.conf -and the documents held in ${PREFIX}/share/doc/ruby18/mod_ruby/ -for indications on what to do. - -(${PREFIX} is typically /usr/local) - -When it's all set up, do the following to take effect: - - apachectl configtest (and correct any errors reported) - apachectl restart - -Enjoy! -************************************************************ diff --git a/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist deleted file mode 100644 index 977a0586585c..000000000000 --- a/www/mod_ruby/pkg-plist +++ /dev/null @@ -1,36 +0,0 @@ -%%RUBY_SITELIBDIR%%/apache/erb-run.rb -%%RUBY_SITELIBDIR%%/apache/eruby-debug.rb -%%RUBY_SITELIBDIR%%/apache/eruby-run.rb -%%RUBY_SITELIBDIR%%/apache/query.rb -%%RUBY_SITELIBDIR%%/apache/rd2html.rb -%%RUBY_SITELIBDIR%%/apache/registry.rb -%%RUBY_SITELIBDIR%%/apache/ruby-debug.rb -%%RUBY_SITELIBDIR%%/apache/ruby-profile.rb -%%RUBY_SITELIBDIR%%/apache/rails-dispatcher.rb -%%RUBY_SITELIBDIR%%/apache/ruby-run.rb -%%RUBY_SITELIBDIR%%/auto-reload.rb -@dirrm %%RUBY_SITELIBDIR%%/apache -%%APACHEMODDIR%%/mod_ruby.so -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/LEGAL -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/LICENSE.apreq -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/NOTICE -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes.en.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/default.css -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/directives.en.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq.en.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.en.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/install.en.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/classes.ja.euc.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/default.css -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/directives.ja.euc.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/faq.ja.euc.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.ja.euc.rd -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/install.ja.euc.rd -%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja -%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% |