we license under gpl2, not gpl2 or later

6 files changed, 30 insertions, 30 deletions

diff --git a/net-misc/dhcp/files/conf.dhcpd b/net-misc/dhcp/files/conf.dhcpd
index 4bba86c1e2c3..57c0e0c7c549 100644
--- a/net-misc/dhcp/files/conf.dhcpd
+++ b/net-misc/dhcp/files/conf.dhcpd
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/conf.dhcpd,v 1.4 2002/09/03 07:40:14 lostlogic Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/conf.dhcpd,v 1.5 2004/03/06 03:30:53 vapier Exp $
 
 #configure which interface or interfaces to for dhcp to listen on
 #list all interfaces space separated.
diff --git a/net-misc/dhcp/files/dhcp.conf b/net-misc/dhcp/files/dhcp.conf
index 9e294ba23172..07ecb36d03a1 100644
--- a/net-misc/dhcp/files/dhcp.conf
+++ b/net-misc/dhcp/files/dhcp.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.conf,v 1.3 2004/01/15 01:04:51 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.conf,v 1.4 2004/03/06 03:30:53 vapier Exp $
 
 # Configure which interface or interfaces to for dhcp to listen on
 # list all interfaces space separated.
diff --git a/net-misc/dhcp/files/dhcp.rc6 b/net-misc/dhcp/files/dhcp.rc6
index 0c1a75cfd499..4e3c1bc4c603 100644
--- a/net-misc/dhcp/files/dhcp.rc6
+++ b/net-misc/dhcp/files/dhcp.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc6,v 1.10 2004/01/15 01:15:07 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc6,v 1.11 2004/03/06 03:30:53 vapier Exp $
 
 depend() {
 	need net
@@ -32,13 +32,13 @@ start() {
 	start-stop-daemon --start --quiet --exec /usr/sbin/dhcpd \
 		-- -pf /var/run/dhcp/dhcpd.pid -q \
 		-user dhcp -group dhcp ${DHCPD_OPTS} \
-        	${CHROOT:+-chroot ${CHROOT}} ${IFACE}
+		${CHROOT:+-chroot ${CHROOT}} ${IFACE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dhcpd"
 	start-stop-daemon --stop --quiet --pidfile \
-                "${CHROOT}/var/run/dhcp/dhcpd.pid"
+		"${CHROOT}/var/run/dhcp/dhcpd.pid"
 	eend $?
 }
diff --git a/net-misc/dhcp/files/dhcp.rc7 b/net-misc/dhcp/files/dhcp.rc7
index 9acb94d6d235..e92348a45b11 100644
--- a/net-misc/dhcp/files/dhcp.rc7
+++ b/net-misc/dhcp/files/dhcp.rc7
@@ -1,32 +1,32 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc7,v 1.4 2003/07/25 20:27:08 lanius Exp $
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcp.rc7,v 1.5 2004/03/06 03:30:53 vapier Exp $
 
 #configuration is done in /etc/conf.d/dhcp
 
 depend() {
-    need net
+	need net
 	use named
 }
 
 checkconfig() {
-    if [ ! -e /etc/dhcp/dhcpd.conf ] ; then
-	eerror "You need an /etc/dhcp/dhcpd.conf file to run dhcpd"
-	eerror "There is a sample conf file in /usr/share/doc/dhcp"
-	return 1
-    fi
+	if [ ! -e /etc/dhcp/dhcpd.conf ] ; then
+		eerror "You need an /etc/dhcp/dhcpd.conf file to run dhcpd"
+		eerror "There is a sample conf file in /usr/share/doc/dhcp"
+		return 1
+	fi
 }
 
 start() {
-    checkconfig || return 1
-    ebegin "Starting dhcpd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/dhcpd -- ${DHCPD_OPTS} ${IFACE}
-    eend $?
+	checkconfig || return 1
+	ebegin "Starting dhcpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/dhcpd -- ${DHCPD_OPTS} ${IFACE}
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping dhcpd"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/dhcpd
-    eend $?
+	ebegin "Stopping dhcpd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/dhcpd
+	eend $?
 }
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
index 38c2d860d3cc..30b9a4eba318 100644
--- a/net-misc/dhcp/files/dhcrelay.conf
+++ b/net-misc/dhcp/files/dhcrelay.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.1 2004/01/15 01:04:51 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.2 2004/03/06 03:30:53 vapier Exp $
 
 # Configure which interface or interfaces to for dhcp to listen on
 # list all interfaces space separated.
diff --git a/net-misc/dhcp/files/dhcrelay.rc6 b/net-misc/dhcp/files/dhcrelay.rc6
index e4b9d75e46b6..969da15b5167 100644
--- a/net-misc/dhcp/files/dhcrelay.rc6
+++ b/net-misc/dhcp/files/dhcrelay.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.2 2004/01/15 01:15:07 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.3 2004/03/06 03:30:53 vapier Exp $
 
 depend() {
 	need net
@@ -12,7 +12,7 @@ start() {
 	ebegin "Starting dhcrelay"
 	start-stop-daemon --start --quiet --exec /usr/sbin/dhcrelay \
 		-- -q -i ${IFACE} ${DHCRELAY_OPTS} \
-        	${DHCRELAY_SERVERS}
+		${DHCRELAY_SERVERS}
 	eend $?
 }