diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-11-06 17:28:33 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2013-11-06 17:28:33 +0000 |
| commit | 4bc951579ff0c01eaea7419fdd6ab12efd36a272 (patch) | |
| tree | e4bbad25de080a134d9fdd21f91d9cbfb9fcd6c6 /misc/amanda-server | |
| parent | 4b1b9a34f84f1044be9dc0e1c5ee9784b0f10da1 (diff) | |
| download | ports-4bc951579ff0c01eaea7419fdd6ab12efd36a272.tar.gz ports-4bc951579ff0c01eaea7419fdd6ab12efd36a272.zip | |
Fix pkg name collisions
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=333014
Diffstat (limited to 'misc/amanda-server')
| -rw-r--r-- | misc/amanda-server/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 70af19278a95..5540b879ca09 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -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 |