Date: Thu, 12 Oct 2006 19:14:37 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107769 for review Message-ID: <200610121914.k9CJEb55055389@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107769 Change 107769 by piso@piso_newluxor on 2006/10/12 19:13:57 These weren't integrated correctly @ 107767 Affected files ... .. //depot/projects/soc2005/libalias/etc/libalias.conf#4 integrate .. //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#4 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#8 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#7 integrate .. //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#7 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/libalias/Makefile#10 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile#6 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile.inc#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/cuseeme/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/dummy/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/ftp/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/irc/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/modules.inc#7 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/nbt/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/pptp/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/skinny/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/modules/libalias/modules/smedia/Makefile#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#14 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#24 integrate .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#23 integrate Differences ... ==== //depot/projects/soc2005/libalias/etc/libalias.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/libalias.conf,v 1.1 2006/09/26 23:26:48 piso Exp $ +# $FreeBSD: src/etc/libalias.conf,v 1.2 2006/10/08 14:01:58 piso Exp $ /lib/libalias_cuseeme.so /lib/libalias_ftp.so /lib/libalias_irc.so ==== //depot/projects/soc2005/libalias/lib/libalias/libalias/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile#7 (text+ko) ==== ==== //depot/projects/soc2005/libalias/lib/libalias/modules/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/Makefile.inc,v 1.2 2006/09/27 12:30:27 ru Exp $ +# $FreeBSD: src/lib/libalias/modules/Makefile.inc,v 1.3 2006/10/08 14:01:59 piso Exp $ .PATH: ${.CURDIR}/../../../../sys/netinet/libalias ==== //depot/projects/soc2005/libalias/lib/libalias/modules/cuseeme/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/cuseeme/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= cuseeme SRCS= alias_cuseeme.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/dummy/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/dummy/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= dummy SRCS= alias_dummy.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/ftp/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/ftp/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= ftp SRCS= alias_ftp.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/irc/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/irc/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= irc SRCS= alias_irc.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/nbt/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/nbt/Makefile,v 1.2 2006/10/08 14:01:59 piso Exp $ NAME= nbt SRCS= alias_nbt.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/pptp/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.1 2006/09/26 23:26:50 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/pptp/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $ NAME= pptp SRCS= alias_pptp.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/skinny/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/skinny/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $ NAME= skinny SRCS= alias_skinny.c ==== //depot/projects/soc2005/libalias/lib/libalias/modules/smedia/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.1 2006/09/26 23:26:51 piso Exp $ +# $FreeBSD: src/lib/libalias/modules/smedia/Makefile,v 1.2 2006/10/08 14:02:00 piso Exp $ NAME= smedia SRCS= alias_smedia.c ==== //depot/projects/soc2005/libalias/sys/modules/libalias/libalias/Makefile#10 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile#6 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/Makefile.inc#5 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/cuseeme/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/dummy/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/ftp/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/irc/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/modules.inc#7 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/nbt/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/pptp/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/skinny/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/modules/libalias/modules/smedia/Makefile#4 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_dummy.c#14 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.c#24 (text+ko) ==== ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_mod.h#23 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610121914.k9CJEb55055389>