INDEX build failed for 4.x

[Edwin Groothuis]

On Tue, Nov 30, 2004 at 08:11:28PM -0700, Robin Schoonover wrote:
> On Wed, 1 Dec 2004 12:53:08 +1100
> Edwin Groothuis <edwin at mavetju.org> wrote:
> > On Tue, Nov 30, 2004 at 08:38:35PM -0500, Kris Kennaway wrote:
> > > INDEX build failed with errors:
> > > Generating INDEX - please wait.."Makefile", line 13: 1 open
> > > conditional make: fatal errors encountered -- cannot continue
> > 
> > Now that's an interesting one which I failed to understand why it
> > doesn't work.
> > 
> 
> The \ on line 200 of sysutils/bacula-server/Makefile is causing the
> problem.

Close! But it gave me enough information on what actually was wrong:
.fi vs .endif

Lars: is this patch okay with you?


Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile	30 Nov 2004 20:31:40 -0000	1.37
+++ Makefile	1 Dec 2004 03:33:06 -0000
@@ -73,6 +73,7 @@
 
 # Client only or full server version
 .if defined(WITH_CLIENT_ONLY)
+CONFFILES=	fd
 CONFIGURE_ARGS+=	--enable-client-only
 PORTDOCS=	bacula.pdf ReleaseNotes html-manual
 PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.client
@@ -99,6 +100,7 @@
 .endif
 .else
 # Server only Options
+CONFFILES=		sd dir
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-mysql=yes
 USE_MYSQL=		yes
@@ -194,18 +196,14 @@
 	${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula
 .endif
 	# Install leaves existing conf files untouched. Respect this here!
-.if defined(WITH_CLIENT_ONLY)
-	for na in fd; do \
-.else
-	for na in sd dir; do \
-.fi
+	for na in ${CONFFILES}; do \
 		if [ -f ${PREFIX}/etc/bacula-$$na.conf.new ]; then \
 			${ECHO_CMD} "etc/bacula-$$na.conf.new" >> ${TMPPLIST}; \
 		elif [ -f ${PREFIX}/etc/bacula-$$na.conf ]; then \
 			${MV} ${PREFIX}/etc/bacula-$$na.conf ${PREFIX}/etc/bacula-$$na.conf.sample; \
 			${ECHO_CMD} "etc/bacula-$$na.conf.sample" >> ${TMPPLIST}; \
-		fi \
-	done; \
+		fi; \
+	done
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/html-manual


-- 
Edwin Groothuis      |            Personal website: http://www.mavetju.org
edwin at mavetju.org    |          Weblog: http://weblog.barnet.com.au/edwin/