aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net-mgmt/rancid3/Makefile2
-rw-r--r--net-mgmt/rancid3/files/patch-etc__Makefile.am37
2 files changed, 1 insertions, 38 deletions
diff --git a/net-mgmt/rancid3/Makefile b/net-mgmt/rancid3/Makefile
index 99aa19adf2db..def2d478cd3b 100644
--- a/net-mgmt/rancid3/Makefile
+++ b/net-mgmt/rancid3/Makefile
@@ -57,7 +57,7 @@ pre-everything::
@ ${ECHO} "Make sure your rancid repository is quiet before upgrading; disable rancid cron jobs"
post-patch:
- ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${WRKSRC}/man/Makefile.am
+ ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in
${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1
post-install:
diff --git a/net-mgmt/rancid3/files/patch-etc__Makefile.am b/net-mgmt/rancid3/files/patch-etc__Makefile.am
deleted file mode 100644
index 88e9c810e1e8..000000000000
--- a/net-mgmt/rancid3/files/patch-etc__Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
---- etc/Makefile.am.orig 2014-09-05 15:59:52 UTC
-+++ etc/Makefile.am
-@@ -25,30 +25,10 @@
- endif
-
- install-data-local: all
-- @if test "$(DO_CONF_INSTALL)" = "yes"; then \
-- if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \
-- echo ""; \
-- echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists. See "; \
-- echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \
-- echo " *** examples."; \
-- echo ""; \
-- else \
-- $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \
-- fi; \
-- if test ! -f $(DESTDIR)$(sysconfdir)/rancid.types.conf ; then \
-- $(INSTALL_DATA) rancid.types.conf $(DESTDIR)$(sysconfdir)/rancid.types.conf; \
-- fi; \
-- if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \
-- echo ""; \
-- echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists. See "; \
-- echo " *** $(pkgdatadir)/lg.conf.sample for new"; \
-- echo " *** examples."; \
-- echo ""; \
-- else \
-- $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \
-- fi; \
-- fi; \
-- $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base
-+ $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)
-+ #$(INSTALL_DATA) rancid.types.conf $(DESTDIR)$(sysconfdir)
-+ $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)
-+ $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)
-
- #clean:
- # rm -f Makefile rancid.conf $(BIN_DATAS) $(BIN_PROGS)