ports/187336: [PATCH] databases/hsqldb: update to 2.3.2, take maintainership, add stage support
Jim Ohlstein
jim at ohlste.in
Fri Mar 7 00:10:01 UTC 2014
>Number: 187336
>Category: ports
>Synopsis: [PATCH] databases/hsqldb: update to 2.3.2, take maintainership, add stage support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 07 00:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Jim Ohlstein
>Release: FreeBSD 10.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD bromine.jlkhosting.com 10.0-STABLE FreeBSD 10.0-STABLE #0 r262738: Tue Mar 4 15:55:21
>Description:
- Update to 2.3.2
- Take maintainership
- Add stage support
- Update license
- Redports https://redports.org/buildarchive/20140306200344-84620/
Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:
--- hsqldb-2.3.2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 347332)
+++ Makefile (working copy)
@@ -2,14 +2,14 @@
# $FreeBSD$
PORTNAME= hsqldb
-PORTVERSION= 2.3.0
+PORTVERSION= 2.3.2
CATEGORIES= databases java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_2_3
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= jim at ohlste.in
COMMENT= An embeddable SQL database written in Java
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_JAVA= yes
JAVA_VERSION= 1.6+
@@ -19,30 +19,26 @@
BUILD_WRKSRC= ${WRKSRC}/build
ALL_TARGET= hsqldb hsqljdbc
-NO_STAGE= yes
-
OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
do-install:
- @${ECHO_MSG} -n ">> Installing JAR files to ${JAVAJARDIR}..."
- @${INSTALL_DATA} ${WRKSRC}/lib/hsqldb.jar \
- ${JAVAJARDIR}/hsqldb.jar
- @${INSTALL_DATA} ${WRKSRC}/lib/hsqljdbc.jar \
- ${JAVAJARDIR}/hsqljdbc.jar
- @${INSTALL_DATA} ${WRKSRC}/lib/sqltool.jar \
- ${JAVAJARDIR}/sqltool.jar
- @${ECHO_MSG} " [DONE]"
+ ${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+ ${INSTALL_DATA} ${WRKSRC}/lib/hsqldb.jar \
+ ${STAGEDIR}${JAVAJARDIR}/hsqldb.jar
+ ${INSTALL_DATA} ${WRKSRC}/lib/hsqljdbc.jar \
+ ${STAGEDIR}${JAVAJARDIR}/hsqljdbc.jar
+ ${INSTALL_DATA} ${WRKSRC}/lib/sqltool.jar \
+ ${STAGEDIR}${JAVAJARDIR}/sqltool.jar
+post-install:
.if ${PORT_OPTIONS:MDOCS}
- @${ECHO_MSG} -n ">> Installing DOC files to ${DOCSDIR}..."
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/doc \
- && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; \
- && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
- @${ECHO_MSG} " [DONE]"
+ && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
+ && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo (revision 347332)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (hsqldb-2.3.0.zip) = 74faf1bbfccc72703ada7aa2413d12bbbc728bea74382b50301b80051174316d
-SIZE (hsqldb-2.3.0.zip) = 7704891
+SHA256 (hsqldb-2.3.2.zip) = 573082ab3f1c8f02c1f496b9aae15b74f1b5aedf3812ef300e90ead3047e5fb0
+SIZE (hsqldb-2.3.2.zip) = 7734168
Index: pkg-plist
===================================================================
--- pkg-plist (revision 347332)
+++ pkg-plist (working copy)
@@ -189,45 +189,31 @@
%%PORTDOCS%%%%DOCSDIR%%/images/db/blank.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/1.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/1.png
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/1.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/10.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/10.png
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/10.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/11.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/11.png
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/11.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/12.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/12.png
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/12.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/13.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/13.png
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/13.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/14.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/14.png
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/14.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/15.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/15.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/2.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/2.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/3.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/3.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/4.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/4.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/5.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/5.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/6.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/6.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/7.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/7.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/8.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/8.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/9.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/9.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/1.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/10.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/11.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/12.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/13.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/14.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/15.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/16.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/17.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/18.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/19.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/2.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/2.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/20.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/21.svg
@@ -239,20 +225,42 @@
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/27.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/28.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/29.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/3.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/3.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/3.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/30.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/4.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/4.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/4.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/5.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/5.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/5.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/6.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/6.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/6.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/7.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/7.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/7.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/8.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/8.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/8.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/9.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/9.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/callouts/9.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/caution.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/caution.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/caution.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/caution.tif
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/caution.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/home.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/important.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/next.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/note.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/prev.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/tip.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/up.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/warning.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/draft.png
-%%PORTDOCS%%%%DOCSDIR%%/images/db/draft.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/home.gif
%%PORTDOCS%%%%DOCSDIR%%/images/db/home.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/home.svg
@@ -284,15 +292,6 @@
%%PORTDOCS%%%%DOCSDIR%%/images/db/warning.png
%%PORTDOCS%%%%DOCSDIR%%/images/db/warning.svg
%%PORTDOCS%%%%DOCSDIR%%/images/db/warning.tif
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/caution.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/home.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/important.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/next.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/note.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/prev.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/tip.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/up.svg
-%%PORTDOCS%%%%DOCSDIR%%/images/db/colorsvg/warning.svg
%%PORTDOCS%%%%DOCSDIR%%/images/hypersql_logo.png
%%PORTDOCS%%%%DOCSDIR%%/images/hypersql_logo2.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
@@ -302,9 +301,9 @@
%%PORTDOCS%%%%DOCSDIR%%/util-guide/book-pref.html
%%PORTDOCS%%%%DOCSDIR%%/util-guide/dbm-chapt.html
%%PORTDOCS%%%%DOCSDIR%%/util-guide/dummy.html
-%%PORTDOCS%%%%DOCSDIR%%/util-guide/index.html
%%PORTDOCS%%%%DOCSDIR%%/util-guide/filelinks-app.html
%%PORTDOCS%%%%DOCSDIR%%/util-guide/html-report.png
+%%PORTDOCS%%%%DOCSDIR%%/util-guide/index.html
%%PORTDOCS%%%%DOCSDIR%%/util-guide/rejreport-sample.png
%%PORTDOCS%%%%DOCSDIR%%/util-guide/sqltool-chapt.html
%%PORTDOCS%%%%DOCSDIR%%/util-guide/systempls-app.html
@@ -336,41 +335,41 @@
%%PORTDOCS%%%%DOCSDIR%%/verbatim/src/org/hsqldb/test/TestBase.java
%%PORTDOCS%%%%DOCSDIR%%/verbatim/testrun/sqltool/sqljrt.sql
%%PORTDOCS%%%%DOCSDIR%%/verbatim/testrun/sqltool/sqlpsm.sql
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/auth
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/cmdline/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/cmdline
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/jdbc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/lib/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/lib/tar
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/lib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/sample/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/sample
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/server/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/server
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/util/class-use
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb/util
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org/hsqldb
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/resources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs/org
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidocs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/guide
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/db/callouts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/db/colorsvg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images/db
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/util-guide
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/testrun/sqltool
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/testrun
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/src/org/hsqldb/sample
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/src/org/hsqldb/server
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/src/org/hsqldb/test
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/src/org/hsqldb
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/src/org
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/src
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim/sample
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/verbatim
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/testrun/sqltool
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/testrun
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/src/org/hsqldb/test
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/src/org/hsqldb/server
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/src/org/hsqldb/sample
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/src/org/hsqldb
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/src/org
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/src
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim/sample
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/verbatim
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/util-guide
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images/db/colorsvg
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images/db/callouts
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images/db
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/guide
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/resources
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/util/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/util
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/server/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/server
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/sample/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/sample
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/lib/tar/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/lib/tar
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/lib/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/lib
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/jdbc/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/jdbc
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/cmdline/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/cmdline
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/auth/class-use
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb/auth
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org/hsqldb
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs/org
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/apidocs
%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- hsqldb-2.3.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list