From owner-svn-ports-all@FreeBSD.ORG Mon Oct 14 06:52:36 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 24928FDF; Mon, 14 Oct 2013 06:52:36 +0000 (UTC) (envelope-from bapt@FreeBSD.org) 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 02FA12E3C; Mon, 14 Oct 2013 06:52:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9E6qZC9009967; Mon, 14 Oct 2013 06:52:35 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9E6qWBM009945; Mon, 14 Oct 2013 06:52:32 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201310140652.r9E6qWBM009945@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 14 Oct 2013 06:52:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330275 - in head: chinese/phpbb3-tw databases/adodb5 databases/mysql++1 devel/autoconf213 devel/gitolite2 devel/llvm33 dns/idnkit2 dns/opendnssec13 java/eclipse-aptana2 lang/clang33 ma... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 14 Oct 2013 06:52:36 -0000 Author: bapt Date: Mon Oct 14 06:52:32 2013 New Revision: 330275 URL: http://svnweb.freebsd.org/changeset/ports/330275 Log: Fix package name collision Modified: head/chinese/phpbb3-tw/Makefile head/databases/adodb5/Makefile head/databases/mysql++1/Makefile head/devel/autoconf213/Makefile head/devel/gitolite2/Makefile head/devel/llvm33/Makefile head/dns/idnkit2/Makefile head/dns/opendnssec13/Makefile head/java/eclipse-aptana2/Makefile head/lang/clang33/Makefile head/mail/wanderlust-devel/Makefile head/net-p2p/libtorrent-rasterbar-15/Makefile head/print/scribus-devel/Makefile head/science/minc2/Makefile head/textproc/apache-solr3/Makefile Modified: head/chinese/phpbb3-tw/Makefile ============================================================================== --- head/chinese/phpbb3-tw/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/chinese/phpbb3-tw/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -6,7 +6,7 @@ PORTVERSION= 3.0.11 CATEGORIES= chinese www MASTER_SITES= http://www.phpbb-tw.net/phpbb/download/ \ http://freebsd.ee.ccu.edu.tw/phpBB/ -PKGNAMESUFFIX= -tw +PKGNAMESUFFIX= 3-tw DISTNAME= phpBB-${PORTVERSION} MAINTAINER= appleboy.tw@gmail.com Modified: head/databases/adodb5/Makefile ============================================================================== --- head/databases/adodb5/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/databases/adodb5/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -6,6 +6,7 @@ DISTVERSION= 5.18 CATEGORIES= databases www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5-only/${PORTNAME}-${DISTVERSION:S/.//g}-for-php5 DISTNAME= ${PORTNAME:S/5//}${DISTVERSION:S/.//g}a +PKGNAMESUFFIX= 5 MAINTAINER= joehorn@gmail.com COMMENT= Database library for PHP @@ -13,7 +14,6 @@ COMMENT= Database library for PHP LICENSE= BSD CONFLICTS= adodb-4.* -LATEST_LINK= adodb5 USE_ZIP= yes USE_PHP= pcre Modified: head/databases/mysql++1/Makefile ============================================================================== --- head/databases/mysql++1/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/databases/mysql++1/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -6,7 +6,7 @@ PORTVERSION= 1.7.40 PORTREVISION= 2 CATEGORIES= databases devel MASTER_SITES= http://tangentsoft.net/mysql++/releases/ -PKGNAMESUFFIX= -mysql${MYSQL_VER} +PKGNAMESUFFIX= 1-mysql${MYSQL_VER} MAINTAINER= sergey@network-asp.biz COMMENT= Complex C++ API for MySQL${MYSQL_VER} @@ -19,7 +19,6 @@ CONFIGURE_ARGS= --with-mysql=${LOCALBASE USE_LDCONFIG= yes CONFLICTS= ${PORTNAME}*-2.* -NO_LATEST_LINK= yes NO_STAGE= yes post-install: Modified: head/devel/autoconf213/Makefile ============================================================================== --- head/devel/autoconf213/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/devel/autoconf213/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -8,6 +8,7 @@ CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ade/gnu DISTNAME= autoconf-000227 +PKGNAMESUFFIX= 213 # note: before committing to this port, contact portmgr to arrange for an # experimental ports run. Untested commits may be backed out at portmgr's @@ -21,7 +22,6 @@ RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ BUILD_VERSION= 2.13 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf213 USE_BZIP2= yes USES= perl5 GNU_CONFIGURE= yes Modified: head/devel/gitolite2/Makefile ============================================================================== --- head/devel/gitolite2/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/devel/gitolite2/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -5,6 +5,7 @@ PORTVERSION= 2.3.1 CATEGORIES= devel MASTER_SITES= http://milki.github.io/${PORTNAME}/ \ LOCAL/tdb +PKGNAMESUFFIX= 2 MAINTAINER= milki@rescomp.berkeley.edu COMMENT= An access control layer on top of git Modified: head/devel/llvm33/Makefile ============================================================================== --- head/devel/llvm33/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/devel/llvm33/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -6,6 +6,7 @@ PORTREVISION= 4 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src +PKGNAMESUFFIX= 33 MAINTAINER= brooks@FreeBSD.org COMMENT= Low Level Virtual Machine Modified: head/dns/idnkit2/Makefile ============================================================================== --- head/dns/idnkit2/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/dns/idnkit2/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -5,6 +5,7 @@ PORTNAME= idnkit PORTVERSION= 2.2 CATEGORIES= dns MASTER_SITES= http://jprs.co.jp/idn/ +PKGNAMESUFFIX= 2 MAINTAINER= fbsd@grid.einherjar.de COMMENT= Internationalized Domain Name toolkit 2 @@ -13,7 +14,6 @@ LICENSE_PERMS= # permissive LICENSE_NAME= OSCL LICENSE_FILE= LICENSE.txt -LATEST_LINK= ${PORTNAME}${PORTVERSION:R} CONFLICTS_INSTALL= idnkit-1.* USE_AUTOTOOLS= libtool Modified: head/dns/opendnssec13/Makefile ============================================================================== --- head/dns/opendnssec13/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/dns/opendnssec13/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -5,6 +5,7 @@ PORTNAME= opendnssec PORTVERSION= 1.3.15 CATEGORIES= dns MASTER_SITES= http://dist.opendnssec.org/source/ +PKGNAMESUFFIX= 13 MAINTAINER= jaap@NLnetLabs.nl COMMENT= Tool suite for maintaining DNSSEC @@ -12,8 +13,6 @@ COMMENT= Tool suite for maintaining DNSS BUILD_DEPENDS= ldns>=1.6.16:${PORTSDIR}/dns/ldns LIB_DEPENDS= libldns.so:${PORTSDIR}/dns/ldns -LATEST_LINK= ${PORTNAME}13 - GNU_CONFIGURE= yes USE_RC_SUBR= opendnssec USE_GNOME= libxml2 Modified: head/java/eclipse-aptana2/Makefile ============================================================================== --- head/java/eclipse-aptana2/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/java/eclipse-aptana2/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -7,6 +7,7 @@ PORTVERSION= 2.0.5.1278522500 CATEGORIES= java devel MASTER_SITES= http://nivi.interfree.it/distfiles/eclipse-aptana2/ PKGNAMEPREFIX= eclipse- +PKGNAMESUFFIX= 2 DISTNAME= com.aptana.ide.feature.studio-${PORTVERSION}-5-7857HJ97CFF61HN1HZHtem5tN7 MAINTAINER= nivit@FreeBSD.org @@ -18,8 +19,6 @@ CONFLICTS_INSTALL= eclipse-aptana-1* JAVA_VERSION= 1.6+ -LATEST_LINK?= ${PKGNAMEPREFIX}aptana2 - NO_BUILD= yes NO_WRKSUBDIR= yes Modified: head/lang/clang33/Makefile ============================================================================== --- head/lang/clang33/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/lang/clang33/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -5,6 +5,7 @@ DISTVERSION= 3.3 PORTREVISION= 1 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ +PKGNAMESUFFIX= 33 DISTNAME= ${CLANG_NAME} DISTFILES= ${CLANG_SOURCE} \ ${LLVM_SOURCE} Modified: head/mail/wanderlust-devel/Makefile ============================================================================== --- head/mail/wanderlust-devel/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/mail/wanderlust-devel/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -8,7 +8,7 @@ CATEGORIES= mail elisp MASTER_SITES= http://www.jpl.org/ftp/pub/github-snapshots/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nobutaka -PKGNAMESUFFIX= -${EMACS_PORT_NAME} +PKGNAMESUFFIX= -devel-${EMACS_PORT_NAME} DISTNAME= wanderlust-${SNAPDATE}${SNAPTIME} MAINTAINER= nobutaka@FreeBSD.org Modified: head/net-p2p/libtorrent-rasterbar-15/Makefile ============================================================================== --- head/net-p2p/libtorrent-rasterbar-15/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/net-p2p/libtorrent-rasterbar-15/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -6,6 +6,7 @@ PORTREVISION?= 4 CATEGORIES?= net-p2p ipv6 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PROJECTHOST= libtorrent +PKGNAMESUFFIX= -15 MAINTAINER= ports@FreeBSD.org COMMENT?= C++ library implementing a BitTorrent client @@ -15,8 +16,6 @@ BROKEN= Does not build with recent boos CONFLICTS+= libtorrent-rasterbar-0.1[46789].* -NO_LATEST_LINK= yes - BUILD_DEPENDS= pkgconf>0:${PORTSDIR}/devel/pkgconf LIB_DEPENDS+= boost_date_time:${PORTSDIR}/devel/boost-libs \ GeoIP.5:${PORTSDIR}/net/GeoIP Modified: head/print/scribus-devel/Makefile ============================================================================== --- head/print/scribus-devel/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/print/scribus-devel/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -8,6 +8,7 @@ CATEGORIES= print editors MASTER_SITES= http://download.tuxfamily.org/bartcoding/FreeBSD/ \ ${MASTER_SITE_LOCAL} DISTNAME= ${PORTNAME}-${PORTVERSION}-${SVN_REV} +PKGNAMESUFFIX= -devel MAINTAINER= coder@tuxfamily.org COMMENT= Comprehensive desktop publishing program @@ -32,7 +33,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkin CONFLICTS= scribus-1.[0-4]* -NO_LATEST_LINK= yes USE_BZIP2= yes USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build xml network USE_GNOME= desktopfileutils libartlgpl2 libxml2 Modified: head/science/minc2/Makefile ============================================================================== --- head/science/minc2/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/science/minc2/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -15,6 +15,7 @@ PORTVERSION= 2.2.00 PORTREVISION= 1 CATEGORIES= science biology MASTER_SITES= http://packages.bic.mni.mcgill.ca/tgz/ +PKGNAMESUFFIX= 2 MAINTAINER= jwbacon@tds.net COMMENT= Medical Imaging NetCDF @@ -31,7 +32,6 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_L CMAKE_ARGS= -DMINC2_BUILD_SHARED_LIBS:BOOL=YES CONFLICTS= minc-1* zh-tk-[0-9]* -LATEST_LINK= minc2 NO_STAGE= yes post-install: Modified: head/textproc/apache-solr3/Makefile ============================================================================== --- head/textproc/apache-solr3/Makefile Mon Oct 14 01:43:16 2013 (r330274) +++ head/textproc/apache-solr3/Makefile Mon Oct 14 06:52:32 2013 (r330275) @@ -7,6 +7,7 @@ CATEGORIES= textproc java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= lucene/solr/${PORTVERSION}/ EXTRACT_SUFX= .tgz +PKGNAMESUFFIX= 3 MAINTAINER= gaod@hychen.org COMMENT= High performance search server built using Lucene Java @@ -15,7 +16,6 @@ LICENSE= AL2 CONFLICT= apache-solr-4.1.* -NO_LATEST_LINK= yes JAVA_VERSION= 1.6+ NO_BUILD= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}"