Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Apr 2019 08:02:30 +0000 (UTC)
From:      Koichiro Iwao <meta@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r497555 - in head: . databases databases/ruby-gdbm databases/rubygem-gdbm lang/ruby24 lang/ruby25 mail/bsfilter sysutils/ck4up
Message-ID:  <201904020802.x3282UEb006631@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: meta
Date: Tue Apr  2 08:02:30 2019
New Revision: 497555
URL: https://svnweb.freebsd.org/changeset/ports/497555

Log:
  databases/ruby-gdbm: Gemify gdbm
  
  since gdbm is gemified in upstream after Ruby 2.5 [1]. Ruby 2.4 can also
  use the gdbm gem because it is a gem!
  
  - Add MOVED entry
  - Bump PORTEPOCH because PORTVERSION goes barwards
  - Update pkg-descr and WWW
  - Remove unnecessary pkg-message
  
  [1] https://bugs.ruby-lang.org/issues/5481
  
  Update lang/ruby* ports:
  
  - Do not build gdbm together with Ruby interpreter, but build as a rubygem
  - Remove ${BUILD_WRKSRC}/ext/gdbm instead of moving it to ${WRKDIR}
  - Update pkg-message to mention rubygem-gdbm instead of ruby-gdbm
  
  Also following changes are made to ruby-gdbm consumers:
  
  - Updade dependency to depend on rubygem-gdbm
  - Bump PORTREVISION due to dependency change
  
  PR:		230436
  Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
  Sponsored by:	HAW International, Inc.

Added:
  head/databases/rubygem-gdbm/
     - copied from r497554, head/databases/ruby-gdbm/
  head/databases/rubygem-gdbm/distinfo   (contents, props changed)
Deleted:
  head/databases/ruby-gdbm/
  head/databases/rubygem-gdbm/pkg-message
Modified:
  head/MOVED
  head/databases/Makefile
  head/databases/rubygem-gdbm/Makefile
  head/databases/rubygem-gdbm/pkg-descr
  head/lang/ruby24/Makefile
  head/lang/ruby24/pkg-message
  head/lang/ruby25/Makefile
  head/lang/ruby25/pkg-message
  head/mail/bsfilter/Makefile
  head/sysutils/ck4up/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/MOVED	Tue Apr  2 08:02:30 2019	(r497555)
@@ -11553,6 +11553,7 @@ math/wxMaxima|math/wxmaxima|2019-02-10|rename for cons
 net-mgmt/py-snmp4|net-mgmt/py-pysnmp|2019-02-11|Renamed to match upstream naming
 net-mgmt/py-snmp4-apps|net-mgmt/py-pysnmp-apps|2019-02-11|Renamed to match upstream naming
 net-mgmt/py-snmp4-mibs|net-mgmt/py-pysnmp-mibs|2019-02-11|Renamed to match upstream naming
+databases/ruby-gdbm|databases/rubygem-gdbm|2019-02-18|Renamed because switch to use gem
 science/mmtf|science/mmtf-cpp|2019-02-16|Rename to match the project name on github
 dns/p5-pgeodns||2019-02-16|Has expired: Uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
 ftp/proftpd-mod_geoip||2019-02-16|Has expired: Uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/databases/Makefile	Tue Apr  2 08:02:30 2019	(r497555)
@@ -887,7 +887,6 @@
     SUBDIR += rrdtool
     SUBDIR += rrdtool12
     SUBDIR += ruby-bdb
-    SUBDIR += ruby-gdbm
     SUBDIR += ruby-odbc
     SUBDIR += ruby-qdbm
     SUBDIR += ruby-tokyocabinet
@@ -947,6 +946,7 @@
     SUBDIR += rubygem-familia
     SUBDIR += rubygem-flipper-active_record
     SUBDIR += rubygem-flipper-active_record013
+    SUBDIR += rubygem-gdbm
     SUBDIR += rubygem-globalid
     SUBDIR += rubygem-globalid-rails5
     SUBDIR += rubygem-globalid-rails50

Modified: head/databases/rubygem-gdbm/Makefile
==============================================================================
--- head/databases/ruby-gdbm/Makefile	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/databases/rubygem-gdbm/Makefile	Tue Apr  2 08:02:30 2019	(r497555)
@@ -2,41 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	gdbm
-PORTVERSION=	${RUBY_PORTVERSION}
-PORTREVISION=	4
-PORTEPOCH=	1
-CATEGORIES=	databases ruby
-MASTER_SITES=	# none
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTFILES=	# none
+PORTVERSION=	2.0.0
+PORTEPOCH=	2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby extension to GDBM library
 
-LICENSE=	BSD2CLAUSE RUBY
-LICENSE_COMB=	dual
+LICENSE=	BSD2CLAUSE
 
-FETCH_DEPENDS=	${NONEXISTENT}:${RUBY_PORT}:patch
 LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
-PLIST_FILES=	%%RUBY_ARCHLIBDIR%%/gdbm.so
+USES=		gem
 USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
-MAKE_ARGS=	sitelibdir='$$(rubylibdir)' \
-		INSTALL_PROG="${INSTALL_PROGRAM}" \
-		INSTALL_DATA="${INSTALL_DATA}"
-
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_VER} >= 2.4
-post-patch:
-	@${REINPLACE_CMD} -e '/\/include\/ruby.h/d' ${WRKSRC}/depend
-.endif
-
-do-extract:
-	${MKDIR} ${WRKDIR}
-	${LN} -sf `cd ${PORTSDIR}/${RUBY_PORT}; ${MAKE} -V WRKDIR`/${PORTNAME} ${WRKDIR}/
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/databases/rubygem-gdbm/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rubygem-gdbm/distinfo	Tue Apr  2 08:02:30 2019	(r497555)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1533630322
+SHA256 (rubygem/gdbm-2.0.0.gem) = 1097164950c3c9f08f9aa670067b830329c151fec31b922e694ba47f87319b58
+SIZE (rubygem/gdbm-2.0.0.gem) = 11776

