Attachment 221625 Details for Bug 252716 – patch to 3.6.2 using diff -Nur

[patch] patch to 3.6.2 using diff -Nur

pgloader3.6.2.patch (text/plain), 6.92 KB, created by Mario Duhanic on 2021-01-16 10:48:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mario Duhanic

Created: 2021-01-16 10:48:17 UTC

Size: 6.92 KB

patch

obsolete

>diff -Nur /usr/ports/databases/pgloader3/Makefile databases/pgloader3/Makefile
>--- /usr/ports/databases/pgloader3/Makefile	2020-09-30 11:48:11.000000000 +0200
>+++ databases/pgloader3/Makefile	2021-01-15 18:20:40.009592000 +0100
>@@ -1,47 +1,39 @@
>-# Created by: Jov <amutu@amutu.com>
> # $FreeBSD: head/databases/pgloader3/Makefile 550670 2020-09-30 09:48:11Z antoine $
> 
> PORTNAME=	pgloader
>-PORTVERSION=	3.4.1
>+PORTVERSION=	3.6.2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	databases
>-PKGNAMESUFFIX=	3
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Data loading tool for PostgreSQL,using the COPY command
>+MAINTAINER=	freebsd-washroom@duhanic.com
>+COMMENT=	Data loading and migration tool for PostgreSQL using the COPY command.
> 
> LICENSE=	PostgreSQL
> 
>-BROKEN=		fails to build
>-
>-BUILD_DEPENDS=	ccl:lang/ccl
>+BUILD_DEPENDS=	sbcl:lang/sbcl \
>+		curl:ftp/curl
> LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
> 		libtdsodbc.so:databases/freetds
> 
>-CONFLICTS=	pgloader-2*
>-
> USES=		gmake
> 
>+CONFLICTS=	pgloader-2*
>+
> USE_GITHUB=	yes
> GH_ACCOUNT=	dimitri
>-GH_TUPLE=	amutu:quicklisp_offline:e9008cc:qlp/build/quicklisp
> 
>-PLIST_FILES=	bin/pgloader \
>-		bin/pgloader3 \
>-		man/man1/pgloader.1.gz
>+PLIST_FILES=	bin/pgloader
> 
>-MAKE_ARGS=	CL=ccl
>-MAKE_ENV=	ASDF_OUTPUT_TRANSLATIONS=/:
>+# new default:
>+MAKE_ARGS=	CL=sbcl
> 
>-# stripping can break lisp binaries
>+# breaks when built parallely:
>+MAKE_JOBS_UNSAFE=	yes
>+
>+# don't strip away SBCL/CCL:
> STRIP=
> 
>-post-patch:
>-	${LN} ${WRKSRC}/build/quicklisp/quicklisp.lisp ${WRKSRC}/build
>-
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/pgloader ${STAGEDIR}${PREFIX}/bin/pgloader3
>-	${INSTALL_SCRIPT} ${WRKSRC}/pgloader_wrapper.sh ${STAGEDIR}${PREFIX}/bin/pgloader
>-	${INSTALL_MAN} ${WRKSRC}/pgloader.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/pgloader ${STAGEDIR}${PREFIX}/bin/pgloader
> 
> .include <bsd.port.mk>
>diff -Nur /usr/ports/databases/pgloader3/distinfo databases/pgloader3/distinfo
>--- /usr/ports/databases/pgloader3/distinfo	2017-08-07 15:46:50.000000000 +0200
>+++ databases/pgloader3/distinfo	2021-01-14 22:44:31.972559000 +0100
>@@ -1,5 +1,3 @@
>-TIMESTAMP = 1499825145
>-SHA256 (dimitri-pgloader-v3.4.1_GH0.tar.gz) = 3ac4d03706057a35e1d4d0e63571b84be7d0d07ea09e015d90e242200488fe82
>-SIZE (dimitri-pgloader-v3.4.1_GH0.tar.gz) = 4218005
>-SHA256 (amutu-quicklisp_offline-e9008cc_GH0.tar.gz) = 2085b87b2c62b0eca85784995c86a66a0a202950c242e100273c9cea4cde0453
>-SIZE (amutu-quicklisp_offline-e9008cc_GH0.tar.gz) = 4833120
>+TIMESTAMP = 1610660671
>+SHA256 (dimitri-pgloader-v3.6.2_GH0.tar.gz) = 33f87df9cb8f9a36f9836cd691ad6dfa72ae76200a12fe01ee89584f3b771ae7
>+SIZE (dimitri-pgloader-v3.6.2_GH0.tar.gz) = 3717111
>diff -Nur /usr/ports/databases/pgloader3/files/patch-Makefile databases/pgloader3/files/patch-Makefile
>--- /usr/ports/databases/pgloader3/files/patch-Makefile	2017-08-07 15:46:50.000000000 +0200
>+++ databases/pgloader3/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
>@@ -1,38 +0,0 @@
>---- Makefile.orig	2017-07-06 14:53:29 UTC
>-+++ Makefile
>-@@ -84,7 +84,7 @@ $(QLDIR)/local-projects/cl-csv:
>- 
>- $(QLDIR)/setup.lisp:
>- 	mkdir -p $(BUILDDIR)
>--	curl -o $(BUILDDIR)/quicklisp.lisp http://beta.quicklisp.org/quicklisp.lisp
>-+#	curl -o $(BUILDDIR)/quicklisp.lisp http://beta.quicklisp.org/quicklisp.lisp
>- 	$(CL) $(CL_OPTS) --load $(BUILDDIR)/quicklisp.lisp                        \
>-              --load src/getenv.lisp                                               \
>-              --eval '(quicklisp-quickstart:install :path "$(BUILDDIR)/quicklisp" :proxy (getenv "http_proxy"))' \
>-@@ -97,7 +97,7 @@ clones: $(QLDIR)/local-projects/cl-ixf \
>-         $(QLDIR)/local-projects/cl-csv \
>-         $(QLDIR)/local-projects/qmynd ;
>- 
>--$(LIBS): $(QLDIR)/setup.lisp clones
>-+$(LIBS): $(QLDIR)/setup.lisp
>- 	$(CL) $(CL_OPTS) --load $(QLDIR)/setup.lisp                 \
>-              --eval '(push "$(PWD)/" asdf:*central-registry*)'      \
>-              --eval '(ql:quickload "pgloader")'                     \
>-@@ -113,7 +113,7 @@ $(MANIFEST): $(LIBS)
>- 
>- manifest: $(MANIFEST) ;
>- 
>--$(BUILDAPP_CCL): $(QLDIR)/setup.lisp
>-+$(BUILDAPP_CCL): $(QLDIR)/setup.lisp $(LIBS)
>- 	mkdir -p $(BUILDDIR)/bin
>- 	$(CL) $(CL_OPTS) --load $(QLDIR)/setup.lisp               \
>-              --eval '(ql:quickload "buildapp")'                   \
>-@@ -176,7 +176,7 @@ $(BUNDLE): $(BUNDLEDIR)
>- 	sed -e s/%VERSION%/$(VERSION)/ < bundle/Makefile > $(BUNDLEDIR)/Makefile
>- 	git archive --format=tar --prefix=pgloader-$(VERSION)/ master \
>- 	     | tar -C $(BUNDLEDIR)/local-projects/ -xf -
>--	make QLDIR=$(BUNDLEDIR) clones
>-+	make QLDIR=$(BUNDLEDIR)
>- 	tar -C build/bundle 		    \
>-             --exclude bin   		    \
>-             --exclude test/sqlite           \
>diff -Nur /usr/ports/databases/pgloader3/files/patch-pgloader__wrapper.sh databases/pgloader3/files/patch-pgloader__wrapper.sh
>--- /usr/ports/databases/pgloader3/files/patch-pgloader__wrapper.sh	2017-08-07 15:46:50.000000000 +0200
>+++ databases/pgloader3/files/patch-pgloader__wrapper.sh	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- pgloader_wrapper.sh.orig	2017-07-14 08:47:14 UTC
>-+++ pgloader_wrapper.sh
>-@@ -0,0 +1,8 @@
>-+#!/bin/sh
>-+
>-+# There is a bug for current ccl on FreeBSD, which is  determine_executable_name
>-+# doesn't do the job for FreeBSD. Now we use this script as a workaround. See:
>-+# https://github.com/Clozure/ccl/issues/38
>-+
>-+BIN_DIR="$(cd $(/usr/bin/dirname $0);pwd)"
>-+exec "${BIN_DIR}"/pgloader3 "${@}"
>diff -Nur /usr/ports/databases/pgloader3/pkg-descr databases/pgloader3/pkg-descr
>--- /usr/ports/databases/pgloader3/pkg-descr	2017-08-07 15:46:50.000000000 +0200
>+++ databases/pgloader3/pkg-descr	2021-01-15 01:48:53.252594000 +0100
>@@ -1,9 +1,5 @@
>-Pgloader loads data into PostgreSQL using the COPY streaming protocol,and
>-doing so with separate threads for reading and writing data.Asynchronous
>-IO,compiled to the metal programming language.
>-pgloader knows how to read data from MySQL,SQLite or dBase databases,and
>-knows how to discover the schema and properly cast data types over.It also
>-knows how to read CSV files in several definitions of CSV,and fixed columns
>-files.
>+pgloader loads data from various sources into PostgreSQL. It can transform the data it reads on the fly and submit raw SQL before and after the loading. It uses the COPY PostgreSQL protocol to stream the data into the server, and manages errors by filling a pair of reject.dat and reject.log files.
> 
>-WWW: http://pgloader.io
>+Thanks to being able to load data directly from a database source, pgloader also supports from migrations from other productions to PostgreSQL. In this mode of operations, pgloader handles both the schema and data parts of the migration, in a single unmanned command, allowing to implement Continuous Migration.
>+
>+WWW: https://pgloader.io
>diff -Nur /usr/ports/databases/pgloader3/pkg-plist databases/pgloader3/pkg-plist
>--- /usr/ports/databases/pgloader3/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>+++ databases/pgloader3/pkg-plist	2021-01-15 01:50:49.256536000 +0100
>@@ -0,0 +1 @@
>+bin/pgloader

Actions: View | Diff

Attachments on bug 252716: 221604 | 221625 | 222468 | 222469 | 222680 | 222681