* Modified patches to support CC/INSTALL/PREFIX properly

* Stripped binaries
* Sorted pkg/PLIST

PR:		15226
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

8 files changed, 171 insertions, 32 deletions

diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 8595ff69645d..df0471af745d 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -12,15 +12,38 @@ MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/old-versions/
 
 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 --git a/misc/amanda/files/patch-ac b/misc/amanda/files/patch-ac
index 09b7a827efaf..8da6374c4de1 100644
--- a/misc/amanda/files/patch-ac
+++ b/misc/amanda/files/patch-ac
@@ -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 --git a/misc/amanda/files/patch-ad b/misc/amanda/files/patch-ad
new file mode 100644
index 000000000000..cb9fc29789c9
--- /dev/null
+++ b/misc/amanda/files/patch-ad
@@ -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 --git a/misc/amanda/files/patch-ae b/misc/amanda/files/patch-ae
new file mode 100644
index 000000000000..dbe730b1baeb
--- /dev/null
+++ b/misc/amanda/files/patch-ae
@@ -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 --git a/misc/amanda/files/patch-af b/misc/amanda/files/patch-af
new file mode 100644
index 000000000000..83e97aefdec8
--- /dev/null
+++ b/misc/amanda/files/patch-af
@@ -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 --git a/misc/amanda/files/patch-ag b/misc/amanda/files/patch-ag
new file mode 100644
index 000000000000..7ab785088492
--- /dev/null
+++ b/misc/amanda/files/patch-ag
@@ -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 --git a/misc/amanda/pkg-descr b/misc/amanda/pkg-descr
index 0f6de7025679..a4e85566669a 100644
--- a/misc/amanda/pkg-descr
+++ b/misc/amanda/pkg-descr
@@ -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 --git a/misc/amanda/pkg-plist b/misc/amanda/pkg-plist
index 1fb87daa442e..c100ef0b1fc3 100644
--- a/misc/amanda/pkg-plist
+++ b/misc/amanda/pkg-plist
@@ -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