cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Upgrade to 3.3.1 after preserving 3.2.x as

Browse Source 
misc/amanda32-{server,client} by repocopy.
This commit is contained in:
Jun Kuriyama 2012-05-15 14:37:05 +00:00
parent 7a5a3316d1
commit 4f956ba8ff
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=296672
9 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/Makefile
View File

@ -14,6 +14,8 @@
SUBDIR += amanda25-server
SUBDIR += amanda26-client
SUBDIR += amanda26-server
SUBDIR += amanda32-client
SUBDIR += amanda32-server
SUBDIR += amfm
SUBDIR += apparix
SUBDIR += asbutton

15
misc/amanda-server/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= amanda
PORTVERSION= 3.2.3
PORTVERSION= 3.3.1
PORTEPOCH= 1
CATEGORIES= misc
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
@ -92,7 +92,7 @@ pre-fetch:
@${ECHO} " AMANDA_DATES=path to client amandates file"
@${ECHO} ""
CONFLICTS= amanda-server-2.5.* amanda-server-2.6.*
CONFLICTS= amanda-server-2.5.* amanda-server-2.6.* amanda-server-3.2.*
BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
@ -104,15 +104,18 @@ MAN5= disklist.5 \
MAN7= amanda-changers.7 \
amanda-compatibility.7 \
amanda-devices.7 \
amanda-interactivity.7 \
amanda-taperscan.7
MAN8= amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \
amcheckdb.8 amcheckdump.8 amcleanup.8 \
amcheckdb.8 amcheckdump.8 \
amcleanup.8 \
amcleanupdisk.8 \
amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \
amdevcheck.8 \
amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \
amlabel.8 \
amoverview.8 amreport.8 amrestore.8 amrmtape.8 \
amserverconfig.8 amservice.8 amstatus.8 \
amserverconfig.8 amstatus.8 \
amtape.8 amtoc.8 amtapetype.8 \
amvault.8
@ -171,7 +174,7 @@ pre-fetch:
@${ECHO} " AMANDA_DATES=path to client amandates file"
@${ECHO} ""
CONFLICTS= amanda-client-2.5.* amanda-client-2.6.*
CONFLICTS= amanda-client-2.5.* amanda-client-2.6.* amanda-client-3.2.*
CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
.if defined(AMANDA_NO_SNAPSHOT_DUMP)
CFLAGS= -DFreeBSD_NO_SNAPSHOT_DUMP=t
@ -186,11 +189,13 @@ MAN7= amanda-applications.7 \
amanda-scripts.7
MAN8= amanda.8 \
amarchiver.8 \
amdump_client.8 \
amgtar.8 \
ampgsql.8 \
amraw.8 \
amrecover.8 \
amsamba.8 \
amservice.8 \
amstar.8 \
amsuntar.8 \
amzfs-sendrecv.8 \

4
misc/amanda-server/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (amanda-3.2.3.tar.gz) = 8ac37cc82add71ffd009fa4ea8763c633037277e15d51d28aefb8cb4c0b6a7fd
SIZE (amanda-3.2.3.tar.gz) = 4125405
SHA256 (amanda-3.3.1.tar.gz) = 190fcf84b7154494772d7ff6f8225fc165e89b4563437c6358549456f73e7612
SIZE (amanda-3.3.1.tar.gz) = 4328574

8
misc/amanda-server/files/patch-common-src::Makefile.in
View File

@ -1,9 +1,9 @@
--- common-src/Makefile.in.orig 2010-10-16 18:21:52.890010063 +0900
+++ common-src/Makefile.in 2010-10-16 18:22:26.842453745 +0900
@@ -1346,7 +1346,7 @@
--- common-src/Makefile.in.orig 2012-02-21 20:37:54.000000000 +0900
+++ common-src/Makefile.in 2012-05-08 11:49:17.145335897 +0900
@@ -1363,7 +1363,7 @@
INCLUDES = -I$(top_srcdir)/gnulib
AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
-amlib_LTLIBRARIES = libamanda.la
+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamanda.la
LINT = $(AMLINT)

8
misc/amanda-server/files/patch-xfer-src::Makefile.in
View File

@ -1,9 +1,9 @@
--- xfer-src/Makefile.in.orig 2010-10-16 14:38:56.304820189 +0900
+++ xfer-src/Makefile.in 2010-10-16 14:40:42.063983713 +0900
@@ -1176,7 +1176,7 @@
--- xfer-src/Makefile.in.orig 2012-02-21 20:37:55.000000000 +0900
+++ xfer-src/Makefile.in 2012-05-08 11:54:46.833498833 +0900
@@ -1187,7 +1187,7 @@
AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
-amlib_LTLIBRARIES = libamxfer.la
+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamxfer.la
LINT = $(AMLINT)

17
misc/amanda-server/pkg-plist
View File

