Changes 0.8.41:

* Added support for libmcrypt
* Bug fixes

7 files changed, 53 insertions, 132 deletions

diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 52c22f313f8..563d00313b5 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:28:52 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.18 2006/05/26 08:44:28 adam Exp $
 
-DISTNAME=	dact-0.8.3
-PKGREVISION=	4
+DISTNAME=	dact-0.8.41
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rkeene.org/devel/
 
@@ -12,11 +10,9 @@ COMMENT=	Dynamic adaptive compression tool
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
-
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ENV+=		ac_cv_lib_mcrypt_main=no
 
 INSTALLATION_DIRS=	bin man/man1
 
@@ -25,4 +21,5 @@ pre-install:
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/libmcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/dact/distinfo b/archivers/dact/distinfo
index b0faff85127..201646aef0d 100644
--- a/archivers/dact/distinfo
+++ b/archivers/dact/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/11/07 12:55:06 joerg Exp $
+$NetBSD: distinfo,v 1.9 2006/05/26 08:44:28 adam Exp $
 
-SHA1 (dact-0.8.3.tar.gz) = 850aec889be4174e9f42a3314bf29b1fc5181090
-RMD160 (dact-0.8.3.tar.gz) = 2778e64d3c456fc63b1739b31773f7ff2d84ee9c
-Size (dact-0.8.3.tar.gz) = 84301 bytes
-SHA1 (patch-aa) = f0040ac3f13305a33943407759d52454dd6d7d37
-SHA1 (patch-ab) = 75235c19ea8fbfac87eebcbe88dd9273136c08c5
-SHA1 (patch-ac) = 240ef0959be3fc0f3dbf2d9a67b31d7b03d5c642
-SHA1 (patch-ad) = b26314007903508ae6af6d283ad3eb2523869bf9
-SHA1 (patch-ae) = d297c3c616d34db8ff7e62db5462739cb3740b4d
+SHA1 (dact-0.8.41.tar.gz) = a87db20ae7bf4ffd1b5d37c7e3be70c84661e379
+RMD160 (dact-0.8.41.tar.gz) = 015544501df128da869f837b64579de53028a163
+Size (dact-0.8.41.tar.gz) = 151032 bytes
+SHA1 (patch-aa) = 64516b96418fc98e76da9d14e2286920406628d1
+SHA1 (patch-ab) = 4bb63e9e9ae2cf1a4faf06bfad20c0f47a4c46a2
diff --git a/archivers/dact/patches/patch-aa b/archivers/dact/patches/patch-aa
index 144b0d2f234..9c8d30565fd 100644
--- a/archivers/dact/patches/patch-aa
+++ b/archivers/dact/patches/patch-aa
@@ -1,42 +1,52 @@
-$NetBSD: patch-aa,v 1.4 2005/01/21 02:48:21 tv Exp $
+$NetBSD: patch-aa,v 1.5 2006/05/26 08:44:28 adam Exp $
 
---- Makefile.in.orig	2001-09-07 16:29:02.000000000 -0400
+--- Makefile.in.orig	2006-03-25 14:15:04.000000000 +0100
 +++ Makefile.in
-@@ -34,11 +34,11 @@ CR_OBJ = comp_range/qsmodel.o comp_range
- comp_range.so: $(CR_OBJ)
- CLR += $(CROBJ)
+@@ -42,15 +42,15 @@ OBJS += dact_common.o comp_fail.o comp_p
+ 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@
+ ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@
+ 
+-TOBUILD = dact$(EXEEXT) libdact.$(SHOBJEXT) libdact.a dact.conf
++TOBUILD = dact$(EXEEXT) dact.conf
+ 
+ all: @DEFAULT@
  
 -module: @DEPEND@
 +module:
- 	@MODS="$(ALGO:.c=.so)" LDLIBS="-ldl" LDFLAGS="-rdynamic" \
- 	  $(MAKE) dact dact.conf
+ 	@MODS="$(ALGO:.c=.so)" LDLIBS="@ALLMODLIBS@" \
+ 	  $(MAKE) $(TOBUILD)
  
 -static: @DEPEND@
 +static:
- 	@OBJS="$(ALGO:.c=.o) $(CR_OBJ)" LDLIBS="$(MODLIBS)" $(MAKE) dact dact.conf
+ 	@OBJS="$(ALGO:.c=.o) $(CR_OBJ)" SHLIBOBJS="$(ALGO:.c=_shr.o)" LDLIBS="$(MODLIBS)" $(MAKE) $(TOBUILD)
  
  dact.conf: Makefile
