Fix package building and install sample config files

PR:		ports/43385
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu>
This commit is contained in:
Edwin Groothuis 2002-11-09 02:19:36 +00:00
parent d3117e3c90
commit 86c22fc02a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=69772
9 changed files with 126 additions and 51 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= rancid
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/

View file

@ -0,0 +1,17 @@
--- bin/Makefile.in.orig Thu Sep 26 10:46:33 2002
+++ bin/Makefile.in Thu Sep 26 10:47:14 2002
@@ -375,13 +375,7 @@
for prog in $(BIN_PROGS) ; do \
$(INSTALL) $$prog $(bindir); \
done; \
- if test -f $(bindir)/env ; then \
- echo "WARNING: *** $(bindir)/env exists: installing as env.new."; \
- echo " *** review env.new for new/deprecated switches"; \
- $(INSTALL_DATA) env $(bindir)/env.new; \
- else \
- $(INSTALL_DATA) env $(bindir); \
- fi
+ $(INSTALL_DATA) env $(bindir)/env.new
# BIN_DATAS are empty at the moment.
# for prog in $(BIN_DATAS) ; do \
# $(INSTALL_DATA) $$prog $(PREFIX)/bin; \

View file

@ -1,17 +1,24 @@
*** util/lg/Makefile.in.orig Mon Jun 3 14:14:33 2002
--- util/lg/Makefile.in Mon Jun 3 14:14:51 2002
***************
*** 1,6 ****
PREFIX = @prefix@
! INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
--- 1,6 ----
PREFIX = @prefix@
! INSTALL = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
--- util/lg/Makefile.in.orig Fri Aug 9 23:59:06 2002
+++ util/lg/Makefile.in Thu Sep 26 10:54:50 2002
@@ -1,6 +1,6 @@
PREFIX = @prefix@
-INSTALL = @INSTALL@
+INSTALL = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
@@ -13,13 +13,7 @@
for file in $(UTIL_LG_PROGS) ; do \
$(INSTALL) $$file $(PREFIX)/util/lg; \
done; \
- if test -f $(PREFIX)/util/lg/lg.conf ; then \
- echo "WARNING: *** $(PREFIX)/util/lg/lg.conf exists: installing as lg.conf.new."; \
- echo " *** review lg.conf.new for new/deprecated switches"; \
$(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.new; \
- else \
- $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg; \
- fi; \
for file in *README* *.html; do \
$(INSTALL_DATA) $$file $(PREFIX)/util/lg; \
done

View file

@ -7,6 +7,7 @@
PORTNAME= rancid
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/

View file

@ -0,0 +1,17 @@
--- bin/Makefile.in.orig Thu Sep 26 10:46:33 2002
+++ bin/Makefile.in Thu Sep 26 10:47:14 2002
@@ -375,13 +375,7 @@
for prog in $(BIN_PROGS) ; do \
$(INSTALL) $$prog $(bindir); \
done; \
- if test -f $(bindir)/env ; then \
- echo "WARNING: *** $(bindir)/env exists: installing as env.new."; \
- echo " *** review env.new for new/deprecated switches"; \
- $(INSTALL_DATA) env $(bindir)/env.new; \
- else \
- $(INSTALL_DATA) env $(bindir); \
- fi
+ $(INSTALL_DATA) env $(bindir)/env.new
# BIN_DATAS are empty at the moment.
# for prog in $(BIN_DATAS) ; do \
# $(INSTALL_DATA) $$prog $(PREFIX)/bin; \

View file

@ -1,17 +1,24 @@
*** util/lg/Makefile.in.orig Mon Jun 3 14:14:33 2002
--- util/lg/Makefile.in Mon Jun 3 14:14:51 2002
***************
*** 1,6 ****
PREFIX = @prefix@
! INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
--- 1,6 ----
PREFIX = @prefix@
! INSTALL = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
--- util/lg/Makefile.in.orig Fri Aug 9 23:59:06 2002
+++ util/lg/Makefile.in Thu Sep 26 10:54:50 2002
@@ -1,6 +1,6 @@
PREFIX = @prefix@
-INSTALL = @INSTALL@
+INSTALL = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
@@ -13,13 +13,7 @@
for file in $(UTIL_LG_PROGS) ; do \
$(INSTALL) $$file $(PREFIX)/util/lg; \
done; \
- if test -f $(PREFIX)/util/lg/lg.conf ; then \
- echo "WARNING: *** $(PREFIX)/util/lg/lg.conf exists: installing as lg.conf.new."; \
- echo " *** review lg.conf.new for new/deprecated switches"; \
$(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.new; \
- else \
- $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg; \
- fi; \
for file in *README* *.html; do \
$(INSTALL_DATA) $$file $(PREFIX)/util/lg; \
done

View file

@ -7,6 +7,7 @@
PORTNAME= rancid
PORTVERSION= 2.2.2
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/

View file

@ -0,0 +1,17 @@
--- bin/Makefile.in.orig Thu Sep 26 10:46:33 2002
+++ bin/Makefile.in Thu Sep 26 10:47:14 2002
@@ -375,13 +375,7 @@
for prog in $(BIN_PROGS) ; do \
$(INSTALL) $$prog $(bindir); \
done; \
- if test -f $(bindir)/env ; then \
- echo "WARNING: *** $(bindir)/env exists: installing as env.new."; \
- echo " *** review env.new for new/deprecated switches"; \
- $(INSTALL_DATA) env $(bindir)/env.new; \
- else \
- $(INSTALL_DATA) env $(bindir); \
- fi
+ $(INSTALL_DATA) env $(bindir)/env.new
# BIN_DATAS are empty at the moment.
# for prog in $(BIN_DATAS) ; do \
# $(INSTALL_DATA) $$prog $(PREFIX)/bin; \

View file

@ -1,17 +1,24 @@
*** util/lg/Makefile.in.orig Mon Jun 3 14:14:33 2002
--- util/lg/Makefile.in Mon Jun 3 14:14:51 2002
***************
*** 1,6 ****
PREFIX = @prefix@
! INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
--- 1,6 ----
PREFIX = @prefix@
! INSTALL = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
--- util/lg/Makefile.in.orig Fri Aug 9 23:59:06 2002
+++ util/lg/Makefile.in Thu Sep 26 10:54:50 2002
@@ -1,6 +1,6 @@
PREFIX = @prefix@
-INSTALL = @INSTALL@
+INSTALL = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
UTIL_LG_PROGS = @RD_UTIL_LG_PROGS@
@@ -13,13 +13,7 @@
for file in $(UTIL_LG_PROGS) ; do \
$(INSTALL) $$file $(PREFIX)/util/lg; \
done; \
- if test -f $(PREFIX)/util/lg/lg.conf ; then \
- echo "WARNING: *** $(PREFIX)/util/lg/lg.conf exists: installing as lg.conf.new."; \
- echo " *** review lg.conf.new for new/deprecated switches"; \
$(INSTALL_DATA) lg.conf $(PREFIX)/util/lg/lg.conf.new; \
- else \
- $(INSTALL_DATA) lg.conf $(PREFIX)/util/lg; \
- fi; \
for file in *README* *.html; do \
$(INSTALL_DATA) $$file $(PREFIX)/util/lg; \
done