Attachment 198413 Details for Bug 230436 – updated patch file

[patch] updated patch file

databases_rubygem-gdbm.patch (text/plain), 8.11 KB, created by Yasuhiro Kimura on 2018-10-20 19:07:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2018-10-20 19:07:28 UTC

Size: 8.11 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 482603)
>+++ MOVED	(working copy)
>@@ -10583,3 +10583,4 @@
> audio/msilbc|multimedia/mswebrtc|2018-10-18|Deprecated upstream
> multimedia/msx264|multimedia/msopenh264|2018-10-18|Deprecated upstream
> games/openastromenace|games/astromenace|2018-10-20|Name correctly after upstream
>+databases/ruby-gdbm|databases/rubygem-gdbm|2018-10-21|Renamed because switch to use gem
>Index: databases/Makefile
>===================================================================
>--- databases/Makefile	(revision 482603)
>+++ databases/Makefile	(working copy)
>@@ -937,7 +937,6 @@
>     SUBDIR += rrdtool
>     SUBDIR += rrdtool12
>     SUBDIR += ruby-bdb
>-    SUBDIR += ruby-gdbm
>     SUBDIR += ruby-odbc
>     SUBDIR += ruby-qdbm
>     SUBDIR += ruby-tokyocabinet
>@@ -997,6 +996,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
>Index: databases/rubygem-gdbm/Makefile
>===================================================================
>--- databases/rubygem-gdbm/Makefile	(revision 482603)
>+++ databases/rubygem-gdbm/Makefile	(working copy)
>@@ -2,41 +2,19 @@
> # $FreeBSD$
> 
> PORTNAME=	gdbm
>-PORTVERSION=	${RUBY_PORTVERSION}
>-PORTREVISION=	3
>-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>
>Index: databases/rubygem-gdbm/distinfo
>===================================================================
>--- databases/rubygem-gdbm/distinfo	(nonexistent)
>+++ databases/rubygem-gdbm/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1533630322
>+SHA256 (rubygem/gdbm-2.0.0.gem) = 1097164950c3c9f08f9aa670067b830329c151fec31b922e694ba47f87319b58
>+SIZE (rubygem/gdbm-2.0.0.gem) = 11776
>Index: databases/rubygem-gdbm/pkg-descr
>===================================================================
>--- databases/rubygem-gdbm/pkg-descr	(revision 482603)
>+++ databases/rubygem-gdbm/pkg-descr	(working copy)
>@@ -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
>Index: lang/ruby23/Makefile
>===================================================================
>--- lang/ruby23/Makefile	(revision 482603)
>+++ lang/ruby23/Makefile	(working copy)
>@@ -162,12 +162,13 @@
> # We get the gem executable from ports.
> 	@${RM} ${BUILD_WRKSRC}/bin/gem
> 
>+# We get GDBM class library from ports.
>+	@${RM} -r ${BUILD_WRKSRC}/ext/gdbm
>+
> #
> # Prepare modules we are wanting to build via external ports
> #
>-.for d in gdbm tk
>-	@${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
>-.endfor
>+	@${MV} ${BUILD_WRKSRC}/ext/tk ${WRKDIR}/
> 
> post-build:
> #
>Index: lang/ruby23/pkg-message
>===================================================================
>--- lang/ruby23/pkg-message	(revision 482603)
>+++ lang/ruby23/pkg-message	(working copy)
>@@ -8,7 +8,7 @@
> 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.
> ====
>Index: lang/ruby24/Makefile
>===================================================================
>--- lang/ruby24/Makefile	(revision 482603)
>+++ lang/ruby24/Makefile	(working copy)
>@@ -133,11 +133,9 @@
> 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:
> #
>Index: lang/ruby24/pkg-message
>===================================================================
>--- lang/ruby24/pkg-message	(revision 482603)
>+++ lang/ruby24/pkg-message	(working copy)
>@@ -8,7 +8,7 @@
> 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.
> ====
>Index: lang/ruby25/Makefile
>===================================================================
>--- lang/ruby25/Makefile	(revision 482603)
>+++ lang/ruby25/Makefile	(working copy)
>@@ -133,11 +133,9 @@
> 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:
> #
>Index: lang/ruby25/pkg-message
>===================================================================
>--- lang/ruby25/pkg-message	(revision 482603)
>+++ lang/ruby25/pkg-message	(working copy)
>@@ -8,7 +8,7 @@
> 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.
> ====
>Index: mail/bsfilter/Makefile
>===================================================================
>--- mail/bsfilter/Makefile	(revision 482603)
>+++ mail/bsfilter/Makefile	(working copy)
>@@ -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 @@
> 
> 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
>Index: sysutils/ck4up/Makefile
>===================================================================
>--- sysutils/ck4up/Makefile	(revision 482603)
>+++ sysutils/ck4up/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ck4up
> PORTVERSION=	1.4
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	http://jue.li/crux/ck4up/
> 
>@@ -9,7 +10,7 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Checks 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

Actions: View | Diff

Attachments on bug 230436: 195975 | 197421 | 197805 | 198413 | 202106