Attachment 222468 Details for Bug 252716 – new diff with cleared deps

[patch] new diff with cleared deps

pgloader3-2021-02-15.diff (text/plain), 8.23 KB, created by Mario Duhanic on 2021-02-15 14:04:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mario Duhanic

Created: 2021-02-15 14:04:14 UTC

Size: 8.23 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-02-15 01:35:22.024633000 +0100
>@@ -1,47 +1,45 @@
>-# Created by: Jov <amutu@amutu.com>
>-# $FreeBSD: head/databases/pgloader3/Makefile 550670 2020-09-30 09:48:11Z antoine $
>-
>+# $FreeBSD$
> 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=	sbcl:lang/sbcl
> 
>-BUILD_DEPENDS=	ccl:lang/ccl
> 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
>+MY_QL_VER=	version-2015-01-28
>+MY_PGL_LP=	build/quicklisp/local-projects
>+GH_TUPLE=	dimitri:pgloader: \
>+		quicklisp:quicklisp-bootstrap:${MY_QL_VER}:ql/build \
>+		qitab:qmynd:7e56daf7:qmynd/${MY_PGL_LP}/qmynd \
>+		dimitri:cl-ixf:ed26f87e:clixf/${MY_PGL_LP}/cl-ixf \
>+		dimitri:cl-db3:38e5ad35:cldb3/${MY_PGL_LP}/cl-db3 \
>+		AccelerationNet:cl-csv:68ecb5d8:clcsv/${MY_PGL_LP}/cl-csv
> 
>-MAKE_ARGS=	CL=ccl
>-MAKE_ENV=	ASDF_OUTPUT_TRANSLATIONS=/:
>+MAKE_ARGS=	CL=sbcl
> 
>-# stripping can break lisp binaries
>+MAKE_JOBS_UNSAFE=	yes
>+
>+# don't strip away SBCL/CCL:
> STRIP=
> 
>-post-patch:
>-	${LN} ${WRKSRC}/build/quicklisp/quicklisp.lisp ${WRKSRC}/build
>+post-extract:
>+	${LN} ${WRKSRC}/build/quicklisp-bootstrap-${MY_QL_VER}/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-02-14 23:52:10.107585000 +0100
>@@ -1,5 +1,13 @@
>-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 = 1613343130
>+SHA256 (dimitri-pgloader-v3.6.2_GH0.tar.gz) = 33f87df9cb8f9a36f9836cd691ad6dfa72ae76200a12fe01ee89584f3b771ae7
>+SIZE (dimitri-pgloader-v3.6.2_GH0.tar.gz) = 3717111
>+SHA256 (quicklisp-quicklisp-bootstrap-version-2015-01-28_GH0.tar.gz) = 92aef100970de4e64b102be1f08de1c9a9e8f22d6711f6aad217ffb6d16fc82f
>+SIZE (quicklisp-quicklisp-bootstrap-version-2015-01-28_GH0.tar.gz) = 13942
>+SHA256 (qitab-qmynd-7e56daf7_GH0.tar.gz) = 3b73f0e10e697cf4c76417935734a2a0abd9bdb53a6d893ba45f9b4c2fc1860d
>+SIZE (qitab-qmynd-7e56daf7_GH0.tar.gz) = 50195
>+SHA256 (dimitri-cl-ixf-ed26f87e_GH0.tar.gz) = dcf377ff941302ac0535d05c617ca71a887e5f87b939c402b8ff6cd8b5e75a8e
>+SIZE (dimitri-cl-ixf-ed26f87e_GH0.tar.gz) = 8737
>+SHA256 (dimitri-cl-db3-38e5ad35_GH0.tar.gz) = 09b7b5e49c4c96ce9920581ba3ead2f8578f1c69b71f427954047149f446cc01
>+SIZE (dimitri-cl-db3-38e5ad35_GH0.tar.gz) = 6250
>+SHA256 (AccelerationNet-cl-csv-68ecb5d8_GH0.tar.gz) = a3d17a2aed3dbe8106ff18e557c9e77ab823470b5d78fbe29fec9722135f4dd8
>+SIZE (AccelerationNet-cl-csv-68ecb5d8_GH0.tar.gz) = 26245
>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	2021-02-14 01:40:07.623415000 +0100
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2017-07-06 14:53:29 UTC
>+--- Makefile.orig	2020-03-22 21:26:18 UTC
> +++ Makefile
>-@@ -84,7 +84,7 @@ $(QLDIR)/local-projects/cl-csv:
>+@@ -86,7 +86,7 @@ $(QLDIR)/local-projects/cl-csv:
>  
>  $(QLDIR)/setup.lisp:
>  	mkdir -p $(BUILDDIR)
>@@ -9,30 +9,12 @@
>  	$(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)
>+@@ -199,7 +199,7 @@ $(BUNDLE): $(BUNDLEDIR) $(BUNDLEDIR)/version.sexp
>  	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)
>++#	make QLDIR=$(BUNDLEDIR) clones
>  	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-02-15 00:15:48.079568000 +0100
>@@ -1,9 +1,11 @@
>-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 migrations from other productions to PostgreSQL. In this mode of
>+operation, 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