- Update to 1.7.3

PR:		132405
Submitted by:	Alexander Logvinov <ports@logvinov.com>
Approved by:	maintainer

graphics/geoserver/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geoserver
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.3
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -17,29 +17,49 @@ COMMENT=	An Open Source GIS Server
 USE_JAVA=	yes
 USE_ZIP=	yes
 JAVA_VERSION=	1.5+
-NO_BUILD=	YES
+NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-GEOSERVERDIR=	${PREFIX}/lib/${PORTNAME}
+GEOSERVERDIR=	${PREFIX}/${PORTNAME}
+GEODIRS=	data_dir etc lib logs resources webapps
 
-.include <bsd.port.pre.mk>
+USE_RC_SUBR=	${PORTNAME}
+PLIST_SUB=	G="${GEOSERVERDIR:S,^${PREFIX}/,,}"
+SUB_LIST=	GEOSERVERDIR="${GEOSERVERDIR}" JAVA="${JAVA}"
+SUB_FILES=	pkg-message
 
-USE_RC_SUBR=	geoserver.sh
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX}
+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:
 	@${REINPLACE_CMD} -e 's|$$GEOSERVER_HOME|${GEOSERVERDIR}|g' \
-	    ${WRKSRC}/bin/startup.sh ${WRKSRC}/bin/shutdown.sh
-
-pre-install:
-	@${FIND} ${WRKSRC} -name "*.bak" -o -name "*.orig" | ${XARGS} ${RM}
+		-e 's|%%JAVA%%|${JAVA}|g' \
+		${WRKSRC}/bin/startup.sh ${WRKSRC}/bin/shutdown.sh
 
 do-install:
-	@${MKDIR} ${GEOSERVERDIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${GEOSERVERDIR}/
-	@${CHMOD} -R 755 ${GEOSERVERDIR}
+	@${MKDIR} ${GEOSERVERDIR}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${GEOSERVERDIR}/bin
+.for f in GPL.txt LICENSE.txt README.txt RUNNING.txt start.jar
+	${INSTALL_DATA} ${WRKSRC}/${f} ${GEOSERVERDIR}
+.endfor
+.for dir in ${GEODIRS}
+	@cd ${WRKSRC} && \
+		${FIND} ${dir} -type d -exec \
+			${MKDIR} "${GEOSERVERDIR}/{}" \; && \
+		${FIND} ${dir} -type f -exec \
+			${INSTALL_DATA} "${WRKSRC}/{}" "${GEOSERVERDIR}/{}" \;
+.endfor
 
 post-install:
-	@${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g'
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

graphics/geoserver/distinfo

@@ -1,3 +1,3 @@
-MD5 (geoserver-1.7.0-bin.zip) = 40b8045de91cfee5ff2a66a863ab9985
-SHA256 (geoserver-1.7.0-bin.zip) = 211ba54ea09cb83c6b2879f5c9636aa64b6bba8e3f6a1be28a358a4cfb5a98c9
-SIZE (geoserver-1.7.0-bin.zip) = 43849533
+MD5 (geoserver-1.7.3-bin.zip) = 5f096d36c10b92fc7d1e6a24fe2769cb
+SHA256 (geoserver-1.7.3-bin.zip) = c199626e4260801ca41d4ad7db734ccf363241867d16c76d46feb85b83d4849a
+SIZE (geoserver-1.7.3-bin.zip) = 45486115

graphics/geoserver/files/geoserver.in

@@ -0,0 +1,42 @@
+#!/bin/sh
+# 
+# $FreeBSD$
+#
+# PROVIDE: geoserver
+# REQUIRE: NETWORKING
+#
+# Add the following line to /etc/rc.conf[.local] to enable geoserver
+#
+# geoserver_enable (bool):	Set to "NO" by default.
+#				Set it to "YES" to enable geoserver.
+
+
+. %%RC_SUBR%%
+
+name="geoserver"
+rcvar=${name}_enable
+
+load_rc_config ${name}
+
+: ${geoserver_enable="NO"}
+: ${geoserver_stdout_log="/var/log/geoserver_output.log"}
+: ${geoserver_stderr_log="/var/log/geoserver_error.log"}
+: ${geoserver_user="root"}
+: ${geoserver_chdir="%%GEOSERVERDIR%%"}
+
+java_args="-DGEOSERVER_DATA_DIR=%%GEOSERVERDIR%%/data_dir -Djava.awt.headless=true \
+		-DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar"
+log_args=">> ${geoserver_stdout_log} 2>> ${geoserver_stderr_log}"
+
+command="%%JAVA%%"
+command_args="${java_args} ${geoserver_flags} ${log_args} &"
+
+start_precmd=logs_touch
+
+logs_touch()
+{
+    touch $geoserver_stdout_log $geoserver_stderr_log
+    chown $geoserver_user $geoserver_stdout_log $geoserver_stderr_log
+}
+
+run_rc_command "$1"

graphics/geoserver/files/geoserver.sh.in

@@ -1,15 +0,0 @@
-#!/bin/sh
-# 
-# PROVIDE: geoserver
-# REQUIRE: networking
-
-. %%RC_SUBR%%
-
-name="geoserver"
-rcvar=${name}_enable
-
-start_cmd=%%PREFIX%%/lib/${name}/bin/startup.sh
-stop_cmd=%%PREFIX%%/lib/${name}/bin/shutdown.sh
-
-load_rc_config ${name}
-run_rc_command "$1"

graphics/geoserver/files/patch-bin_shutdown.sh

@@ -26,4 +26,4 @@
  
  cd "$GEOSERVER_HOME"
 -exec "$_RUNJAVA" -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar --stop
-+exec java -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar --stop
++exec %%JAVA%% -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar --stop

graphics/geoserver/files/patch-bin_startup.sh

@@ -26,4 +26,4 @@
  #added headless to true by default, if this messes anyone up let the list
  #know and we can change it back, but it seems like it won't hurt -ch
 -exec "$_RUNJAVA" -DGEOSERVER_DATA_DIR=$GEOSERVER_DATA_DIR -Djava.awt.headless=true -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar 
-+exec java -DGEOSERVER_DATA_DIR=$GEOSERVER_DATA_DIR -Djava.awt.headless=true -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar
++exec %%JAVA%% -DGEOSERVER_DATA_DIR=$GEOSERVER_DATA_DIR -Djava.awt.headless=true -DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar