Tue Feb 10 00:25:54 2009 UTC ()
DESTDIR support.


(joerg)
diff -r1.19 -r1.20 pkgsrc/archivers/dact/Makefile
diff -r1.10 -r1.11 pkgsrc/archivers/dact/distinfo
diff -r1.6 -r1.7 pkgsrc/archivers/dact/patches/patch-aa
cvs diff -r1.19 -r1.20 pkgsrc/archivers/dact/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/dact/Makefile 2006/08/31 06:39:11 1.19
+++ pkgsrc/archivers/dact/Makefile 2009/02/10 00:25:54 1.20
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1# $NetBSD: Makefile,v 1.19 2006/08/31 06:39:11 rillig Exp $ 1# $NetBSD: Makefile,v 1.20 2009/02/10 00:25:54 joerg Exp $
2 2
3DISTNAME= dact-0.8.41 3DISTNAME= dact-0.8.41
4CATEGORIES= archivers 4CATEGORIES= archivers
5MASTER_SITES= http://www.rkeene.org/devel/ 5MASTER_SITES= http://www.rkeene.org/devel/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.rkeene.org/devel/dact/ 8HOMEPAGE= http://www.rkeene.org/devel/dact/
9COMMENT= Dynamic adaptive compression tool 9COMMENT= Dynamic adaptive compression tool
10 10
11PKG_INSTALLATION_TYPES= overwrite pkgviews 11PKG_INSTALLATION_TYPES= overwrite pkgviews
 12PKG_DESTDIR_SUPPORT= user-destdir
12 13
13USE_TOOLS+= gmake 14USE_TOOLS+= gmake
14GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
16 17
17INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/dact 18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/dact
18 19
19.include "../../archivers/bzip2/buildlink3.mk" 20.include "../../archivers/bzip2/buildlink3.mk"
20.include "../../devel/zlib/buildlink3.mk" 21.include "../../devel/zlib/buildlink3.mk"
21.include "../../security/libmcrypt/buildlink3.mk" 22.include "../../security/libmcrypt/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/archivers/dact/distinfo (expand / switch to unified diff)

--- pkgsrc/archivers/dact/distinfo 2006/08/30 15:34:34 1.10
+++ pkgsrc/archivers/dact/distinfo 2009/02/10 00:25:54 1.11
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.10 2006/08/30 15:34:34 rillig Exp $ 1$NetBSD: distinfo,v 1.11 2009/02/10 00:25:54 joerg Exp $
2 2
3SHA1 (dact-0.8.41.tar.gz) = a87db20ae7bf4ffd1b5d37c7e3be70c84661e379 3SHA1 (dact-0.8.41.tar.gz) = a87db20ae7bf4ffd1b5d37c7e3be70c84661e379
4RMD160 (dact-0.8.41.tar.gz) = 015544501df128da869f837b64579de53028a163 4RMD160 (dact-0.8.41.tar.gz) = 015544501df128da869f837b64579de53028a163
5Size (dact-0.8.41.tar.gz) = 151032 bytes 5Size (dact-0.8.41.tar.gz) = 151032 bytes
6SHA1 (patch-aa) = b1e4dbac8271ceaff320720923d0667907503588 6SHA1 (patch-aa) = 087545641533933b85446341161d4df41d05ab65
7SHA1 (patch-ab) = 4bb63e9e9ae2cf1a4faf06bfad20c0f47a4c46a2 7SHA1 (patch-ab) = 4bb63e9e9ae2cf1a4faf06bfad20c0f47a4c46a2
cvs diff -r1.6 -r1.7 pkgsrc/archivers/dact/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/archivers/dact/patches/patch-aa 2006/08/30 15:34:34 1.6
+++ pkgsrc/archivers/dact/patches/patch-aa 2009/02/10 00:25:54 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.6 2006/08/30 15:34:34 rillig Exp $ 1$NetBSD: patch-aa,v 1.7 2009/02/10 00:25:54 joerg Exp $
2 2
3--- Makefile.in.orig 2006-03-25 14:15:04.000000000 +0100 3--- Makefile.in.orig 2006-03-25 14:15:04.000000000 +0100
4+++ Makefile.in 2006-08-30 17:31:54.649362344 +0200 4+++ Makefile.in
5@@ -42,15 +42,15 @@ OBJS += dact_common.o comp_fail.o comp_p 5@@ -42,15 +42,15 @@ OBJS += dact_common.o comp_fail.o comp_p
6 SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@ 6 SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@
7 ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@ 7 ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@
8  8
9-TOBUILD = dact$(EXEEXT) libdact.$(SHOBJEXT) libdact.a dact.conf 9-TOBUILD = dact$(EXEEXT) libdact.$(SHOBJEXT) libdact.a dact.conf
10+TOBUILD = dact$(EXEEXT) dact.conf 10+TOBUILD = dact$(EXEEXT) dact.conf
11  11
12 all: @DEFAULT@ 12 all: @DEFAULT@
13  13
14-module: @DEPEND@ 14-module: @DEPEND@
15+module: 15+module:
16 @MODS="$(ALGO:.c=.so)" LDLIBS="@ALLMODLIBS@" \ 16 @MODS="$(ALGO:.c=.so)" LDLIBS="@ALLMODLIBS@" \
17 $(MAKE) $(TOBUILD) 17 $(MAKE) $(TOBUILD)
@@ -20,40 +20,55 @@ $NetBSD: patch-aa,v 1.6 2006/08/30 15:34 @@ -20,40 +20,55 @@ $NetBSD: patch-aa,v 1.6 2006/08/30 15:34
20+static: 20+static:
21 @OBJS="$(ALGO:.c=.o) $(CR_OBJ)" SHLIBOBJS="$(ALGO:.c=_shr.o)" LDLIBS="$(MODLIBS)" $(MAKE) $(TOBUILD) 21 @OBJS="$(ALGO:.c=.o) $(CR_OBJ)" SHLIBOBJS="$(ALGO:.c=_shr.o)" LDLIBS="$(MODLIBS)" $(MAKE) $(TOBUILD)
22  22
23 dact.conf: Makefile 23 dact.conf: Makefile
24@@ -63,7 +63,7 @@ dact.conf: Makefile 24@@ -63,7 +63,7 @@ dact.conf: Makefile
25 @echo "binary_check off" >> dact.conf 25 @echo "binary_check off" >> dact.conf
26 @echo "module_dir $(datadir)/dact" >> dact.conf 26 @echo "module_dir $(datadir)/dact" >> dact.conf
27 @echo "module_load_all off" >> dact.conf 27 @echo "module_load_all off" >> dact.conf
28-@MODS@ @for so in $(MODS:.so=); do echo "load_module $$so" >> dact.conf; done 28-@MODS@ @for so in $(MODS:.so=); do echo "load_module $$so" >> dact.conf; done
29+@MODS@ @for so in :dummy: $(MODS:.so=); do case $$so in :dummy:) continue;; esac; echo "load_module $$so" >> dact.conf; done 29+@MODS@ @for so in :dummy: $(MODS:.so=); do case $$so in :dummy:) continue;; esac; echo "load_module $$so" >> dact.conf; done
30  30
31 dact$(EXEEXT): $(OBJS) $(MODS) 31 dact$(EXEEXT): $(OBJS) $(MODS)
32 $(CC) $(OBJS) $(LIBS) -o dact$(EXEEXT) $(LDLIBS) $(LDFLAGS) 32 $(CC) $(OBJS) $(LIBS) -o dact$(EXEEXT) $(LDLIBS) $(LDFLAGS)
33@@ -101,14 +101,9 @@ install: all install-bin 33@@ -93,22 +93,17 @@ mrproper: distclean
34 -$(INSTALL) -d $(libdir) 34 rm -rf Makefile.dep configure autom4te.cache/ config.h.in
35 -$(INSTALL) -d $(datadir)/dact 35
36 -$(INSTALL) -d $(sysconfdir) 36 install-bin: dact$(EXEEXT)
 37- -$(INSTALL) -d $(bindir)
 38- $(INSTALL) -m 755 dact$(EXEEXT) $(bindir)/dact$(EXEEXT)
 39+ -$(INSTALL) -d ${DESTDIR}$(bindir)
 40+ $(INSTALL) -m 755 dact$(EXEEXT) ${DESTDIR}$(bindir)/dact$(EXEEXT)
 41
 42 install: all install-bin
 43- -$(INSTALL) -d $(mandir)/man1
 44- -$(INSTALL) -d $(libdir)
 45- -$(INSTALL) -d $(datadir)/dact
 46- -$(INSTALL) -d $(sysconfdir)
