3 files changed, 87 insertions, 86 deletions

diff --git a/graphics/geoserver/Makefile b/graphics/geoserver/Makefile
index 863cc08254f8..92003b436a7d 100644
--- a/graphics/geoserver/Makefile
+++ b/graphics/geoserver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geoserver
-PORTVERSION=	2.8.0
+PORTVERSION=	2.8.1
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -25,6 +25,7 @@ USE_RC_SUBR=	${PORTNAME}
 PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}" GTVER=2.7.2 MVER=${PORTVERSION}
 SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
 SUB_FILES=	pkg-message
+NO_ARCH=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$GEOSERVER_HOME|${GEOSERVERDIR}|g' \
diff --git a/graphics/geoserver/distinfo b/graphics/geoserver/distinfo
index 202e42e907e0..da6b786a38ca 100644
--- a/graphics/geoserver/distinfo
+++ b/graphics/geoserver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geoserver-2.8.0-bin.zip) = 182957ae500dfc41775ca0448feb53da488c3aa90ddbc3e9f9ba4568fad6779e
-SIZE (geoserver-2.8.0-bin.zip) = 65206781
+SHA256 (geoserver-2.8.1-bin.zip) = c0d0a821a6997cad7c604cc466355fa63df296d64045ebd9ac796b74631ffd90
+SIZE (geoserver-2.8.1-bin.zip) = 65218310
diff --git a/graphics/geoserver/pkg-plist b/graphics/geoserver/pkg-plist
index 5472a83fa345..cc066a895813 100644
--- a/graphics/geoserver/pkg-plist
+++ b/graphics/geoserver/pkg-plist
@@ -571,47 +571,47 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-web-wms-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wfs-%%MVER%%.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gs-wms-%%MVER%%.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-api-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-data-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-graph-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gtopo30-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-14.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-api-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-app-schema-resolver-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-arcgrid-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-complex-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-coverage-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-cql-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-data-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-epsg-hsql-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geojson-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-geotiff-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-graph-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-grid-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-gtopo30-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-image-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-imagemosaic-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-jdbc-postgis-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-main-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-metadata-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-opengis-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-feature-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-process-raster-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-property-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-referencing-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-render-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-shapefile-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-svg-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-transform-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wfs-ng-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-wms-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xml-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-core-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-fes-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-filter-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml2-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-gml3-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-ows-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-sld-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wcs-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/gt-xsd-wfs-14.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/guava-17.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-core-1.8.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/gwc-diskquota-core-1.8.0.jar
@@ -627,12 +627,12 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/h2-1.1.119.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/hsqldb-2.3.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/htmlvalidator-1.2.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-1.1.12.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-1.1.12.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-1.1.11.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-1.1.12.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-1.1.12.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-1.1.12.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-arcgrid-1.1.13.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-geocore-1.1.13.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-png-1.1.13.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-streams-1.1.13.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-tiff-1.1.13.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/imageio-ext-utilities-1.1.13.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/itext-2.1.5.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_codec-1.1.3.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jai_core-1.1.3.jar
@@ -645,57 +645,57 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/json-simple-1.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jsr-275-1.0-beta-2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jsr305-2.0.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-1.0.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-affine-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-algebra-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-attributeop-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandcombine-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandmerge-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandselect-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-binarize-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-border-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-buffer-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classifier-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorconvert-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorindexer-1.0.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandcombine-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandmerge-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-bandselect-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-binarize-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-border-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-buffer-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-classifier-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorconvert-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-colorindexer-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-contour-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-crop-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-errordiffusion-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-format-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-imagefunction-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-iterators-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-lookup-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-mosaic-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-nullop-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-orderdither-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-piecewise-1.0.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-crop-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-errordiffusion-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-format-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-imagefunction-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-iterators-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-lookup-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-mosaic-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-nullop-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-orderdither-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-piecewise-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-rangelookup-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-1.0.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rescale-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-rlookup-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-scale-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-stats-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-translate-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-utilities-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-utils-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbin-1.0.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbin-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorbinarize-1.4.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-vectorize-1.4.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-1.0.6.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-1.0.6.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-warp-1.0.8.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonal-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jt-zonalstats-1.4.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/jts-1.13.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/log4j-1.2.14.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/mail-1.4.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-14.0.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-14.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.fes-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.ows-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wcs-14.1.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/net.opengis.wfs-14.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.json-2.0.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.freemarker-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.json-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.restlet.ext.spring-1.0.8.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/org.simpleframework-3.1.3.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-14.0.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/org.w3.xlink-14.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/picocontainer-1.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/pngj-2.0.1.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/postgresql-8.4-701.jdbc3.jar
@@ -726,7 +726,7 @@
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-extensions-1.4.12.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-ioc-1.4.12.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/wicket-spring-1.4.12.jar
-%%G%%/webapps/%%G%%/WEB-INF/lib/xml-apis-1.3.04.jar
+%%G%%/webapps/%%G%%/WEB-INF/lib/xml-apis-1.4.01.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xml-apis-ext-1.3.04.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xml-commons-resolver-1.2.jar
 %%G%%/webapps/%%G%%/WEB-INF/lib/xmlpull-1.1.3.1.jar