From owner-svn-ports-all@FreeBSD.ORG Wed Jan 1 08:42:31 2014 Return-Path: Delivered-To: svn-ports-all@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 536716F5; Wed, 1 Jan 2014 08:42:31 +0000 (UTC) Received: from mail-oa0-x22b.google.com (mail-oa0-x22b.google.com [IPv6:2607:f8b0:4003:c02::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E1C4E14B3; Wed, 1 Jan 2014 08:42:30 +0000 (UTC) Received: by mail-oa0-f43.google.com with SMTP id i7so13944841oag.30 for ; Wed, 01 Jan 2014 00:42:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=+futV1KPSisXNMH6Ek0zqJ/oWZkyzRDcuwOj8GPq8+I=; b=UfLqGNmCutkGg0rJBuBTaPSqoW3yVxgij6xaEpZ2riJ+8IiiXbdryOZzIFCw007Ftt EjF0+GczrheWqApXsioXhkC95LFb00F0ksploLSEmyQcgiNO060L8RpyuLRcWxWdrxy+ cpokFUUoxqZvYI1hBXOLmBkKdk8k0GF+45mnWvtsjkv6c4N33WV3Vqb1uvGeliNEoBva my9S2LuWsL5eUzsOUjpsZT/XJWK9OQLKfpCsB/wC6QdT1QUwsGREdatTX5j60sy6PpWS y2c1dRTlNGLX1t8ASMtL8h4wRcCid7tMNrd6SPRyzxxmxYi/Kqnxq7/FdzNj70kdHq0K FG9w== MIME-Version: 1.0 X-Received: by 10.182.28.134 with SMTP id b6mr51168159obh.27.1388565750055; Wed, 01 Jan 2014 00:42:30 -0800 (PST) Sender: andrej.zverev@gmail.com Received: by 10.182.230.131 with HTTP; Wed, 1 Jan 2014 00:42:29 -0800 (PST) In-Reply-To: <201401010812.s018CedY038638@svn.freebsd.org> References: <201401010812.s018CedY038638@svn.freebsd.org> Date: Wed, 1 Jan 2014 12:42:29 +0400 X-Google-Sender-Auth: wSNETrpBnqQhI8sshn2noGxUSmE Message-ID: Subject: Re: svn commit: r338371 - in head/www: moodle24 moodle25 From: Andrej Zverev To: Jason Helfman Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jan 2014 08:42:31 -0000 Why so cryptic style? You can simple do it like this. Index: moodle24/Makefile =================================================================== --- moodle24/Makefile (revision 338371) +++ moodle24/Makefile (working copy) @@ -6,6 +6,7 @@ CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable24/ EXTRACT_SUFX= .tgz +PKGNAMESUFFIX= 24 MAINTAINER= wen@FreeBSD.org COMMENT= Course management system based on social constructionism @@ -14,7 +15,6 @@ RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl CONFLICTS= moodle-1.*.* moodle-2.5.* -PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ soap openssl simplexml spl dom json zip zlib hash Index: moodle25/Makefile =================================================================== --- moodle25/Makefile (revision 338371) +++ moodle25/Makefile (working copy) @@ -6,6 +6,7 @@ CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable25/ EXTRACT_SUFX= .tgz +PKGNAMESUFFIX= 25 MAINTAINER= wen@FreeBSD.org COMMENT= Course management system based on social constructionism @@ -14,7 +15,6 @@ RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl CONFLICTS= moodle-1.*.* moodle-2.4.* -PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ soap openssl simplexml spl dom json zip zlib hash On Wed, Jan 1, 2014 at 12:12 PM, Jason Helfman wrote: > Author: jgh > Date: Wed Jan 1 08:12:40 2014 > New Revision: 338371 > URL: http://svnweb.freebsd.org/changeset/ports/338371 > > Log: > - fix pkgname collisions > > Submitted by: jgh@ > Approved by: wen@ > > Modified: > head/www/moodle24/Makefile > head/www/moodle25/Makefile > > Modified: head/www/moodle24/Makefile > > ============================================================================== > --- head/www/moodle24/Makefile Wed Jan 1 07:59:26 2014 (r338370) > +++ head/www/moodle24/Makefile Wed Jan 1 08:12:40 2014 (r338371) > @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PHPBASE}/lib/php/${PHP_ > RUN_DEPENDS= > ${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl > > CONFLICTS= moodle-1.*.* moodle-2.5.* > -LATEST_LINK= moodle24 > +PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} > > USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc > ctype \ > soap openssl simplexml spl dom json zip zlib hash > > Modified: head/www/moodle25/Makefile > > ============================================================================== > --- head/www/moodle25/Makefile Wed Jan 1 07:59:26 2014 (r338370) > +++ head/www/moodle25/Makefile Wed Jan 1 08:12:40 2014 (r338371) > @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PHPBASE}/lib/php/${PHP_ > RUN_DEPENDS= > ${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl > > CONFLICTS= moodle-1.*.* moodle-2.4.* > -LATEST_LINK= moodle25 > +PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} > > USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc > ctype \ > soap openssl simplexml spl dom json zip zlib hash >