@ -7,6 +7,7 @@ lib/amanda/libamserver.a
lib/amanda/libamserver.la
lib/amanda/libamserver.so
%%SITE_PERL%%/Amanda/Changer.pm
%%SITE_PERL%%/Amanda/Changer/aggregate.pm
%%SITE_PERL%%/Amanda/Changer/compat.pm
%%SITE_PERL%%/Amanda/Changer/disk.pm
%%SITE_PERL%%/Amanda/Changer/multi.pm
@ -22,8 +23,11 @@ lib/amanda/libamserver.so
%%SITE_PERL%%/Amanda/Device.pm
%%SITE_PERL%%/Amanda/Disklist.pm
%%SITE_PERL%%/Amanda/Holding.pm
%%SITE_PERL%%/Amanda/Interactive.pm
%%SITE_PERL%%/Amanda/Interactive/stdin.pm
%%SITE_PERL%%/Amanda/Interactivity.pm
%%SITE_PERL%%/Amanda/Interactivity/email.pm
%%SITE_PERL%%/Amanda/Interactivity/stdin.pm
%%SITE_PERL%%/Amanda/Interactivity/tty.pm
%%SITE_PERL%%/Amanda/Interactivity/tty_email.pm
%%SITE_PERL%%/Amanda/Logfile.pm
%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
%%SITE_PERL%%/Amanda/Recovery/Planner.pm
@ -32,10 +36,13 @@ lib/amanda/libamserver.so
%%SITE_PERL%%/Amanda/Report/human.pm
%%SITE_PERL%%/Amanda/Report/postscript.pm
%%SITE_PERL%%/Amanda/Report/xml.pm
%%SITE_PERL%%/Amanda/ScanInventory.pm
%%SITE_PERL%%/Amanda/Tapelist.pm
%%SITE_PERL%%/Amanda/Taper/Controller.pm
%%SITE_PERL%%/Amanda/Taper/Protocol.pm
%%SITE_PERL%%/Amanda/Taper/Scan.pm
%%SITE_PERL%%/Amanda/Taper/Scan/lexical.pm
%%SITE_PERL%%/Amanda/Taper/Scan/oldest.pm
%%SITE_PERL%%/Amanda/Taper/Scan/traditional.pm
%%SITE_PERL%%/Amanda/Taper/Scribe.pm
%%SITE_PERL%%/Amanda/Taper/Worker.pm
@ -54,7 +61,7 @@ lib/amanda/libamserver.so
%%SITE_PERL%%/auto/Amanda/XferServer/libXferServer.so
%%PLOT%%libexec/amanda/amcat.awk
libexec/amanda/amcheck-device
libexec/amanda/amcleanupdisk
libexec/amanda/amdumpd
libexec/amanda/amindexd
libexec/amanda/amlogroll
%%PLOT%%libexec/amanda/amplot.awk
@ -80,6 +87,7 @@ sbin/amcheck
sbin/amcheckdb
sbin/amcheckdump
sbin/amcleanup
sbin/amcleanupdisk
sbin/amdevcheck
sbin/amdump
sbin/amfetchdump
@ -91,7 +99,6 @@ sbin/amreport
sbin/amrestore
sbin/amrmtape
sbin/amserverconfig
sbin/amservice
sbin/amstatus
sbin/amtape
sbin/amtapetype
@ -107,7 +114,7 @@ sbin/amvault
@dirrm %%SITE_PERL%%/Amanda/Taper
@dirrm %%SITE_PERL%%/Amanda/Report
@dirrm %%SITE_PERL%%/Amanda/Recovery
@dirrm %%SITE_PERL%%/Amanda/Interactive
@dirrm %%SITE_PERL%%/Amanda/Interactivity
@dirrm %%SITE_PERL%%/Amanda/DB
@dirrm %%SITE_PERL%%/Amanda/Curinfo
@dirrm %%SITE_PERL%%/Amanda/Changer

2
misc/amanda-server/pkg-plist.client
View File

@ -106,10 +106,12 @@ sbin/amcrypt
sbin/amcrypt-ossl
sbin/amcrypt-ossl-asym
sbin/amcryptsimple
sbin/amdump_client
sbin/amgetconf
sbin/amgpgcrypt
sbin/amoldrecover
sbin/amrecover
sbin/amservice
%%DATADIR%%/COPYRIGHT
%%DATADIR%%/ChangeLog
%%DATADIR%%/NEWS

2
misc/amanda32-client/Makefile
View File

@ -10,7 +10,7 @@ PORTREVISION= 0
COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)
MASTERDIR= ${.CURDIR}/../amanda-server
MASTERDIR= ${.CURDIR}/../amanda32-server
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client

10
misc/amanda32-server/Makefile
View File

@ -19,7 +19,7 @@ RUN_DEPENDS= perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
BUILD_DEPENDS= perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
SLAVEDIRS= misc/amanda-client
SLAVEDIRS= misc/amanda32-client
LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
GNU_CONFIGURE= yes
@ -92,10 +92,10 @@ pre-fetch:
@${ECHO} " AMANDA_DATES=path to client amandates file"
@${ECHO} ""
CONFLICTS= amanda-server-2.5.* amanda-server-2.6.*
CONFLICTS= amanda-server-2.5.* amanda-server-2.6.* amanda-server-3.3.*
BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda32-client
RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda32-client
CONFIGURE_ARGS+=--without-client
@ -171,7 +171,7 @@ pre-fetch:
@${ECHO} " AMANDA_DATES=path to client amandates file"
@${ECHO} ""
CONFLICTS= amanda-client-2.5.* amanda-client-2.6.*
CONFLICTS= amanda-client-2.5.* amanda-client-2.6.* amanda-client-3.3.*
CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
.if defined(AMANDA_NO_SNAPSHOT_DUMP)
CFLAGS= -DFreeBSD_NO_SNAPSHOT_DUMP=t