diff options
| author | skrll <skrll@pkgsrc.org> | 2000-09-15 15:59:33 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2000-09-15 15:59:33 +0000 |
| commit | 22e5d4a5aa9eaa79ee8fd2424aaf26f54be7bed7 (patch) | |
| tree | c9eb23f436aaa5a85d5add9a97dc981e3e852523 /sysutils/amanda-common | |
| parent | 7c19e7f7fe5eeccdb49dd759e3b648a912d36ac5 (diff) | |
| download | pkgsrc-22e5d4a5aa9eaa79ee8fd2424aaf26f54be7bed7.tar.gz | |
Use pkgsrc libtool not internal one.
Remove unnecessary versionsuffix dependency on libamclient.
Diffstat (limited to 'sysutils/amanda-common')
| -rw-r--r-- | sysutils/amanda-common/Makefile.common | 3 | ||||
| -rw-r--r-- | sysutils/amanda-common/files/patch-sum | 4 | ||||
| -rw-r--r-- | sysutils/amanda-common/patches/patch-aa | 32 |
3 files changed, 18 insertions, 21 deletions
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 8ebf1ecfee3..66850f5bd45 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2000/08/17 02:26:29 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2000/09/15 15:59:33 skrll Exp $ # # common make file fragment shared by all amanda-* pkgs. # @@ -13,6 +13,7 @@ AMANDA_USER?= backup AMANDA_VAR?= /var/amanda USE_LIBTOOL= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-user=${AMANDA_USER} \ --with-group=${AMANDA_GROUP} \ diff --git a/sysutils/amanda-common/files/patch-sum b/sysutils/amanda-common/files/patch-sum index e936594dc17..ebdeaf69271 100644 --- a/sysutils/amanda-common/files/patch-sum +++ b/sysutils/amanda-common/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.3 2000/03/06 21:14:50 groo Exp $ +$NetBSD: patch-sum,v 1.4 2000/09/15 15:59:34 skrll Exp $ -MD5 (patch-aa) = a5cf361996d2c2c815fb9c11079d775b +MD5 (patch-aa) = 62906fb534c538021b83b757b91534fd MD5 (patch-ab) = 2eaacdc2ccf0db3fe126cbc88eb36d26 MD5 (patch-ac) = 2dcc4ba64e249c61c0a303f10303683a MD5 (patch-ad) = 5d6a750fa5d7d1d26483b52790f82f0e diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa index b79dbe97f58..fd0802b6206 100644 --- a/sysutils/amanda-common/patches/patch-aa +++ b/sysutils/amanda-common/patches/patch-aa @@ -1,20 +1,16 @@ -$NetBSD: patch-aa,v 1.3 1999/11/12 16:07:32 rh Exp $ +$NetBSD: patch-aa,v 1.4 2000/09/15 15:59:34 skrll Exp $ ---- configure.orig Sat Nov 21 18:12:59 1998 -+++ configure Fri Nov 12 17:04:12 1999 -@@ -4457,6 +4457,7 @@ - echo "$ac_t""no" 1>&6 - fi +--- client-src/Makefile.in.orig Sat Nov 21 17:33:45 1998 ++++ client-src/Makefile.in +@@ -285,9 +285,8 @@ + getfsent_LDFLAGS = + versionsuffix_SOURCES = versionsuffix.c + versionsuffix_OBJECTS = versionsuffix.o +-versionsuffix_LDADD = $(LDADD) +-versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \ +-../common-src/libamanda.$(LIB_EXTENSION) ++versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) ++versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) + versionsuffix_LDFLAGS = + SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS) -+if false; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -@@ -4502,6 +4503,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. |