Date: Thu, 2 Dec 1999 10:05:47 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org Subject: ports/15226: Update port: misc/amanda Message-ID: <19991202180547.019BD14D3B@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15226
>Category: ports
>Synopsis: Update port: misc/amanda
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 2 10:10:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 3.3-RELEASE i386
>Organization:
>Environment:
>Description:
* Modified patches to support CC/INSTALL/PREFIX properly
* Stripped binaries
* Sorted pkg/PLIST
Add file:
patches/patch-ad patches/patch-ae patches/patch-af patches/patch-ag
Remove file:
patches/patch-ab scripts/configure
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/misc/amanda/Makefile misc/amanda/Makefile
--- /usr/ports/misc/amanda/Makefile Wed Nov 10 21:12:28 1999
+++ misc/amanda/Makefile Fri Dec 3 01:53:16 1999
@@ -12,15 +12,38 @@
MAINTAINER= ports@FreeBSD.org
-PATCH_STRIP=
-MAN8= amanda.8 amadmin.8 amcheck.8 amcleanup.8 amdump.8 \
- amflush.8 amlabel.8 amrestore.8 amtape.8
+MAN8= amadmin.8 amanda.8 amcheck.8 amcleanup.8 amdump.8 amflush.8 \
+ amlabel.8 amrestore.8 amtape.8
-pre-configure:
- ${ECHO} "${CFLAGS}" > /tmp/build-ports-misc-amanda-cflags
+LIBEXEC_BIN= amandad calcsize driver dumper getconf planner reporter \
+ runtar selfcheck sendbackup-dump sendbackup-gnutar sendsize \
+ taper
+SBIN_BIN= amadmin amcheck amflush amlabel amrestore amtape
+
+post-patch:
+ @${LN} -sf config.h-freebsd2 ${WRKSRC}/config/config.h
+ @${SED} -e 's:%%CC%%:${CC}:g' \
+ -e 's:%%CFLAGS%%:${CFLAGS}:g' \
+ -e 's:%%INSTALL%%:${INSTALL}:g' \
+ -e 's:%%PREFIX%%:${PREFIX}:g' \
+ ${WRKSRC}/config/options.h-vanilla > ${WRKSRC}/config/options.h
+.for file in amanda.8 amcleanup.8 amflush.8 amlabel.8
+ @cd ${WRKSRC}/man/; ${MV} ${file} ${file}.in; \
+ ${SED} -e 's:%%PREFIX%%:${PREFIX}:g' ${file}.in > ${file}
+.endfor
post-install:
- ${MKDIR} ${PREFIX}/share/examples/amanda
- ${CP} -R ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda
+.for file in ${LIBEXEC_BIN}
+ @if [ -f ${PREFIX}/libexec/amanda/${file} ]; then \
+ strip ${PREFIX}/libexec/amanda/${file}; \
+ fi
+.endfor
+.for file in ${SBIN_BIN}
+ @if [ -f ${PREFIX}/sbin/${file} ]; then \
+ strip ${PREFIX}/sbin/${file}; \
+ fi
+.endfor
+ @${MKDIR} ${PREFIX}/share/examples/amanda
+ ${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda
.include <bsd.port.mk>
diff -urN /usr/ports/misc/amanda/patches/patch-ab misc/amanda/patches/patch-ab
--- /usr/ports/misc/amanda/patches/patch-ab Sat Mar 8 00:00:00 1997
+++ misc/amanda/patches/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,76 +0,0 @@
---- man/amanda.8~ Sun May 19 22:11:25 1996
-+++ man/amanda.8 Fri Mar 7 22:24:28 1997
-@@ -135,19 +135,19 @@
-
- All the files are stored in a
- .I config
--directory under /etc/amanda. Often a single site will have more than
-+directory under /usr/local/etc/amanda. Often a single site will have more than
- one configuration; these configurations are named by the directories
- that their config files are in. For example, a site might have a
- .I normal
- configuration for every-day backups, and a
- .I archive
- configuration for 6-month full archival backups. The config files for
--these two would be stored under /etc/amanda/normal and
--/etc/amanda/archive, respectively.
-+these two would be stored under /usr/local/etc/amanda/normal and
-+/usr/local/etc/amanda/archive, respectively.
-
- All log and database files generated by Amanda go in corresponding
--directories under /usr/adm/amanda. In our example, the logs would go
--in /usr/adm/amanda/normal and /usr/adm/amanda/archive.
-+directories under /var/lov/amanda. In our example, the logs would go
-+in /var/log/amanda/normal and /var/log/amanda/archive.
-
- .SH CONFIG FILE PARAMETERS
-
---- man/amcleanup.8~ Sun May 19 22:11:25 1996
-+++ man/amcleanup.8 Fri Mar 7 22:23:07 1997
-@@ -31,13 +31,13 @@
-
- .PP
- .nf
--if [ -s /usr/adm/amanda/csd/amanda.log ]
-+if [ -s /var/log/amanda/csd/amanda.log ]
- then
- /usr/local/sbin/amcleanup csd
- fi
- .fi
- .RS .5i
--Putting the above in /etc/rc.local runs the Amanda
-+Putting the above in /usr/local/etc/rc.local runs the Amanda
- cleanup process when needed as part of the reboot, eliminating the need
- to run it by hand.
- .RE
---- man/amflush.8~ Sun May 19 22:11:25 1996
-+++ man/amflush.8 Fri Mar 7 22:22:28 1997
-@@ -22,7 +22,7 @@
- .B Amflush
- will look in the holding disk specified by the
- .I amanda.conf
--file in /etc/amanda/\fIconfig\fR
-+file in /usr/local/etc/amanda/\fIconfig\fR
- for any non-empty Amanda work directories. It then prompts the
- operator to select the correct directory. The work directories on the
- holding disk are named by the date at the time
---- man/amlabel.8~ Sun May 19 22:11:25 1996
-+++ man/amlabel.8 Fri Mar 7 22:22:22 1997
-@@ -11,7 +11,7 @@
- .B Amlabel
- writes an Amanda label on the tape in the tape drive specified by the
- .I amanda.conf
--file in /etc/amanda/\fIconfig\fR. The
-+file in /usr/local/etc/amanda/\fIconfig\fR. The
- .I label
- can be any string that does not contain whitespace, and that matches the
- .I amanda.conf
-@@ -26,7 +26,7 @@
- .TP
- % amlabel csd VOL1
- If the line "tapedev /dev/tape/1n" is in
--/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
-+/usr/local/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
- written on the /dev/tape/1n device.
-
- .SH AUTHOR
diff -urN /usr/ports/misc/amanda/patches/patch-ac misc/amanda/patches/patch-ac
--- /usr/ports/misc/amanda/patches/patch-ac Sat Mar 8 00:00:00 1997
+++ misc/amanda/patches/patch-ac Fri Dec 3 00:30:53 1999
@@ -1,13 +1,13 @@
-*** config/options.h-vanilla Fri Feb 10 11:21:59 1995
---- config/options.h Tue Feb 28 16:34:30 1995
+*** config/options.h-vanilla.orig Mon May 20 11:11:25 1996
+--- config/options.h-vanilla Fri Dec 3 00:29:56 1999
***************
*** 42,51 ****
* LIBEXEC_DIR - Internal support programs
* MAN_DIR - Man pages
*/
! #define CONFIG_DIR "/etc/amanda"
- #define LIBEXEC_DIR "/usr/local/libexec/amanda"
- #define BIN_DIR "/usr/local/sbin"
+! #define LIBEXEC_DIR "/usr/local/libexec/amanda"
+! #define BIN_DIR "/usr/local/sbin"
! #define MAN_DIR "/usr/share/local/man/man8"
@@ -16,10 +16,43 @@
* LIBEXEC_DIR - Internal support programs
* MAN_DIR - Man pages
*/
-! #define CONFIG_DIR "/usr/local/etc/amanda"
- #define LIBEXEC_DIR "/usr/local/libexec/amanda"
- #define BIN_DIR "/usr/local/sbin"
-! #define MAN_DIR "/usr/local/man/man8"
+! #define CONFIG_DIR "%%PREFIX%%/etc/amanda"
+! #define LIBEXEC_DIR "%%PREFIX%%/libexec/amanda"
+! #define BIN_DIR "%%PREFIX%%/sbin"
+! #define MAN_DIR "%%PREFIX%%/man/man8"
+
+
+ /*
+***************
+*** 53,66 ****
+ * I compile with -g to compile in a full symbol table, but you might choose
+ * to use -O or something else.
+ */
+! #define MK_CCOPTS -g
+ /*
+ * You can also redefine MK_CC here if you wish to override the system
+ * dependent C compiler. If you have a stable version of GCC, you may
+ * well want to use that instead of the system compiler.
+ */
+! /* #undef MK_CC */
+! /* #define MK_CC gcc -Wall */
+
+
+ /*
+--- 53,68 ----
+ * I compile with -g to compile in a full symbol table, but you might choose
+ * to use -O or something else.
+ */
+! #define MK_CCOPTS %%CFLAGS%%
+ /*
+ * You can also redefine MK_CC here if you wish to override the system
+ * dependent C compiler. If you have a stable version of GCC, you may
+ * well want to use that instead of the system compiler.
+ */
+! #undef MK_INSTALL
+! #define MK_INSTALL %%INSTALL%%
+! #undef MK_CC
+! #define MK_CC %%CC%%
/*
@@ -32,7 +65,7 @@
/*
---- 77,83 ----
+--- 79,85 ----
* Since 2.2.1 is a major change, I recommend defining this for existing
* Amanda sites.
*/
@@ -41,7 +74,7 @@
/*
***************
-*** 182,196 ****
+*** 182,198 ****
#define HAVE_GZIP
#ifdef HAVE_GZIP
@@ -57,7 +90,9 @@
# define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
! # define UNCOMPRESS_CMD "zcat"
#endif
---- 182,196 ----
+
+ /*
+--- 184,200 ----
#define HAVE_GZIP
#ifdef HAVE_GZIP
@@ -73,3 +108,5 @@
# define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
! # define UNCOMPRESS_CMD "/usr/bin/zcat"
#endif
+
+ /*
diff -urN /usr/ports/misc/amanda/patches/patch-ad misc/amanda/patches/patch-ad
--- /usr/ports/misc/amanda/patches/patch-ad Thu Jan 1 09:00:00 1970
+++ misc/amanda/patches/patch-ad Wed Dec 1 04:07:03 1999
@@ -0,0 +1,27 @@
+--- man/amanda.8.orig Mon May 20 11:11:25 1996
++++ man/amanda.8 Wed Dec 1 03:59:02 1999
+@@ -135,19 +135,19 @@
+
+ All the files are stored in a
+ .I config
+-directory under /etc/amanda. Often a single site will have more than
++directory under %%PREFIX%%/etc/amanda. Often a single site will have more than
+ one configuration; these configurations are named by the directories
+ that their config files are in. For example, a site might have a
+ .I normal
+ configuration for every-day backups, and a
+ .I archive
+ configuration for 6-month full archival backups. The config files for
+-these two would be stored under /etc/amanda/normal and
+-/etc/amanda/archive, respectively.
++these two would be stored under %%PREFIX%%/etc/amanda/normal and
++%%PREFIX%%/etc/amanda/archive, respectively.
+
+ All log and database files generated by Amanda go in corresponding
+-directories under /usr/adm/amanda. In our example, the logs would go
+-in /usr/adm/amanda/normal and /usr/adm/amanda/archive.
++directories under /var/log/amanda. In our example, the logs would go
++in /var/log/amanda/normal and /var/log/amanda/archive.
+
+ .SH CONFIG FILE PARAMETERS
+
diff -urN /usr/ports/misc/amanda/patches/patch-ae misc/amanda/patches/patch-ae
--- /usr/ports/misc/amanda/patches/patch-ae Thu Jan 1 09:00:00 1970
+++ misc/amanda/patches/patch-ae Wed Dec 1 04:22:14 1999
@@ -0,0 +1,19 @@
+--- man/amcleanup.8.orig Mon May 20 11:11:25 1996
++++ man/amcleanup.8 Wed Dec 1 04:22:03 1999
+@@ -31,13 +31,13 @@
+
+ .PP
+ .nf
+-if [ -s /usr/adm/amanda/csd/amanda.log ]
++if [ -s /var/log/amanda/csd/amanda.log ]
+ then
+- /usr/local/sbin/amcleanup csd
++ %%PREFIX%%/sbin/amcleanup csd
+ fi
+ .fi
+ .RS .5i
+-Putting the above in /etc/rc.local runs the Amanda
++Putting the above in %%PREFIX%%/rc.local runs the Amanda
+ cleanup process when needed as part of the reboot, eliminating the need
+ to run it by hand.
+ .RE
diff -urN /usr/ports/misc/amanda/patches/patch-af misc/amanda/patches/patch-af
--- /usr/ports/misc/amanda/patches/patch-af Thu Jan 1 09:00:00 1970
+++ misc/amanda/patches/patch-af Wed Dec 1 04:06:04 1999
@@ -0,0 +1,11 @@
+--- man/amflush.8.orig Mon May 20 11:11:25 1996
++++ man/amflush.8 Wed Dec 1 03:59:02 1999
+@@ -22,7 +22,7 @@
+ .B Amflush
+ will look in the holding disk specified by the
+ .I amanda.conf
+-file in /etc/amanda/\fIconfig\fR
++file in %%PREFIX%%/etc/amanda/\fIconfig\fR
+ for any non-empty Amanda work directories. It then prompts the
+ operator to select the correct directory. The work directories on the
+ holding disk are named by the date at the time
diff -urN /usr/ports/misc/amanda/patches/patch-ag misc/amanda/patches/patch-ag
--- /usr/ports/misc/amanda/patches/patch-ag Thu Jan 1 09:00:00 1970
+++ misc/amanda/patches/patch-ag Wed Dec 1 04:06:04 1999
@@ -0,0 +1,20 @@
+--- man/amlabel.8.orig Mon May 20 11:11:25 1996
++++ man/amlabel.8 Wed Dec 1 03:59:02 1999
+@@ -11,7 +11,7 @@
+ .B Amlabel
+ writes an Amanda label on the tape in the tape drive specified by the
+ .I amanda.conf
+-file in /etc/amanda/\fIconfig\fR. The
++file in %%PREFIX%%/etc/amanda/\fIconfig\fR. The
+ .I label
+ can be any string that does not contain whitespace, and that matches the
+ .I amanda.conf
+@@ -26,7 +26,7 @@
+ .TP
+ % amlabel csd VOL1
+ If the line "tapedev /dev/tape/1n" is in
+-/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
++%%PREFIX%%/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
+ written on the /dev/tape/1n device.
+
+ .SH AUTHOR
diff -urN /usr/ports/misc/amanda/pkg/DESCR misc/amanda/pkg/DESCR
--- /usr/ports/misc/amanda/pkg/DESCR Wed Nov 10 21:12:29 1999
+++ misc/amanda/pkg/DESCR Wed Dec 1 03:34:10 1999
@@ -1,3 +1,5 @@
This is the Advanced Maryland Automatic Network Disk Archiver. Amanda
is a backup system designed to archive many computers on a network to
a single large-capacity tape drive.
+
+WWW: http://www.cs.umd.edu/projects/amanda/
diff -urN /usr/ports/misc/amanda/pkg/PLIST misc/amanda/pkg/PLIST
--- /usr/ports/misc/amanda/pkg/PLIST Mon Oct 5 10:18:00 1998
+++ misc/amanda/pkg/PLIST Thu Dec 2 23:49:17 1999
@@ -1,27 +1,27 @@
libexec/amanda/amandad
-libexec/amanda/sendsize
libexec/amanda/calcsize
-libexec/amanda/sendbackup-dump
-libexec/amanda/sendbackup-gnutar
-libexec/amanda/runtar
-libexec/amanda/selfcheck
-libexec/amanda/taper
-libexec/amanda/dumper
+libexec/amanda/chg-generic
libexec/amanda/driver
+libexec/amanda/dumper
+libexec/amanda/getconf
libexec/amanda/planner
libexec/amanda/reporter
-libexec/amanda/getconf
-libexec/amanda/chg-generic
-sbin/amrestore
+libexec/amanda/runtar
+libexec/amanda/selfcheck
+libexec/amanda/sendbackup-dump
+libexec/amanda/sendbackup-gnutar
+libexec/amanda/sendsize
+libexec/amanda/taper
sbin/amadmin
-sbin/amflush
-sbin/amlabel
sbin/amcheck
-sbin/amdump
sbin/amcleanup
+sbin/amdump
+sbin/amflush
+sbin/amlabel
+sbin/amrestore
sbin/amtape
share/examples/amanda/amanda.conf
share/examples/amanda/chg-generic.conf
share/examples/amanda/disklist
-@dirrm libexec/amanda
@dirrm share/examples/amanda
+@dirrm libexec/amanda
diff -urN /usr/ports/misc/amanda/scripts/configure misc/amanda/scripts/configure
--- /usr/ports/misc/amanda/scripts/configure Sat Mar 8 00:00:00 1997
+++ misc/amanda/scripts/configure Thu Jan 1 09:00:00 1970
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-CFLAGS=`cat /tmp/build-ports-misc-amanda-cflags`
-rm /tmp/build-ports-misc-amanda-cflags
-echo $CFLAGS
-
-mv $WRKSRC/config/config.h-freebsd2 $WRKSRC/config/config.h
-sed "s/#define MK_CCOPTS -g/#define MK_CCOPTS $CFLAGS/" < $WRKSRC/config/options.h-vanilla > $WRKSRC/config/options.h
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991202180547.019BD14D3B>