pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/dact Don't do the Makefile.dep dance; that's...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c3d2a928e58c
branches:  trunk
changeset: 487852:c3d2a928e58c
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Jan 21 02:48:21 2005 +0000

description:
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.

diffstat:

 archivers/dact/distinfo         |   4 ++--
 archivers/dact/patches/patch-aa |  31 ++++++++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r efdb31da8534 -r c3d2a928e58c archivers/dact/distinfo
--- a/archivers/dact/distinfo   Fri Jan 21 02:40:41 2005 +0000
+++ b/archivers/dact/distinfo   Fri Jan 21 02:48:21 2005 +0000
@@ -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 -r efdb31da8534 -r c3d2a928e58c archivers/dact/patches/patch-aa
--- a/archivers/dact/patches/patch-aa   Fri Jan 21 02:40:41 2005 +0000
+++ b/archivers/dact/patches/patch-aa   Fri Jan 21 02:48:21 2005 +0000
@@ -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 @@
  
  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:



Home | Main Index | Thread Index | Old Index