Date: Thu, 12 Aug 2004 11:10:29 GMT From: Sergey Akifyev <asa@gascom.ru> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/70195: [SW-BUG] Every update of print/cups-base overwrites the configuration files Message-ID: <200408121110.i7CBATO6097381@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/70195; it has been noted by GNATS. From: Sergey Akifyev <asa@gascom.ru> To: Volker Stolz <vs@freebsd.org> Cc: freebsd-gnats-submit@freebsd.org, johnmary@adelphia.net Subject: Re: ports/70195: [SW-BUG] Every update of print/cups-base overwrites the configuration files Date: Thu, 12 Aug 2004 15:06:43 +0400 --=-3TFlert6d0q0P1PVi/Of Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Tue, 2004-08-10 at 16:37, Volker Stolz wrote: I've applied this magick to mime.types and mime.convs . Look like previous maintainer thought it isn't necessary for theese files, because all users would use defaults. I don't see anything bad in checking theese files before overwriting, so here's the patch: =3D=3D=3D=3D[ cups-base.diff start diff -ruN cups-base.orig/Makefile cups-base/Makefile --- cups-base.orig/Makefile Tue Aug 3 13:28:52 2004 +++ cups-base/Makefile Thu Aug 12 14:53:57 2004 @@ -40,13 +40,10 @@ =20 post-install: ${MKDIR} ${CUPS_ETCDIR} -.for f in classes.conf client.conf cupsd.conf printers.conf +.for f in classes.conf client.conf cupsd.conf printers.conf mime.convs mime.types ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N cd ${CUPS_ETCDIR}; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi .endfor # classes.conf client.conf cupsd.conf printers.conf -.for f in mime.convs mime.types - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f} -.endfor # mime.convs mime.types cd ${CUPS_RCDIR}; ${MV} cups cups.sh.sample ${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete ${MKDIR} ${CUPS_SPOOLDIR} ${CUPS_SPOOLDIR}/tmp diff -ruN cups-base.orig/pkg-plist cups-base/pkg-plist --- cups-base.orig/pkg-plist Thu Mar 18 10:13:47 2004 +++ cups-base/pkg-plist Thu Aug 12 14:58:46 2004 @@ -11,8 +11,12 @@ @unexec if cmp -s %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; then rm -f %D/etc/cups/cupsd.conf; fi etc/cups/cupsd.conf.N @exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi -etc/cups/mime.convs -etc/cups/mime.types +@unexec if cmp -s %D/etc/cups/mime.convs.N %D/etc/cups/mime.convs; then rm -f %D/etc/cups/mime.convs; fi +etc/cups/mime.convs.N +@exec if test ! -f %D/etc/cups/mime.convs; then cp -p %D/etc/cups/mime.convs.N %D/etc/cups/mime.convs; fi +@unexec if cmp -s %D/etc/cups/mime.types.N %D/etc/cups/mime.types; then rm -f %D/etc/cups/mime.types; fi +etc/cups/mime.types.N +@exec if test ! -f %D/etc/cups/mime.types; then cp -p %D/etc/cups/mime.types.N %D/etc/cups/mime.types; fi @unexec if cmp -s %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; then rm -f %D/etc/cups/printers.conf; fi etc/cups/printers.conf.N @exec if test ! -f %D/etc/cups/printers.conf; then cp -p %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; fi =3D=3D=3D=3D[ cups-base.diff end --=20 regards, Sergey Akifyev <asa@gascom.ru> JSC Gascom <http://www.gascom.ru> PGP key available from: ftp://ftp.gascom.ru/pub/PGP-keys/asa.txt --=-3TFlert6d0q0P1PVi/Of Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (FreeBSD) iD8DBQBBG09Cbu06QwmNwNsRAitDAKCCNcLdlih9B3C45zm7YgeiamdYlwCeMkRG Qcb5nsSgQwztLAS1xj7lqdA= =Wixw -----END PGP SIGNATURE----- --=-3TFlert6d0q0P1PVi/Of--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408121110.i7CBATO6097381>