Topo boot scripts cleanup

- there is no more generic boot scripts
- the boot scripts are specialized for each system (FreeBSD, Debian)
- the boot scripts are now located in the pkg subdirectories
- phase 1: freebsd topo* boot scripts

This commit is related to issue #34 and issue #32.

pkg/freebsd/netmagis-common/Makefile

@@ -44,6 +44,8 @@ RUN_DEPENDS+=	pdflatex:${PORTSDIR}/print/teTeX-base \
 .endif
 
 .if ${PKGNAMESUFFIX} == "-topo"
+USE_RC_SUBR=	topographd toposendd
+SUB_LIST=	TCLSH=${TCLSH}
 RUN_DEPENDS+=	rancid-run:${PORTSDIR}/net-mgmt/rancid \
 		fping:${PORTSDIR}/net/fping
 .endif

topo/rc/freebsd/topographd → pkg/freebsd/netmagis-common/files/topographd.in

@@ -18,14 +18,14 @@
 
 name=topographd
 rcvar=topographd_enable
-command_interpreter=%TCLSH%
+command_interpreter=%%TCLSH%%
 
 load_rc_config $name
 
 : ${topographd_enable:=NO}
 : ${topographd_flags:=""}
 : ${topographd_user:="rancid"}
 
-command="%NMLIBDIR%/topo/topographd"
+command="%%PREFIX%%/sbin/topographd"
 
 run_rc_command "$1"

topo/rc/freebsd/toposendd → pkg/freebsd/netmagis-common/files/toposendd.in

@@ -18,14 +18,14 @@
 
 name=toposendd
 rcvar=toposendd_enable
-command_interpreter=%TCLSH%
+command_interpreter=%%TCLSH%%
 
 load_rc_config $name
 
 : ${toposendd_enable:=NO}
 : ${toposendd_flags:=""}
 : ${toposendd_user:="rancid"}
 
-command="%NMLIBDIR%/topo/toposendd"
+command="%%PREFIX%%/sbin/toposendd"
 
 run_rc_command "$1"

pkg/freebsd/netmagis-topo/pkg-plist

@@ -20,12 +20,18 @@ lib/netmagis/topo/parse-server.tcl
 lib/netmagis/topo/sendmail
 lib/netmagis/topo/ssidsensors
 lib/netmagis/topo/start-rancid
-lib/netmagis/topo/topographd
-lib/netmagis/topo/toposendd
+sbin/topographd
+sbin/toposendd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eqvirt/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eqvirt/rtr.eq
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eqvirt/sw1.eq
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eqvirt/sw2.eq
 @dirrmtry var/netmagis/eqvirt
 @dirrmtry var/netmagis/eqgen
 @dirrmtry var/netmagis
 @dirrmtry var
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/eqvirt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/netmagis/topo
 @dirrm lib/netmagis
 @exec mkdir -p %D/var/netmagis/eqvirt

topo/Makefile

@@ -8,7 +8,6 @@ build:
 install: build
 	@echo ">>> Making install in `pwd`"
 	cd src ; make $(DIRS) install
-	cd rc ; make $(DIRS) install
 	cd eqvirt ; make $(DIRS) install
 	mkdir -p $(DESTDIR)$(NMVARDIR)/eqvirt
 	mkdir -p $(DESTDIR)$(NMVARDIR)/eqgen

topo/src/Makefile

@@ -24,11 +24,13 @@ SCRIPTS = \
 	list-rancid	\
 	list-vlans	\
 	ssidsensors	\
-	topographd	\
-	toposendd	\
 	start-rancid	\
 	sendmail
 
+DAEMONS = \
+	topographd	\
+	toposendd
+
 LIBS	= \
 	parse-hp.tcl	\
 	parse-cisco.tcl	\
@@ -53,6 +55,8 @@ install: $(PROGS) $(SCRIPTS)
 	install -m 0755 $(PROGS) $(DESTDIR)$(NMLIBDIR)/topo
 	$(NINSTALL) -m 0755 $(SUBST) $(SCRIPTS) $(DESTDIR)$(NMLIBDIR)/topo
 	$(NINSTALL) -m 0644 $(SUBST) $(LIBS)    $(DESTDIR)$(NMLIBDIR)/topo
+	mkdir -p $(DESTDIR)$(SBINDIR)
+	$(NINSTALL) -m 0755 $(SUBST) $(DAEMONS) $(DESTDIR)$(SBINDIR)
 
 clean:
 	rm -f *.o $(PROGS) *.core