Mon Jul 30 07:00:50 2012 UTC ()
Add --without-gnuplot to CONFIGURE_ARGS for amanda-{common,client,server}.


(sbd)
diff -r1.52 -r1.53 pkgsrc/sysutils/amanda-client/Makefile
diff -r1.51 -r1.52 pkgsrc/sysutils/amanda-common/Makefile
diff -r1.50 -r1.51 pkgsrc/sysutils/amanda-server/Makefile
cvs diff -r1.52 -r1.53 pkgsrc/sysutils/amanda-client/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-client/Makefile 2012/07/30 07:00:12 1.52
+++ pkgsrc/sysutils/amanda-client/Makefile 2012/07/30 07:00:50 1.53
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.52 2012/07/30 07:00:12 sbd Exp $ 1# $NetBSD: Makefile,v 1.53 2012/07/30 07:00:50 sbd Exp $
2# 2#
3 3
4PKGNAME= amanda-client-${AMANDA_VERSION} 4PKGNAME= amanda-client-${AMANDA_VERSION}
5PKGREVISION= 2 5PKGREVISION= 2
6SVR4_PKGNAME= amacl 6SVR4_PKGNAME= amacl
7 7
8COMMENT= Client part of Amanda, a network backup system 8COMMENT= Client part of Amanda, a network backup system
9 9
10PKG_DESTDIR_SUPPORT= destdir 10PKG_DESTDIR_SUPPORT= destdir
11 11
12USE_TOOLS+= awk:run perl:run 12USE_TOOLS+= awk:run perl:run
13 13
14.include "../../sysutils/amanda-common/Makefile.common" 14.include "../../sysutils/amanda-common/Makefile.common"
15CONFIGURE_ARGS+= --without-server 15CONFIGURE_ARGS+= --without-server --without-gnuplot
16 16
17.if !empty(PKG_OPTIONS:Mamanda-smb) 17.if !empty(PKG_OPTIONS:Mamanda-smb)
18CONFIGURE_ARGS+= --with-smbclient 18CONFIGURE_ARGS+= --with-smbclient
19DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba 19DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba
20.endif 20.endif
21 21
22.if !empty(PKG_OPTIONS:Mamanda-dump-snap) 22.if !empty(PKG_OPTIONS:Mamanda-dump-snap)
23CONFIGURE_ARGS+= --with-dump-use-snapshot --with-rundump 23CONFIGURE_ARGS+= --with-dump-use-snapshot --with-rundump
24.endif 24.endif
25 25
26# Prevent configure script from finding unnecessary libraries. We'll patch 26# Prevent configure script from finding unnecessary libraries. We'll patch
27# the amrecover Makefile to add the readline libraries as it's the only 27# the amrecover Makefile to add the readline libraries as it's the only
28# program that uses readline. (XXX: incorrect, does not happen) 28# program that uses readline. (XXX: incorrect, does not happen)
cvs diff -r1.51 -r1.52 pkgsrc/sysutils/amanda-common/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/Makefile 2012/07/30 07:00:12 1.51
+++ pkgsrc/sysutils/amanda-common/Makefile 2012/07/30 07:00:50 1.52
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.51 2012/07/30 07:00:12 sbd Exp $ 1# $NetBSD: Makefile,v 1.52 2012/07/30 07:00:50 sbd Exp $
2 2
3PKGNAME= amanda-common-${AMANDA_VERSION} 3PKGNAME= amanda-common-${AMANDA_VERSION}
4SVR4_PKGNAME= amaco 4SVR4_PKGNAME= amaco
5PKGREVISION= 2 5PKGREVISION= 2
6 6
7COMMENT= Common libraries and binaries for Amanda 7COMMENT= Common libraries and binaries for Amanda
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11.include "../../sysutils/amanda-common/Makefile.common" 11.include "../../sysutils/amanda-common/Makefile.common"
12 12
13.if ${OPSYS} == "SunOS" 13.if ${OPSYS} == "SunOS"
14CPPFLAGS+= -D_LARGEFILE64_SOURCE 14CPPFLAGS+= -D_LARGEFILE64_SOURCE
15.endif 15.endif
16 16
17CONFIGURE_ARGS+= --without-server --without-client 17CONFIGURE_ARGS+= --without-server --without-client --without-gnuplot
18 18
19# Prevent configure script from finding unnecessary libraries. 19# Prevent configure script from finding unnecessary libraries.
20# 20#
21CONFIGURE_ENV+= ac_cv_lib_intl_main=no 21CONFIGURE_ENV+= ac_cv_lib_intl_main=no
22CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no 22CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
23CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no 23CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
24CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no 24CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
25CONFIGURE_ENV+= ac_cv_lib_readline_readline=no 25CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
26 26
27PKG_GROUPS= ${AMANDA_GROUP} 27PKG_GROUPS= ${AMANDA_GROUP}
28PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP} 28PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}
29 29
30PKG_GECOS.${AMANDA_USER}= Amanda pseudo-user 30PKG_GECOS.${AMANDA_USER}= Amanda pseudo-user
cvs diff -r1.50 -r1.51 pkgsrc/sysutils/amanda-server/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-server/Makefile 2012/07/30 07:00:13 1.50
+++ pkgsrc/sysutils/amanda-server/Makefile 2012/07/30 07:00:50 1.51
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.50 2012/07/30 07:00:13 sbd Exp $ 1# $NetBSD: Makefile,v 1.51 2012/07/30 07:00:50 sbd Exp $
2 2
3PKGNAME= amanda-server-${AMANDA_VERSION} 3PKGNAME= amanda-server-${AMANDA_VERSION}
4PKGREVISION= 2 4PKGREVISION= 2
5SVR4_PKGNAME= amase 5SVR4_PKGNAME= amase
6 6
7COMMENT= Server part of Amanda, a network backup system 7COMMENT= Server part of Amanda, a network backup system
8 8
9PKG_DESTDIR_SUPPORT= destdir 9PKG_DESTDIR_SUPPORT= destdir
10 10
11.include "../../sysutils/amanda-common/Makefile.common" 11.include "../../sysutils/amanda-common/Makefile.common"
12 12
13USE_TOOLS+= awk:run perl:run mail:run 13USE_TOOLS+= awk:run perl:run mail:run
14 14
15DEPENDS+= p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs 15DEPENDS+= p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs
16 16
17# Prevent configure script from finding unnecessary libraries. 17# Prevent configure script from finding unnecessary libraries.
18# 18#
19CONFIGURE_ENV+= ac_cv_lib_intl_main=no 19CONFIGURE_ENV+= ac_cv_lib_intl_main=no
20CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no 20CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
21CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no 21CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
22CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no 22CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
23CONFIGURE_ENV+= ac_cv_lib_readline_readline=no 23CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
24 24
25CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail} 25CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail}
26CONFIGURE_ARGS+= --without-client 26CONFIGURE_ARGS+= --without-client --without-gnuplot
27 27
28PLIST_VARS+= scsi 28PLIST_VARS+= scsi
29.if ${OPSYS} != "SunOS" 29.if ${OPSYS} != "SunOS"
30PLIST.scsi= yes 30PLIST.scsi= yes
31.endif 31.endif
32 32
33.include "../../sysutils/amanda-common/buildlink3.mk" 33.include "../../sysutils/amanda-common/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"