Add more options, some based upon PR 19333

PR:		19333
Submitted by:	Stefan Moeding <s.moeding@ndh.net>

5 files changed, 210 insertions, 30 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index def22efe5619..7165eadc9c95 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -35,12 +35,16 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
+	@${ECHO} "        The default is /dev/nrsa0"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
 	@${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
+RUN_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
@@ -62,14 +66,37 @@ PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SMBCLIENT)
-BUILD_DEPEND+=	smbclient:${PORTSDIR}/net/samba
-RUN_DEPEND+=	smbclient:${PORTSDIR}/net/samba
+BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_TAPE)
+CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 # amanda24-client part
 .else
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
+	@${ECHO} ""
+
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
@@ -86,6 +113,15 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index def22efe5619..7165eadc9c95 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -35,12 +35,16 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
+	@${ECHO} "        The default is /dev/nrsa0"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
 	@${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
+RUN_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
@@ -62,14 +66,37 @@ PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SMBCLIENT)
-BUILD_DEPEND+=	smbclient:${PORTSDIR}/net/samba
-RUN_DEPEND+=	smbclient:${PORTSDIR}/net/samba
+BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_TAPE)
+CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 # amanda24-client part
 .else
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
+	@${ECHO} ""
+
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
@@ -86,6 +113,15 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index def22efe5619..7165eadc9c95 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -35,12 +35,16 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
+	@${ECHO} "        The default is /dev/nrsa0"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
 	@${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
+RUN_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
@@ -62,14 +66,37 @@ PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SMBCLIENT)
-BUILD_DEPEND+=	smbclient:${PORTSDIR}/net/samba
-RUN_DEPEND+=	smbclient:${PORTSDIR}/net/samba
+BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_TAPE)
+CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 # amanda24-client part
 .else
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
+	@${ECHO} ""
+
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
@@ -86,6 +113,15 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index def22efe5619..7165eadc9c95 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -35,12 +35,16 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
+	@${ECHO} "        The default is /dev/nrsa0"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
 	@${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
+RUN_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
@@ -62,14 +66,37 @@ PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SMBCLIENT)
-BUILD_DEPEND+=	smbclient:${PORTSDIR}/net/samba
-RUN_DEPEND+=	smbclient:${PORTSDIR}/net/samba
+BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_TAPE)
+CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 # amanda24-client part
 .else
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
+	@${ECHO} ""
+
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
@@ -86,6 +113,15 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index def22efe5619..7165eadc9c95 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -35,12 +35,16 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
+	@${ECHO} "        The default is /dev/nrsa0"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
 	@${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
+RUN_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
@@ -62,14 +66,37 @@ PLIST_SUB+=	PLOT='@comment '
 .endif
 
 .if defined (WITH_SMBCLIENT)
-BUILD_DEPEND+=	smbclient:${PORTSDIR}/net/samba
-RUN_DEPEND+=	smbclient:${PORTSDIR}/net/samba
+BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_TAPE)
+CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 # amanda24-client part
 .else
 
+pre-fetch:
+	@${ECHO} ""
+	@${ECHO} "You may use the following build options:"
+	@${ECHO} ""
+	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
+	@${ECHO} "        The default is `uname -n`"
+	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
+	@${ECHO} "        The default is user"
+	@${ECHO} ""
+
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
@@ -86,6 +113,15 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if defined (AMANDA_SERVER)
+CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
+CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
+.endif
+
+.if defined (AMANDA_CONFIG)
+CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
+.endif
+
 .endif
 
 .include <bsd.port.post.mk>