Modified: head/databases/rubygem-gdbm/pkg-descr
==============================================================================
--- head/databases/ruby-gdbm/pkg-descr	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/databases/rubygem-gdbm/pkg-descr	Tue Apr  2 08:02:30 2019	(r497555)
@@ -1,2 +1,19 @@
-This is a Ruby extension to GDBM library, which is actually a part of
-the Ruby distribution.
+Ruby extension for GNU dbm (gdbm) -- a simple database engine for
+storing key-value pairs on disk.
+
+GNU dbm is a library for simple databases. A database is a file that
+stores key-value pairs. Gdbm allows the user to store, retrieve, and
+delete data by key. It furthermore allows a non-sorted traversal of
+all key-value pairs. A gdbm database thus provides the same
+functionality as a hash. As with objects of the Hash class, elements
+can be accessed with []. Furthermore, GDBM mixes in the Enumerable
+module, thus providing convenient methods such as #find, #collect,
+#map, etc.
+
+A process is allowed to open several different databases at the same
+time. A process can open a database as a "reader" or a
+"writer". Whereas a reader has only read-access to the database, a
+writer has read- and write-access. A database can be accessed either
+by any number of readers or by exactly one writer at the same time.
+
+WWW: https://rubygems.org/gems/gdbm

Modified: head/lang/ruby24/Makefile
==============================================================================
--- head/lang/ruby24/Makefile	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/lang/ruby24/Makefile	Tue Apr  2 08:02:30 2019	(r497555)
@@ -133,11 +133,9 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(C
 post-patch:
 	@${FIND} ${WRKSRC}/ -name "*.orig" -delete
 # We get these from other ports
-.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem
+.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem ext/gdbm
 	@${RM} -r ${BUILD_WRKSRC}/${d}
 .endfor
-# Used by databases/ruby-gdbm port
-	@${MV} ${BUILD_WRKSRC}/ext/gdbm ${WRKDIR}/
 
 post-build:
 #

Modified: head/lang/ruby24/pkg-message
==============================================================================
--- head/lang/ruby24/pkg-message	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/lang/ruby24/pkg-message	Tue Apr  2 08:02:30 2019	(r497555)
@@ -8,7 +8,7 @@ of upgrading:
 And some of the standard libraries are provided as separate ports
 since they require extra dependencies:
 
-	databases/ruby-gdbm:	GDBM module
+	databases/rubygem-gdbm:	GDBM module
 
 Install them as occasion demands.
 ====

Modified: head/lang/ruby25/Makefile
==============================================================================
--- head/lang/ruby25/Makefile	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/lang/ruby25/Makefile	Tue Apr  2 08:02:30 2019	(r497555)
@@ -133,11 +133,9 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(C
 post-patch:
 	@${FIND} ${WRKSRC}/ -name "*.orig" -delete
 # We get these from other ports
-.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem
+.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem ext/gdbm
 	@${RM} -r ${BUILD_WRKSRC}/${d}
 .endfor
-# Used by databases/ruby-gdbm port
-	@${MV} ${BUILD_WRKSRC}/ext/gdbm ${WRKDIR}/
 
 post-build:
 #

Modified: head/lang/ruby25/pkg-message
==============================================================================
--- head/lang/ruby25/pkg-message	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/lang/ruby25/pkg-message	Tue Apr  2 08:02:30 2019	(r497555)
@@ -8,7 +8,7 @@ of upgrading:
 And some of the standard libraries are provided as separate ports
 since they require extra dependencies:
 
-	databases/ruby-gdbm:	GDBM module
+	databases/rubygem-gdbm:	GDBM module
 
 Install them as occasion demands.
 ====

Modified: head/mail/bsfilter/Makefile
==============================================================================
--- head/mail/bsfilter/Makefile	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/mail/bsfilter/Makefile	Tue Apr  2 08:02:30 2019	(r497555)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bsfilter
 PORTVERSION=	1.0.19
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ruby
 MASTER_SITES=	OSDN/bsfilter/59804
 
@@ -12,7 +12,7 @@ COMMENT=	Bayesian spam filter written in Ruby
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${RUBY_PKGNAMEPREFIX}gdbm>=0:databases/ruby-gdbm
+RUN_DEPENDS=	rubygem-gdbm>=2.0.0,2:databases/rubygem-gdbm
 
 NO_BUILD=	yes
 USE_RUBY=	yes

Modified: head/sysutils/ck4up/Makefile
==============================================================================
--- head/sysutils/ck4up/Makefile	Tue Apr  2 08:00:38 2019	(r497554)
+++ head/sysutils/ck4up/Makefile	Tue Apr  2 08:02:30 2019	(r497555)
@@ -3,13 +3,14 @@
 
 PORTNAME=	ck4up
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://jue.li/crux/ck4up/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Check HTTP and FTP sites for updates
 
-RUN_DEPENDS=	${RUBY_ARCHLIBDIR}/gdbm.so:databases/ruby-gdbm
+RUN_DEPENDS=	rubygem-gdbm>=2.0.0,2:databases/rubygem-gdbm
 
 NO_BUILD=	yes
 NO_ARCH=	yes



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