diff options
| author | salo <salo@pkgsrc.org> | 2006-08-18 13:45:57 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2006-08-18 13:45:57 +0000 |
| commit | e88747f44c5be5673aae3d00bed26af4fb289f14 (patch) | |
| tree | 281e29fc6eb364fa09f6bd884559336bcd9c7954 /net/miredo | |
| parent | 98d039334e725a6739324055dbe051c5b2c5d492 (diff) | |
| download | pkgsrc-e88747f44c5be5673aae3d00bed26af4fb289f14.tar.gz | |
Fix example configuration files installation so they aren't installed twice
(extra ones in PKG_SYSCONFDIR).
ok <rpaulo>
Diffstat (limited to 'net/miredo')
| -rw-r--r-- | net/miredo/Makefile | 9 | ||||
| -rw-r--r-- | net/miredo/distinfo | 4 | ||||
| -rw-r--r-- | net/miredo/patches/patch-aa | 32 |
3 files changed, 31 insertions, 14 deletions
diff --git a/net/miredo/Makefile b/net/miredo/Makefile index c4062507e8e..a1d9110d5b9 100644 --- a/net/miredo/Makefile +++ b/net/miredo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/08/15 20:54:44 rpaulo Exp $ +# $NetBSD: Makefile,v 1.10 2006/08/18 13:45:57 salo Exp $ DISTNAME= miredo-0.9.9 CATEGORIES= net @@ -21,13 +21,6 @@ CONF_FILES+= ${EGDIR}/miredo-server.conf-dist \ ${PKG_SYSCONFDIR}/miredo-server.conf CONF_FILES+= ${EGDIR}/isatapd.conf-dist ${PKG_SYSCONFDIR}/isatapd.conf -INSTALLATION_DIRS= share/examples/miredo - -post-install: - ${INSTALL_DATA} ${WRKSRC}/misc/miredo.conf-dist ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/misc/miredo-server.conf-dist ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/misc/isatapd.conf-dist ${EGDIR} - .include "../../net/libpcap/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/miredo/distinfo b/net/miredo/distinfo index 8763079d000..3b8e2f60c14 100644 --- a/net/miredo/distinfo +++ b/net/miredo/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2006/08/15 20:54:44 rpaulo Exp $ +$NetBSD: distinfo,v 1.7 2006/08/18 13:45:57 salo Exp $ SHA1 (miredo-0.9.9.tar.bz2) = 15fd2dc04f295cce5a25a4372488caaf99bc6552 RMD160 (miredo-0.9.9.tar.bz2) = 7bb88d5fc90001b8c7efdc809038bf382708bdcd Size (miredo-0.9.9.tar.bz2) = 441042 bytes -SHA1 (patch-aa) = 21e1224ddaec51d6444e5d9e69acac0e81aef97e +SHA1 (patch-aa) = 184c8dd8ca12ecdfcf56700aef25d46eccc16c53 SHA1 (patch-ab) = 08e67c6fa8bebfca8d47ca2b9525bda2eefb518f SHA1 (patch-ac) = c591e9097cf143c9bc4bde3cb66b875755547cd1 diff --git a/net/miredo/patches/patch-aa b/net/miredo/patches/patch-aa index af859c0e054..b7294e94402 100644 --- a/net/miredo/patches/patch-aa +++ b/net/miredo/patches/patch-aa @@ -1,8 +1,32 @@ -$NetBSD: patch-aa,v 1.4 2006/08/15 20:54:44 rpaulo Exp $ +$NetBSD: patch-aa,v 1.5 2006/08/18 13:45:57 salo Exp $ ---- Makefile.in.orig 2006-08-12 18:43:14.000000000 +0100 -+++ Makefile.in 2006-08-13 13:51:30.000000000 +0100 -@@ -703,7 +703,6 @@ info-am: +--- Makefile.in.orig 2006-08-15 22:15:54.000000000 +0200 ++++ Makefile.in 2006-08-18 15:32:53.000000000 +0200 +@@ -237,6 +237,7 @@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ ++examplesdir = @prefix@/share/examples/miredo + target_alias = @target_alias@ + ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = po doc compat libteredo libtun6 src +@@ -347,12 +348,9 @@ + done + install-nodist_sysconfDATA: $(nodist_sysconf_DATA) + @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" +- @list='$(nodist_sysconf_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(nodist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(nodist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(examplesdir) ++ for p in $(nodist_sysconf_DATA); do \ ++ $(BSD_INSTALL_DATA) $$p $(DESTDIR)$(examplesdir)/; \ + done + + uninstall-nodist_sysconfDATA: +@@ -703,7 +701,6 @@ install-data-am: @$(NORMAL_INSTALL) |