1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

Fix pkg name collisions

With hat:	portmgr
This commit is contained in:
Baptiste Daroussin 2013-11-06 17:28:33 +00:00
parent 4b1b9a34f8
commit 4bc951579f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=333014
8 changed files with 15 additions and 22 deletions

View File

@ -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}RuleDispatch>=0.5.a0.r2306:${PORTSDIR}/deve
${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

View File

@ -18,7 +18,6 @@ BUILD_DEPENDS= perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
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

View File

@ -1,7 +1,7 @@
# Created by: gpalmer
# $FreeBSD$
PKGNAMESUFFIX= -client
PKGNAMESUFFIX= 25-client
PORTREVISION= 4
COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)

View File

@ -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 Automatic Network Disk Archiver (server)
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

View File

@ -1,7 +1,7 @@
# Created by: gpalmer
# $FreeBSD$
PKGNAMESUFFIX= -client
PKGNAMESUFFIX= 26-client
PORTREVISION= 2
COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)

View File

@ -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 Automatic Network Disk Archiver (server)
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 \

View File

@ -1,7 +1,7 @@
# Created by: gpalmer
# $FreeBSD$
PKGNAMESUFFIX= -client
PKGNAMESUFFIX= 32-client
PORTREVISION= 0
COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)

View File

@ -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}/misc/amanda-perl-wrapper
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