From owner-svn-src-stable@FreeBSD.ORG  Thu Nov  6 13:28:50 2008
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADC3B1065675;
	Thu,  6 Nov 2008 13:28:50 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BCDE8FC14;
	Thu,  6 Nov 2008 13:28:50 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA6DSoVf056706;
	Thu, 6 Nov 2008 13:28:50 GMT (envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA6DSonm056705;
	Thu, 6 Nov 2008 13:28:50 GMT (envelope-from kensmith@svn.freebsd.org)
Message-Id: <200811061328.mA6DSonm056705@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Thu, 6 Nov 2008 13:28:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184723 - stable/7/release
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Nov 2008 13:28:50 -0000

Author: kensmith
Date: Thu Nov  6 13:28:50 2008
New Revision: 184723
URL: http://svn.freebsd.org/changeset/base/184723

Log:
  Oops.  Correct a mis-merge.  This piece of r183860 didn't make it
  through while doing the merge.
  
  PR:		misc/128610
  Submitted by:	veron <dot> x503 <at> hotmail <dot> com
  Approved by:	re (blackend, kib)

Modified:
  stable/7/release/Makefile

Modified: stable/7/release/Makefile
==============================================================================
--- stable/7/release/Makefile	Thu Nov  6 13:25:59 2008	(r184722)
+++ stable/7/release/Makefile	Thu Nov  6 13:28:50 2008	(r184723)
@@ -1091,7 +1091,7 @@ CD_DISC2_PKGS=	${CD_PACKAGE_TREE}/disc2
 CD_DISC3_PKGS=	${CD_PACKAGE_TREE}/disc3
 .endif
 .if exists(${CD_PACKAGE_TREE}/dvd1)
-CD_DVD_PKGS=	${CD_PACKAGE_TREE}/dvd1
+CD_DVD1_PKGS=	${CD_PACKAGE_TREE}/dvd1
 .endif
 .endif
 .endif