Wed Jan 23 17:58:19 2013 UTC ()
Fix build with automake-1.13.


(wiz)
diff -r1.37 -r1.38 pkgsrc/sysutils/amanda-common/Makefile.common
cvs diff -r1.37 -r1.38 pkgsrc/sysutils/amanda-common/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/Makefile.common 2012/07/30 07:21:11 1.37
+++ pkgsrc/sysutils/amanda-common/Makefile.common 2013/01/23 17:58:19 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.37 2012/07/30 07:21:11 sbd Exp $ 1# $NetBSD: Makefile.common,v 1.38 2013/01/23 17:58:19 wiz Exp $
2 2
3# used by sysutils/amanda-common/Makefile 3# used by sysutils/amanda-common/Makefile
4# used by sysutils/amanda-client/Makefile 4# used by sysutils/amanda-client/Makefile
5# used by sysutils/amanda-server/Makefile 5# used by sysutils/amanda-server/Makefile
6# used by sysutils/amanda-plot/Makefile 6# used by sysutils/amanda-plot/Makefile
7 7
8COMMONDIR= ../../sysutils/amanda-common 8COMMONDIR= ../../sysutils/amanda-common
9.include "${COMMONDIR}/version.mk" 9.include "${COMMONDIR}/version.mk"
10 10
11DISTNAME= amanda-${AMANDA_VERSION} 11DISTNAME= amanda-${AMANDA_VERSION}
12CATEGORIES= sysutils 12CATEGORIES= sysutils
13MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/} 13MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/}
14 14
@@ -37,26 +37,28 @@ AMANDA_USER?= amandabackup @@ -37,26 +37,28 @@ AMANDA_USER?= amandabackup
37AMANDA_TMP?= /tmp/amanda 37AMANDA_TMP?= /tmp/amanda
38AMANDA_VAR?= ${VARBASE}/amanda 38AMANDA_VAR?= ${VARBASE}/amanda
39 39
40PKG_GROUPS_VARS+= AMANDA_GROUP 40PKG_GROUPS_VARS+= AMANDA_GROUP
41PKG_USERS_VARS+= AMANDA_USER 41PKG_USERS_VARS+= AMANDA_USER
42BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE 42BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE
43FILES_SUBST+= AMANDA_VAR=${AMANDA_VAR:Q} 43FILES_SUBST+= AMANDA_VAR=${AMANDA_VAR:Q}
44 44
45AM_PROG_PERMS= ${REAL_ROOT_USER} ${AMANDA_GROUP} 4510 45AM_PROG_PERMS= ${REAL_ROOT_USER} ${AMANDA_GROUP} 4510
46 46
47USE_LIBTOOL= yes 47USE_LIBTOOL= yes
48USE_TOOLS+= gzip:run gtar:run perl:run 48USE_TOOLS+= gzip:run gtar:run perl:run
49USE_TOOLS+= gmake pkg-config autoconf automake 49USE_TOOLS+= gmake pkg-config autoconf automake
 50# for autopoint
 51BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
50PERL5_CONFIGURE= no 52PERL5_CONFIGURE= no
51AUTO_MKDIRS= yes 53AUTO_MKDIRS= yes
52 54
53GNU_CONFIGURE= yes 55GNU_CONFIGURE= yes
54CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q} 56CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
55CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q} 57CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q}
56CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 58CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
57CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q} 59CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q}
58CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q} 60CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q}
59CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists 61CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists
60CONFIGURE_ARGS+= --with-amperldir=${AMPERLDIR:Q} 62CONFIGURE_ARGS+= --with-amperldir=${AMPERLDIR:Q}
61CONFIGURE_ARGS+= --with-debugging=${VARBASE:Q}/log/amanda 63CONFIGURE_ARGS+= --with-debugging=${VARBASE:Q}/log/amanda
62CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q} 64CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q}
@@ -73,27 +75,27 @@ CONFIGURE_ARGS+= --with-dump-honor-nodum @@ -73,27 +75,27 @@ CONFIGURE_ARGS+= --with-dump-honor-nodum
73CONFIGURE_ARGS+= --disable-installperms 75CONFIGURE_ARGS+= --disable-installperms
74 76
75INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP} 77INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP}
76 78
77AMPERLDIR= ${PERLDIR:Q}/${PERL5_SUB_INSTALLVENDORLIB} 79AMPERLDIR= ${PERLDIR:Q}/${PERL5_SUB_INSTALLVENDORLIB}
78 80
79.include "../../sysutils/amanda-common/options.mk" 81.include "../../sysutils/amanda-common/options.mk"
80 82
81.PHONY: autogen 83.PHONY: autogen
82pre-configure: autogen 84pre-configure: autogen
83autogen: 85autogen:
84 ${RUN}${_ULIMIT_CMD} cd ${WRKSRC} && \ 86 ${RUN}${_ULIMIT_CMD} cd ${WRKSRC} && \
85 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ 87 ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \
86 ${CONFIG_SHELL} ./autogen 88 autoreconf -fi
87 89
88.PHONY: build-perl 90.PHONY: build-perl
89post-build: build-perl 91post-build: build-perl
90build-perl: 92build-perl:
91.if defined(PERL5_LIBS) && !empty(PERL5_LIBS) 93.if defined(PERL5_LIBS) && !empty(PERL5_LIBS)
92 ${RUN}${_ULIMIT_CMD} cd ${WRKSRC}/perl && \ 94 ${RUN}${_ULIMIT_CMD} cd ${WRKSRC}/perl && \
93 ${BUILD_MAKE_CMD} ${PERL5_LIBS:@lib@lib${lib}.la@} 95 ${BUILD_MAKE_CMD} ${PERL5_LIBS:@lib@lib${lib}.la@}
94.endif 96.endif
95 97
96.if defined(PERL5_MODS) && !empty(PERL5_MODS) 98.if defined(PERL5_MODS) && !empty(PERL5_MODS)
97INSTALLATION_DIRS+= ${PERL5_MODS:H:@_t_@${PERL5_SUB_INSTALLVENDORLIB}/${_t_}@} 99INSTALLATION_DIRS+= ${PERL5_MODS:H:@_t_@${PERL5_SUB_INSTALLVENDORLIB}/${_t_}@}
98.endif 100.endif
99.if defined(PERL5_LIBS) && !empty(PERL5_LIBS) 101.if defined(PERL5_LIBS) && !empty(PERL5_LIBS)