INDEX build failed for 4.x
LarsKöller
lars.koeller at uni-bielefeld.de
Tue Nov 30 23:37:30 PST 2004
----------
Hello!
In reply to Edwin Groothuis who wrote:
> 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
Yes, looks much better, please commit. I just fix the .fi problem
-> .endif.
Thanks
Lars
--
E-Mail: Lars.Koeller at Uni-Bielefeld.DE \ Lars Köller
lkoeller at FreeBSD.org \ CC University of
PGP: http://www.uk.pgp.net/pgpnet/wwwkeys.html \ Bielefeld, Germany
Key-ID: A430D499 \ Tel: +49 521 106 4964
----------- FreeBSD, what else? ---- http://www.freebsd.org -------------
More information about the freebsd-ports
mailing list