From owner-svn-ports-head@freebsd.org Fri Nov 15 06:39:48 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 453EA1BE016; Fri, 15 Nov 2019 06:39:48 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47DpcM4QBhz4FnM; Fri, 15 Nov 2019 06:39:47 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1AEF5CDC1; Fri, 15 Nov 2019 06:39:47 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAF6dkXJ056678; Fri, 15 Nov 2019 06:39:46 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAF6dk3C056674; Fri, 15 Nov 2019 06:39:46 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201911150639.xAF6dk3C056674@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 15 Nov 2019 06:39:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517632 - in head/databases/liquibase: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/databases/liquibase: . files X-SVN-Commit-Revision: 517632 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2019 06:39:48 -0000 Author: danfe Date: Fri Nov 15 06:39:45 2019 New Revision: 517632 URL: https://svnweb.freebsd.org/changeset/ports/517632 Log: - Update to version 3.8.1 and install all requires JAR files - Fix the launch script which was badly damaged in r475607 - Untangle the installation routine (pessimized in r388739) Pointy hat to: joneum PR: 241950 Added: head/databases/liquibase/pkg-plist - copied, changed from r388738, head/databases/liquibase/pkg-plist Modified: head/databases/liquibase/Makefile head/databases/liquibase/distinfo head/databases/liquibase/files/patch-liquibase Modified: head/databases/liquibase/Makefile ============================================================================== --- head/databases/liquibase/Makefile Fri Nov 15 06:37:01 2019 (r517631) +++ head/databases/liquibase/Makefile Fri Nov 15 06:39:45 2019 (r517632) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= liquibase -PORTVERSION= 3.6.2 -DISTVERSIONSUFFIX= -bin +PORTVERSION= 3.8.1 CATEGORIES= databases java -MASTER_SITES= https://github.com/liquibase/liquibase/releases/download/liquibase-parent-${PORTVERSION}/ +MASTER_SITES= https://github.com/liquibase/liquibase/releases/download/v${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Database Change Management @@ -18,13 +17,10 @@ NO_WRKSUBDIR= yes USE_JAVA= yes -PLIST_FILES= bin/liquibase %%DATADIR%%/liquibase.jar - do-install: - (cd ${WRKSRC} && ${INSTALL_SCRIPT} liquibase \ - ${STAGEDIR}${PREFIX}/bin) + ${INSTALL_SCRIPT} ${WRKSRC}/liquibase ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC} && ${INSTALL_DATA} liquibase.jar \ - ${STAGEDIR}${DATADIR}) + ${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${WRKSRC}/liquibase.jar \ + ${STAGEDIR}${DATADIR} .include Modified: head/databases/liquibase/distinfo ============================================================================== --- head/databases/liquibase/distinfo Fri Nov 15 06:37:01 2019 (r517631) +++ head/databases/liquibase/distinfo Fri Nov 15 06:39:45 2019 (r517632) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532806380 -SHA256 (liquibase-3.6.2-bin.tar.gz) = dd6d6c81b7ed6c75ee32d51bb53b3449fe2a695684965e36014ff70ea65c3ea5 -SIZE (liquibase-3.6.2-bin.tar.gz) = 6084651 +TIMESTAMP = 1573080630 +SHA256 (liquibase-3.8.1.tar.gz) = 11e5cbb7f5b92aa41e79154708a5f8d33083ecb890b27d5e9f9d56b24f7478e9 +SIZE (liquibase-3.8.1.tar.gz) = 7300065 Modified: head/databases/liquibase/files/patch-liquibase ============================================================================== --- head/databases/liquibase/files/patch-liquibase Fri Nov 15 06:37:01 2019 (r517631) +++ head/databases/liquibase/files/patch-liquibase Fri Nov 15 06:39:45 2019 (r517632) @@ -1,6 +1,6 @@ ---- liquibase.orig 2018-07-28 21:36:02.294669000 +0200 -+++ liquibase 2018-07-28 21:41:44.302244000 +0200 -@@ -1,55 +1,14 @@ +--- liquibase.orig 2019-11-06 04:45:57 UTC ++++ liquibase +@@ -1,28 +1,6 @@ -#!/usr/bin/env bash +#!/bin/sh @@ -27,42 +27,27 @@ - # echo "Liquibase Home: $LIQUIBASE_HOME" -fi - -- --# build classpath from all jars in lib --if [ -f /usr/bin/cygpath ]; then -- CP=. -- for i in "$LIQUIBASE_HOME"/liquibase*.jar; do -- i=`cygpath --windows "$i"` -- CP="$CP;$i" -- done -- for i in "$LIQUIBASE_HOME"/lib/*.jar; do -- i=`cygpath --windows "$i"` -- CP="$CP;$i" -- done --else ++LIQUIBASE_HOME=`readlink -f "$(dirname "$0")/../share/liquibase"` + + # build classpath from all jars in lib + if [ -f /usr/bin/cygpath ]; then +@@ -36,17 +14,13 @@ if [ -f /usr/bin/cygpath ]; then + CP="$CP;$i" + done + else - if [[ $(uname) = MINGW* ]]; then -- CP_SEPARATOR=";" -- else -- CP_SEPARATOR=":" -- fi -- CP=. ++ if [ $(uname) = Msys ]; then + CP_SEPARATOR=";" + else + CP_SEPARATOR=":" + fi + CP=. - for i in "$LIQUIBASE_HOME"/liquibase*.jar; do - CP="$CP""$CP_SEPARATOR""$i" - done - CP="$CP""$CP_SEPARATOR""$LIQUIBASE_HOME/lib/" - for i in "$LIQUIBASE_HOME"/lib/*.jar; do -- CP="$CP""$CP_SEPARATOR""$i" -- done --fi -+LIQUIBASE_HOME=`dirname $0`/../share/liquibase -+CP=. -+for i in "$LIQUIBASE_HOME=/liquibase*.jat; do -+ CP="$CP":$i" -+ done -+for i in $LIQUIBASE_HOME"/lib/*.jar; do -+ CP=$CP":$i" -+ done -+.fi - - # add any JVM options here - JAVA_OPTS="${JAVA_OPTS-}" ++ for i in "$LIQUIBASE_HOME"/*.jar; do + CP="$CP""$CP_SEPARATOR""$i" + done + fi Copied and modified: head/databases/liquibase/pkg-plist (from r388738, head/databases/liquibase/pkg-plist) ============================================================================== --- head/databases/liquibase/pkg-plist Sun Jun 7 17:21:31 2015 (r388738, copy source) +++ head/databases/liquibase/pkg-plist Fri Nov 15 06:39:45 2019 (r517632) @@ -1,2 +1,10 @@ -%%DATADIR%%/liquibase.jar bin/liquibase +%%DATADIR%%/commons-cli-1.4.jar +%%DATADIR%%/jaxb-api-2.2.11.jar +%%DATADIR%%/jaxb-core-2.2.11.jar +%%DATADIR%%/jaxb-impl-2.2.11.jar +%%DATADIR%%/liquibase.jar +%%DATADIR%%/logback-classic-1.2.3.jar +%%DATADIR%%/logback-core-1.2.3.jar +%%DATADIR%%/slf4j-api-1.7.28.jar +%%DATADIR%%/snakeyaml-1.24.jar