ports/79707: [NONMAINTAINER UPDATE] www/resin: [allow port to build again]

[Boris Kovalenko]

>Number:         79707
>Category:       ports
>Synopsis:       [NONMAINTAINER UPDATE] www/resin: [allow port to build again]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 09 05:30:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Boris Kovalenko
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
JSC "TAGNet"
>Environment:
System: FreeBSD boris.nikom.ru 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #4: Wed Mar 23 19:01:50 YEKT 2005
>Description:
[DESCRIBE CHANGES]

    Wonder why .for is cutting ${WRKSRC} from path but it does. So logic
is slightly changed to allow port to build again. BROKEN is removed.
Question to maintainer - may be better to change portnames to resin2 and
resin3 respectively?

Port maintainer (jb.quenot at caraldi.com) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- resin-3.0.12.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/resin/Makefile /usr/ports/www/resin3.new/Makefile
--- /usr/ports/www/resin/Makefile	Mon Mar 28 08:15:30 2005
+++ /usr/ports/www/resin3.new/Makefile	Sat Apr  9 11:15:23 2005
@@ -13,8 +13,6 @@
 MAINTAINER=		jb.quenot at caraldi.com
 COMMENT=		Resin, a Java-based Application Server, 3.x branch
 
-BROKEN=			Does not build
-
 USE_JAVA=		yes
 JAVA_VERSION=		1.2+
 HAS_CONFIGURE=		yes
@@ -43,17 +41,16 @@
 PKGINSTALL=		${WRKDIR}/pkg-install
 PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 PKGMESSAGE=		${WRKDIR}/pkg-message
-# We need WRKSRC and WRKDIR right now so define them "manually"
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 REINPLACE_FILES=	${WRKSRC}/src/c/apache1/Makefile.in \
 			${WRKSRC}/src/c/apache2/Makefile.in
 REPLACE_FILES=		${FILESDIR}/pkg-install \
 			${FILESDIR}/pkg-deinstall \
 			${FILESDIR}/install.sh \
 			${FILESDIR}/pkg-message.in \
-			${WRKSRC}/conf/resin.conf \
 			${FILESDIR}/resinctl \
 			${FILESDIR}/resin.sh.in
+RESINCONF=		${WRKSRC}/conf/resin.conf
 COPYDIRS=		lib libexec webapps
 
 .include <bsd.port.pre.mk>
@@ -111,11 +108,12 @@
 
 post-patch:
 .for FILE in ${REINPLACE_FILES}
-	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${FILE}
+	@${REINPLACE_CMD} ${SUBSTITUTIONS} ${WRKSRC}${FILE}
 .endfor
 .for FILE in ${REPLACE_FILES}
 	@${SED} ${SUBSTITUTIONS} ${FILE} > ${WRKDIR}/`basename ${FILE}`
 .endfor
+	@${SED} ${SUBSTITUTIONS} ${RESINCONF} > ${WRKDIR}/`basename ${RESINCONF}`
 	@${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
 .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \
 defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
--- resin-3.0.12.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: