diff options
| author | tron <tron> | 2000-11-01 14:23:32 +0000 |
|---|---|---|
| committer | tron <tron> | 2000-11-01 14:23:32 +0000 |
| commit | 3d32a2dda5870760c8773f7c4aef9f7e98ae86aa (patch) | |
| tree | 03914d2f9648d97906b6f44816efaee58fe36212 /www/analog | |
| parent | a8a06f778e6b3e37fa7efc837fbd61520b6f3ed1 (diff) | |
| download | pkgsrc-3d32a2dda5870760c8773f7c4aef9f7e98ae86aa.tar.gz | |
Don't overwrite analog configuration during installation. Fixes
PR pkg/11351 by David Brownlee.
Diffstat (limited to 'www/analog')
| -rw-r--r-- | www/analog/Makefile | 26 | ||||
| -rw-r--r-- | www/analog/pkg/PLIST | 5 |
2 files changed, 11 insertions, 20 deletions
diff --git a/www/analog/Makefile b/www/analog/Makefile index e4d73382d7c..99477e5e4c8 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/10/27 03:22:49 tron Exp $ +# $NetBSD: Makefile,v 1.18 2000/11/01 14:23:32 tron Exp $ # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp DISTNAME= analog-4.13 @@ -15,23 +15,15 @@ ALL_TARGET= analog MAKE_ENV+= PREFIX=${PREFIX} do-install: - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \ - ${PREFIX}/share/doc/analog - ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \ - ${PREFIX}/lib/analog/lang - ${INSTALL} -d -o nobody -g nogroup -m 755 \ - ${PREFIX}/lib/analog/images - cd ${WRKSRC}/docs && \ - ${INSTALL_DATA} * ${PREFIX}/share/doc/analog - cd ${WRKSRC}/images && \ - ${INSTALL_DATA} * ${PREFIX}/lib/analog/images - cd ${WRKSRC}/lang && \ - ${INSTALL_DATA} * ${PREFIX}/lib/analog/lang - cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} analog ${PREFIX}/bin - cd ${WRKSRC} && \ - ${INSTALL_DATA} -m 644 ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg + ${MKDIR} ${PREFIX}/share/doc/analog ${PREFIX}/lib/analog/lang \ + ${PREFIX}/lib/analog/images + ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/analog + ${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/lib/analog/images + ${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/lib/analog/lang + ${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin ${INSTALL_DATA} -m 644 ${WRKSRC}/analog.cfg \ ${PREFIX}/etc/analog.cfg.default + ${TEST} -f ${PREFIX}/etc/analog.cfg || \ + ${INSTALL_DATA} -m 644 ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg .include "../../mk/bsd.pkg.mk" diff --git a/www/analog/pkg/PLIST b/www/analog/pkg/PLIST index db7e4150f95..2a80f26a525 100644 --- a/www/analog/pkg/PLIST +++ b/www/analog/pkg/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.14 2000/10/27 03:22:51 tron Exp $ +@comment $NetBSD: PLIST,v 1.15 2000/11/01 14:23:33 tron Exp $ bin/analog etc/analog.cfg.default -@exec cp -p %F %D/etc/analog.cfg -@unexec rm -f %D/etc/analog.cfg +@exec test -f %D/etc/analog.cfg || cp -p %F %D/etc/analog.cfg lib/analog/images/analogo.gif lib/analog/images/bara1.gif lib/analog/images/bara16.gif |