From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 4 13:30:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 650E21065677 for ; Fri, 4 Apr 2008 13:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 48D708FC21 for ; Fri, 4 Apr 2008 13:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m34DU1hk036280 for ; Fri, 4 Apr 2008 13:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m34DU1bb036276; Fri, 4 Apr 2008 13:30:01 GMT (envelope-from gnats) Resent-Date: Fri, 4 Apr 2008 13:30:01 GMT Resent-Message-Id: <200804041330.m34DU1bb036276@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rong-En Fan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6F881065671 for ; Fri, 4 Apr 2008 13:23:57 +0000 (UTC) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (svm.csie.ntu.edu.tw [140.112.90.75]) by mx1.freebsd.org (Postfix) with ESMTP id 773938FC1A for ; Fri, 4 Apr 2008 13:23:57 +0000 (UTC) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (localhost [127.0.0.1]) by svm.csie.ntu.edu.tw (8.14.2/8.14.2) with ESMTP id m34DNtTt051697; Fri, 4 Apr 2008 21:23:55 +0800 (CST) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: (from rafan@localhost) by svm.csie.ntu.edu.tw (8.14.2/8.14.2/Submit) id m34DNtNX075631; Fri, 4 Apr 2008 21:23:55 +0800 (CST) (envelope-from rafan) Message-Id: <200804041323.m34DNtNX075631@svm.csie.ntu.edu.tw> Date: Fri, 4 Apr 2008 21:23:55 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: gnome@FreeBSD.org Subject: ports/122443: [PATCH] net/avahi-app: use correct rc script suffix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2008 13:30:01 -0000 >Number: 122443 >Category: ports >Synopsis: [PATCH] net/avahi-app: use correct rc script suffix >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Apr 04 13:30:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 7.0-STABLE amd64 >Organization: NTU CSIE >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@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 +.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,@sbindir\@,$(sbindir),g' $< > $@ + chmod +x $@ + +-avahi-dnsconfd.sh: avahi-dnsconfd.sh.in ++avahi-dnsconfd: avahi-dnsconfd.sh.in + sed \ + -e 's,@sbindir\@,$(sbindir),g' \ + -e 's,@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 --- >Release-Note: >Audit-Trail: >Unformatted: