diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2005-07-28 07:28:22 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2005-07-28 07:28:22 +0000 |
| commit | 575f7019d37d5b24960e2aacd01f9bac4e14c266 (patch) | |
| tree | 65741970e68a122fa2f761456c3fb8b2c9934952 /www | |
| parent | d9310412ea40ec2e9972b89bc0816ac5f48955d0 (diff) | |
| download | ports-575f7019d37d5b24960e2aacd01f9bac4e14c266.tar.gz ports-575f7019d37d5b24960e2aacd01f9bac4e14c266.zip | |
- Correctly USE_RC_SUBR
- Fix build-issue on 4.x
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=140291
Diffstat (limited to 'www')
| -rw-r--r-- | www/cocoon/Makefile | 2 | ||||
| -rw-r--r-- | www/cocoon/files/cocoon.sh | 2 | ||||
| -rw-r--r-- | www/cocoon/files/patch-build.sh | 13 |
3 files changed, 14 insertions, 3 deletions
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index b8660cfff1fa..55b77ee06b17 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -15,6 +15,7 @@ DISTNAME= ${PDISTNAME}-src MAINTAINER= jb.quenot@caraldi.com COMMENT= XML Web Development Framework +USE_RC_SUBR= yes USE_JAVA= yes JAVA_VERSION= 1.3+ USE_PYTHON= 1.6+ @@ -46,6 +47,7 @@ LOG_FILE?= ${APP_HOME}/${APP_NAME}.log SUBSTITUTIONS= \ -e "s|%%APP_HOME%%|${APP_HOME}|g" \ -e "s|%%APP_NAME%%|${APP_NAME}|g" \ + -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%PORT%%|${PORT}|g" \ -e "s|%%COCOON_LIB%%|${COCOON_LIB}|g" \ diff --git a/www/cocoon/files/cocoon.sh b/www/cocoon/files/cocoon.sh index 259ada14b103..f9badad030c4 100644 --- a/www/cocoon/files/cocoon.sh +++ b/www/cocoon/files/cocoon.sh @@ -11,7 +11,7 @@ # %%APP_NAME%%_enable="YES" # -. /etc/rc.subr +. %%RC_SUBR%% name=%%APP_NAME%% rcvar=`set_rcvar` diff --git a/www/cocoon/files/patch-build.sh b/www/cocoon/files/patch-build.sh index 861dc2b5c612..08f852f4a959 100644 --- a/www/cocoon/files/patch-build.sh +++ b/www/cocoon/files/patch-build.sh @@ -1,8 +1,17 @@ ---- build.sh.orig Thu Nov 4 13:14:57 2004 -+++ build.sh Thu Nov 4 13:15:01 2004 +--- build.sh.orig Wed Mar 23 12:44:13 2005 ++++ build.sh Wed Jul 27 18:50:50 2005 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e # Copyright 1999-2004 The Apache Software Foundation # +@@ -27,7 +27,7 @@ + + # ----- Ignore system CLASSPATH variable + OLD_CLASSPATH="$CLASSPATH" +-unset CLASSPATH ++unset CLASSPATH || true + CLASSPATH="`echo lib/endorsed/*.jar | tr ' ' $S`" + export CLASSPATH + |