General port cleanup: USE_RC_SUBR and plist fixes mostly.

6 files changed, 14 insertions, 32 deletions

diff --git a/net/spread/Makefile b/net/spread/Makefile
index 5cacc60c7170..29dc8264d73b 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -17,8 +17,8 @@ COMMENT=	The Spread Group Communication System, a network toolkit
 
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_RC_SUBR=	yes
-INSTALLS_SHLIB=	yes
+USE_RC_SUBR=	spread.sh
+USE_LDCONFIG=	yes
 
 MAKE_ARGS+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
@@ -52,15 +52,11 @@ post-build:
 	@cd ${WRKSRC}/perl/Spread && \
 		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 	@cd ${WRKSRC}/perl/Spread && ${MAKE}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
 
 pre-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
-		${PREFIX}/etc/rc.d/${PORTNAME}.sh
 .for f in ${HEADERFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include
 .endfor
diff --git a/net/spread/files/spread.sh b/net/spread/files/spread.sh.in
index fc9fd9e85755..fc9fd9e85755 100644
--- a/net/spread/files/spread.sh
+++ b/net/spread/files/spread.sh.in
diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist
index 261d36278628..e934a4121a4d 100644
--- a/net/spread/pkg-plist
+++ b/net/spread/pkg-plist
@@ -2,13 +2,10 @@ bin/spflooder
 bin/spmonitor
 bin/sptuser
 bin/spuser
-etc/rc.d/spread.sh
-@unexec if cmp -s %D/etc/spread.access_ip %D/etc/spread.access_ip.sample; then rm -f %D/etc/spread.access_ip; fi
+etc/spread.access_ip
 etc/spread.access_ip.sample
-@exec [ -f %B/spread.access_ip ] || cp %B/%f %B/spread.access_ip
-@unexec if cmp -s %D/etc/spread.conf %D/etc/spread.conf.sample; then rm -f %D/etc/spread.conf; fi
+etc/spread.conf
 etc/spread.conf.sample
-@exec [ -f %B/spread.conf ] || cp %B/%f %B/spread.conf
 include/sp.h
 include/sp_events.h
 include/sp_func.h
@@ -18,14 +15,12 @@ lib/libspread.so.1
 lib/libtspread.a
 lib/libtspread.so
 lib/libtspread.so.1
-sbin/spread
 %%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
+sbin/spread
 %%EXAMPLESDIR%%/test.pl
-@exec mkdir -p /var/run/spread
-@unexec rmdir /var/run/spread 2>/dev/null || true
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
-@dirrmtry %%EXAMPLESDIR%%
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
diff --git a/net/spread4/Makefile b/net/spread4/Makefile
index 5cacc60c7170..29dc8264d73b 100644
--- a/net/spread4/Makefile
+++ b/net/spread4/Makefile
@@ -17,8 +17,8 @@ COMMENT=	The Spread Group Communication System, a network toolkit
 
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_RC_SUBR=	yes
-INSTALLS_SHLIB=	yes
+USE_RC_SUBR=	spread.sh
+USE_LDCONFIG=	yes
 
 MAKE_ARGS+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
@@ -52,15 +52,11 @@ post-build:
 	@cd ${WRKSRC}/perl/Spread && \
 		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 	@cd ${WRKSRC}/perl/Spread && ${MAKE}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
 
 pre-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
-		${PREFIX}/etc/rc.d/${PORTNAME}.sh
 .for f in ${HEADERFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include
 .endfor
diff --git a/net/spread4/files/spread.sh b/net/spread4/files/spread.sh.in
index fc9fd9e85755..fc9fd9e85755 100644
--- a/net/spread4/files/spread.sh
+++ b/net/spread4/files/spread.sh.in
diff --git a/net/spread4/pkg-plist b/net/spread4/pkg-plist
index 261d36278628..e934a4121a4d 100644
--- a/net/spread4/pkg-plist
+++ b/net/spread4/pkg-plist
@@ -2,13 +2,10 @@ bin/spflooder
 bin/spmonitor
 bin/sptuser
 bin/spuser
-etc/rc.d/spread.sh
-@unexec if cmp -s %D/etc/spread.access_ip %D/etc/spread.access_ip.sample; then rm -f %D/etc/spread.access_ip; fi
+etc/spread.access_ip
 etc/spread.access_ip.sample
-@exec [ -f %B/spread.access_ip ] || cp %B/%f %B/spread.access_ip
-@unexec if cmp -s %D/etc/spread.conf %D/etc/spread.conf.sample; then rm -f %D/etc/spread.conf; fi
+etc/spread.conf
 etc/spread.conf.sample
-@exec [ -f %B/spread.conf ] || cp %B/%f %B/spread.conf
 include/sp.h
 include/sp_events.h
 include/sp_func.h
@@ -18,14 +15,12 @@ lib/libspread.so.1
 lib/libtspread.a
 lib/libtspread.so
 lib/libtspread.so.1
-sbin/spread
 %%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
+sbin/spread
 %%EXAMPLESDIR%%/test.pl
-@exec mkdir -p /var/run/spread
-@unexec rmdir /var/run/spread 2>/dev/null || true
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
-@dirrmtry %%EXAMPLESDIR%%
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread