Date: Mon, 4 May 2009 11:05:24 +1000 (YAKST) From: Alexander Logvinov <ports@logvinov.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: wenheping@gmail.com Subject: ports/134196: [PATCH] graphics/geoserver: update to 1.7.4 Message-ID: <200905040105.n4415OJe022250@blg.akavia.ru> Resent-Message-ID: <200905040110.n441A1df080547@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 134196
>Category: ports
>Synopsis: [PATCH] graphics/geoserver: update to 1.7.4
>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: Mon May 04 01:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Alexander Logvinov
>Release: FreeBSD 6.4-RELEASE i386
>Organization:
>Environment:
>Description:
Update to 1.7.4.
Fix config installation bug which introduced in previous update.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/geoserver/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 15 Mar 2009 20:53:17 -0000 1.7
+++ Makefile 29 Apr 2009 22:12:19 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= geoserver
-PORTVERSION= 1.7.3
+PORTVERSION= 1.7.4
CATEGORIES= graphics geography java
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
@@ -28,19 +28,8 @@
SUB_LIST= GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
SUB_FILES= pkg-message
-pre-patch:
- @${RM} ${WRKSRC}/webapps/geoserver/editarea/images/Thumbs.db
-.for dir in ${GEODIRS}
- @(cd ${WRKSRC};${FIND} -E ${dir} -type f -iregex ".*(keystore|\.(xml|properties))") \
- | while read a; do \
- ${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.sample; \
- if [ ! -e "${GEOSERVERDIR}/$$a" ]; then \
- ${CP} ${WRKSRC}/$$a.sample ${WRKSRC}/$$a; \
- fi; \
- done
-.endfor
-
post-patch:
+ @${RM} ${WRKSRC}/webapps/geoserver/editarea/images/Thumbs.db
@${REINPLACE_CMD} -e 's|$$GEOSERVER_HOME|${GEOSERVERDIR}|g' \
-e 's|%%JAVA%%|${JAVA}|g' \
${WRKSRC}/bin/startup.sh ${WRKSRC}/bin/shutdown.sh
@@ -52,6 +41,13 @@
${INSTALL_DATA} ${WRKSRC}/${f} ${GEOSERVERDIR}
.endfor
.for dir in ${GEODIRS}
+ @(cd ${WRKSRC};${FIND} -E ${dir} -type f -iregex ".*(keystore|\.(xml|properties))") \
+ | while read a; do \
+ ${MV} ${WRKSRC}/$$a ${WRKSRC}/$$a.sample; \
+ if [ ! -e "${GEOSERVERDIR}/$$a" ]; then \
+ ${CP} ${WRKSRC}/$$a.sample ${WRKSRC}/$$a; \
+ fi; \
+ done
@cd ${WRKSRC} && \
${FIND} ${dir} -type d -exec \
${MKDIR} "${GEOSERVERDIR}/{}" \; && \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/graphics/geoserver/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 15 Mar 2009 20:53:17 -0000 1.6
+++ distinfo 29 Apr 2009 05:37:16 -0000
@@ -1,3 +1,3 @@
-MD5 (geoserver-1.7.3-bin.zip) = 5f096d36c10b92fc7d1e6a24fe2769cb
-SHA256 (geoserver-1.7.3-bin.zip) = c199626e4260801ca41d4ad7db734ccf363241867d16c76d46feb85b83d4849a
-SIZE (geoserver-1.7.3-bin.zip) = 45486115
+MD5 (geoserver-1.7.4-bin.zip) = 879303b1f10c725e7e4b275d6a6826fe
+SHA256 (geoserver-1.7.4-bin.zip) = d82e59bda08acb76d7f53f4b0a54fdbf754a70b56cf47a108795a6d11ce60ba3
+SIZE (geoserver-1.7.4-bin.zip) = 45927202
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/graphics/geoserver/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist 15 Mar 2009 20:53:17 -0000 1.6
+++ pkg-plist 29 Apr 2009 06:09:18 -0000
@@ -810,69 +810,85 @@
%%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/data-1.7.3.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/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-M1.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/geowebcache-1.1.0.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-api-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-arcgrid-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-coverage-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-cql-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-data-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-epsg-hsql-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-geotiff-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-graph-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-gtopo30-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-image-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-imagemosaic-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-jdbc-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-main-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-metadata-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-postgis-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-directory-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-referencing-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-render-2.5.4.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/jts-1.9.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-shapefile-renderer-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-validation-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-wfs-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-wms-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xml-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-core-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-filter-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml2-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-gml3-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-ows-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gt-xsd-wfs-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/gwc-1.7.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/h2-1.1.104.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/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/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.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.ows-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wcs-2.5.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/net.opengis.wfs-2.5.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/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.4.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/ows-1.7.3-tests.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/ows-1.7.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/platform-1.7.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/rest-1.7.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/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
@@ -884,12 +900,12 @@
%%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.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wcs-1.7.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wcs1_1-1.7.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wfs-1.7.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wfs11-1.7.3.jar
-%%G%%/webapps/geoserver/WEB-INF/lib/wms-1.7.3.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/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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905040105.n4415OJe022250>