- update to 20040323

- removes patches that have been included in distribution

6 files changed, 11 insertions, 76 deletions

diff --git a/net/tinyldap/Makefile b/net/tinyldap/Makefile
index 7f97969b1a71..192cb4dbed06 100644
--- a/net/tinyldap/Makefile
+++ b/net/tinyldap/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	tinyldap
-PORTVERSION=	0.0.20040226
-PORTREVISION=	2
+PORTVERSION=	0.0.${SNAPSHOT}
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.dinoex.de/pub/tinyldap/
+DISTNAME=	${PORTNAME}-${SNAPSHOT}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A small LDAP implementation
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libowfat.a:${PORTSDIR}/${LIBOWFAT_PORT}
 
+SNAPSHOT=	20040323
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/net/tinyldap/distinfo b/net/tinyldap/distinfo
index 9d05debb4b58..dd2826669420 100644
--- a/net/tinyldap/distinfo
+++ b/net/tinyldap/distinfo
@@ -1,2 +1,2 @@
-MD5 (tinyldap-0.0.20040226.tar.bz2) = 2863609a4aab26e1b0b9d0086d8b34fc
-SIZE (tinyldap-0.0.20040226.tar.bz2) = 33755
+MD5 (tinyldap-20040323.tar.bz2) = 0153fa998499f0e21dab26f29e82eed9
+SIZE (tinyldap-20040323.tar.bz2) = 33993
diff --git a/net/tinyldap/files/patch-Makefile b/net/tinyldap/files/patch-Makefile
index dc53c069c531..17afc494bd99 100644
--- a/net/tinyldap/files/patch-Makefile
+++ b/net/tinyldap/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Sat Feb 14 01:31:42 2004
-+++ Makefile	Thu Feb 26 16:06:04 2004
-@@ -32,13 +32,16 @@
+--- Makefile.orig	Sat Mar 13 00:21:24 2004
++++ Makefile	Tue Mar 23 15:49:03 2004
+@@ -32,16 +32,19 @@
  
  auth.a: auth.o
  
@@ -16,31 +16,12 @@
 +DIET=
 +CFLAGS+=-g
  endif
+ ifneq ($(DIET),)
+ LIBS+=-llatin1
+ endif
 +CFLAGS+=-I. -I/usr/local/include/libowfat
 +LDFLAGS+=-L/usr/local/lib
 +LIBS+=-lmd
  
  %.o: %.c
  	$(DIET) $(CC) $(CFLAGS) -c $<
-@@ -47,7 +50,7 @@
- 	ar cru $@ $^
- 
- %: %.c
--	$(DIET) $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lowfat
-+	$(DIET) $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lowfat ${LIBS}
- 
- t1 parse: ldif.a storage.a
- t2: ldap.a asn1.a
-@@ -58,10 +61,10 @@
- idx2ldif: ldap.a
- 
- tinyldap_standalone: tinyldap.c
--	$(DIET) $(CC) $(CFLAGS) -DSTANDALONE -o $@ $^ $(LDFLAGS) -lowfat
-+	$(DIET) $(CC) $(CFLAGS) -DSTANDALONE -o $@ $^ $(LDFLAGS) -lowfat ${LIBS}
- 
- tinyldap_debug: tinyldap.c
--	$(DIET) $(CC) $(CFLAGS) -DSTANDALONE -DDEBUG -o $@ $^ $(LDFLAGS) -lowfat
-+	$(DIET) $(CC) $(CFLAGS) -DSTANDALONE -DDEBUG -o $@ $^ $(LDFLAGS) -lowfat ${LIBS}
- 
- .PHONY: clean tar
- clean:
diff --git a/net/tinyldap/files/patch-idx2ldif.c b/net/tinyldap/files/patch-idx2ldif.c
deleted file mode 100644
index f8b20b0a625c..000000000000
--- a/net/tinyldap/files/patch-idx2ldif.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- idx2ldif.c.orig	Thu Feb  5 01:02:52 2004
-+++ idx2ldif.c	Thu Feb 26 16:03:58 2004
-@@ -35,6 +35,7 @@
-   unsigned long filelen;
-   char* fn=argc<2?"data":argv[1];
-   char* map=mmap_read(fn,&filelen);
-+  uint32 magic,attribute_count,record_count,indices_offset,size_of_string_table;
-   if (!map) {
-     buffer_puts(buffer_2,"could not open ");
-     buffer_puts(buffer_2,fn);
-@@ -43,7 +44,6 @@
-     buffer_putnlflush(buffer_2);
-     return 1;
-   }
--  uint32 magic,attribute_count,record_count,indices_offset,size_of_string_table;
-   uint32_unpack(map,&magic);
-   uint32_unpack(map+4,&attribute_count);
-   uint32_unpack(map+2*4,&record_count);
diff --git a/net/tinyldap/files/patch-mstorage_add.c b/net/tinyldap/files/patch-mstorage_add.c
deleted file mode 100644
index d93d3b1e6e73..000000000000
--- a/net/tinyldap/files/patch-mstorage_add.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- mstorage_add.c.orig	Thu Feb  5 00:27:01 2004
-+++ mstorage_add.c	Thu Feb 26 16:03:58 2004
-@@ -54,9 +54,9 @@
- 	if (!tmp) return -1;
-       } else {
- 	munmap(p->root,p->used);
--	tmp=mmap(0,need,PROT_READ|PROT_WRITE,MAP_SHARED,fd,0);
-+	tmp=mmap(0,need,PROT_READ|PROT_WRITE,MAP_SHARED,p->fd,0);
- 	if (tmp==-1) {
--	  tmp=mmap(0,p->used,PROT_READ|PROT_WRITE,MAP_SHARED,fd,0);
-+	  tmp=mmap(0,p->used,PROT_READ|PROT_WRITE,MAP_SHARED,p->fd,0);
- 	  /* this can never fail, because we mmap exactly as much as we
- 	   * had mmapped previously.  We need to munmap before doing the
- 	   * new mmap, though, because we may run into the address space
diff --git a/net/tinyldap/files/patch-tinyldap.c b/net/tinyldap/files/patch-tinyldap.c
deleted file mode 100644
index 76eb407f07fd..000000000000
--- a/net/tinyldap/files/patch-tinyldap.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- tinyldap.c.orig	Thu Feb  5 02:29:18 2004
-+++ tinyldap.c	Thu Feb 26 16:03:58 2004
-@@ -14,7 +14,12 @@
- #ifdef STANDALONE
- #include "socket.h"
- #include "ip6.h"
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- #endif
- #include "case.h"
- #include <signal.h>