From a4dc61a491aa2a68e79cd14fdd13672788f436f4 Mon Sep 17 00:00:00 2001 From: "Serhii (Sergey) Kozlov" Date: Wed, 15 Mar 2023 23:20:06 +0000 Subject: devel/pydio-packr: Remove port Was only used for building www/pydio-cells before, not needed anymore --- MOVED | 1 + devel/Makefile | 1 - devel/pydio-packr/Makefile | 36 ------------ devel/pydio-packr/distinfo | 7 --- devel/pydio-packr/files/patch-go.mod | 30 ---------- devel/pydio-packr/files/patch-go.sum | 11 ---- devel/pydio-packr/files/patch-vendor_modules.txt | 72 ------------------------ devel/pydio-packr/pkg-descr | 2 - 8 files changed, 1 insertion(+), 159 deletions(-) delete mode 100644 devel/pydio-packr/Makefile delete mode 100644 devel/pydio-packr/distinfo delete mode 100644 devel/pydio-packr/files/patch-go.mod delete mode 100644 devel/pydio-packr/files/patch-go.sum delete mode 100644 devel/pydio-packr/files/patch-vendor_modules.txt delete mode 100644 devel/pydio-packr/pkg-descr diff --git a/MOVED b/MOVED index ab92998a9650..6407c5213971 100644 --- a/MOVED +++ b/MOVED @@ -17790,3 +17790,4 @@ devel/libpthread-stubs||2023-03-12|No consumers left and never supported pthread multimedia/mkvtoolnix-nox11|multimedia/mkvtoolnix@nogui|2023-03-13|Converted to flavor security/openssl-devel|security/openssl30|2023-03-14|3.0 is not devel, prevent confusion with 3.1 net-p2p/openethereum||2023-03-15|Has expired: not maintained anymore +devel/pydio-packr||2023-03-15|Was only used for building www/pydio-cells before, not needed anymore diff --git a/devel/Makefile b/devel/Makefile index 25e17a780213..320303eab7c4 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -5731,7 +5731,6 @@ SUBDIR += pycount SUBDIR += pydbus-common SUBDIR += pydeps - SUBDIR += pydio-packr SUBDIR += pyenv SUBDIR += pygobject3-common SUBDIR += pylint diff --git a/devel/pydio-packr/Makefile b/devel/pydio-packr/Makefile deleted file mode 100644 index 906859caffe0..000000000000 --- a/devel/pydio-packr/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PORTNAME= packr -DISTVERSIONPREFIX= v -DISTVERSION= 1.30.2-0.20200608151212 -DISTVERSIONSUFFIX= -7d41389ccc6e -PORTREVISION= 12 -CATEGORIES= devel -PKGNAMEPREFIX= pydio- - -MAINTAINER= skozlov@FreeBSD.org -COMMENT= Pydio fork of packr v1 -WWW= https://github.com/pydio/packr - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= www/pydio-cells doesn't build on i386, so there's no point building pydio-packr - -USES= go:modules -USE_GITHUB= nodefault -GH_TUPLE= golang:sys:v0.6.0:sys - -GO_MODULE= github.com/pydio/packr -GO_TARGET= ./packr - -PLIST_FILES= bin/pydio-packr - -pre-patch: - ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys - ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys - -post-install: - ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${PORTNAME} - -.include diff --git a/devel/pydio-packr/distinfo b/devel/pydio-packr/distinfo deleted file mode 100644 index ae9c268fbf11..000000000000 --- a/devel/pydio-packr/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -TIMESTAMP = 1678529684 -SHA256 (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/v1.30.2-0.20200608151212-7d41389ccc6e.mod) = 58b0303c07cc8bea31e992ffe04fd9b9fddfb75924ba8b75033d7d1e961005b2 -SIZE (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/v1.30.2-0.20200608151212-7d41389ccc6e.mod) = 316 -SHA256 (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/v1.30.2-0.20200608151212-7d41389ccc6e.zip) = 507b08772bcd71db243f12b5d6c254c0099dc494d3078a3b929ef45f1983c793 -SIZE (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/v1.30.2-0.20200608151212-7d41389ccc6e.zip) = 37808 -SHA256 (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 -SIZE (go/devel_pydio-packr/packr-v1.30.2-0.20200608151212-7d41389ccc6e/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/devel/pydio-packr/files/patch-go.mod b/devel/pydio-packr/files/patch-go.mod deleted file mode 100644 index ba66eb747d8e..000000000000 --- a/devel/pydio-packr/files/patch-go.mod +++ /dev/null @@ -1,30 +0,0 @@ ---- go.mod.orig 2023-03-11 10:16:45 UTC -+++ go.mod -@@ -1,6 +1,6 @@ - module github.com/pydio/packr - --go 1.12 -+go 1.17 - - require ( - github.com/gobuffalo/envy v1.7.0 -@@ -10,4 +10,19 @@ require ( - github.com/spf13/cobra v0.0.5 - github.com/stretchr/testify v1.3.0 - golang.org/x/sync v0.0.0-20190423024810-112230192c58 -+) -+ -+require ( -+ github.com/davecgh/go-spew v1.1.1 // indirect -+ github.com/gobuffalo/logger v1.0.0 // indirect -+ github.com/inconshreveable/mousetrap v1.0.0 // indirect -+ github.com/joho/godotenv v1.3.0 // indirect -+ github.com/karrick/godirwalk v1.10.12 // indirect -+ github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect -+ github.com/pmezard/go-difflib v1.0.0 // indirect -+ github.com/rogpeppe/go-internal v1.3.0 // indirect -+ github.com/sirupsen/logrus v1.4.2 // indirect -+ github.com/spf13/pflag v1.0.3 // indirect -+ golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 // indirect -+ golang.org/x/sys v0.6.0 // indirect - ) diff --git a/devel/pydio-packr/files/patch-go.sum b/devel/pydio-packr/files/patch-go.sum deleted file mode 100644 index 22d15a49693d..000000000000 --- a/devel/pydio-packr/files/patch-go.sum +++ /dev/null @@ -1,11 +0,0 @@ ---- go.sum.orig 2023-03-11 10:16:48 UTC -+++ go.sum -@@ -73,6 +73,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go - golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 h1:khxRGsvPk4n2y8I/mLLjp7e5dMTJmH75wvqS6nMwUtY= - golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= - golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= diff --git a/devel/pydio-packr/files/patch-vendor_modules.txt b/devel/pydio-packr/files/patch-vendor_modules.txt deleted file mode 100644 index 4b0ac5cdae32..000000000000 --- a/devel/pydio-packr/files/patch-vendor_modules.txt +++ /dev/null @@ -1,72 +0,0 @@ ---- vendor/modules.txt.orig 2023-03-11 10:17:32 UTC -+++ vendor/modules.txt -@@ -1,15 +1,21 @@ - # github.com/davecgh/go-spew v1.1.1 -+## explicit - github.com/davecgh/go-spew/spew - # github.com/gobuffalo/envy v1.7.0 -+## explicit - github.com/gobuffalo/envy - # github.com/gobuffalo/logger v1.0.0 -+## explicit; go 1.12 - github.com/gobuffalo/logger - # github.com/gobuffalo/packd v0.3.0 -+## explicit; go 1.12 - github.com/gobuffalo/packd - github.com/gobuffalo/packd/internal/takeon/github.com/markbates/errx - # github.com/gobuffalo/packr v1.30.1 -+## explicit; go 1.12 - github.com/gobuffalo/packr - # github.com/gobuffalo/packr/v2 v2.5.2 -+## explicit; go 1.12 - github.com/gobuffalo/packr/v2/file - github.com/gobuffalo/packr/v2/file/resolver - github.com/gobuffalo/packr/v2/file/resolver/encoding/hex -@@ -19,32 +25,46 @@ github.com/gobuffalo/packr/v2/jam/parser - github.com/gobuffalo/packr/v2/jam/store - github.com/gobuffalo/packr/v2/plog - # github.com/inconshreveable/mousetrap v1.0.0 -+## explicit - github.com/inconshreveable/mousetrap - # github.com/joho/godotenv v1.3.0 -+## explicit - github.com/joho/godotenv - # github.com/karrick/godirwalk v1.10.12 -+## explicit; go 1.12 - github.com/karrick/godirwalk - # github.com/konsorten/go-windows-terminal-sequences v1.0.2 -+## explicit - github.com/konsorten/go-windows-terminal-sequences - # github.com/pmezard/go-difflib v1.0.0 -+## explicit - github.com/pmezard/go-difflib/difflib - # github.com/rogpeppe/go-internal v1.3.0 -+## explicit - github.com/rogpeppe/go-internal/modfile - github.com/rogpeppe/go-internal/module - github.com/rogpeppe/go-internal/semver - # github.com/sirupsen/logrus v1.4.2 -+## explicit - github.com/sirupsen/logrus - # github.com/spf13/cobra v0.0.5 -+## explicit; go 1.12 - github.com/spf13/cobra - # github.com/spf13/pflag v1.0.3 -+## explicit - github.com/spf13/pflag - # github.com/stretchr/testify v1.3.0 -+## explicit - github.com/stretchr/testify/assert - github.com/stretchr/testify/require - # golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 -+## explicit - golang.org/x/crypto/ssh/terminal - # golang.org/x/sync v0.0.0-20190423024810-112230192c58 -+## explicit - golang.org/x/sync/errgroup --# golang.org/x/sys v0.0.0-20190515120540-06a5c4944438 -+# golang.org/x/sys v0.6.0 -+## explicit; go 1.17 -+golang.org/x/sys/internal/unsafeheader - golang.org/x/sys/unix - golang.org/x/sys/windows diff --git a/devel/pydio-packr/pkg-descr b/devel/pydio-packr/pkg-descr deleted file mode 100644 index 91361f95735f..000000000000 --- a/devel/pydio-packr/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -This is a fork of gobuffalo's packr v1 customized by pydio team. -Its sole purpose is to be used in building the www/pydio-cells port. -- cgit v1.2.3