From owner-p4-projects@FreeBSD.ORG  Sat Sep 30 13:52:17 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 13BDA16A415; Sat, 30 Sep 2006 13:52:17 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E2F1616A403
	for <perforce@freebsd.org>; Sat, 30 Sep 2006 13:52:16 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E616A43D53
	for <perforce@freebsd.org>; Sat, 30 Sep 2006 13:52:15 +0000 (GMT)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8UDqFCb066942
	for <perforce@freebsd.org>; Sat, 30 Sep 2006 13:52:15 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8UDqFCc066939
	for perforce@freebsd.org; Sat, 30 Sep 2006 13:52:15 GMT
	(envelope-from piso@freebsd.org)
Date: Sat, 30 Sep 2006 13:52:15 GMT
Message-Id: <200609301352.k8UDqFCc066939@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106981 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Sep 2006 13:52:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=106981

Change 106981 by piso@piso_newluxor on 2006/09/30 13:51:51

	Reduce diff against HEAD

Affected files ...

.. //depot/projects/soc2005/libalias/etc/libalias.conf#2 edit
.. //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#3 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#6 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#4 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#4 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#4 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#4 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#4 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#4 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#4 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#4 edit
.. //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#4 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/libalias/Makefile#9 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile#5 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile.inc#4 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/cuseeme/Makefile#3 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/dummy/Makefile#3 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/ftp/Makefile#3 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/irc/Makefile#3 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/nbt/Makefile#3 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/pptp/Makefile#3 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/skinny/Makefile#3 edit
.. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/smedia/Makefile#3 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#13 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#23 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#22 edit

Differences ...

==== //depot/projects/soc2005/libalias/etc/libalias.conf#2 (text+ko) ====

@@ -1,3 +1,4 @@
+# $FreeBSD: src/etc/libalias.conf,v 1.1 2006/09/26 23:26:48 piso Exp $
 /usr/lib/libalias_cuseeme.so
 /usr/lib/libalias_ftp.so
 /usr/lib/libalias_irc.so

==== //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#3 (text+ko) ====

@@ -1,13 +1,14 @@
-# $FreeBSD: src/lib/libalias/Makefile,v 1.30.2.1 2005/07/22 17:29:02 kensmith Exp $
+# $FreeBSD: src/lib/libalias/libalias/Makefile,v 1.3 2006/09/27 12:30:27 ru Exp $
 
 .PATH: ${.CURDIR}/../../../sys/netinet/libalias
 
 LIB=	alias
 SHLIBDIR?= /lib
-SHLIB_MAJOR=	5
+SHLIB_MAJOR= 5
 MAN=	libalias.3
 SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_old.c alias_mod.c
-INCS=   alias.h
+INCS=	alias.h
 WARNS?=	6
+NO_WERROR=
 
 .include <bsd.lib.mk>

==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#6 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/Makefile,v 1.2 2006/09/27 12:30:27 ru Exp $
 
-.include "../../../sys/modules/libalias/modules/modules.inc"
+.include "${.CURDIR}/../../../sys/modules/libalias/modules/modules.inc"
 
-SUBDIR= ${MODULES}
+SUBDIR=	${MODULES}
 
 .include <bsd.subdir.mk>

==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#4 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/Makefile.inc,v 1.2 2006/09/27 12:30:27 ru Exp $
 
 .PATH: ${.CURDIR}/../../../../sys/netinet/libalias
 
 SHLIBDIR?= /lib
-SHLIB_MAJOR=	4
-WARNS?= 1
+SHLIB_MAJOR= 4
+WARNS?=	1

==== //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $
 
 LIB=	alias_cuseeme
 SRCS=	alias_cuseeme.c

==== //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $
 
 LIB=	alias_dummy
 SRCS=	alias_dummy.c

==== //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $
 
 LIB=	alias_ftp
 SRCS=	alias_ftp.c

==== //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $
 
 LIB=	alias_irc
 SRCS=	alias_irc.c

==== //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $
 
 LIB=	alias_nbt
 SRCS=	alias_nbt.c

==== //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $
 
 LIB=	alias_pptp
 SRCS=	alias_pptp.c

==== //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $
 
 LIB=	alias_skinny
 SRCS=	alias_skinny.c

==== //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $
 
 LIB=	alias_smedia
 SRCS=	alias_smedia.c

==== //depot/projects/soc2005/libalias/sys/modules/libalias/libalias/Makefile#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/libalias/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $
 
 .PATH: ${.CURDIR}/../../../netinet/libalias
 

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile#5 (text+ko) ====

@@ -1,7 +1,7 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/Makefile,v 1.2 2006/09/27 12:30:27 ru Exp $
 
-.include "modules.inc"
+.include "${.CURDIR}/modules.inc"
 
-SUBDIR= ${MODULES}
+SUBDIR=	${MODULES}
 
 .include <bsd.subdir.mk>

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile.inc#4 (text+ko) ====

@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/Makefile.inc,v 1.1 2006/09/26 23:26:51 piso Exp $
 
 .PATH: ${.CURDIR}/../../../../netinet/libalias

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/cuseeme/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/cuseeme/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_cuseeme
 SRCS=	alias_cuseeme.c

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/dummy/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/dummy/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_dummy
 SRCS=	alias_dummy.c

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/ftp/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/ftp/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_ftp
 SRCS=	alias_ftp.c

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/irc/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/irc/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_irc
 SRCS=	alias_irc.c

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/nbt/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/nbt/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_nbt
 SRCS=	alias_nbt.c

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/pptp/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/pptp/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_pptp
 SRCS=	alias_pptp.c

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/skinny/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/skinny/Makefile,v 1.1 2006/09/26 23:26:52 piso Exp $
 
 KMOD=	alias_skinny
 SRCS=	alias_skinny.c

==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/smedia/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/libalias/modules/smedia/Makefile,v 1.1 2006/09/26 23:26:53 piso Exp $
 
 KMOD=	alias_smedia
 SRCS=	alias_smedia.c

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#13 (text+ko) ====

@@ -25,6 +25,7 @@
  */
 
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_dummy.c,v 1.1 2006/09/26 23:26:53 piso Exp $");
 
 /* 
  * Alias_dummy is just an empty skeleton used to demostrate how to write

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#23 (text+ko) ====

@@ -24,6 +24,8 @@
  * SUCH DAMAGE.
  *
  */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/libalias/alias_mod.c,v 1.2 2006/09/27 02:08:44 piso Exp $");
 
 #ifdef _KERNEL
 #include <sys/libkern.h>

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#22 (text+ko) ====

@@ -22,6 +22,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/sys/netinet/libalias/alias_mod.h,v 1.1 2006/09/26 23:26:53 piso Exp $
  */
 
 /*