~olbohlen/oi-userland.git

parent: 5aca290a | patch | commit | ignore whitespace

Alexander Pyhalov

2019-11-22 88061cd54f968c45771959ca087d25b937b3f8cd

pgtcl: update to 2.6.3

5 files modified

	components/tcl/pgtcl/Makefile	27 ●●●●● patch \| view \| raw \| blame \| history
	components/tcl/pgtcl/files/pkgIndex.tcl	6 ●●●●● patch \| view \| raw \| blame \| history
	components/tcl/pgtcl/manifests/sample-manifest.p5m	20 ●●●●● patch \| view \| raw \| blame \| history
	components/tcl/pgtcl/patches/01-ldflags.patch	6 ●●●●● patch \| view \| raw \| blame \| history
	components/tcl/pgtcl/pgtcl.p5m	20 ●●●●● patch \| view \| raw \| blame \| history

 components/tcl/pgtcl/Makefile

@@ -13,15 +13,17 @@
# Copyright 2017 Alexander Pyhalov
#

BUILD_BITS=32_and_64

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= pgtcl
COMPONENT_VERSION=     2.3.2
COMPONENT_VERSION=     2.6.3
COMPONENT_SUMMARY=     A Tcl client library for PostgreSQL
COMPONENT_SRC=         Pgtcl-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=     $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
  sha256:514b4fcaa8c6bbd9625943d4c01aafe73cbc26ddda482b510ced17192271a253
  sha256:7950d2640dd206dd07ad36ea96363f3d436d3d2be3fec8993c11f363c55f0d22
COMPONENT_ARCHIVE_URL= \
  https://github.com/flightaware/Pgtcl/archive/v$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL = http://flightaware.github.io/Pgtcl/
@@ -33,15 +35,16 @@
# Don't depend on host default pg_config
PATH=$(PG_BINDIR.$(BITS)):$(PATH.illumos)

include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
TEST_TARGET=$(NO_TESTS)
include $(WS_MAKE_RULES)/common.mk

COMPONENT_PREP_ACTION += (cd $(@D) && autoreconf -fi)

CONFIGURE_OPTIONS +=    --enable-threads
CONFIGURE_OPTIONS.64 +=    --enable-64bit

CONFIGURE_OPTIONS.32 += --libdir=/usr/lib/tcl8.6/pgtcl2.3
CONFIGURE_OPTIONS.64 += --libdir=/usr/lib/tcl8.6/pgtcl2.3/$(MACH64)
CONFIGURE_OPTIONS.32 += --libdir=/usr/lib/tcl8.6/pgtcl
CONFIGURE_OPTIONS.64 += --libdir=/usr/lib/tcl8.6/pgtcl/$(MACH64)

