[PATCH] net/avahi-app: use correct rc script suffix

[Rong-En Fan]

>Submitter-Id:	current-users
>Originator:	Rong-En Fan
>Organization:	NTU CSIE
>Confidential:	no 
>Synopsis:	[PATCH] net/avahi-app: use correct rc script suffix
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 7.0-STABLE amd64
>Environment:
System: FreeBSD svm.csie.ntu.edu.tw 7.0-STABLE FreeBSD 7.0-STABLE #1: Sat Mar 29 11:44:08 CST 2008
>Description:
- The rc scripts meet the rcng style, so it should use proper suffix so
  that the order will be enforced.

Added file(s):
- files/extra-initscript_freebsd_Makefile.in

Port maintainer (gnome at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- avahi-app-0.6.22_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/avahi-app/Makefile /home/rafan/work/FreeBSD/ports/net/avahi-app/Makefile
--- /usr/ports/net/avahi-app/Makefile	2008-03-25 03:47:28.000000000 +0800
+++ /home/rafan/work/FreeBSD/ports/net/avahi-app/Makefile	2008-04-04 21:22:44.000000000 +0800
@@ -8,7 +8,7 @@
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.22
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	net dns
 MASTER_SITES=	http://www.avahi.org/download/
 PKGNAMESUFFIX?=	-app
@@ -55,9 +55,14 @@
 .endif
 
 USE_RC_SUBR=yes
+PLIST_SUB=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
 .include <bsd.port.pre.mk>
 
+.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))
+EXTRA_PATCHES+=	${PATCHDIR}/extra-initscript_freebsd_Makefile.in
+.endif
+
 .if ${AVAHI_SLAVE}=="autoipd"
 CONFIGURE_ARGS+=--enable-autoipd
 .if ${OSVERSION} < 600000
diff -ruN --exclude=CVS /usr/ports/net/avahi-app/files/extra-initscript_freebsd_Makefile.in /home/rafan/work/FreeBSD/ports/net/avahi-app/files/extra-initscript_freebsd_Makefile.in
--- /usr/ports/net/avahi-app/files/extra-initscript_freebsd_Makefile.in	1970-01-01 08:00:00.000000000 +0800
+++ /home/rafan/work/FreeBSD/ports/net/avahi-app/files/extra-initscript_freebsd_Makefile.in	2008-04-04 20:49:26.000000000 +0800
@@ -0,0 +1,33 @@
+--- initscript/freebsd/Makefile.in.orig	2008-04-04 20:44:34.000000000 +0800
++++ initscript/freebsd/Makefile.in	2008-04-04 20:49:03.000000000 +0800
+@@ -428,12 +428,12 @@
+ 	avahi-dnsconfd.sh.in
+ 
+ initd_SCRIPTS = \
+-	avahi-daemon.sh \
+-	avahi-dnsconfd.sh
++	avahi-daemon \
++	avahi-dnsconfd
+ 
+ CLEANFILES = \
+-	avahi-daemon.sh \
+-	avahi-dnsconfd.sh
++	avahi-daemon \
++	avahi-dnsconfd
+ 
+ all: all-am
+ 
+@@ -620,11 +620,11 @@
+ 	uninstall-initdSCRIPTS
+ 
+ 
+-avahi-daemon.sh: avahi-daemon.sh.in
++avahi-daemon: avahi-daemon.sh.in
+ 	sed -e 's, at sbindir\@,$(sbindir),g' $< > $@
+ 	chmod +x $@
+ 
+-avahi-dnsconfd.sh: avahi-dnsconfd.sh.in
++avahi-dnsconfd: avahi-dnsconfd.sh.in
+ 	sed \
+ 	-e 's, at sbindir\@,$(sbindir),g' \
+ 	-e 's, at sysconfdir\@,$(sysconfdir),g' \
diff -ruN --exclude=CVS /usr/ports/net/avahi-app/pkg-plist /home/rafan/work/FreeBSD/ports/net/avahi-app/pkg-plist
--- /usr/ports/net/avahi-app/pkg-plist	2007-12-22 03:44:45.000000000 +0800
+++ /home/rafan/work/FreeBSD/ports/net/avahi-app/pkg-plist	2008-04-04 20:37:07.000000000 +0800
@@ -13,8 +13,8 @@
 etc/avahi/services/sftp-ssh.service
 etc/avahi/services/ssh.service
 etc/dbus-1/system.d/avahi-dbus.conf
-etc/rc.d/avahi-daemon.sh
-etc/rc.d/avahi-dnsconfd.sh
+etc/rc.d/avahi-daemon%%RC_SUBR_SUFFIX%%
+etc/rc.d/avahi-dnsconfd%%RC_SUBR_SUFFIX%%
 include/avahi-client/client.h
 include/avahi-client/lookup.h
 include/avahi-client/publish.h
--- avahi-app-0.6.22_3.patch ends here ---