From owner-svn-ports-head@FreeBSD.ORG Wed Nov 6 17:28:36 2013 Return-Path: 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 ESMTP id 1CA591E2; Wed, 6 Nov 2013 17:28: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 EDCF62EBC; Wed, 6 Nov 2013 17:28:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6HSZqj069432; Wed, 6 Nov 2013 17:28:35 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6HSYcV069424; Wed, 6 Nov 2013 17:28:34 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201311061728.rA6HSYcV069424@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 6 Nov 2013 17:28:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333014 - in head: devel/py-turbojson11 misc/amanda-server misc/amanda25-client misc/amanda25-server misc/amanda26-client misc/amanda26-server misc/amanda32-client misc/amanda32-server 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 17:28:36 -0000 Author: bapt Date: Wed Nov 6 17:28:33 2013 New Revision: 333014 URL: http://svnweb.freebsd.org/changeset/ports/333014 Log: Fix pkg name collisions With hat: portmgr Modified: head/devel/py-turbojson11/Makefile head/misc/amanda-server/Makefile head/misc/amanda25-client/Makefile head/misc/amanda25-server/Makefile head/misc/amanda26-client/Makefile head/misc/amanda26-server/Makefile head/misc/amanda32-client/Makefile head/misc/amanda32-server/Makefile Modified: head/devel/py-turbojson11/Makefile ============================================================================== --- head/devel/py-turbojson11/Makefile Wed Nov 6 17:11:14 2013 (r333013) +++ head/devel/py-turbojson11/Makefile Wed Nov 6 17:28:33 2013 (r333014) @@ -8,6 +8,7 @@ CATEGORIES= devel python MASTER_SITES= CHEESESHOP \ http://nivi.interfree.it/distfiles/${PORTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 11 MAINTAINER= nivit@FreeBSD.org COMMENT= Python template plugin for TurboGears that supports json @@ -16,8 +17,6 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Rul ${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \ ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}11 - USE_PYTHON= 2.5+ USE_PYDISTUTILS= easy_install Modified: head/misc/amanda-server/Makefile ============================================================================== --- head/misc/amanda-server/Makefile Wed Nov 6 17:11:14 2013 (r333013) +++ head/misc/amanda-server/Makefile Wed Nov 6 17:28:33 2013 (r333014) @@ -18,7 +18,6 @@ BUILD_DEPENDS= perl-amanda:${PORTSDIR}/m WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda-client -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} GNU_CONFIGURE= yes USES= gmake pkgconfig perl5 USE_GNOME= glib20 @@ -98,7 +97,7 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -CONFLICTS= amanda-server-2.5.* amanda-server-2.6.* amanda-server-3.2.* +CONFLICTS= amanda-server-2.* amanda-server-3.2.* amanda2[56]-server-* BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client @@ -176,7 +175,7 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -CONFLICTS= amanda-client-2.5.* amanda-client-2.6.* amanda-client-3.2.* +CONFLICTS= amanda-client-2.* amanda-client-3.2.* amanda2[56]-client-* CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES} .if defined(AMANDA_NO_SNAPSHOT_DUMP) CFLAGS= -DFreeBSD_NO_SNAPSHOT_DUMP=t Modified: head/misc/amanda25-client/Makefile ============================================================================== --- head/misc/amanda25-client/Makefile Wed Nov 6 17:11:14 2013 (r333013) +++ head/misc/amanda25-client/Makefile Wed Nov 6 17:28:33 2013 (r333014) @@ -1,7 +1,7 @@ # Created by: gpalmer # $FreeBSD$ -PKGNAMESUFFIX= -client +PKGNAMESUFFIX= 25-client PORTREVISION= 4 COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) Modified: head/misc/amanda25-server/Makefile ============================================================================== --- head/misc/amanda25-server/Makefile Wed Nov 6 17:11:14 2013 (r333013) +++ head/misc/amanda25-server/Makefile Wed Nov 6 17:28:33 2013 (r333014) @@ -4,7 +4,7 @@ PORTNAME= amanda PORTVERSION= 2.5.1p3 PORTREVISION?= 7 -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= 25-server PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION} @@ -15,7 +15,6 @@ COMMENT?= The Advanced Maryland Automati WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda25-client -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} USE_AUTOTOOLS= autoconf USES= gmake USE_OPENSSL= yes @@ -124,8 +123,7 @@ USES+= perl5 BUILD_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda25-client RUN_DEPENDS+= ${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda25-client -NO_LATEST_LINK= yes -CONFLICTS= amanda-server-2.6.* amanda-server-3.* +CONFLICTS= amanda-server-2.6.* amanda-server-3.* amanda26-server-* CONFIGURE_ARGS+=--without-client MAN8= amadmin.8 amaespipe.8 amcheck.8 \ @@ -191,8 +189,7 @@ pre-fetch: @${ECHO} " The default is no restriction on UDP ports." @${ECHO} "" -NO_LATEST_LINK= yes -CONFLICTS= amanda-client-2.6.* amanda-client-3.* +CONFLICTS= amanda-client-2.6.* amanda-client-3.* amanda26-client-* CONFIGURE_ARGS+=--without-server MAN5= amanda.conf.5 amanda-client.conf.5 Modified: head/misc/amanda26-client/Makefile ============================================================================== --- head/misc/amanda26-client/Makefile Wed Nov 6 17:11:14 2013 (r333013) +++ head/misc/amanda26-client/Makefile Wed Nov 6 17:28:33 2013 (r333014) @@ -1,7 +1,7 @@ # Created by: gpalmer # $FreeBSD$ -PKGNAMESUFFIX= -client +PKGNAMESUFFIX= 26-client PORTREVISION= 2 COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) Modified: head/misc/amanda26-server/Makefile ============================================================================== --- head/misc/amanda26-server/Makefile Wed Nov 6 17:11:14 2013 (r333013) +++ head/misc/amanda26-server/Makefile Wed Nov 6 17:28:33 2013 (r333014) @@ -7,7 +7,7 @@ PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION} -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= 26-server MAINTAINER= kuriyama@FreeBSD.org COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) @@ -15,7 +15,6 @@ COMMENT?= The Advanced Maryland Automati WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda26-client -NO_LATEST_LINK= yes USES= gmake perl5 pkgconfig GNU_CONFIGURE= yes USE_GNOME= glib20 @@ -94,7 +93,7 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -CONFLICTS= amanda-server-2.5.* amanda-server-3.* +CONFLICTS= amanda-server-2.5.* amanda-server-3.* amanda25-server-* BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda26-client RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda26-client @@ -179,7 +178,7 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -CONFLICTS= amanda-client-2.5.* amanda-client-3.* +CONFLICTS= amanda-client-2.5.* amanda-client-3.* amanda25-client-* CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES} MAN5= amanda-archive-format.5 \ Modified: head/misc/amanda32-client/Makefile ============================================================================== --- head/misc/amanda32-client/Makefile Wed Nov 6 17:11:14 2013 (r333013) +++ head/misc/amanda32-client/Makefile Wed Nov 6 17:28:33 2013 (r333014) @@ -1,7 +1,7 @@ # Created by: gpalmer # $FreeBSD$ -PKGNAMESUFFIX= -client +PKGNAMESUFFIX= 32-client PORTREVISION= 0 COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client) Modified: head/misc/amanda32-server/Makefile ============================================================================== --- head/misc/amanda32-server/Makefile Wed Nov 6 17:11:14 2013 (r333013) +++ head/misc/amanda32-server/Makefile Wed Nov 6 17:28:33 2013 (r333014) @@ -7,7 +7,7 @@ PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION} -PKGNAMESUFFIX?= -server +PKGNAMESUFFIX?= 32-server MAINTAINER= kuriyama@FreeBSD.org COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server) @@ -18,7 +18,6 @@ BUILD_DEPENDS= perl-amanda:${PORTSDIR}/m WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} SLAVEDIRS= misc/amanda32-client -NO_LATEST_LINK= yes GNU_CONFIGURE= yes USES= gmake perl5 pkgconfig USE_GNOME= glib20 @@ -98,7 +97,7 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -CONFLICTS= amanda-server-2.5.* amanda-server-2.6.* amanda-server-3.3.* +CONFLICTS= amanda-server-2.* amanda-server-3.3.* amanda2[56]-server-* BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda32-client RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda32-client @@ -173,7 +172,7 @@ pre-fetch: @${ECHO} " AMANDA_DATES=path to client amandates file" @${ECHO} "" -CONFLICTS= amanda-client-2.5.* amanda-client-2.6.* amanda-client-3.3.* +CONFLICTS= amanda-client-2.* amanda-client-3.3.* amanda2[56]-client-* CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES} .if defined(AMANDA_NO_SNAPSHOT_DUMP) CFLAGS= -DFreeBSD_NO_SNAPSHOT_DUMP=t