7 files changed, 90 insertions, 56 deletions

diff --git a/net/diradmin/Makefile b/net/diradmin/Makefile
index d25078d97d7b..2b2fae09e357 100644
--- a/net/diradmin/Makefile
+++ b/net/diradmin/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	diradmin
 # Date created:		24 April 2003
-# Whom:			lewiz <purple@lewiz.info>
+# Whom:			Lewis Thompson <purple@lewiz.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	diradmin
-PORTVERSION=	1.3.5
+PORTVERSION=	1.5.1
 CATEGORIES=	net
 MASTER_SITES=	http://diradmin.open-it.org/
 DISTNAME=	directory_administrator-${PORTVERSION}
@@ -14,22 +14,20 @@ DISTNAME=	directory_administrator-${PORTVERSION}
 MAINTAINER=	purple@lewiz.net
 COMMENT=	A smart LDAP directory management tool
 
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
-#CPPFLAGS+=	-I/usr/src/lib/libcrypt
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
+USE_OPENLDAP=	yes
 CFLAGS+=	-I/usr/src/lib/libcrypt
 
-DOCS=		AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS \
+PORTDOCS=	AUTHORS CREDITS ChangeLog INSTALL NEWS \
        		README TODO
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCS}
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/net/diradmin/distinfo b/net/diradmin/distinfo
index 21ca53429db9..1fe42fa946d5 100644
--- a/net/diradmin/distinfo
+++ b/net/diradmin/distinfo
@@ -1 +1 @@
-MD5 (directory_administrator-1.3.5.tar.gz) = a4796ea71d62b39caefb3bec999899e0
+MD5 (directory_administrator-1.5.1.tar.gz) = 6ce1d8f2715ed100ec297779e7557d46
diff --git a/net/diradmin/files/patch-aa b/net/diradmin/files/patch-aa
index 08cb1446c146..a5126d74c41a 100644
--- a/net/diradmin/files/patch-aa
+++ b/net/diradmin/files/patch-aa
@@ -1,29 +1,29 @@
-diff -ruN directory_administrator-1.3.5/aclocal.m4 directory_administrator-1.3.5.new/aclocal.m4
---- aclocal.m4.orig	Wed Feb  5 20:15:34 2003
-+++ aclocal.m4	Fri Apr 25 01:21:57 2003
-@@ -1589,6 +1589,6 @@
+--- aclocal.m4.orig	Fri Dec 19 22:55:07 2003
++++ aclocal.m4	Fri Dec 19 22:57:03 2003
+@@ -1539,6 +1539,6 @@
  dnl LDAP_CHECKS
  AC_DEFUN([LDAP_CHECKS],
  [
 -        LDFLAGS="$LDFLAGS -llber -lldap -lresolv -lcrypt"
 +        LDFLAGS="$LDFLAGS -llber -lldap -lcrypt"
  ])
+
  
-diff -ruN directory_administrator-1.3.5/configure directory_administrator-1.3.5.new/configure
---- configure.orig	Wed Feb  5 20:15:40 2003
-+++ configure	Fri Apr 25 01:22:07 2003
-@@ -4951,7 +4951,7 @@
- 
- 
- 
+--- configure.orig      Fri Dec 19 22:55:22 2003
++++ configure   Fri Dec 19 22:56:07 2003
+@@ -5413,7 +5413,7 @@
+
+
+
 -        LDFLAGS="$LDFLAGS -llber -lldap -lresolv -lcrypt"
 +        LDFLAGS="$LDFLAGS -llber -lldap -lcrypt"
- 
- 
- PACKAGE_PIXMAPS_DIR="/share/pixmaps/${PACKAGE}"
-diff -ruN directory_administrator-1.3.5/macros/ldap.m4 directory_administrator-1.3.5.new/macros/ldap.m4
---- macros/ldap.m4.orig	Fri Dec 20 15:39:42 2002
-+++ macros/ldap.m4	Fri Apr 25 01:22:21 2003
+
+
+
+
+
+--- macros/ldap.m4.orig Fri Dec 19 22:55:34 2003
++++ macros/ldap.m4      Fri Dec 19 22:57:46 2003
 @@ -1,5 +1,5 @@
  dnl LDAP_CHECKS
  AC_DEFUN([LDAP_CHECKS],
@@ -31,3 +31,4 @@ diff -ruN directory_administrator-1.3.5/macros/ldap.m4 directory_administrator-1
 -        LDFLAGS="$LDFLAGS -llber -lldap -lresolv -lcrypt"
 +        LDFLAGS="$LDFLAGS -llber -lldap -lcrypt"
  ])
