- Update to 0.8

svn path=/head/; revision=190313

www/apache-forrest/Makefile

@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		apache-forrest
-PORTVERSION=		0.7
+PORTVERSION=		0.8
 CATEGORIES=		www java
 MASTER_SITES=		${MASTER_SITE_APACHE} \
 			http://mirror.tomato.it/apache/forrest/ \

www/apache-forrest/distinfo

@@ -1,3 +1,3 @@
-MD5 (apache-forrest-0.7.tar.gz) = ec83eb26a2bd39a3577ae1d9debd2a64
-SHA256 (apache-forrest-0.7.tar.gz) = df8547983af4a04877764f7f12fb1c937a6b4878deb320c8c05edc27ad73a379
-SIZE (apache-forrest-0.7.tar.gz) = 21917527
+MD5 (apache-forrest-0.8.tar.gz) = 56799bac54f79cd26a8ba29b10904259
+SHA256 (apache-forrest-0.8.tar.gz) = 7ca01a274e222f5720533d44c1500c4b6bf6d8c3f678835f3f337251c2f747a7
+SIZE (apache-forrest-0.8.tar.gz) = 23244435

www/apache-forrest/files/patch-bin-forrest

@@ -1,7 +1,6 @@
 $FreeBSD$
-
---- bin/forrest	Sun Jun 19 11:54:14 2005
-+++ bin/forrest.port	Thu Jun 30 14:16:09 2005
+--- bin/forrest	Tue Apr 10 18:17:55 2007
++++ bin/forrest.port	Mon Apr 16 14:24:52 2007
 @@ -20,6 +20,7 @@
  
  cygwin=false;
@@ -15,34 +14,34 @@ $FreeBSD$
             fi
             ;;
 +  FreeBSD*) freebsd=true
-+	    if [ -z "$JAVA_HOME" ] ; then
-+		JAVA_HOME=%%JAVA_HOME%%
-+	    fi
-+	    ;;
++	   if [ -z "$JAVA_HOME" ]; then
++	     JAVA_HOME=%%JAVA_HOME%%
++	   fi
++	   ;;
  esac
-+export JAVA_HOME;
++export JAVA_HOME
  
  if [ "$cygwin" = "true" ] ; then
    PROJECT_HOME=`cygpath -w "$PWD"`
-@@ -72,6 +79,12 @@
-   FORREST_DOT_HOME=$FORREST_HOME
+@@ -35,6 +42,12 @@
+   PROJECT_HOME=`pwd`
  fi
  
 +if [ -z "$DISPLAY" ]; then
-+	JAVA_AWT_HEADLESS="-Dforrest.jvmargs=-Djava.awt.headless=true"
++       JAVA_AWT_HEADLESS="-Dforrest.jvmargs=-Djava.awt.headless=true"
 +else
-+	JAVA_AWT_HEADLESS=''
++       JAVA_AWT_HEADLESS=''
 +fi
 +
- # set the ant file to use
- ANTFILE="$FORREST_DOT_HOME/main/forrest.build.xml"
+ if [ -z "$FORREST_HOME" ] ; then
+   # use the location of this script to infer $FORREST_HOME
  
-@@ -94,7 +107,7 @@
+@@ -97,7 +110,7 @@
  echo "Apache Forrest.  Run 'forrest -projecthelp' to list options"
  echo
  export FORREST_HOME
--"$ANT_HOME/bin/ant" --noconfig -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" -emacs $@
-+"$ANT_HOME/bin/ant" --noconfig -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" ${JAVA_AWT_HEADLESS} -emacs $@
+-"$ANT_HOME/bin/ant" --noconfig -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" -emacs "$@"
++"$ANT_HOME/bin/ant" --noconfig -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" ${JAVA_AWT_HEADLESS} -emacs "$@"
  RESULT=$?
  
  # ---- Restore Classpath

www/apache-forrest/files/patch-tools-ant-bin-ant

@@ -1,7 +1,6 @@
 $FreeBSD$
-
---- tools/ant/bin/ant	Sun Jun 19 11:54:04 2005
-+++ tools/ant/bin/ant.port	Tue Jul  5 13:53:37 2005
+--- tools/ant/bin/ant	Tue Apr 10 18:18:14 2007
++++ tools/ant/bin/ant.port	Mon Apr 16 14:27:19 2007
 @@ -78,6 +78,7 @@
  # OS specific support.  $var _must_ be set to either true or false.
  cygwin=false;
@@ -22,5 +21,5 @@ $FreeBSD$
  esac
 +export JAVA_HOME
  
- if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
-   # try to find ANT
+ # Forrest uses its own packaged Ant, so don't use the system Ant libraries
+ #if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then

www/apache-forrest/pkg-message

@@ -11,10 +11,10 @@
 
       1)  $ mkdir mysite; cd mysite
       2)  $ forrest seed
-      3)  $ forrest
-      4)  see results in ./build/site/index.html with your web browser
+      3)  $ forrest run
+      4)  point your web browser to http://localhost:8888
 
-  To avoid any issue with old classes being loaded, run a 'forrest clean'
+  To avoid any issue with old classes being loaded, run a 'forrest clean-work'
   in your project directory, after you upgraded to this version (%%PORTVERSION%%)
 
 *************************************************************************