New ports required for gitlab-ce 13.6 upgrade.

8 files changed, 111 insertions, 0 deletions

diff --git a/databases/Makefile b/databases/Makefile
index ca579ac426dc..2b1e80d6f1af 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -159,6 +159,7 @@
     SUBDIR += libnvpair
     SUBDIR += libodbc++
     SUBDIR += libpbl
+    SUBDIR += libpg_query
     SUBDIR += libpqtypes
     SUBDIR += libsdb
     SUBDIR += libzdb
@@ -930,6 +931,7 @@
     SUBDIR += rubygem-flipper-active_record
     SUBDIR += rubygem-flipper-active_record017
     SUBDIR += rubygem-gdbm
+    SUBDIR += rubygem-gitlab-pg_query
     SUBDIR += rubygem-globalid
     SUBDIR += rubygem-globalid-rails5
     SUBDIR += rubygem-globalid-rails50
diff --git a/databases/libpg_query/Makefile b/databases/libpg_query/Makefile
new file mode 100644
index 000000000000..e76880d5680f
--- /dev/null
+++ b/databases/libpg_query/Makefile
@@ -0,0 +1,27 @@
+# Created by: Matthias Fechner <mfechner@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	libpg_query
+DISTVERSION=	10-1.0.3
+CATEGORIES=	databases devel
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	C library for accessing the PostgreSQL parser outside of the server
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gmake pgsql
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	lfittl
+
+do-install:
+	${INSTALL_LIB} ${WRKSRC}/libpg_query.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/pg_query.h ${STAGEDIR}${PREFIX}/include/
+
+PLIST_FILES=	include/pg_query.h \
+		lib/libpg_query.a
+
+.include <bsd.port.mk>
diff --git a/databases/libpg_query/distinfo b/databases/libpg_query/distinfo
new file mode 100644
index 000000000000..7719f26c7344
--- /dev/null
+++ b/databases/libpg_query/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1605911735
+SHA256 (lfittl-libpg_query-10-1.0.3_GH0.tar.gz) = 1332761f31c198cb9825e6ccccda0b6a0e57daeb824870e8524df77f1592d149
+SIZE (lfittl-libpg_query-10-1.0.3_GH0.tar.gz) = 1507832
diff --git a/databases/libpg_query/pkg-descr b/databases/libpg_query/pkg-descr
new file mode 100644
index 000000000000..6e04a75b2fc6
--- /dev/null
+++ b/databases/libpg_query/pkg-descr
@@ -0,0 +1,6 @@
+C library for accessing the PostgreSQL parser outside of the server.
+
+This library uses the actual PostgreSQL server source to parse SQL
+queries and return the internal PostgreSQL parse tree.
+
+WWW: https://github.com/lfittl/libpg_query
diff --git a/databases/rubygem-gitlab-pg_query/Makefile b/databases/rubygem-gitlab-pg_query/Makefile
new file mode 100644
index 000000000000..c4721c305c17
--- /dev/null
+++ b/databases/rubygem-gitlab-pg_query/Makefile
@@ -0,0 +1,24 @@
+# Created by: Matthias Fechner <mfechner@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	gitlab-pg_query
+PORTVERSION=	1.3.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Parses SQL queries using a copy of the PostgreSQL server query parser
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpg_query.a:databases/libpg_query
+
+USES=		gem
+USE_RUBY=	yes
+
+#CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
+#		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
+#PG_CONFIG=	${LOCALBASE}/bin/pg_config
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-gitlab-pg_query/distinfo b/databases/rubygem-gitlab-pg_query/distinfo
new file mode 100644
index 000000000000..f8775c785407
--- /dev/null
+++ b/databases/rubygem-gitlab-pg_query/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1605910010
+SHA256 (rubygem/gitlab-pg_query-1.3.0.gem) = 98c66602fdf054dc57dff8b91925e57fa7b43015c9c699dc6f6d6de31fd27f77
+SIZE (rubygem/gitlab-pg_query-1.3.0.gem) = 35328
diff --git a/databases/rubygem-gitlab-pg_query/files/patch-ext_pg__query_extconf.rb b/databases/rubygem-gitlab-pg_query/files/patch-ext_pg__query_extconf.rb
new file mode 100644
index 000000000000..f5947a5ce0df
--- /dev/null
+++ b/databases/rubygem-gitlab-pg_query/files/patch-ext_pg__query_extconf.rb
@@ -0,0 +1,39 @@
+--- ext/pg_query/extconf.rb.orig	2020-11-20 23:41:38 UTC
++++ ext/pg_query/extconf.rb
+@@ -10,22 +10,22 @@ libdir = File.join(workdir, 'libpg_query-' + LIB_PG_QU
+ gemdir = File.join(__dir__, '../..')
+ libfile = libdir + '/libpg_query.a'
+ 
+-unless File.exist?("#{workdir}/libpg_query.tar.gz")
+-  File.open("#{workdir}/libpg_query.tar.gz", 'wb') do |target_file|
+-    open("https://gitlab.com/gitlab-org/libpg_query/-/archive/#{LIB_PG_QUERY_TAG}/libpg_query-#{LIB_PG_QUERY_TAG}.tar.gz", 'rb') do |read_file|
+-      target_file.write(read_file.read)
+-    end
+-  end
+-end
++#unless File.exist?("#{workdir}/libpg_query.tar.gz")
++#  File.open("#{workdir}/libpg_query.tar.gz", 'wb') do |target_file|
++#    open("https://gitlab.com/gitlab-org/libpg_query/-/archive/#{LIB_PG_QUERY_TAG}/libpg_query-#{LIB_PG_QUERY_TAG}.tar.gz", 'rb') do |read_file|
++#      target_file.write(read_file.read)
++#    end
++#  end
++#end
+ 
+-unless Dir.exist?(libdir)
+-  system("tar -xzf #{workdir}/libpg_query.tar.gz") || raise('ERROR')
+-end
++#unless Dir.exist?(libdir)
++#  system("tar -xzf #{workdir}/libpg_query.tar.gz") || raise('ERROR')
++#end
+ 
+-unless Dir.exist?(libfile)
+-  # Build libpg_query (and parts of PostgreSQL)
+-  system("cd #{libdir}; #{ENV['MAKE'] || (RUBY_PLATFORM =~ /bsd/ ? 'gmake' : 'make')} build")
+-end
++#unless Dir.exist?(libfile)
++#  # Build libpg_query (and parts of PostgreSQL)
++#  system("cd #{libdir}; #{ENV['MAKE'] || (RUBY_PLATFORM =~ /bsd/ ? 'gmake' : 'make')} build")
++#end
+ 
+ # Copy test files (this intentionally overwrites existing files!)
+ system("cp #{libdir}/testdata/* #{gemdir}/spec/files/")
diff --git a/databases/rubygem-gitlab-pg_query/pkg-descr b/databases/rubygem-gitlab-pg_query/pkg-descr
new file mode 100644
index 000000000000..7a86795e7fa5
--- /dev/null
+++ b/databases/rubygem-gitlab-pg_query/pkg-descr
@@ -0,0 +1,7 @@
+This Ruby extension uses the actual PostgreSQL server source
+to parse SQL queries and return the internal PostgreSQL parsetree.
+
+In addition the extension allows you to normalize queries (replacing constant
+values with ?) and parse these normalized queries into a parsetree again.
+
+WWW: https://github.com/lfittl/pg_query