+
diff --git a/net/diradmin/files/patch-configure b/net/diradmin/files/patch-configure
new file mode 100644
index 000000000000..03b07a59d7dc
--- /dev/null
+++ b/net/diradmin/files/patch-configure
@@ -0,0 +1,12 @@
+diff -ruN /configure.old configure
+--- configure.old	Thu Jan 22 01:13:11 2004
++++ configure	Thu Jan 22 01:13:51 2004
+@@ -5625,7 +5625,7 @@
+
+ fi
+
+-PACKAGE_PIXMAPS_DIR="/share/pixmaps/${PACKAGE}"
++PACKAGE_PIXMAPS_DIR="/share/gnome/pixmaps/${PACKAGE}"
+
+ PACKAGE_APPLNK_DIR="/share/applications"
+ SYSTEM_MENU_DIR="/lib/menu"
diff --git a/net/diradmin/files/patch-src-charset.c b/net/diradmin/files/patch-src-charset.c
new file mode 100644
index 000000000000..c7b8a66e3885
--- /dev/null
+++ b/net/diradmin/files/patch-src-charset.c
@@ -0,0 +1,16 @@
+--- src/charset.c.orig	Wed Jun 11 23:25:17 2003
++++ src/charset.c	Thu Jan 22 10:18:01 2004
+@@ -165,12 +165,12 @@
+ 
+ 
+ char* replacement_table(char* string) {
+-return NULL;
+ 	char**a,b;
+ 	char*position;
+ 	char*tempstring,tempstring2;
+ 	//int replacementlength;
+ 	int current;
++return NULL;
+ 	tempstring = g_strdup(string);
+ 	for (current=0;_latinchars[current];current++) {
+ 		g_print("To replace: %s         Replacement: %s\n",_latinchars[current],_replacements[current]);
diff --git a/net/diradmin/files/patch-src-prefs.c b/net/diradmin/files/patch-src-prefs.c
new file mode 100644
index 000000000000..34702b4767e4
--- /dev/null
+++ b/net/diradmin/files/patch-src-prefs.c
@@ -0,0 +1,18 @@
+--- src/prefs.c.orig	Thu Jun 12 15:03:12 2003
++++ src/prefs.c	Thu Jan 22 10:16:30 2004
+@@ -34,6 +34,7 @@
+   gchar *homedir = NULL;
+   gchar *cfgfile = NULL;
+   connection_profile *connprof = NULL;
++  gint tls;
+ 
+   gboolean is_default;
+ 
+@@ -53,7 +54,6 @@
+   preferences.logindefaults.VUID_MAX = 60000;
+   preferences.logindefaults.VGID_MIN = 500;
+   preferences.logindefaults.VGID_MAX = 60000;
+-  gint tls;
+ 
+ 
+ 
diff --git a/net/diradmin/pkg-plist b/net/diradmin/pkg-plist
index b0f9a6e3686f..0142794b9ce8 100644
--- a/net/diradmin/pkg-plist
+++ b/net/diradmin/pkg-plist
@@ -1,33 +1,22 @@
 bin/directory_administrator
 share/applications/dragonfear-directory_administrator.desktop
-share/pixmaps/directory_administrator/briefcase.png
-share/pixmaps/directory_administrator/byruddo.png
-share/pixmaps/directory_administrator/cellphone.png
-share/pixmaps/directory_administrator/diradminlogo.ico
-share/pixmaps/directory_administrator/diradminlogo.png
-share/pixmaps/directory_administrator/diradminlogo.xcf
-share/pixmaps/directory_administrator/gnome-computer.png
-share/pixmaps/directory_administrator/gnome-gnomecard.png
-share/pixmaps/directory_administrator/gnome-who.png
-share/pixmaps/directory_administrator/group-icon.xpm
-share/pixmaps/directory_administrator/house.png
-share/pixmaps/directory_administrator/ico-mail.png
-share/pixmaps/directory_administrator/new-16.xpm
-share/pixmaps/directory_administrator/new.xpm
-share/pixmaps/directory_administrator/newgroup-16.xpm
-share/pixmaps/directory_administrator/newgroup.xpm
-share/pixmaps/directory_administrator/old-group-icon.xpm
-share/pixmaps/directory_administrator/old-user-icon.xpm
-share/pixmaps/directory_administrator/user-icon.xpm
-%%PORTDOCS%%share/doc/diradmin/AUTHORS
-%%PORTDOCS%%share/doc/diradmin/COPYING
-%%PORTDOCS%%share/doc/diradmin/CREDITS
-%%PORTDOCS%%share/doc/diradmin/ChangeLog
-%%PORTDOCS%%share/doc/diradmin/INSTALL
-%%PORTDOCS%%share/doc/diradmin/NEWS
-%%PORTDOCS%%share/doc/diradmin/README
-%%PORTDOCS%%share/doc/diradmin/TODO
-%%PORTDOCS%%@dirrm share/doc/diradmin
-@dirrm share/pixmaps/directory_administrator
-@dirrm share/pixmaps
-@dirrm share/applications
+share/gnome/pixmaps/directory_administrator/briefcase.png
+share/gnome/pixmaps/directory_administrator/byruddo.png
+share/gnome/pixmaps/directory_administrator/cellphone.png
+share/gnome/pixmaps/directory_administrator/diradminlogo.ico
+share/gnome/pixmaps/directory_administrator/diradminlogo.png
+share/gnome/pixmaps/directory_administrator/diradminlogo.xcf
+share/gnome/pixmaps/directory_administrator/gnome-computer.png
+share/gnome/pixmaps/directory_administrator/gnome-gnomecard.png
+share/gnome/pixmaps/directory_administrator/gnome-who.png
+share/gnome/pixmaps/directory_administrator/group-icon.xpm
+share/gnome/pixmaps/directory_administrator/house.png
+share/gnome/pixmaps/directory_administrator/ico-mail.png
+share/gnome/pixmaps/directory_administrator/new-16.xpm
+share/gnome/pixmaps/directory_administrator/new.xpm
+share/gnome/pixmaps/directory_administrator/newgroup-16.xpm
+share/gnome/pixmaps/directory_administrator/newgroup.xpm
+share/gnome/pixmaps/directory_administrator/old-group-icon.xpm
+share/gnome/pixmaps/directory_administrator/old-user-icon.xpm
+share/gnome/pixmaps/directory_administrator/user-icon.xpm
+@dirrm share/gnome/pixmaps/directory_administrator