Miscellaneous makefile clean up.

5 files changed, 18 insertions, 49 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index bf682a90613..54755757a86 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2012/07/30 06:57:21 sbd Exp $
+# $NetBSD: Makefile,v 1.52 2012/07/30 07:00:12 sbd Exp $
 #
 
 PKGNAME=		amanda-client-${AMANDA_VERSION}
@@ -9,14 +9,9 @@ COMMENT=		Client part of Amanda, a network backup system
 
 PKG_DESTDIR_SUPPORT=	destdir
 
-GNU_CONFIGURE=		yes
 USE_TOOLS+=		awk:run perl:run
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
-.include "../../sysutils/amanda-common/buildlink3.mk"
-#.include "../../devel/readline/buildlink3.mk"
-
 CONFIGURE_ARGS+=	--without-server
 
 .if !empty(PKG_OPTIONS:Mamanda-smb)
@@ -38,4 +33,5 @@ CONFIGURE_ENV+=		ac_cv_lib_curses_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_ncurses_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_readline_readline=no
 
+.include "../../sysutils/amanda-common/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 33a311eee0d..cd8e25b7f80 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2012/07/30 06:57:21 sbd Exp $
+# $NetBSD: Makefile,v 1.51 2012/07/30 07:00:12 sbd Exp $
 
 PKGNAME=		amanda-common-${AMANDA_VERSION}
 SVR4_PKGNAME=		amaco
@@ -8,12 +8,9 @@ COMMENT=		Common libraries and binaries for Amanda
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
 
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS=		# empty
-.elif ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS"
 CPPFLAGS+=		-D_LARGEFILE64_SOURCE
 .endif
 
@@ -35,7 +32,6 @@ PKG_SHELL.${AMANDA_USER}=	${SH}
 
 OWN_DIRS_PERMS=		${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
 OWN_DIRS_PERMS+=	${AMANDA_VAR}/gnutar-lists  ${AMANDA_USER} ${AMANDA_GROUP} 0700
-BUILD_DEFS+=		AMANDA_VAR
 
 INSTALL_MAKE_FLAGS+=	SETUID_GROUP=${ROOT_GROUP}
 
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index d31f37a0202..5c2b80e2066 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2012/07/30 06:57:21 sbd Exp $
+# $NetBSD: Makefile.common,v 1.33 2012/07/30 07:00:12 sbd Exp $
 
 # used by sysutils/amanda-common/Makefile
 # used by sysutils/amanda-client/Makefile
@@ -31,24 +31,23 @@ AMANDA_VAR?=		${VARBASE}/amanda
 
 PKG_GROUPS_VARS+=	AMANDA_GROUP
 PKG_USERS_VARS+=	AMANDA_USER
-BUILD_DEFS+=		AMANDA_TMP AMANDA_VAR VARBASE
+BUILD_DEFS+=		AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE
 
 USE_LIBTOOL=		yes
-
 USE_TOOLS+=		gzip:run gtar:run
-CONFIGURE_ENV+=		ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
-CONFIGURE_ENV+=		GNUTAR=${TOOLS_GTAR:Q}
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
+CONFIGURE_ENV+=		GNUTAR=${TOOLS_GTAR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${AMANDA_VAR:Q}
+CONFIGURE_ARGS+=	--with-tmpdir=${AMANDA_TMP:Q}
+CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists
 CONFIGURE_ARGS+=	--with-user=${AMANDA_USER:Q}
 CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP:Q}
 CONFIGURE_ARGS+=	--with-owner=${REAL_ROOT_USER:Q}
 CONFIGURE_ARGS+=	--with-mmap
 CONFIGURE_ARGS+=	--with-amandahosts
-CONFIGURE_ARGS+=	--with-tmpdir=${AMANDA_TMP:Q}
-CONFIGURE_ARGS+=	--localstatedir=${AMANDA_VAR:Q}
-CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists
 CONFIGURE_ARGS+=	--with-dump-honor-nodump
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 .include "../../sysutils/amanda-common/options.mk"
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 22b666d004d..68bcc660d81 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/07/30 06:57:22 sbd Exp $
+# $NetBSD: Makefile,v 1.28 2012/07/30 07:00:12 sbd Exp $
 #
 
 PKGNAME=		amanda-plot-${AMANDA_VERSION}
@@ -12,8 +12,6 @@ PKG_DESTDIR_SUPPORT=	destdir
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
 DEPENDS+=		amanda-server-${AMANDA_VERSION}{,nb[0-9]*}:../../sysutils/amanda-server
 
-
-.include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
 
 CONFIGURE_ARGS+=	--without-client
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 3f6d0400d04..0bd294a11db 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/07/30 06:57:22 sbd Exp $
+# $NetBSD: Makefile,v 1.50 2012/07/30 07:00:13 sbd Exp $
 
 PKGNAME=		amanda-server-${AMANDA_VERSION}
 PKGREVISION=		2
@@ -8,15 +8,12 @@ COMMENT=		Server part of Amanda, a network backup system
 
 PKG_DESTDIR_SUPPORT=	destdir
 
+.include "../../sysutils/amanda-common/Makefile.common"
+
 USE_TOOLS+=		awk:run perl:run mail:run
 
 DEPENDS+=               p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs
 
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-common/Makefile.common"
-
-CONFIGURE_ARGS+=	--without-client
-
 # Prevent configure script from finding unnecessary libraries.
 #
 CONFIGURE_ENV+=		ac_cv_lib_intl_main=no
@@ -24,26 +21,9 @@ CONFIGURE_ENV+=		ac_cv_lib_termcap_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_curses_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_ncurses_tgetent=no
 CONFIGURE_ENV+=		ac_cv_lib_readline_readline=no
-CONFIGURE_ENV+=		MAILER=${TOOLS_PATH.mail}
 
-# post-install:
-# 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amanda
-# 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amanda
-# 	for i in ${WRKDIR}/${DISTNAME}/docs/* ; do \
-# 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/amanda; \
-# 	done
-# 	for i in ${WRKDIR}/${DISTNAME}/example/8.5x11.ps \
-# 	    ${WRKDIR}/${DISTNAME}/example/DIN-A4.ps \
-# 	    ${WRKDIR}/${DISTNAME}/example/DLT.ps \
-# 	    ${WRKDIR}/${DISTNAME}/example/EXB-8500.ps \
-# 	    ${WRKDIR}/${DISTNAME}/example/HP-DAT.ps \
-# 	    ${WRKDIR}/${DISTNAME}/example/amanda.conf \
-# 	    ${WRKDIR}/${DISTNAME}/example/chg-multi.conf \
-# 	    ${WRKDIR}/${DISTNAME}/example/chg-scsi.conf \
-# 	    ${WRKDIR}/${DISTNAME}/example/config.site \
-# 	    ${WRKDIR}/${DISTNAME}/example/disklist; do \
-# 		${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \
-# 	done
+CONFIGURE_ENV+=		MAILER=${TOOLS_PATH.mail}
+CONFIGURE_ARGS+=	--without-client
 
 PLIST_VARS+=	scsi
 .if ${OPSYS} != "SunOS"