Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Jan 2017 14:44:55 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r431392 - in head/databases/ruby-bdb: . files
Message-ID:  <201701131444.v0DEitf9006640@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Fri Jan 13 14:44:55 2017
New Revision: 431392
URL: https://svnweb.freebsd.org/changeset/ports/431392

Log:
  Remove always-true RUBY_VER check
  
  - Pet portlint: fix diff header of patch files
  - Convert to options target helper
  
  With hat:	ruby

Added:
  head/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
     - copied, changed from r431391, head/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h
Deleted:
  head/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h
Modified:
  head/databases/ruby-bdb/Makefile
  head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
  head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
  head/databases/ruby-bdb/files/patch-extconf.rb
  head/databases/ruby-bdb/files/patch-src-extconf.rb
  head/databases/ruby-bdb/files/patch-src-features.rb
  head/databases/ruby-bdb/files/patch-src__bdb.c

Modified: head/databases/ruby-bdb/Makefile
==============================================================================
--- head/databases/ruby-bdb/Makefile	Fri Jan 13 14:44:50 2017	(r431391)
+++ head/databases/ruby-bdb/Makefile	Fri Jan 13 14:44:55 2017	(r431392)
@@ -57,10 +57,6 @@ SHEBANG_FILES=	examples/record.rb \
 
 .include <bsd.port.pre.mk>
 
-.if ${RUBY_VER} >= 2.1
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-bdbxml2-bdbxml.h
-.endif
-
 .if ${RUBY_VER} == 2.1
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-src-common.c-21
 .endif
@@ -76,9 +72,13 @@ post-patch:
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/bdb.so
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc)
+
+post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -empty")
 

Modified: head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
==============================================================================
--- head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc	Fri Jan 13 14:44:50 2017	(r431391)
+++ head/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc	Fri Jan 13 14:44:55 2017	(r431392)
@@ -1,5 +1,5 @@
---- ./bdbxml1/bdbxml.cc.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./bdbxml1/bdbxml.cc	2014-01-03 01:47:58.535201285 +0000
+--- bdbxml1/bdbxml.cc.orig	2011-04-06 19:35:39 UTC
++++ bdbxml1/bdbxml.cc
 @@ -2340,18 +2340,16 @@
  	major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
  	minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));

Copied and modified: head/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h (from r431391, head/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h)
==============================================================================
--- head/databases/ruby-bdb/files/extra-patch-bdbxml2-bdbxml.h	Fri Jan 13 14:44:50 2017	(r431391, copy source)
+++ head/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h	Fri Jan 13 14:44:55 2017	(r431392)
@@ -1,5 +1,5 @@
---- bdbxml2/bdbxml.h.orig	2011-04-06 19:35:39.000000000 +0000
-+++ bdbxml2/bdbxml.h	2015-01-22 17:03:07.000000000 +0000
+--- bdbxml2/bdbxml.h.orig	2011-04-06 19:35:39 UTC
++++ bdbxml2/bdbxml.h
 @@ -377,7 +377,7 @@
  static inline void
  rset_obj(VALUE obj)

Modified: head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
==============================================================================
--- head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc	Fri Jan 13 14:44:50 2017	(r431391)
+++ head/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc	Fri Jan 13 14:44:55 2017	(r431392)
@@ -1,5 +1,5 @@
---- ./bdbxml2/bdbxml.cc.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./bdbxml2/bdbxml.cc	2014-01-03 01:49:02.080197786 +0000
+--- bdbxml2/bdbxml.cc.orig	2011-04-06 19:35:39 UTC
++++ bdbxml2/bdbxml.cc
 @@ -5536,18 +5536,16 @@
  	major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
  	minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));

Modified: head/databases/ruby-bdb/files/patch-extconf.rb
==============================================================================
--- head/databases/ruby-bdb/files/patch-extconf.rb	Fri Jan 13 14:44:50 2017	(r431391)
+++ head/databases/ruby-bdb/files/patch-extconf.rb	Fri Jan 13 14:44:55 2017	(r431392)
@@ -1,5 +1,5 @@
---- extconf.rb.orig	2011-04-06 19:35:39.000000000 +0000
-+++ extconf.rb	2015-01-22 14:56:21.000000000 +0000
+--- extconf.rb.orig	2011-04-06 19:35:39 UTC
++++ extconf.rb
 @@ -50,7 +50,7 @@
  rdoc: docs/doc/index.html
  

Modified: head/databases/ruby-bdb/files/patch-src-extconf.rb
==============================================================================
--- head/databases/ruby-bdb/files/patch-src-extconf.rb	Fri Jan 13 14:44:50 2017	(r431391)
+++ head/databases/ruby-bdb/files/patch-src-extconf.rb	Fri Jan 13 14:44:55 2017	(r431392)
@@ -1,5 +1,5 @@
---- src/extconf.rb.orig	2015-01-22 16:09:31.000000000 +0000
-+++ src/extconf.rb	2015-01-22 16:09:34.000000000 +0000
+--- src/extconf.rb.orig	2015-01-22 16:09:31 UTC
++++ src/extconf.rb
 @@ -36,16 +36,16 @@
  
  if unknown = enable_config("unknown")

Modified: head/databases/ruby-bdb/files/patch-src-features.rb
==============================================================================
--- head/databases/ruby-bdb/files/patch-src-features.rb	Fri Jan 13 14:44:50 2017	(r431391)
+++ head/databases/ruby-bdb/files/patch-src-features.rb	Fri Jan 13 14:44:55 2017	(r431392)
@@ -1,5 +1,5 @@
---- src/features.rb.orig	2011-04-06 19:35:39.000000000 +0000
-+++ src/features.rb	2015-01-22 16:40:53.000000000 +0000
+--- src/features.rb.orig	2011-04-06 19:35:39 UTC
++++ src/features.rb
 @@ -813,7 +813,6 @@
  begin
     conftest = CONFTEST_C.dup

Modified: head/databases/ruby-bdb/files/patch-src__bdb.c
==============================================================================
--- head/databases/ruby-bdb/files/patch-src__bdb.c	Fri Jan 13 14:44:50 2017	(r431391)
+++ head/databases/ruby-bdb/files/patch-src__bdb.c	Fri Jan 13 14:44:55 2017	(r431392)
@@ -1,5 +1,5 @@
---- ./src/bdb.c.orig	2011-04-06 19:35:39.000000000 +0000
-+++ ./src/bdb.c	2014-01-03 01:45:56.336210315 +0000
+--- src/bdb.c.orig	2011-04-06 19:35:39 UTC
++++ src/bdb.c
 @@ -166,11 +166,10 @@
  	rb_raise(rb_eNameError, "module already defined");
      }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701131444.v0DEitf9006640>