ports/118348: Revision 1.210 of www/apache22/Makefile breaks building of slave ports.

[Andrey Beresovsky]

>Number:         118348
>Category:       ports
>Synopsis:       Revision 1.210 of www/apache22/Makefile breaks building of slave ports.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 30 11:10:02 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Beresovsky
>Release:        FreeBSD 7.0-BETA1 i386
>Organization:
Southern Federal University
>Environment:
System: FreeBSD moon.cc.rsu.ru 7.0-BETA1 FreeBSD 7.0-BETA1 #1: Wed Oct 31 14:17:23 MSK 2007

>Description:
In our organisation we use a modified version of apache22 port. Revision 1.160
www/apache22/Makefile introduce support for slave ports:

# for slave ports
.if !defined(MASTERDIR)
APACHEDIR=      ${.CURDIR}
.else
APACHEDIR=      ${MASTERDIR}
.endif

.include "${APACHEDIR}/Makefile.doc"
.include "${APACHEDIR}/Makefile.modules"
.include <bsd.port.pre.mk>
.include "${APACHEDIR}/Makefile.modules"

and we are using this facility. But revision 1.210 breaks building of slave ports
by including "${.CURDIR}/Makefile.options"

>How-To-Repeat:
Create your own slave port with the following Makefile:

MASTERDIR=      ${.CURDIR}/../../www/apache22
.include "${MASTERDIR}/Makefile"

run make

it would not find Makefile.options

>Fix:

--- Makefile.orig	2007-11-28 13:27:12.000000000 +0300
+++ Makefile	2007-11-28 13:27:16.000000000 +0300
@@ -45,6 +45,14 @@
 SUB_LIST+=		RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 LIBTOOLFILES=		configure
 
+# for slave ports
+.if !defined(MASTERDIR)
+APACHEDIR=	${.CURDIR}
+.else
+APACHEDIR=	${MASTERDIR}
+.endif
+
+
 .if !defined(WITHOUT_APACHE_OPTIONS)
 OPTIONS= \
 	APR_FROM_PORTS "Use devel/apr as APR (beware!)" Off \
@@ -54,7 +62,7 @@
 	SQLITE "Enable SQLite support for apr-dbd" Off \
 	IPV6 "Enable IPv6 support" On \
 	PCRE_FROM_PORTS "Use devel/pcre instead of bundled one" Off
-.include "${.CURDIR}/Makefile.options"
+.include "${APACHEDIR}/Makefile.options"
 .endif
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
@@ -94,14 +102,6 @@
 CONFIGURE_ARGS+=	--enable-exception-hook
 .endif
 
-# for slave ports
-.if !defined(MASTERDIR)
-APACHEDIR=	${.CURDIR}
-.else
-APACHEDIR=	${MASTERDIR}
-.endif
-
-
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 .include <bsd.port.pre.mk>

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