Date: Wed, 01 Dec 2004 08:37:27 +0100 From: Lars =?iso-8859-1?Q?K=F6ller?= <lars.koeller@uni-bielefeld.de> To: Edwin Groothuis <edwin@mavetju.org> Cc: lars.koeller@uni-bielefeld.de Subject: Re: INDEX build failed for 4.x Message-ID: <200412010737.iB17bRj20089@rayadm.hrz.uni-bielefeld.de> In-Reply-To: Message from Edwin Groothuis <edwin@mavetju.org> "of Wed, 01 Dec 2004 14:34:12 %2B1100." <20041201033412.GE1538@k7.mavetju>
next in thread | previous in thread | raw e-mail | index | archive | help
----------
Hello!
In reply to Edwin Groothuis who wrote:
=20
> Lars: is this patch okay with you?
>=20
>=20
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
> RCS file: /home/pcvs/ports/sysutils/bacula-server/Makefile,v
> retrieving revision 1.37
> diff -u -r1.37 Makefile
> --- Makefile=0930 Nov 2004 20:31:40 -0000=091.37
> +++ Makefile=091 Dec 2004 03:33:06 -0000
> @@ -73,6 +73,7 @@
> =20
> # Client only or full server version
> .if defined(WITH_CLIENT_ONLY)
> +CONFFILES=3D=09fd
> CONFIGURE_ARGS+=3D=09--enable-client-only
> PORTDOCS=3D=09bacula.pdf ReleaseNotes html-manual
> PKGDEINSTALL=3D=09${PKGDIR}/pkg-deinstall.client
> @@ -99,6 +100,7 @@
> .endif
> .else
> # Server only Options
> +CONFFILES=3D=09=09sd dir
> .if defined(WITH_MYSQL)
> CONFIGURE_ARGS+=3D=09--with-mysql=3Dyes
> USE_MYSQL=3D=09=09yes
> @@ -194,18 +196,14 @@
> =09${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula
> .endif
> =09# Install leaves existing conf files untouched. Respect this he=
re!
> -.if defined(WITH_CLIENT_ONLY)
> -=09for na in fd; do \
> -.else
> -=09for na in sd dir; do \
> -.fi
> +=09for na in ${CONFFILES}; do \
> =09=09if [ -f ${PREFIX}/etc/bacula-$$na.conf.new ]; then \
> =09=09=09${ECHO_CMD} "etc/bacula-$$na.conf.new" >> ${TMPPLIST}; \
> =09=09elif [ -f ${PREFIX}/etc/bacula-$$na.conf ]; then \
> =09=09=09${MV} ${PREFIX}/etc/bacula-$$na.conf ${PREFIX}/etc/bacula=
-$$na.conf.sample; \
> =09=09=09${ECHO_CMD} "etc/bacula-$$na.conf.sample" >> ${TMPPLIST};=
\
> -=09=09fi \
> -=09done; \
> +=09=09fi; \
> +=09done
> =20
> .if !defined(NOPORTDOCS)
> =09${MKDIR} ${DOCSDIR}/html-manual
Yes, looks much better, please commit. I just fix the .fi problem=
=20
-> .endif.
Thanks
Lars
--=20
E-Mail: Lars.Koeller@Uni-Bielefeld.DE \ Lars K=F6ller
lkoeller@FreeBSD.org \ CC University of
PGP: http://www.uk.pgp.net/pgpnet/wwwkeys.html \ Bielefeld, Germany=
=20
Key-ID: A430D499 \ Tel: +49 521 106 4=
964
----------- FreeBSD, what else? ---- http://www.freebsd.org ---------=
----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412010737.iB17bRj20089>