From fef4dd5ae353174687efaa4044e01c02db9de0f0 Mon Sep 17 00:00:00 2001 From: "James E. Housley" Date: Wed, 31 Jan 2001 12:24:08 +0000 Subject: Server portion of the new split amanda24 series. o PR 17427 was partly used for the split o PR 18872 was partly used to request plotting (gnuplot) if wanted. o PR 21218 was used for --with-buffered-dump o PR 22258 was also used for requesting plotting PR: 17427 18872 21218 22258 Submitted by: Adrian Filipi-Martin Submitted by: Matt Braithwaite Submitted by: Brad Huntting Submitted by: Mikhail Teterin --- misc/amanda-server/Makefile | 72 +++++++++++++++++++++++++++++------ misc/amanda-server/files/patch-aa | 20 ++++++++++ misc/amanda-server/pkg-comment.client | 1 + misc/amanda-server/pkg-plist | 55 +++----------------------- misc/amanda-server/pkg-plist.client | 45 ++++++++++++++++++++++ 5 files changed, 131 insertions(+), 62 deletions(-) create mode 100644 misc/amanda-server/files/patch-aa create mode 100644 misc/amanda-server/pkg-comment.client create mode 100644 misc/amanda-server/pkg-plist.client (limited to 'misc/amanda-server') diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile index 266db71258a6..def22efe5619 100644 --- a/misc/amanda-server/Makefile +++ b/misc/amanda-server/Makefile @@ -5,32 +5,78 @@ # $FreeBSD$ # -PORTNAME= amanda +PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 2.4.2 +PORTREVISION?= 0 CATEGORIES= misc MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/ +DISTFILES= amanda-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= jeh@FreeBSD.org -BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot -RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot +WRKSRC= ${WRKDIR}/amanda-${PORTVERSION} +SLAVEDIRS= misc/amanda24-client +MASTERPORTNAME= amanda24-server -WRKSRC= ${WRKDIR}/amanda-2.4.2 NO_LATEST_LINK= yes USE_GMAKE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes LIBTOOLFLAGS= --disable-ltlibs --release-ignore +PATCH_STRIP= + +.include +# amanda24-server part +.if !defined(CLIENT_ONLY) + +pre-fetch: + @${ECHO} "" + @${ECHO} "You may use the following build options:" + @${ECHO} "" + @${ECHO} " -DWITH_PLOT to enable ploting, requires X11 libraries" + @${ECHO} " -DWITH_SAMBA to enable the use of smbclient" + @${ECHO} "" + +RUN_DEPENDS= amrecover:${.CURDIR}/../amanda24-client +BUILD_DEPENDS= amrecover:${.CURDIR}/../amanda24-client +#RUN_DEPENDS= amrecover:${PORTSDIR}/misc/amanda24-client +#BUILD_DEPENDS= amrecover:${PORTSDIR}/misc/amanda24-client + CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ --with-amandahosts --with-fqdn \ - --with-dump-honor-nodump \ - --with-user=operator --with-group=operator + --with-dump-honor-nodump --with-buffered-dump \ + --with-user=operator --with-group=operator \ + --without-client -PATCH_STRIP= -MAN8= amadmin.8 amanda.8 amcheck.8 amcheckdb.8 amcleanup.8 \ - amdump.8 amflush.8 amgetconf.8 amlabel.8 amoverview.8 \ - amplot.8 amrecover.8 amreport.8 amrestore.8 amrmtape.8 \ - amstatus.8 amtape.8 amtoc.8 amverify.8 +MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \ + amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \ + amrmtape.8 amstatus.8 amtape.8 amtoc.8 amverify.8 + +.if defined (WITH_PLOT) +BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot +RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot +MAN8+= amplot.8 +PLIST_SUB+= PLOT='' +.else +PLIST_SUB+= PLOT='@comment ' +.endif + +.if defined (WITH_SMBCLIENT) +BUILD_DEPEND+= smbclient:${PORTSDIR}/net/samba +RUN_DEPEND+= smbclient:${PORTSDIR}/net/samba +CONFIGURE_ARGS+= --with-smbclient=${PREFIX}/bin/smbclient +.endif + +# amanda24-client part +.else + +CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ + --with-amandahosts --with-fqdn \ + --with-dump-honor-nodump --with-buffered-dump \ + --with-user=operator --with-group=operator \ + --without-server + +MAN8= amanda.8 amrecover.8 amrestore.8 post-install: ${MKDIR} ${PREFIX}/share/examples/amanda @@ -40,4 +86,6 @@ post-install: ${WRKSRC}/example/disklist \ ${PREFIX}/share/examples/amanda -.include +.endif + +.include diff --git a/misc/amanda-server/files/patch-aa b/misc/amanda-server/files/patch-aa new file mode 100644 index 000000000000..a8b2b0674124 --- /dev/null +++ b/misc/amanda-server/files/patch-aa @@ -0,0 +1,20 @@ +--- man/Makefile.in.orig Sat Nov 25 09:02:01 2000 ++++ man/Makefile.in Wed Jan 31 06:45:07 2001 +@@ -151,7 +151,7 @@ + + @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = @WANT_AMPLOT_TRUE@amplot.8 + +-COMMON_MAN_PAGES = amanda.8 ++@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = @WANT_CLIENT_TRUE@amanda.8 + + @WANT_SERVER_TRUE@SERVER_MAN_PAGES = @WANT_SERVER_TRUE@amadmin.8 \ + @WANT_SERVER_TRUE@ amcheck.8 \ +@@ -171,7 +171,7 @@ + + @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = @WANT_RECOVER_TRUE@amrecover.8 + +-@WANT_RESTORE_TRUE@RESTORE_MAN_PAGES = @WANT_RESTORE_TRUE@amrestore.8 ++@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = @WANT_CLIENT_TRUE@amrestore.8 + + # not autoconf-generated: + EXTRA_DIST = amplot.8 amrestore.8 amtape.8 diff --git a/misc/amanda-server/pkg-comment.client b/misc/amanda-server/pkg-comment.client new file mode 100644 index 000000000000..87b97277da1d --- /dev/null +++ b/misc/amanda-server/pkg-comment.client @@ -0,0 +1 @@ +The Advanced Maryland Automatic Network Disk Archiver diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist index 2475022db66e..f668c9f2d46d 100644 --- a/misc/amanda-server/pkg-plist +++ b/misc/amanda-server/pkg-plist @@ -1,19 +1,13 @@ -lib/libamanda.a -lib/libamclient.a lib/libamserver.a -lib/libamtape.a -libexec/amanda/amandad -libexec/amanda/amcat.awk +%%PLOT%%libexec/amanda/amcat.awk libexec/amanda/amcleanupdisk -libexec/amanda/amidxtaped libexec/amanda/amindexd libexec/amanda/amlogroll -libexec/amanda/amplot.awk -libexec/amanda/amplot.g -libexec/amanda/amplot.gp +%%PLOT%%libexec/amanda/amplot.awk +%%PLOT%%libexec/amanda/amplot.g +%%PLOT%%libexec/amanda/amplot.gp libexec/amanda/amtrmidx libexec/amanda/amtrmlog -libexec/amanda/calcsize libexec/amanda/chg-chio libexec/amanda/chg-chs libexec/amanda/chg-manual @@ -23,16 +17,8 @@ libexec/amanda/chg-rth libexec/amanda/chg-zd-mtx libexec/amanda/driver libexec/amanda/dumper -libexec/amanda/killpgrp -libexec/amanda/patch-system libexec/amanda/planner -libexec/amanda/rundump -libexec/amanda/runtar -libexec/amanda/selfcheck -libexec/amanda/sendbackup -libexec/amanda/sendsize libexec/amanda/taper -libexec/amanda/versionsuffix sbin/amadmin sbin/amcheck sbin/amcheckdb @@ -42,41 +28,10 @@ sbin/amflush sbin/amgetconf sbin/amlabel sbin/amoverview -sbin/amplot -sbin/amrecover +%%PLOT%%sbin/amplot sbin/amreport -sbin/amrestore sbin/amrmtape sbin/amstatus sbin/amtape sbin/amtoc sbin/amverify -share/amanda/COPYRIGHT -share/amanda/COPYRIGHT-APACHE -share/amanda/COPYRIGHT-REGEX -share/amanda/DUMPER-API -share/amanda/FAQ -share/amanda/INDEXING -share/amanda/INSTALL -share/amanda/INTERNALS -share/amanda/KERBEROS -share/amanda/LABEL.PRINTING -share/amanda/MULTITAPE -share/amanda/RESTORE -share/amanda/SAMBA -share/amanda/SECURITY -share/amanda/SYSTEM.NOTES -share/amanda/TAPE.CHANGERS -share/amanda/TAPETYPES -share/amanda/UPGRADE -share/amanda/WHATS.NEW -share/amanda/WISHLIST -share/amanda/YEAR2000 -share/amanda/ZFTAPE -share/examples/amanda/amanda.conf -share/examples/amanda/chg-multi.conf -share/examples/amanda/chg-scsi.conf -share/examples/amanda/disklist -@dirrm share/examples/amanda -@dirrm share/amanda -@dirrm libexec/amanda diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client new file mode 100644 index 000000000000..4f109899c777 --- /dev/null +++ b/misc/amanda-server/pkg-plist.client @@ -0,0 +1,45 @@ +lib/libamanda.a +lib/libamclient.a +lib/libamtape.a +libexec/amanda/amandad +libexec/amanda/amidxtaped +libexec/amanda/calcsize +libexec/amanda/killpgrp +libexec/amanda/patch-system +libexec/amanda/rundump +libexec/amanda/runtar +libexec/amanda/selfcheck +libexec/amanda/sendbackup +libexec/amanda/sendsize +libexec/amanda/versionsuffix +sbin/amrecover +sbin/amrestore +share/amanda/COPYRIGHT +share/amanda/COPYRIGHT-APACHE +share/amanda/COPYRIGHT-REGEX +share/amanda/DUMPER-API +share/amanda/FAQ +share/amanda/INDEXING +share/amanda/INSTALL +share/amanda/INTERNALS +share/amanda/KERBEROS +share/amanda/LABEL.PRINTING +share/amanda/MULTITAPE +share/amanda/RESTORE +share/amanda/SAMBA +share/amanda/SECURITY +share/amanda/SYSTEM.NOTES +share/amanda/TAPE.CHANGERS +share/amanda/TAPETYPES +share/amanda/UPGRADE +share/amanda/WHATS.NEW +share/amanda/WISHLIST +share/amanda/YEAR2000 +share/amanda/ZFTAPE +share/examples/amanda/amanda.conf +share/examples/amanda/chg-multi.conf +share/examples/amanda/chg-scsi.conf +share/examples/amanda/disklist +@dirrm share/examples/amanda +@dirrm share/amanda +@dirrm libexec/amanda -- cgit v1.2.3