4 files changed, 39 insertions, 48 deletions

diff --git a/databases/liquibase/Makefile b/databases/liquibase/Makefile
index 71299410dda2..5307600743ab 100644
--- a/databases/liquibase/Makefile
+++ b/databases/liquibase/Makefile
@@ -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 <bsd.port.mk>
diff --git a/databases/liquibase/distinfo b/databases/liquibase/distinfo
index 3ad199b121a6..97777ad514cc 100644
--- a/databases/liquibase/distinfo
+++ b/databases/liquibase/distinfo
@@ -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
diff --git a/databases/liquibase/files/patch-liquibase b/databases/liquibase/files/patch-liquibase
index 2a6d269ac0df..6c2ee5dc2668 100644
--- a/databases/liquibase/files/patch-liquibase
+++ b/databases/liquibase/files/patch-liquibase
@@ -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
diff --git a/databases/liquibase/pkg-plist b/databases/liquibase/pkg-plist
new file mode 100644
index 000000000000..7447f02b62fe
--- /dev/null
+++ b/databases/liquibase/pkg-plist
@@ -0,0 +1,10 @@
+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