Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Feb 2005 22:17:00 GMT
From:      Lewis Thompson <purple@fajita.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/77428: [ MAINTAINER UPDATE ] net/diradmin -- 1.5.2 to 1.6.0 (fix pkg-plist)
Message-ID:  <200502122217.j1CMH0iJ058271@black.fajita.org>
Resent-Message-ID: <200502122220.j1CMKNrf015716@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         77428
>Category:       ports
>Synopsis:       [ MAINTAINER UPDATE ] net/diradmin -- 1.5.2 to 1.6.0 (fix pkg-plist)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 12 22:20:23 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Lewis Thompson
>Release:        FreeBSD 5.3-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD black.fajita.org 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #3: Wed Feb 9 00:39:28 GMT 2005 lewiz@black.fajita.org:/usr/src/sys/i386/compile/BLACK i386


	
>Description:
Update port net/diradmin to 1.6.0 from 1.5.2.  Fix broken pkg-plist at
the same time (with any luck!)
>How-To-Repeat:
	
>Fix:
diff -ruN diradmin.orig/Makefile diradmin/Makefile
--- diradmin.orig/Makefile	Sat Feb 12 21:55:06 2005
+++ diradmin/Makefile	Sat Feb 12 21:59:13 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	diradmin
-PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTVERSION=	1.6.0
 CATEGORIES=	net
 MASTER_SITES=	http://diradmin.open-it.org/
 DISTNAME=	directory_administrator-${PORTVERSION}
@@ -22,6 +21,7 @@
 USE_OPENLDAP=	yes
 USE_OPENSSL=	yes
 CFLAGS+=	-I/usr/src/lib/libcrypt
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	AUTHORS CREDITS ChangeLog INSTALL NEWS \
        		README TODO
diff -ruN diradmin.orig/distinfo diradmin/distinfo
--- diradmin.orig/distinfo	Sat Feb 12 21:55:06 2005
+++ diradmin/distinfo	Sat Feb 12 21:56:15 2005
@@ -1,2 +1,2 @@
-MD5 (directory_administrator-1.5.1.tar.gz) = 6ce1d8f2715ed100ec297779e7557d46
-SIZE (directory_administrator-1.5.1.tar.gz) = 460818
+MD5 (directory_administrator-1.6.0.tar.gz) = ab0631f5e91c0dfe48c1be240eb01437
+SIZE (directory_administrator-1.6.0.tar.gz) = 464840
diff -ruN diradmin.orig/files/patch-aa diradmin/files/patch-aa
--- diradmin.orig/files/patch-aa	Sat Feb 12 21:55:06 2005
+++ diradmin/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,34 +0,0 @@
---- 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"
- ])
-
- 
---- 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"
-
-
-
-
-
---- 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],
- [
--        LDFLAGS="$LDFLAGS -llber -lldap -lresolv -lcrypt"
-+        LDFLAGS="$LDFLAGS -llber -lldap -lcrypt"
- ])
-
diff -ruN diradmin.orig/files/patch-configure diradmin/files/patch-configure
--- diradmin.orig/files/patch-configure	Sat Feb 12 21:55:06 2005
+++ diradmin/files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -1,20 +0,0 @@
---- configure.orig	Tue Feb 24 16:10:24 2004
-+++ configure	Tue Feb 24 16:12:33 2004
-@@ -5413,7 +5413,7 @@
- 
- 
- 
--        LDFLAGS="$LDFLAGS -llber -lldap -lcrypt"
-+        LDFLAGS="$LDFLAGS -L/usr/local/lib -llber -lldap -lcrypt"
- 
- 
- 
-@@ -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 -ruN diradmin.orig/files/patch-lresolv diradmin/files/patch-lresolv
--- diradmin.orig/files/patch-lresolv	Thu Jan  1 01:00:00 1970
+++ diradmin/files/patch-lresolv	Sat Feb 12 22:01:43 2005
@@ -0,0 +1,21 @@
+--- aclocal.m4.orig	Sat Feb 12 22:00:29 2005
++++ aclocal.m4	Sat Feb 12 22:00:50 2005
+@@ -1616,6 +1616,6 @@
+ dnl LDAP_CHECKS
+ AC_DEFUN([LDAP_CHECKS],
+ [
+-        LDFLAGS="$LDFLAGS -llber -lldap -lresolv -lcrypt"
++        LDFLAGS="$LDFLAGS -llber -lldap -lcrypt"
+ ])
+ 
+--- configure.orig	Sat Feb 12 22:00:35 2005
++++ configure	Sat Feb 12 22:00:42 2005
+@@ -5691,7 +5691,7 @@
+ 
+ 
+ 
+-        LDFLAGS="$LDFLAGS -llber -lldap -lresolv -lcrypt"
++        LDFLAGS="$LDFLAGS -llber -lldap -lcrypt"
+ 
+ 
+ 
diff -ruN diradmin.orig/files/patch-pixmap_location diradmin/files/patch-pixmap_location
--- diradmin.orig/files/patch-pixmap_location	Thu Jan  1 01:00:00 1970
+++ diradmin/files/patch-pixmap_location	Sat Feb 12 22:06:13 2005
@@ -0,0 +1,11 @@
+--- configure.old	Sat Feb 12 22:05:44 2005
++++ configure	Sat Feb 12 22:05:56 2005
+@@ -5933,7 +5933,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 -ruN diradmin.orig/files/patch-src-charset.c diradmin/files/patch-src-charset.c
--- diradmin.orig/files/patch-src-charset.c	Sat Feb 12 21:55:06 2005
+++ diradmin/files/patch-src-charset.c	Thu Jan  1 01:00:00 1970
@@ -1,16 +0,0 @@
---- 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 -ruN diradmin.orig/files/patch-src-prefs.c diradmin/files/patch-src-prefs.c
--- diradmin.orig/files/patch-src-prefs.c	Sat Feb 12 21:55:06 2005
+++ diradmin/files/patch-src-prefs.c	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
---- 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 -ruN diradmin.orig/pkg-plist diradmin/pkg-plist
--- diradmin.orig/pkg-plist	Sat Feb 12 21:55:06 2005
+++ diradmin/pkg-plist	Sat Feb 12 22:13:30 2005
@@ -1,5 +1,12 @@
 bin/directory_administrator
 share/applications/dragonfear-directory_administrator.desktop
+share/doc/diradmin/AUTHORS
+share/doc/diradmin/CREDITS
+share/doc/diradmin/ChangeLog
+share/doc/diradmin/INSTALL
+share/doc/diradmin/NEWS
+share/doc/diradmin/README
+share/doc/diradmin/TODO
 share/gnome/pixmaps/directory_administrator/briefcase.png
 share/gnome/pixmaps/directory_administrator/byruddo.png
 share/gnome/pixmaps/directory_administrator/cellphone.png
@@ -19,4 +26,6 @@
 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/applications
+@dirrm share/doc/diradmin
 @dirrm share/gnome/pixmaps/directory_administrator
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502122217.j1CMH0iJ058271>