diff options
author | James E. Housley <jeh@FreeBSD.org> | 2003-04-14 02:27:58 +0000 |
---|---|---|
committer | James E. Housley <jeh@FreeBSD.org> | 2003-04-14 02:27:58 +0000 |
commit | 996918cd192cb61fdb346727918c65061726b7f7 (patch) | |
tree | eddc38c27fd3a1dd6e357c32f7e3388d9580b8f0 /misc/amanda25-server | |
parent | Backout previous commit. (diff) |
* Update to 2.4.4
* PLIST cleanups
Notes
Notes:
svn path=/head/; revision=78927
Diffstat (limited to 'misc/amanda25-server')
-rw-r--r-- | misc/amanda25-server/Makefile | 6 | ||||
-rw-r--r-- | misc/amanda25-server/distinfo | 2 | ||||
-rw-r--r-- | misc/amanda25-server/files/patch-ac | 26 | ||||
-rw-r--r-- | misc/amanda25-server/pkg-plist | 9 | ||||
-rw-r--r-- | misc/amanda25-server/pkg-plist.client | 11 |
5 files changed, 36 insertions, 18 deletions
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile index df4df04260e8..bb1b5eb8da91 100644 --- a/misc/amanda25-server/Makefile +++ b/misc/amanda25-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= ${MASTERPORTNAME} -PORTVERSION= 2.4.3 +PORTVERSION= 2.4.4 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= misc @@ -72,7 +72,7 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \ MAN8= amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \ amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \ amoverview.8 amreport.8 amrmtape.8 amstatus.8 \ - amtape.8 amtoc.8 amverify.8 amverifyrun.8 + amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.8 .if defined (WITH_PLOT) BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot @@ -137,6 +137,8 @@ CONFIGURE_ARGS+= --with-portrange=${AMANDA_PORTRANGE} # Before 4.0, pre-CAM scsiio.h existed .if ${OSVERSION} < 400000 PLIST_SUB+= SCSICHG='' +.elif ${OSVERSION} >= 480000 +PLIST_SUB+= SCSICHG='' .else PLIST_SUB+= SCSICHG='@comment ' .endif diff --git a/misc/amanda25-server/distinfo b/misc/amanda25-server/distinfo index 65fd569d5f56..a6420367a8f7 100644 --- a/misc/amanda25-server/distinfo +++ b/misc/amanda25-server/distinfo @@ -1 +1 @@ -MD5 (amanda-2.4.3.tar.gz) = 869c08b16838aeff2578991f23cf5182 +MD5 (amanda-2.4.4.tar.gz) = 1f5f0c636707994eb7b5e74b19528323 diff --git a/misc/amanda25-server/files/patch-ac b/misc/amanda25-server/files/patch-ac index a9be81de184d..fe13070d2833 100644 --- a/misc/amanda25-server/files/patch-ac +++ b/misc/amanda25-server/files/patch-ac @@ -1,26 +1,26 @@ ---- tape-src/Makefile.in.orig Fri Nov 30 14:33:56 2001 -+++ tape-src/Makefile.in Tue Dec 4 08:04:12 2001 -@@ -162,7 +162,8 @@ - @WANT_LIBTOOL_FALSE@LIB_EXTENSION = a - @WANT_LIBTOOL_FALSE@noinst_LIBRARIES = libamtape.a +--- tape-src/Makefile.in.orig Mon Feb 24 21:45:25 2003 ++++ tape-src/Makefile.in Sun Apr 13 21:03:21 2003 +@@ -158,7 +158,8 @@ + lib_LTLIBRARIES = libamtape.la + LIB_EXTENSION = la --sbin_PROGRAMS = ammt amdd -+@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd +-sbin_PROGRAMS = ammt amdd amtapetype ++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt amdd amtapetype +@WANT_CLIENT_TRUE@sbin_PROGRAMS = libamtape_la_SOURCES = output-file.c \ output-null.c \ -@@ -241,7 +242,8 @@ - output-tape.lo tapeio.lo +@@ -215,7 +216,8 @@ + output-tape.lo tapeio.lo libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS) - EXTRA_PROGRAMS = tapetype$(EXEEXT) amtapeio$(EXEEXT) --sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) -+@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) + EXTRA_PROGRAMS = amtapeio$(EXEEXT) +-sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) ++@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT) +@WANT_CLIENT_TRUE@sbin_PROGRAMS = PROGRAMS = $(sbin_PROGRAMS) amdd_SOURCES = amdd.c -@@ -524,7 +526,11 @@ +@@ -517,7 +519,11 @@ install-data-am: diff --git a/misc/amanda25-server/pkg-plist b/misc/amanda25-server/pkg-plist index 01336e6ecd07..ef53801dba56 100644 --- a/misc/amanda25-server/pkg-plist +++ b/misc/amanda25-server/pkg-plist @@ -1,3 +1,7 @@ +lib/libamserver-2.4.4.so +lib/libamserver.so +lib/libamserver.la +lib/libamserver.a %%PLOT%%libexec/amanda/amcat.awk libexec/amanda/amcleanupdisk libexec/amanda/amindexd @@ -9,12 +13,15 @@ libexec/amanda/amtrmidx libexec/amanda/amtrmlog libexec/amanda/chg-chio libexec/amanda/chg-chs +libexec/amanda/chg-juke libexec/amanda/chg-manual libexec/amanda/chg-mtx libexec/amanda/chg-multi +libexec/amanda/chg-rait libexec/amanda/chg-rth %%SCSICHG%%libexec/amanda/chg-scsi libexec/amanda/chg-zd-mtx +libexec/amanda/amidxtaped libexec/amanda/driver libexec/amanda/dumper libexec/amanda/planner @@ -32,9 +39,11 @@ sbin/ammt sbin/amoverview %%PLOT%%sbin/amplot sbin/amreport +sbin/amrestore sbin/amrmtape sbin/amstatus sbin/amtape +sbin/amtapetype sbin/amtoc sbin/amverify sbin/amverifyrun diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client index 925c4ef8826d..126fbdfa43ac 100644 --- a/misc/amanda25-server/pkg-plist.client +++ b/misc/amanda25-server/pkg-plist.client @@ -1,5 +1,12 @@ +lib/libamanda-2.4.4.so +lib/libamanda.so +lib/libamanda.la +lib/libamanda.a +lib/libamclient-2.4.4.so +lib/libamclient.so +lib/libamclient.la +lib/libamclient.a libexec/amanda/amandad -libexec/amanda/amidxtaped libexec/amanda/calcsize libexec/amanda/killpgrp libexec/amanda/patch-system @@ -10,13 +17,13 @@ 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/EXCLUDE share/amanda/FAQ +share/amanda/HOWTO-CYGWIN.html share/amanda/INDEXING share/amanda/INSTALL share/amanda/INTERNALS |