-@@ -69,21 +69,14 @@ distclean: clean
- 
- install: all
- 	$(INSTALL) -c -m 755 dact $(bindir)/dact
--	$(INSTALL) -c -m 644 dact.conf $(CONF)
-+	$(INSTALL) -c -m 644 dact.conf $(datadir)/examples/dact
- 	$(INSTALL) -c -m 644 Docs/dact.1 $(mandir)/man1/dact.1
- @MODS@	mkdir -p -m 755 $(datadir)/dact
- @MODS@	for so in *.so; do $(INSTALL) -c -m 644 $$so $(datadir)/dact/$$so; done
--	./patch-magic-file
- 
- uninstall:
- 	rm -f $(bindir)/dact $(bindir)/dact-upgrade.sh
- 	rm -f $(mandir)/man1/dact.1 $(CONF)
+@@ -101,14 +101,9 @@ install: all install-bin
+ 	-$(INSTALL) -d $(libdir)
+ 	-$(INSTALL) -d $(datadir)/dact
+ 	-$(INSTALL) -d $(sysconfdir)
+-	$(INSTALL) -m 644 dact.conf $(CONF)
++	$(INSTALL) -m 644 dact.conf $(datadir)/examples/dact
+ 	$(INSTALL) -m 644 Docs/dact.1 $(mandir)/man1/dact.1
+-	-$(INSTALL) -m 755 libdact.$(SHOBJEXT) $(libdir)/libdact.$(SHOBJEXT)
+-	-$(INSTALL) -m 644 libdact.$(SHOBJEXT).def $(libdir)/libdact.$(SHOBJEXT).def
+-	-$(INSTALL) -m 644 libdact.$(SHOBJEXT).a $(libdir)/libdact.$(SHOBJEXT).a
+-	-$(INSTALL) -m 644 libdact.a $(libdir)/libdact.a
+ @MODS@	for so in $(MODS); do $(INSTALL) -m 755 $$so $(datadir)/dact/$$so; done
+-	./patch-magic-file $(datadir)/magic
+ 
+ install-bin-local: dact$(EXEEXT)
+ 	-$(INSTALL) -d $(HOME)/.dact/`uname -s | tr A-Z a-z`-`uname -m`
+@@ -127,11 +122,10 @@ uninstall:
+ 	rm -f $(libdir)/libdact.a $(libdir)/libdact.$(SHOBJEXT)
  @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:
+ 
+ Makefile.dep: *.c *.h Makefile
+ 	@echo "building Makefile.dep"
+ 	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(ALGO) $(OBJS:.o=.c) $(MODS:.so=.c) dact.c > Makefile.dep
+ 	@$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(ALGO) $(filter-out libdact.c, $(OBJS:.o=.c)) $(MODS:.so=.c) dact.c  | sed -e "s/^\([^ ]*\)\.o: /\1.so: /g" >> Makefile.dep
+ 
+-include Makefile.dep
diff --git a/archivers/dact/patches/patch-ab b/archivers/dact/patches/patch-ab
index ab59d2ba00c..1285ea7e55a 100644
--- a/archivers/dact/patches/patch-ab
+++ b/archivers/dact/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1 2005/01/24 16:22:51 tv Exp $
+$NetBSD: patch-ab,v 1.2 2006/05/26 08:44:28 adam Exp $
 
---- dact.h.orig	2005-01-24 11:16:06.000000000 -0500
+--- dact.h.orig	2006-03-25 14:15:34.000000000 +0100
 +++ dact.h
-@@ -80,6 +80,7 @@
- #include "strsep.h"
+@@ -121,6 +121,7 @@
+ #include "uname.h"
  #endif
  
 +#include <sys/types.h>
