Chase FreeBSD ports, removal of set_rcvar() on 10.0-Current.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16637 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 24 insertions, 18 deletions

diff --git a/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
index b50a9e875..9ee6242e7 100644
--- a/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
+++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
@@ -1,17 +1,20 @@
---- initscript/freebsd/avahi-daemon.sh.in.orig	Sun Nov  5 12:35:16 2006
-+++ initscript/freebsd/avahi-daemon.sh.in	Sun Nov  5 12:36:51 2006
-@@ -9,10 +9,12 @@
+--- initscript/freebsd/avahi-daemon.sh.in.orig	2010-06-25 02:54:22.000000000 +0200
++++ initscript/freebsd/avahi-daemon.sh.in	2012-01-15 19:03:55.000000000 +0100
+@@ -9,13 +9,15 @@
  # Avahi's mDNSResponder, a Zeroconf (Bonjour) service advertisement daemon.
  #
  
 -avahi_daemon_enable=${avahi_daemon_enable-"NO"}
  avahi_daemon_flags=${avahi_daemon_flags-"-D"}
  
--. /etc/rc.subr
-+. /etc/rc.subr
+ . /etc/rc.subr
 +. %%GNOME_SUBR%%
 +
 +avahi_daemon_enable=${avahi_daemon_enable-${gnome_enable}}
  
  name=avahi_daemon
- rcvar=`set_rcvar`
+-rcvar=`set_rcvar`
++rcvar=avahi_daemon_enable
+ 
+ start_cmd=avahi_daemon_start
+ stop_cmd=avahi_daemon_stop
diff --git a/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
index 71c4343a1..b12875709 100644
--- a/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
+++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
@@ -1,17 +1,20 @@
---- initscript/freebsd/avahi-dnsconfd.sh.in.orig	Sun Nov  5 12:35:20 2006
-+++ initscript/freebsd/avahi-dnsconfd.sh.in	Sun Nov  5 12:36:24 2006
-@@ -12,10 +12,12 @@
+--- initscript/freebsd/avahi-dnsconfd.sh.in.orig	2010-06-25 02:54:22.000000000 +0200
++++ initscript/freebsd/avahi-dnsconfd.sh.in	2012-01-15 19:04:25.000000000 +0100
+@@ -12,13 +12,15 @@
  # DNS servers in a DHCP-like fashion with mDNS.
  #
  
 -avahi_dnsconfd_enable=${avahi_dnsconfd_enable-"NO"}
  avahi_dnsconfd_flags=${avahi_dnsconfd_flags-"-D"}
  
--. /etc/rc.subr
-+. /etc/rc.subr
+ . /etc/rc.subr
 +. %%GNOME_SUBR%%
 +
 +avahi_dnsconfd_enable=${avahi_dnsconfd_enable-${gnome_enable}}
  
  name=avahi_dnsconfd
- rcvar=`set_rcvar`
+-rcvar=`set_rcvar`
++rcvar=avahi_dnsconfd_enable
+ 
+ start_cmd=avahi_dnsconfd_start
+ stop_cmd=avahi_dnsconfd_stop
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index bfcb961fe..2a47c5501 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
-# $FreeBSD: ports/x11/gdm/files/gdm.in,v 1.20 2010/07/25 19:35:05 kwm Exp $
-#    $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.5 2010/07/21 13:50:46 kwm Exp $
+# $FreeBSD$
+#    $MCom$
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus
@@ -20,7 +20,7 @@ gdm_lang=${gdm_lang-${LANG}}
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
 
 name="gdm"
-rcvar=`set_rcvar`
+rcvar=gdm_enable
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/sbin/gdm-binary"
diff --git a/x11/gdm3/files/gdm.in b/x11/gdm3/files/gdm.in
index bfcb961fe..2a47c5501 100644
--- a/x11/gdm3/files/gdm.in
+++ b/x11/gdm3/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
-# $FreeBSD: ports/x11/gdm/files/gdm.in,v 1.20 2010/07/25 19:35:05 kwm Exp $
-#    $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.5 2010/07/21 13:50:46 kwm Exp $
+# $FreeBSD$
+#    $MCom$
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus
@@ -20,7 +20,7 @@ gdm_lang=${gdm_lang-${LANG}}
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
 
 name="gdm"
-rcvar=`set_rcvar`
+rcvar=gdm_enable
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/sbin/gdm-binary"