[pkgsrc/trunk]: pkgsrc/sysutils/smartmontools Use a standard idiom to install...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d9c602e47378
branches:  trunk
changeset: 486764:d9c602e47378
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 02 20:29:16 2005 +0000

description:
Use a standard idiom to install the config files into the examples
directory instead of $(sysconfdir) for packages that use GNU automake.
Also modify patch-aa to avoid installing the provided init.d script
in a simpler way.

diffstat:

 sysutils/smartmontools/Makefile         |   5 +-
 sysutils/smartmontools/distinfo         |   4 +-
 sysutils/smartmontools/patches/patch-aa |  62 ++++++++++----------------------
 3 files changed, 23 insertions(+), 48 deletions(-)

diffs (111 lines):

diff -r 9306a1f87de3 -r d9c602e47378 sysutils/smartmontools/Makefile
--- a/sysutils/smartmontools/Makefile   Sun Jan 02 20:19:46 2005 +0000
+++ b/sysutils/smartmontools/Makefile   Sun Jan 02 20:29:16 2005 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:50 reed Exp $
-#
+# $NetBSD: Makefile,v 1.4 2005/01/02 20:29:16 jlam Exp $
 
 DISTNAME=              smartmontools-5.32
 PKGREVISION=           1
@@ -18,11 +17,11 @@
 GNU_CONFIGURE=         yes
 
 EGDIR=                 ${PREFIX}/share/examples/smartmontools
-
 CONF_FILES=            ${EGDIR}/smartd.conf ${PKG_SYSCONFDIR}/smartd.conf
 RCD_SCRIPTS=           smartd
 
 CONFIGURE_ARGS+=       --with-docdir=${PREFIX}/share/doc/smartmontools
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} sysconfdir=${EGDIR}
 
 INSTALLATION_DIRS=     ${EGDIR}
 
diff -r 9306a1f87de3 -r d9c602e47378 sysutils/smartmontools/distinfo
--- a/sysutils/smartmontools/distinfo   Sun Jan 02 20:19:46 2005 +0000
+++ b/sysutils/smartmontools/distinfo   Sun Jan 02 20:29:16 2005 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/15 20:17:45 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2005/01/02 20:29:16 jlam Exp $
 
 SHA1 (smartmontools-5.32.tar.gz) = 2af09136578ea59565ad00b3638afe9700ed26a2
 Size (smartmontools-5.32.tar.gz) = 408224 bytes
-SHA1 (patch-aa) = d9fd094b59b0e0f68e6ce6edc2b18342faa3b03a
+SHA1 (patch-aa) = 2f22d9bd911ce825c1ca888cceb4535bba606671
diff -r 9306a1f87de3 -r d9c602e47378 sysutils/smartmontools/patches/patch-aa
--- a/sysutils/smartmontools/patches/patch-aa   Sun Jan 02 20:19:46 2005 +0000
+++ b/sysutils/smartmontools/patches/patch-aa   Sun Jan 02 20:29:16 2005 +0000
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/15 20:17:46 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2005/01/02 20:29:16 jlam Exp $
 
---- Makefile.in.orig   2004-07-05 10:10:33.000000000 +0200
-+++ Makefile.in        2004-07-15 22:11:59.000000000 +0200
-@@ -148,6 +148,7 @@
- smartd_suffix = @smartd_suffix@
- smartmontools_release_date = @smartmontools_release_date@
- smartmontools_release_time = @smartmontools_release_time@
-+examplesdir = $(prefix)/share/examples/@PACKAGE@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- 
-@@ -251,8 +252,7 @@
+--- Makefile.in.orig   2004-07-05 04:10:33.000000000 -0400
++++ Makefile.in
+@@ -251,8 +251,7 @@ docs_DATA = AUTHORS   \
              NEWS      \
              README    \
              TODO      \
@@ -20,37 +12,21 @@
  
  
  sysconf_DATA = smartd.conf$(smartd_suffix)
-@@ -646,12 +646,12 @@
- sysconfDATA_INSTALL = $(INSTALL_DATA)
- install-sysconfDATA: $(sysconf_DATA)
-       @$(NORMAL_INSTALL)
--      $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+      $(mkinstalldirs) $(DESTDIR)$(examplesdir)
-       @list='$(sysconf_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
--        echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
--        $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
-+        echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(examplesdir)/$$f"; \
-+        $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(examplesdir)/$$f; \
-       done
+@@ -916,7 +915,7 @@ check: check-recursive
+ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-      $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(docsdir) $(DESTDIR)$(initddir) $(DESTDIR)$(sysconfdir)
++      $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(docsdir) $(DESTDIR)$(sysconfdir)
  
- uninstall-sysconfDATA:
-@@ -1079,16 +1079,7 @@
-       cat $(top_builddir)/tmp.tail >> $(srcdir)/smartd.conf.5.in
-       rm -f $(top_builddir)/tmp.head $(top_builddir)/tmp.tail $(top_builddir)/tmp.directives
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -962,7 +961,7 @@ info: info-recursive
+ 
+ info-am:
  
--install-initdDATA: $(initd_DATA)
--      $(mkinstalldirs) $(DESTDIR)$(initddir)
--      $(INSTALL_SCRIPT) $(top_builddir)/smartd.initd $(DESTDIR)$(initddir)/smartd$(smartd_suffix)
--      @echo -e "\n\n####################################################################\n#"
--      @echo -e "#                       PLEASE READ THIS BOX!\n#"
--      @echo -e "#   To manually start the smartd daemon, run:\n#   ${initddir}/smartd start\n#"
--      @echo -e "#   To automatically start smartd on bootup, run:\n#   /sbin/chkconfig --add smartd\n#"
--      @echo -e "#   smartd can now use a configuration file ${sysconfdir}/smartd.conf. Do:\n#   man smartd"
--      @echo -e "#   to learn about it. A sample configuration file can be found in:\n#   ${docdir}\n#"
--      @echo -e "####################################################################\n\n"
-+install-initdDATA:
+-install-data-am: install-docsDATA install-initdDATA install-man
++install-data-am: install-docsDATA install-man
  
- uninstall-initdDATA:
-       rm -rf $(DESTDIR)$(initddir)/smartd$(smartd_suffix)
+ install-exec-am: install-sbinPROGRAMS install-sysconfDATA
+