From owner-svn-ports-all@FreeBSD.ORG  Wed Jun  4 22:10:19 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1E87F77B;
 Wed,  4 Jun 2014 22:10:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E64AA2A13;
 Wed,  4 Jun 2014 22:10:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s54MAIi5045042;
 Wed, 4 Jun 2014 22:10:18 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s54MAIoE045038;
 Wed, 4 Jun 2014 22:10:18 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201406042210.s54MAIoE045038@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 4 Jun 2014 22:10:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356552 - in head/www/cocoon: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jun 2014 22:10:19 -0000

Author: jkim
Date: Wed Jun  4 22:10:18 2014
New Revision: 356552
URL: http://svnweb.freebsd.org/changeset/ports/356552
QAT: https://qat.redports.org/buildarchive/r356552/

Log:
  - Do not build with JDK7 and later.  This port uses deprecated JPEG classes.
  - Support staging.
  
  Reported by:	exp-run (PR190511)

Modified:
  head/www/cocoon/Makefile
  head/www/cocoon/files/message-advanced.in

Modified: head/www/cocoon/Makefile
==============================================================================
--- head/www/cocoon/Makefile	Wed Jun  4 22:08:14 2014	(r356551)
+++ head/www/cocoon/Makefile	Wed Jun  4 22:10:18 2014	(r356552)
@@ -13,7 +13,7 @@ COMMENT=	XML Web Development Framework
 
 USE_RC_SUBR=		${PORTNAME}
 USE_JAVA=		yes
-JAVA_VERSION=		1.6+
+JAVA_VERSION=		1.6
 USE_PYTHON=		yes
 MAKE_ENV=		JAVA_HOME=${JAVA_HOME}
 WRKSRC=			${WRKDIR}/${PDISTNAME}
@@ -61,7 +61,6 @@ SUB_FILES=	\
 		message-advanced
 
 # Load options (before including bsd.port.pre.mk)
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.options"
 
 .include <bsd.port.pre.mk>
@@ -128,19 +127,11 @@ pre-install:
 
 do-install:
 	@${ECHO_MSG} "===> Installing ${COPYDIRS}"
-	@${MKDIR} ${APP_HOME}
-	@cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} | ${CPIO} -pdmuL -R ${LIBOWN}:${LIBGRP} ${APP_HOME}
-	@${INSTALL} ${WRKDIR}/upstreams-cocoon.sh ${APP_HOME}/cocoon.sh
+	@${MKDIR} ${STAGEDIR}${APP_HOME}
+	@cd ${WRKSRC} && ${FIND} -H ${COPYDIRS} | ${CPIO} -pdmuL -R ${LIBOWN}:${LIBGRP} ${STAGEDIR}${APP_HOME}
+	@${INSTALL} ${WRKDIR}/upstreams-cocoon.sh ${STAGEDIR}${APP_HOME}/cocoon.sh
 
 	@${ECHO_MSG} "===> Installing into ${PREFIX}/sbin"
-	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${PREFIX}/sbin
-
-post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${ECHO_CMD}
-	@${ECHO_CMD} "********************************************************************************"
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} "********************************************************************************"
-	@${ECHO_CMD}
+	@${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.post.mk>

Modified: head/www/cocoon/files/message-advanced.in
==============================================================================
--- head/www/cocoon/files/message-advanced.in	Wed Jun  4 22:08:14 2014	(r356551)
+++ head/www/cocoon/files/message-advanced.in	Wed Jun  4 22:10:18 2014	(r356552)
@@ -19,5 +19,5 @@ If you need to pass special options to J
 
 To specify the java version to use, please use %%APP_NAME%%_java_version:
 
-  %%APP_NAME%%_java_version="1.4"
+  %%APP_NAME%%_java_version="1.6"