- Update to 1.7.6

PR:		138396
Submitted by:	Wen Heping <wenheping@gmail.com> (maintainer)

3 files changed, 72 insertions, 73 deletions

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index cf631e32f3ea..5e8da1c59f7e 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geoserver
-PORTVERSION=	1.7.4
+PORTVERSION=	1.7.6
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 16e37753f9ad..f009715dc9fe 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (geoserver-1.7.4-bin.zip) = 879303b1f10c725e7e4b275d6a6826fe
-SHA256 (geoserver-1.7.4-bin.zip) = d82e59bda08acb76d7f53f4b0a54fdbf754a70b56cf47a108795a6d11ce60ba3
-SIZE (geoserver-1.7.4-bin.zip) = 45927202
+MD5 (geoserver-1.7.6-bin.zip) = 39870db874e48a9d8e124fff4c92c895
+SHA256 (geoserver-1.7.6-bin.zip) = 96109e65da14b1c23d0a8ff9dbfdd12a7ecc6f6c471ae3303bfe245c73f67c19
+SIZE (geoserver-1.7.6-bin.zip) = 46092217
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 011888acae3c..e482a7dd3963 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -810,85 +810,84 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/commons-fileupload-1.2.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/commons-io-1.3.2.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/commons-logging-1.1.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/commons-cli-2.0-gt2-pre1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/data-1.7.4.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/data-1.7.6.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/easymock-2.3.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/easymockclassextension-2.3.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/ezmorph-1.0.6.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/freemarker-2.3.13.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/geoapi-2.2.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/geowebcache-1.1.0g.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-api-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-arcgrid-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-coverage-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-cql-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-data-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-epsg-hsql-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-geotiff-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-graph-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-gtopo30-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-image-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-imagemosaic-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-imageio-ext-gdal-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-main-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-metadata-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-postgis-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-directory-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-referencing-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-render-2.5.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/geowebcache-1.1.4.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-api-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-arcgrid-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-coverage-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-cql-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-data-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-epsg-hsql-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-geotiff-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-graph-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-gtopo30-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-image-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-imagemosaic-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-imageio-ext-gdal-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-main-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-metadata-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-postgis-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-directory-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-referencing-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-render-2.5-SNAPSHOT.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/jts-1.9.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-renderer-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-validation-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-wfs-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-wms-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xml-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-core-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-filter-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml2-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml3-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-ows-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-wfs-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gwc-1.7.4.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-renderer-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-validation-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-wfs-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-wms-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xml-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-core-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-filter-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml2-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml3-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-ows-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-wfs-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/gwc-1.7.6.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/h2-1.1.110.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-arcgrid-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-customstreams-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-tiff-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalerdasimg-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalecw-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdal-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalecwjp2-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdaldted-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-utilities-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalframework-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalmrsidjp2-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalehdr-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalnitf-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalmrsid-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-geocore-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-imagereadmt-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalkakadujp2-1.0.1.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-arcgrid-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-customstreams-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-tiff-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalerdasimg-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalecw-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalecwjp2-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdaldted-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-utilities-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalframework-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalmrsidjp2-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalehdr-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalnitf-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalmrsid-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-geocore-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-imagereadmt-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdalkakadujp2-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/imageio-ext-gdal-bindings-1.4.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/jettison-1.0.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/json-lib-2.2.3-jdk15.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/jsr-275-1.0-beta-2.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/jstl-1.0.6.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/mail-1.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/main-1.7.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.ows-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wcs-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wfs-2.5.5.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/main-1.7.6.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.ows-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wcs-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wfs-2.5-SNAPSHOT.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.json-2.0.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.restlet-1.0.8.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.restlet.ext.freemarker-1.0.8.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.restlet.ext.json-1.0.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.restlet.ext.spring-1.0.8.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/org.simpleframework-3.1.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/org.w3.xlink-2.5.5.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/ows-1.7.4-tests.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/ows-1.7.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/platform-1.7.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/rest-1.7.4.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/org.w3.xlink-2.5-SNAPSHOT.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/ows-1.7.6-tests.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/ows-1.7.6.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/platform-1.7.6.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/rest-1.7.6.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/spring-aop-2.5.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/spring-beans-2.5.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/spring-context-2.5.5.jar
@@ -900,15 +899,15 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/spring-webmvc-2.5.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/spring-webmvc-struts-2.5.5.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/stax-api-1.0.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/validation-1.7.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wcs-1.7.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wcs1_1-1.7.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wfs-1.7.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wfs11-1.7.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wms-1.7.4.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/validation-1.7.6.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wcs-1.7.6.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wcs1_1-1.7.6.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wfs-1.7.6.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wfs11-1.7.6.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/wms-1.7.6.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xpp3_min-1.1.4c.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xstream-1.3.1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/acegi-security-1.0.3.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/acegi-security-1.0.7.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/ant-optional-1.5.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/antlr-2.7.2.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/aopalliance-1.0.jar
@@ -956,7 +955,7 @@
 %%G%%/webapps/geoserver/WEB-INF/lib/velocity-dep-1.4.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xalan-2.7.0.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xercesImpl-2.4.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/xml-apis-1.0.b2.jar
+%%G%%/webapps/geoserver/WEB-INF/lib/xml-apis-1.3.04.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xml-apis-xerces-2.7.1.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xpp3-1.1.3.4.O.jar
 %%G%%/webapps/geoserver/WEB-INF/lib/xsd-2.2.2.jar