From 2103c3d3ec0b45a3b95f9ade3027b1769121720d Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 21 Jan 2005 02:48:21 +0000 Subject: Don't do the Makefile.dep dance; that's not needed in pkgsrc and breaks in some bizarre way on Interix. This also makes the build more friendly to non-gcc compilers. --- archivers/dact/distinfo | 4 ++-- archivers/dact/patches/patch-aa | 31 ++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) (limited to 'archivers') diff --git a/archivers/dact/distinfo b/archivers/dact/distinfo index 3724cd4b590..eebc3a8e77a 100644 --- a/archivers/dact/distinfo +++ b/archivers/dact/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2004/05/10 18:04:02 minskim Exp $ +$NetBSD: distinfo,v 1.4 2005/01/21 02:48:21 tv Exp $ SHA1 (dact-0.8.3.tar.gz) = 850aec889be4174e9f42a3314bf29b1fc5181090 Size (dact-0.8.3.tar.gz) = 84301 bytes -SHA1 (patch-aa) = 263234ba4fa0034ee19dc5449213705841b72e68 +SHA1 (patch-aa) = f0040ac3f13305a33943407759d52454dd6d7d37 diff --git a/archivers/dact/patches/patch-aa b/archivers/dact/patches/patch-aa index d33dab03adb..144b0d2f234 100644 --- a/archivers/dact/patches/patch-aa +++ b/archivers/dact/patches/patch-aa @@ -1,8 +1,22 @@ -$NetBSD: patch-aa,v 1.3 2004/05/10 18:04:02 minskim Exp $ +$NetBSD: patch-aa,v 1.4 2005/01/21 02:48:21 tv Exp $ ---- Makefile.in.orig 2001-09-07 15:29:02.000000000 -0500 +--- Makefile.in.orig 2001-09-07 16:29:02.000000000 -0400 +++ Makefile.in -@@ -69,11 +69,10 @@ distclean: clean +@@ -34,11 +34,11 @@ CR_OBJ = comp_range/qsmodel.o comp_range + comp_range.so: $(CR_OBJ) + CLR += $(CROBJ) + +-module: @DEPEND@ ++module: + @MODS="$(ALGO:.c=.so)" LDLIBS="-ldl" LDFLAGS="-rdynamic" \ + $(MAKE) dact dact.conf + +-static: @DEPEND@ ++static: + @OBJS="$(ALGO:.c=.o) $(CR_OBJ)" LDLIBS="$(MODLIBS)" $(MAKE) dact dact.conf + + dact.conf: Makefile +@@ -69,21 +69,14 @@ distclean: clean install: all $(INSTALL) -c -m 755 dact $(bindir)/dact @@ -15,3 +29,14 @@ $NetBSD: patch-aa,v 1.3 2004/05/10 18:04:02 minskim Exp $ uninstall: rm -f $(bindir)/dact $(bindir)/dact-upgrade.sh + rm -f $(mandir)/man1/dact.1 $(CONF) + @MODS@ rm -rf $(datadir)/dact + +-depend: Makefile.dep +- +-Makefile.dep: *.c *.h Makefile +- @echo "building Makefile.dep" +- @$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(ALGO) $(OBJS:.o=.c) $(MODS:.so=.c) dact.c | tee Makefile.dep | sed -e "s/^\([^ ]*\)\.o: /\1.so: /g" >> Makefile.dep +- +-include Makefile.dep ++depend: -- cgit v1.2.3