diff --git a/archivers/dact/patches/patch-ac b/archivers/dact/patches/patch-ac
deleted file mode 100644
index 3f0c00e9db5..00000000000
--- a/archivers/dact/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/11/07 12:55:06 joerg Exp $
-
---- net.c.orig	2001-09-07 20:29:03.000000000 +0000
-+++ net.c
-@@ -22,7 +22,6 @@
- #include "parse.h"
- #include "crc.h"
- 
--extern int errno;
- char *dact_urls[256];
- 
- /*
-@@ -85,7 +84,7 @@ int open_net(const char *pathname, int f
- 	mode_t mode;
- 
- 	va_start(args, flags);
--	mode = va_arg(args, mode_t);
-+	mode = va_arg(args, int);
- 	va_end(args);
- 
- 	if (!parse_url(pathname,scheme,username,password,host,&port,file)) {
-@@ -292,7 +291,7 @@ int open_net(const char *pathname, int f
- 	mode_t mode;
- 
- 	va_start(args, flags);
--	mode = va_arg(args, mode_t);
-+	mode = va_arg(args, int);
- 	va_end(args);
- 
- 	return(open(pathname,flags,mode));
diff --git a/archivers/dact/patches/patch-ad b/archivers/dact/patches/patch-ad
deleted file mode 100644
index b79855c237d..00000000000
--- a/archivers/dact/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/10/07 17:15:40 joerg Exp $
-
---- dact.c.orig	2005-10-07 18:57:34.000000000 +0200
-+++ dact.c
-@@ -182,7 +182,7 @@ int dact_upgrade(const char *options, ui
- 	strncat(dact_binfile,"dact.bin",sizeof(dact_binfile)-strlen(dact_binfile)-1);
- #endif
- 	urlsubst=parse_url_subst("http://www.rkeene.org/projects/rget/rget.cgi?os=@@OSNM@@&arch=@@ARCH@@&project=dact&file=bin&meth=gz","");
--	if ((outFd=open_net(dact_binfile, O_WRONLY|O_TRUNC|O_CREAT, 0755))<0) { PERROR("open_net"); return(-1); }
-+	if ((outFd=open_net(dact_binfile, O_WRONLY|O_TRUNC|O_CREAT, (int)0755))<0) { PERROR("open_net"); return(-1); }
- 	if ((inFd=open_net(urlsubst, O_RDONLY))<0) { PERROR("open_net"); return(-1); }
- 	if (!dact_process_file(inFd, outFd, DACT_MODE_DECMP, options, "dact", crcs,-1)) {
- 		close(inFd);
-@@ -1186,7 +1186,7 @@ int main(int argc, char **argv) {
- 					continue;
- 				}
- 				if (!options[DACT_OPT_STDOUT]) {
--					if ((out_fd=open_net(out_file,O_WRONLY|O_CREAT|O_TRUNC,0644))==-1) {
-+					if ((out_fd=open_net(out_file,O_WRONLY|O_CREAT|O_TRUNC,(int)0644))==-1) {
- 						fprintf(stderr, "dact: Can't open %s for writing.\n",out_file);
- 						PERROR("open");
- 						continue;
diff --git a/archivers/dact/patches/patch-ae b/archivers/dact/patches/patch-ae
deleted file mode 100644
index ce085ed6c15..00000000000
--- a/archivers/dact/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/10/07 17:15:40 joerg Exp $
-
---- parse.c.orig	2005-10-07 19:09:21.000000000 +0200
-+++ parse.c
-@@ -138,7 +138,7 @@ char *parse_url_subst(const char *src, c
- 			case 346290: /* OSVR-done */
- 				if (strlen(system_info.release)>127) break;
- 				for (x=0;x<strlen(system_info.release);x++) {
--					if (isdigit(system_info.release[x]) || system_info.release[x]=='.') {
-+					if (isdigit((unsigned char)system_info.release[x]) || system_info.release[x]=='.') {
- 						ret[0]=system_info.release[x];
- 						ret++;
- 					} else {
-@@ -151,7 +151,7 @@ char *parse_url_subst(const char *src, c
- 				for (x=0;x<strlen(system_info.release);x++) {
- 					if (system_info.release[x]=='.' && found) break;
- 					if (system_info.release[x]=='.') found=1;
--					if (isdigit(system_info.release[x]) || found) {
-+					if (isdigit((unsigned char)system_info.release[x]) || found) {
- 						ret[0]=system_info.release[x];
- 						ret++;
- 					}
-@@ -264,7 +264,7 @@ char *parse_url_subst_dist(void) {
- void strtolower(char *str) {
- 	uint32_t x=0;
- 
--	while (str[x]) { str[x]=tolower(str[x]); x++; }
-+	while (str[x]) { str[x]=tolower((unsigned char)str[x]); x++; }
- }
- 
- char *mime64(unsigned char *str) {