Correct a variable name (PKG_JAVA_HOME). Bump PKGREVISION.

This commit is contained in:
minskim 2006-07-07 03:11:48 +00:00
parent 2019a27e47
commit b786dee9be
2 changed files with 6 additions and 6 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.5 2006/07/07 03:02:13 minskim Exp $ # $NetBSD: Makefile,v 1.6 2006/07/07 03:12:19 minskim Exp $
DISTNAME= apache-tomcat-${TOMCAT_VERSION} DISTNAME= apache-tomcat-${TOMCAT_VERSION}
PKGREVISION= 1 PKGREVISION= 2
CATEGORIES= www java CATEGORIES= www java
# The list of sites to download is generated by an apache website. # The list of sites to download is generated by an apache website.
# The getsite.sh script parses the HTML and extracts the urls. # The getsite.sh script parses the HTML and extracts the urls.
@ -49,7 +49,7 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f} CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
.endfor .endfor
FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
# If we were going to build jsvc, this would be a start # If we were going to build jsvc, this would be a start
# post-extract: # post-extract:

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.11 2006/07/07 03:02:39 minskim Exp $ # $NetBSD: Makefile,v 1.12 2006/07/07 03:11:48 minskim Exp $
PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION} PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
PKGREVISION= 2 PKGREVISION= 3
CATEGORIES= www java CATEGORIES= www java
# The list of sites to download is generated by a jakarta website. # The list of sites to download is generated by a jakarta website.
# The getsite.sh script parses the HTML and extracts the urls. # The getsite.sh script parses the HTML and extracts the urls.
@ -47,7 +47,7 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f} CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
.endfor .endfor
FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
do-build: do-build:
@${MV} ${WRKSRC}/conf ${WRKDIR} @${MV} ${WRKSRC}/conf ${WRKDIR}