From owner-svn-ports-head@FreeBSD.ORG  Tue Dec  3 07:08:41 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F1C5D13C;
 Tue,  3 Dec 2013 07:08:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DECA21A55;
 Tue,  3 Dec 2013 07:08:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB378eZY001510;
 Tue, 3 Dec 2013 07:08:40 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB378erF001507;
 Tue, 3 Dec 2013 07:08:40 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201312030708.rB378erF001507@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 3 Dec 2013 07:08:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335547 - in head/www: mediawiki119 mediawiki120
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Dec 2013 07:08:41 -0000

Author: mat
Date: Tue Dec  3 07:08:40 2013
New Revision: 335547
URL: http://svnweb.freebsd.org/changeset/ports/335547

Log:
  Fix pkgname conflicts.
  
  PR:		ports/184451
  Submitted by:	mat
  Approved by:	wen

Modified:
  head/www/mediawiki119/Makefile
  head/www/mediawiki120/Makefile

Modified: head/www/mediawiki119/Makefile
==============================================================================
--- head/www/mediawiki119/Makefile	Tue Dec  3 06:28:03 2013	(r335546)
+++ head/www/mediawiki119/Makefile	Tue Dec  3 07:08:40 2013	(r335547)
@@ -5,6 +5,7 @@ PORTNAME=	mediawiki
 PORTVERSION=	1.19.8
 CATEGORIES=	www
 MASTER_SITES=	http://dumps.wikimedia.org/mediawiki/${PORTVERSION:R}/
+PKGNAMESUFFIX=	119
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	The wiki engine used by Wikipedia
@@ -14,7 +15,6 @@ LICENSE=	GPLv2
 CONFLICTS=	mediawiki-1.2[0-9].*
 
 FETCH_ARGS=	-pr
-NO_LATEST_LINK=	yes
 USE_PHP=	ctype iconv mbstring pcre session xml zlib readline dom
 IGNORE_WITH_PHP=4
 WANT_PHP_WEB=	yes

Modified: head/www/mediawiki120/Makefile
==============================================================================
--- head/www/mediawiki120/Makefile	Tue Dec  3 06:28:03 2013	(r335546)
+++ head/www/mediawiki120/Makefile	Tue Dec  3 07:08:40 2013	(r335547)
@@ -5,6 +5,7 @@ PORTNAME=	mediawiki
 PORTVERSION=	1.20.8
 CATEGORIES=	www
 MASTER_SITES=	http://dumps.wikimedia.org/mediawiki/${PORTVERSION:R}/
+PKGNAMESUFFIX=	120
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	The wiki engine used by Wikipedia
@@ -14,7 +15,6 @@ LICENSE=	GPLv2
 CONFLICTS=	mediawiki-1.1[0-9].* mediawiki-1.21.*
 
 FETCH_ARGS=	-pr
-NO_LATEST_LINK=	yes
 USE_PHP=	ctype hash iconv mbstring pcre session xml zlib readline dom
 WANT_PHP_WEB=	yes
 MEDIAWIKIDIR?=	www/mediawiki