diff options
author | jlam <jlam@pkgsrc.org> | 2005-01-02 20:29:16 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-01-02 20:29:16 +0000 |
commit | d7c341a8a98bf6f326432f00170ed52b0cd09572 (patch) | |
tree | 5baa9304f68f9d3d532c39c9671ce69adab5e4f8 /sysutils/smartmontools | |
parent | e590f9d9a83ac5df256221acb2c6eeafc8ca3ab4 (diff) | |
download | pkgsrc-d7c341a8a98bf6f326432f00170ed52b0cd09572.tar.gz |
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 (limited to 'sysutils/smartmontools')
-rw-r--r-- | sysutils/smartmontools/Makefile | 5 | ||||
-rw-r--r-- | sysutils/smartmontools/distinfo | 4 | ||||
-rw-r--r-- | sysutils/smartmontools/patches/patch-aa | 62 |
3 files changed, 23 insertions, 48 deletions
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 6e9e5e408f0..8a9a7592337 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -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 @@ USE_PKGINSTALL= yes 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 --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index fac29eddb06..8c4b35844d5 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -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 --git a/sysutils/smartmontools/patches/patch-aa b/sysutils/smartmontools/patches/patch-aa index 477b16e476c..0dd38fe3348 100644 --- a/sysutils/smartmontools/patches/patch-aa +++ b/sysutils/smartmontools/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/07/15 20:17:46 xtraeme Exp $ 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) + + install: install-recursive + install-exec: install-exec-recursive +@@ -962,7 +961,7 @@ info: info-recursive + + info-am: - 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-data-am: install-docsDATA install-initdDATA install-man ++install-data-am: install-docsDATA install-man --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-exec-am: install-sbinPROGRAMS install-sysconfDATA - uninstall-initdDATA: - rm -rf $(DESTDIR)$(initddir)/smartd$(smartd_suffix) |