37- $(INSTALL) -m 644 dact.conf $(CONF) 47- $(INSTALL) -m 644 dact.conf $(CONF)
38+ $(INSTALL) -m 644 dact.conf $(datadir)/examples/dact 48- $(INSTALL) -m 644 Docs/dact.1 $(mandir)/man1/dact.1
39 $(INSTALL) -m 644 Docs/dact.1 $(mandir)/man1/dact.1 
40- -$(INSTALL) -m 755 libdact.$(SHOBJEXT) $(libdir)/libdact.$(SHOBJEXT) 49- -$(INSTALL) -m 755 libdact.$(SHOBJEXT) $(libdir)/libdact.$(SHOBJEXT)
41- -$(INSTALL) -m 644 libdact.$(SHOBJEXT).def $(libdir)/libdact.$(SHOBJEXT).def 50- -$(INSTALL) -m 644 libdact.$(SHOBJEXT).def $(libdir)/libdact.$(SHOBJEXT).def
42- -$(INSTALL) -m 644 libdact.$(SHOBJEXT).a $(libdir)/libdact.$(SHOBJEXT).a 51- -$(INSTALL) -m 644 libdact.$(SHOBJEXT).a $(libdir)/libdact.$(SHOBJEXT).a
43- -$(INSTALL) -m 644 libdact.a $(libdir)/libdact.a 52- -$(INSTALL) -m 644 libdact.a $(libdir)/libdact.a
44-@MODS@ for so in $(MODS); do $(INSTALL) -m 755 $$so $(datadir)/dact/$$so; done 53-@MODS@ for so in $(MODS); do $(INSTALL) -m 755 $$so $(datadir)/dact/$$so; done
45- ./patch-magic-file $(datadir)/magic 54- ./patch-magic-file $(datadir)/magic
46+@MODS@ for so in :dummy: $(MODS); do case $$so in :dummy:) continue;; esac; $(INSTALL) -m 755 $$so $(datadir)/dact/$$so; done 55+ -$(INSTALL) -d ${DESTDIR}$(mandir)/man1
 56+ -$(INSTALL) -d ${DESTDIR}$(libdir)
 57+ -$(INSTALL) -d ${DESTDIR}$(datadir)/dact
 58+ -$(INSTALL) -d ${DESTDIR}$(sysconfdir)
 59+ $(INSTALL) -m 644 dact.conf ${DESTDIR}$(datadir)/examples/dact
 60+ $(INSTALL) -m 644 Docs/dact.1 ${DESTDIR}$(mandir)/man1/dact.1
 61+@MODS@ for so in :dummy: $(MODS); do case $$so in :dummy:) continue;; esac; $(INSTALL) -m 755 $$so ${DESTDIR}$(datadir)/dact/$$so; done
47  62
48 install-bin-local: dact$(EXEEXT) 63 install-bin-local: dact$(EXEEXT)
49 -$(INSTALL) -d $(HOME)/.dact/`uname -s | tr A-Z a-z`-`uname -m` 64 -$(INSTALL) -d $(HOME)/.dact/`uname -s | tr A-Z a-z`-`uname -m`
50@@ -127,11 +122,10 @@ uninstall: 65@@ -127,11 +122,10 @@ uninstall:
51 rm -f $(libdir)/libdact.a $(libdir)/libdact.$(SHOBJEXT) 66 rm -f $(libdir)/libdact.a $(libdir)/libdact.$(SHOBJEXT)
52 @MODS@ rm -rf $(datadir)/dact 67 @MODS@ rm -rf $(datadir)/dact
53  68
54-depend: Makefile.dep 69-depend: Makefile.dep
55+depend: 70+depend:
56  71
57 Makefile.dep: *.c *.h Makefile 72 Makefile.dep: *.c *.h Makefile
58 @echo "building Makefile.dep" 73 @echo "building Makefile.dep"
59 @$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(ALGO) $(OBJS:.o=.c) $(MODS:.so=.c) dact.c > Makefile.dep 74 @$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(ALGO) $(OBJS:.o=.c) $(MODS:.so=.c) dact.c > Makefile.dep