CONFIGURE_OPTIONS.32    += --with-tcl="/usr/lib"
CONFIGURE_OPTIONS.64    += --with-tcl="/usr/lib/$(MACH64)"
@@ -49,12 +52,10 @@
COMPONENT_POST_INSTALL_ACTION= ( mkdir -p $(PROTOUSRSHAREDOCDIR)/pgtcl-$(COMPONENT_VERSION) && \
     cp -a $(SOURCE_DIR)/doc/html/* $(PROTOUSRSHAREDOCDIR)/pgtcl-$(COMPONENT_VERSION) )  

build:        $(BUILD_32_and_64)
# Build dependencies
REQUIRED_PACKAGES += $(PG_DEVELOPER_PKG)

install:    $(INSTALL_32_and_64)

test:        $(NO_TESTS)

REQUIRED_PACKAGES += database/postgres-94/library
# Auto-generated dependencies
REQUIRED_PACKAGES += $(PG_LIBRARY_PKG)
REQUIRED_PACKAGES += database/sqlite-3
REQUIRED_PACKAGES += system/library

 components/tcl/pgtcl/files/pkgIndex.tcl

@@ -1,8 +1,8 @@
global tcl_platform
if {$tcl_platform(wordSize) == 8} {
  package ifneeded Pgtcl 2.3.2  [list load [file join $dir amd64/libpgtcl2.3.2.so]]
  package ifneeded Pgtcl 2.6.3  [list load [file join $dir amd64/libpgtcl2.6.3.so]]
} else {
  package ifneeded Pgtcl 2.3.2  [list load [file join $dir libpgtcl2.3.2.so]]
  package ifneeded Pgtcl 2.6.3  [list load [file join $dir libpgtcl2.6.3.so]]
}
package ifneeded sc_postgres 1.2 \
package ifneeded sc_postgres 1.3 \
    [list source [file join $dir postgres-helpers.tcl]]

 components/tcl/pgtcl/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2017 <contributor>
# Copyright 2018 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -22,12 +22,17 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/lib/tcl8.6/pgtcl2.2/$(MACH64)/libpgtcl$(COMPONENT_VERSION).so
file path=usr/lib/tcl8.6/pgtcl2.2/$(MACH64)/pkgIndex.tcl
file path=usr/lib/tcl8.6/pgtcl2.2/$(MACH64)/postgres-helpers.tcl
file path=usr/lib/tcl8.6/pgtcl2.2/libpgtcl$(COMPONENT_VERSION).so
file path=usr/lib/tcl8.6/pgtcl2.2/pkgIndex.tcl
file path=usr/lib/tcl8.6/pgtcl2.2/postgres-helpers.tcl
file path=usr/include/pgtclId.h
file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/libpgtcl$(COMPONENT_VERSION).so
link path=usr/lib/tcl8.6/pgtcl/$(MACH64)/libpgtcl.so \
    target=/libpgtcl$(COMPONENT_VERSION).so
file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/pkgIndex.tcl
file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/postgres-helpers.tcl
file path=usr/lib/tcl8.6/pgtcl/libpgtcl$(COMPONENT_VERSION).so
link path=usr/lib/tcl8.6/pgtcl/libpgtcl.so \
    target=/libpgtcl$(COMPONENT_VERSION).so
file path=usr/lib/tcl8.6/pgtcl/pkgIndex.tcl
file path=usr/lib/tcl8.6/pgtcl/postgres-helpers.tcl
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/HTML.index
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/index.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/libpgtcl-loading.html
@@ -47,6 +52,7 @@
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexec.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexecprepared.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexecute.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pggetconnectionid.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pggetresult.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgisbusy.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pglisten.html

 components/tcl/pgtcl/patches/01-ldflags.patch

@@ -1,6 +1,6 @@
--- Pgtcl-2.2.0/configure.~1~    2017-06-21 15:14:48.000000000 +0000
+++ Pgtcl-2.2.0/configure    2017-07-18 21:47:36.316575862 +0000
@@ -5395,8 +5395,8 @@
--- Pgtcl-2.6.3/configure.in.1    2019-11-22 12:51:03.519783323 +0000
+++ Pgtcl-2.6.3/configure.in    2019-11-22 12:54:16.937889276 +0000
@@ -108,8 +108,8 @@
 LIBPG=""
 PG_INCLUDES="-I$PG_INC_DIR"
 PKG_INCLUDES="-I$PG_INC_DIR"

 components/tcl/pgtcl/pgtcl.p5m

@@ -23,14 +23,19 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

# We need to replace index to load 64-bit library when necessary
file files/pkgIndex.tcl path=usr/lib/tcl8.6/pgtcl2.3/pkgIndex.tcl
file files/pkgIndex.tcl path=usr/lib/tcl8.6/pgtcl/pkgIndex.tcl

file path=usr/lib/tcl8.6/pgtcl2.3/$(MACH64)/libpgtcl$(COMPONENT_VERSION).so
#file path=usr/lib/tcl8.6/pgtcl2.3/$(MACH64)/pkgIndex.tcl
#file path=usr/lib/tcl8.6/pgtcl2.3/$(MACH64)/postgres-helpers.tcl
file path=usr/lib/tcl8.6/pgtcl2.3/libpgtcl$(COMPONENT_VERSION).so
#file path=usr/lib/tcl8.6/pgtcl2.3/pkgIndex.tcl
file path=usr/lib/tcl8.6/pgtcl2.3/postgres-helpers.tcl
file path=usr/include/pgtclId.h
file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/libpgtcl$(COMPONENT_VERSION).so
link path=usr/lib/tcl8.6/pgtcl/$(MACH64)/libpgtcl.so \
    target=./libpgtcl$(COMPONENT_VERSION).so
#file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/pkgIndex.tcl
#file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/postgres-helpers.tcl
file path=usr/lib/tcl8.6/pgtcl/libpgtcl$(COMPONENT_VERSION).so
link path=usr/lib/tcl8.6/pgtcl/libpgtcl.so \
    target=./libpgtcl$(COMPONENT_VERSION).so
#file path=usr/lib/tcl8.6/pgtcl/pkgIndex.tcl
file path=usr/lib/tcl8.6/pgtcl/postgres-helpers.tcl
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/HTML.index
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/index.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/libpgtcl-loading.html
@@ -50,6 +55,7 @@
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexec.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexecprepared.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexecute.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pggetconnectionid.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pggetresult.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgisbusy.html
file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pglisten.html

			@@ -13,15 +13,17 @@
			# Copyright 2017 Alexander Pyhalov
			#

			BUILD_BITS=32_and_64

			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= pgtcl
			COMPONENT_VERSION= 2.3.2
			COMPONENT_VERSION= 2.6.3
			COMPONENT_SUMMARY= A Tcl client library for PostgreSQL
			COMPONENT_SRC= Pgtcl-$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
			COMPONENT_ARCHIVE_HASH= \
			sha256:514b4fcaa8c6bbd9625943d4c01aafe73cbc26ddda482b510ced17192271a253
			sha256:7950d2640dd206dd07ad36ea96363f3d436d3d2be3fec8993c11f363c55f0d22
			COMPONENT_ARCHIVE_URL= \
			https://github.com/flightaware/Pgtcl/archive/v$(COMPONENT_VERSION).tar.gz
			COMPONENT_PROJECT_URL = http://flightaware.github.io/Pgtcl/
			@@ -33,15 +35,16 @@
			# Don't depend on host default pg_config
			PATH=$(PG_BINDIR.$(BITS)):$(PATH.illumos)

			include $(WS_MAKE_RULES)/prep.mk
			include $(WS_MAKE_RULES)/configure.mk
			include $(WS_MAKE_RULES)/ips.mk
			TEST_TARGET=$(NO_TESTS)
			include $(WS_MAKE_RULES)/common.mk

			COMPONENT_PREP_ACTION += (cd $(@D) && autoreconf -fi)

			CONFIGURE_OPTIONS += --enable-threads
			CONFIGURE_OPTIONS.64 += --enable-64bit

			CONFIGURE_OPTIONS.32 += --libdir=/usr/lib/tcl8.6/pgtcl2.3
			CONFIGURE_OPTIONS.64 += --libdir=/usr/lib/tcl8.6/pgtcl2.3/$(MACH64)
			CONFIGURE_OPTIONS.32 += --libdir=/usr/lib/tcl8.6/pgtcl
			CONFIGURE_OPTIONS.64 += --libdir=/usr/lib/tcl8.6/pgtcl/$(MACH64)

			CONFIGURE_OPTIONS.32 += --with-tcl="/usr/lib"
			CONFIGURE_OPTIONS.64 += --with-tcl="/usr/lib/$(MACH64)"
			@@ -49,12 +52,10 @@
			COMPONENT_POST_INSTALL_ACTION= ( mkdir -p $(PROTOUSRSHAREDOCDIR)/pgtcl-$(COMPONENT_VERSION) && \
			cp -a $(SOURCE_DIR)/doc/html/* $(PROTOUSRSHAREDOCDIR)/pgtcl-$(COMPONENT_VERSION) )

			build: $(BUILD_32_and_64)
			# Build dependencies
			REQUIRED_PACKAGES += $(PG_DEVELOPER_PKG)

			install: $(INSTALL_32_and_64)

			test: $(NO_TESTS)

			REQUIRED_PACKAGES += database/postgres-94/library
			# Auto-generated dependencies
			REQUIRED_PACKAGES += $(PG_LIBRARY_PKG)
			REQUIRED_PACKAGES += database/sqlite-3
			REQUIRED_PACKAGES += system/library

			@@ -1,8 +1,8 @@
			global tcl_platform
			if {$tcl_platform(wordSize) == 8} {
			package ifneeded Pgtcl 2.3.2 [list load [file join $dir amd64/libpgtcl2.3.2.so]]
			package ifneeded Pgtcl 2.6.3 [list load [file join $dir amd64/libpgtcl2.6.3.so]]
			} else {
			package ifneeded Pgtcl 2.3.2 [list load [file join $dir libpgtcl2.3.2.so]]
			package ifneeded Pgtcl 2.6.3 [list load [file join $dir libpgtcl2.6.3.so]]
			}
			package ifneeded sc_postgres 1.2 \
			package ifneeded sc_postgres 1.3 \
			[list source [file join $dir postgres-helpers.tcl]]

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2017 <contributor>
			# Copyright 2018 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -22,12 +22,17 @@

			license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

			file path=usr/lib/tcl8.6/pgtcl2.2/$(MACH64)/libpgtcl$(COMPONENT_VERSION).so
			file path=usr/lib/tcl8.6/pgtcl2.2/$(MACH64)/pkgIndex.tcl
			file path=usr/lib/tcl8.6/pgtcl2.2/$(MACH64)/postgres-helpers.tcl
			file path=usr/lib/tcl8.6/pgtcl2.2/libpgtcl$(COMPONENT_VERSION).so
			file path=usr/lib/tcl8.6/pgtcl2.2/pkgIndex.tcl
			file path=usr/lib/tcl8.6/pgtcl2.2/postgres-helpers.tcl
			file path=usr/include/pgtclId.h
			file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/libpgtcl$(COMPONENT_VERSION).so
			link path=usr/lib/tcl8.6/pgtcl/$(MACH64)/libpgtcl.so \
			target=/libpgtcl$(COMPONENT_VERSION).so
			file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/pkgIndex.tcl
			file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/postgres-helpers.tcl
			file path=usr/lib/tcl8.6/pgtcl/libpgtcl$(COMPONENT_VERSION).so
			link path=usr/lib/tcl8.6/pgtcl/libpgtcl.so \
			target=/libpgtcl$(COMPONENT_VERSION).so
			file path=usr/lib/tcl8.6/pgtcl/pkgIndex.tcl
			file path=usr/lib/tcl8.6/pgtcl/postgres-helpers.tcl
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/HTML.index
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/index.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/libpgtcl-loading.html
			@@ -47,6 +52,7 @@
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexec.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexecprepared.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexecute.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pggetconnectionid.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pggetresult.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgisbusy.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pglisten.html

			@@ -1,6 +1,6 @@
			--- Pgtcl-2.2.0/configure.~1~ 2017-06-21 15:14:48.000000000 +0000
			+++ Pgtcl-2.2.0/configure 2017-07-18 21:47:36.316575862 +0000
			@@ -5395,8 +5395,8 @@
			--- Pgtcl-2.6.3/configure.in.1 2019-11-22 12:51:03.519783323 +0000
			+++ Pgtcl-2.6.3/configure.in 2019-11-22 12:54:16.937889276 +0000
			@@ -108,8 +108,8 @@
			LIBPG=""
			PG_INCLUDES="-I$PG_INC_DIR"
			PKG_INCLUDES="-I$PG_INC_DIR"

			@@ -23,14 +23,19 @@
			license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

			# We need to replace index to load 64-bit library when necessary
			file files/pkgIndex.tcl path=usr/lib/tcl8.6/pgtcl2.3/pkgIndex.tcl
			file files/pkgIndex.tcl path=usr/lib/tcl8.6/pgtcl/pkgIndex.tcl

			file path=usr/lib/tcl8.6/pgtcl2.3/$(MACH64)/libpgtcl$(COMPONENT_VERSION).so
			#file path=usr/lib/tcl8.6/pgtcl2.3/$(MACH64)/pkgIndex.tcl
			#file path=usr/lib/tcl8.6/pgtcl2.3/$(MACH64)/postgres-helpers.tcl
			file path=usr/lib/tcl8.6/pgtcl2.3/libpgtcl$(COMPONENT_VERSION).so
			#file path=usr/lib/tcl8.6/pgtcl2.3/pkgIndex.tcl
			file path=usr/lib/tcl8.6/pgtcl2.3/postgres-helpers.tcl
			file path=usr/include/pgtclId.h
			file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/libpgtcl$(COMPONENT_VERSION).so
			link path=usr/lib/tcl8.6/pgtcl/$(MACH64)/libpgtcl.so \
			target=./libpgtcl$(COMPONENT_VERSION).so
			#file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/pkgIndex.tcl
			#file path=usr/lib/tcl8.6/pgtcl/$(MACH64)/postgres-helpers.tcl
			file path=usr/lib/tcl8.6/pgtcl/libpgtcl$(COMPONENT_VERSION).so
			link path=usr/lib/tcl8.6/pgtcl/libpgtcl.so \
			target=./libpgtcl$(COMPONENT_VERSION).so
			#file path=usr/lib/tcl8.6/pgtcl/pkgIndex.tcl
			file path=usr/lib/tcl8.6/pgtcl/postgres-helpers.tcl
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/HTML.index
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/index.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/libpgtcl-loading.html
			@@ -50,6 +55,7 @@
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexec.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexecprepared.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgexecute.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pggetconnectionid.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pggetresult.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pgisbusy.html
			file path=usr/share/doc/pgtcl-$(COMPONENT_VERSION)/pgtcl-pglisten.html