- Update to 3.3.2

- Move plist to Makefile variables

PR:		200297
Submitted by:	tkato432 at yahoo.com

5 files changed, 25 insertions, 24 deletions

diff --git a/databases/liquibase/Makefile b/databases/liquibase/Makefile
index c52e57f07870..62e8319d8cc6 100644
--- a/databases/liquibase/Makefile
+++ b/databases/liquibase/Makefile
@@ -2,23 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	liquibase
-PORTVERSION=	2.0.5
+PORTVERSION=	3.3.2
+DISTVERSIONSUFFIX=	-bin
 CATEGORIES=	databases java
-MASTER_SITES=	http://cloud.github.com/downloads/liquibase/liquibase/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-bin${EXTRACT_SUFX}
+MASTER_SITES=	SF/${PORTNAME}/Liquibase%20Core
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database Change Management
 
 LICENSE=	APACHE20
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+
 USE_JAVA=	yes
 
+PLIST_FILES=	bin/liquibase %%DATADIR%%/liquibase.jar
+
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/liquibase.jar ${STAGEDIR}${DATADIR}/
-	${INSTALL_SCRIPT} ${WRKSRC}/liquibase ${STAGEDIR}${PREFIX}/bin/
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} liquibase \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} liquibase.jar \
+		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/databases/liquibase/distinfo b/databases/liquibase/distinfo
index fb89fafa9a5b..c416b1a7ed5e 100644
--- a/databases/liquibase/distinfo
+++ b/databases/liquibase/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liquibase-2.0.5-bin.tar.gz) = 8e395ce32f0b35fd7eaeb1b718adc8286ea6002af193b1f0812accf0810b6320
-SIZE (liquibase-2.0.5-bin.tar.gz) = 1859514
+SHA256 (liquibase-3.3.2-bin.tar.gz) = 879eddb8545a30c816fa674e278b4b8293cc936884eac4bf3f5cf5af47e39784
+SIZE (liquibase-3.3.2-bin.tar.gz) = 6517290
diff --git a/databases/liquibase/files/patch-liquibase b/databases/liquibase/files/patch-liquibase
index d1b538708fc9..ed9979827207 100644
--- a/databases/liquibase/files/patch-liquibase
+++ b/databases/liquibase/files/patch-liquibase
@@ -1,11 +1,9 @@
---- liquibase.orig	2013-02-11 22:36:23.000000000 +0800
-+++ liquibase	2013-02-11 22:38:03.000000000 +0800
-@@ -1,51 +1,14 @@
+--- liquibase.orig	2015-01-08 14:10:22 UTC
++++ liquibase
+@@ -1,49 +1,14 @@
  #! /bin/sh
  
--if [ -n "${LIQUIBASE_HOME+x}" ]; then
--echo "Liquibase Home: $LIQUIBASE_HOME"
--else
+-if [ ! -n "${LIQUIBASE_HOME+x}" ]; then
 -  echo "Liquibase Home is not set."
 -
 -  ## resolve links - $0 may be a symlink
@@ -25,9 +23,10 @@
 -
 -  # make it fully qualified
 -  LIQUIBASE_HOME=`cd "$LIQUIBASE_HOME" && pwd`
--  echo "Liquibase Home: $LIQUIBASE_HOME"
+-  # echo "Liquibase Home: $LIQUIBASE_HOME"
 -fi
--
++LIQUIBASE_HOME=`dirname $0`/../share/liquibase
+ 
 - 
 -# build classpath from all jars in lib
 -if [ -f /usr/bin/cygpath ]; then
@@ -49,8 +48,6 @@
 -    CP="$CP":"$i"
 -  done
 -fi
-+LIQUIBASE_HOME=`dirname $0`/../share/liquibase
-+
 +CP=.
 +for i in "$LIQUIBASE_HOME"/liquibase*.jar; do
 +  CP="$CP":"$i"
@@ -60,4 +57,4 @@
 +done
  
  # add any JVM options here
- JAVA_OPTS=
+ JAVA_OPTS="${JAVA_OPTS-}"
diff --git a/databases/liquibase/pkg-descr b/databases/liquibase/pkg-descr
index c97b878c9590..f5e60e273ca4 100644
--- a/databases/liquibase/pkg-descr
+++ b/databases/liquibase/pkg-descr
@@ -1,6 +1,6 @@
 Liquibase is an open source (Apache 2.0 Licensed), database-independent
-library for tracking, managing and applying database changes. It is built on
-a simple premise: All database changes are stored in a human readable yet
-trackable form and checked into source control.
+library for tracking, managing and applying database changes. It is
+built on a simple premise: All database changes are stored in a human
+readable yet trackable form and checked into source control.
 
 WWW: http://www.liquibase.org/
diff --git a/databases/liquibase/pkg-plist b/databases/liquibase/pkg-plist
deleted file mode 100644
index ebfcd7b70141..000000000000
--- a/databases/liquibase/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%DATADIR%%/liquibase.jar
-bin/liquibase