Date: Thu, 24 Aug 2006 20:51:29 +0400 (MSD) From: Dmitriy Kirhlarov <dimma@higis.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102483: [PATCH] update LDAP-Account-Manager port to 1.0.4 Message-ID: <200608241651.k7OGpT3A094848@dkirhlarov.mow.oilspace.com> Resent-Message-ID: <200608241700.k7OH0YMB077830@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102483
>Category: ports
>Synopsis: [PATCH] update LDAP-Account-Manager port to 1.0.4
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 24 17:00:33 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Dmitriy Kirhlarov
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD dimma 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed Aug 2 16:56:13 UTC 2006 root@jailhost1:/usr/obj/usr/src/sys/THINKPAD_KST i386
>Description:
update port to current version. Russian locale declared.
>How-To-Repeat:
>Fix:
diff -urNB /usr/ports/sysutils/ldap-account-manager.orig/Makefile ldap-account-manager/Makefile
--- /usr/ports/sysutils/ldap-account-manager.orig/Makefile Wed Aug 2 16:06:02 2006
+++ ldap-account-manager/Makefile Thu Aug 24 20:12:24 2006
@@ -2,12 +2,11 @@
# Date created: August, 2nd 2003
# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org>
#
-# $FreeBSD: /repoman/r/pcvs/ports/sysutils/ldap-account-manager/Makefile,v 1.21 2006/08/02 12:06:02 erwin Exp $
+# $FreeBSD: ports/sysutils/ldap-account-manager/Makefile,v 1.21 2006/08/02 12:06:02 erwin Exp $
#
PORTNAME= LDAP-Account-Manager
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= sysutils www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= lam
@@ -19,7 +18,7 @@
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Quota.pm:${PORTSDIR}/sysutils/p5-Quota\
${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
-USE_PHP= pcre xml gettext session mcrypt ldap
+USE_PHP= pcre xml gettext session mcrypt ldap mhash iconv
WANT_PHP_WEB= yes
NO_BUILD= YES
WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
@@ -29,10 +28,27 @@
WWWGRP?= www
PKGINSTALL= ${WRKDIR}/pkg-install
PLIST_SUB+= WWWROOT=${WWW_ROOT}
-WWW_DATA= index.html config graphics help lib locale sess style templates tmp
-MYPORTDOCS= HISTORY README TODO COPYING INSTALL VERSION copyright docs/*
+WWW_DATA= index.html config graphics help lib sess style templates tmp
+WWW_LOCALE= locale
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_NLS)
+PLIST_SUB+= NLS="@comment "
+.else
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+FLAG_NLS= true
+.endif
+
+MYPORTDOCS = COPYING HISTORY INSTALL README TODO copyright \
+ docs/README.Kolab.txt docs/README.fpdf.htm \
+ docs/README.hosts.txt docs/README.lamdaemon.txt \
+ docs/README.openldap.txt docs/README.schema.txt \
+ docs/README.security.txt docs/README.upgrade.txt
+
LAM_SCRIPTS= lib/lamdaemon.pl
-PORTDOCS= *
+HTMLPORTDOCS= docs/devel
do-configure:
@${RM} ${WRKSRC}/config/shells
@@ -43,12 +61,20 @@
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${TAR} cf - ${MYPORTDOCS} | ${TAR} xf - -C ${DOCSDIR}
+ @${MKDIR} ${PREFIX}/${WWW_ROOT}/html
+ cd ${WRKSRC} && ${TAR} -C ${HTMLPORTDOCS} -cf - . | ${TAR} xf - -C ${PREFIX}/${WWW_ROOT}/html
+.endif
+
+.if defined(FLAG_NLS)
+ cd ${WRKSRC} && ${TAR} cf - ${WWW_LOCALE} | ${TAR} xf - -C ${PREFIX}/${WWW_ROOT}
.endif
+
@${MKDIR} ${PREFIX}/${WWW_ROOT}/tmp
@[ -e ${PREFIX}/${WWW_ROOT}/config/config.cfg ] || \
- ${INSTALL_DATA} ${WRKSRC}/config/config.cfg_sample ${PREFIX}/${WWW_ROOT}/config/config.cfg
+ ${INSTALL_DATA} ${WRKSRC}/config/config.cfg_sample ${PREFIX}/${WWW_ROOT}/config/config.cfg
@[ -e ${PREFIX}/${WWW_ROOT}/config/lam.conf ] || \
- ${INSTALL_DATA} ${WRKSRC}/config/lam.conf_sample ${PREFIX}/${WWW_ROOT}/config/lam.conf
+ ${INSTALL_DATA} ${WRKSRC}/config/lam.conf_sample ${PREFIX}/${WWW_ROOT}/config/lam.conf
+
post-patch:
@${SED} -e "s;%%WWWOWN%%;${WWWOWN};g" \
-e "s;%%WWWGRP%%;${WWWGRP};g" \
@@ -64,4 +90,4 @@
@PKG_PREFIX=${PREFIX} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} WWW_ROOT=${WWW_ROOT} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urNB /usr/ports/sysutils/ldap-account-manager.orig/distinfo ldap-account-manager/distinfo
--- /usr/ports/sysutils/ldap-account-manager.orig/distinfo Tue Jul 18 11:11:31 2006
+++ ldap-account-manager/distinfo Thu Aug 24 14:42:19 2006
@@ -1,3 +1,3 @@
-MD5 (ldap-account-manager-1.0.2.tar.gz) = 363df91a11f0f0f6a25b1c596e2483ca
-SHA256 (ldap-account-manager-1.0.2.tar.gz) = 68b0b6072e1efa936940dd746f662c1c92e947dae31bb2abf1a68f9f7bdacaf9
-SIZE (ldap-account-manager-1.0.2.tar.gz) = 1517572
+MD5 (ldap-account-manager-1.0.4.tar.gz) = d9c8f00fffc98bc86d278195ed50ae85
+SHA256 (ldap-account-manager-1.0.4.tar.gz) = 94ce5cff1424bb582579e418aab802b9b8bc9a78d6933bdffdc6046886dbfe59
+SIZE (ldap-account-manager-1.0.4.tar.gz) = 1646060
diff -urNB /usr/ports/sysutils/ldap-account-manager.orig/pkg-plist ldap-account-manager/pkg-plist
--- /usr/ports/sysutils/ldap-account-manager.orig/pkg-plist Wed Aug 2 16:06:02 2006
+++ ldap-account-manager/pkg-plist Thu Aug 24 20:42:45 2006
@@ -1,11 +1,24 @@
-@comment $FreeBSD: /repoman/r/pcvs/ports/sysutils/ldap-account-manager/pkg-plist,v 1.13 2006/08/02 12:06:02 erwin Exp $
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/HISTORY
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/README
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/copyright
+%%DOCSDIR%%/docs/README.Kolab.txt
+%%DOCSDIR%%/docs/README.fpdf.htm
+%%DOCSDIR%%/docs/README.hosts.txt
+%%DOCSDIR%%/docs/README.lamdaemon.txt
+%%DOCSDIR%%/docs/README.openldap.txt
+%%DOCSDIR%%/docs/README.schema.txt
+%%DOCSDIR%%/docs/README.security.txt
+%%DOCSDIR%%/docs/README.upgrade.txt
+share/nls/POSIX
+share/nls/en_US.US-ASCII
%%WWWROOT%%/config/.htaccess
-@unexec if cmp -s %D/%%WWWROOT%%/config/config.cfg %D/%%WWWROOT%%/config/config.cfg_sample; then rm -f %D/%%WWWROOT%%/config/config.cfg ; fi
+%%WWWROOT%%/config/config.cfg
%%WWWROOT%%/config/config.cfg_sample
-@exec [ -f %B/config.cfg ] || cp %B/%f %B/config.cfg
-@unexec if cmp -s %D/%%WWWROOT%%/config/lam.conf %D/%%WWWROOT%%/config/lam.conf_sample; then rm -f %D/%%WWWROOT%%/config/lam.conf; fi
+%%WWWROOT%%/config/lam.conf
%%WWWROOT%%/config/lam.conf_sample
-@exec [ -f %B/lam.conf ] || cp %B/%f %B/lam.conf
%%WWWROOT%%/config/language
%%WWWROOT%%/config/pdf/default.group.xml
%%WWWROOT%%/config/pdf/default.host.xml
@@ -13,14 +26,19 @@
%%WWWROOT%%/config/pdf/default.smbDomain.xml
%%WWWROOT%%/config/pdf/default.user.xml
%%WWWROOT%%/config/pdf/logos/printLogo.jpg
+%%WWWROOT%%/config/profiles/.htaccess
%%WWWROOT%%/config/profiles/default.group
%%WWWROOT%%/config/profiles/default.host
%%WWWROOT%%/config/profiles/default.mailAlias
%%WWWROOT%%/config/profiles/default.smbDomain
%%WWWROOT%%/config/profiles/default.user
+%%WWWROOT%%/config/selfService/.htaccess
%%WWWROOT%%/config/shells
%%WWWROOT%%/graphics/add.png
%%WWWROOT%%/graphics/banner.jpg
+%%WWWROOT%%/graphics/bigPeople.png
+%%WWWROOT%%/graphics/bigServers.png
+%%WWWROOT%%/graphics/bigTools.png
%%WWWROOT%%/graphics/catalog.png
%%WWWROOT%%/graphics/dc.png
%%WWWROOT%%/graphics/delete.gif
@@ -74,6 +92,62 @@
%%WWWROOT%%/graphics/userDefault.png
%%WWWROOT%%/graphics/warn.png
%%WWWROOT%%/help/help.inc
+%%WWWROOT%%/html/FAQ.htm
+%%WWWROOT%%/html/account_modules.htm
+%%WWWROOT%%/html/account_modules_lib.htm
+%%WWWROOT%%/html/account_pages.htm
+%%WWWROOT%%/html/account_types.htm
+%%WWWROOT%%/html/account_types_lib.htm
+%%WWWROOT%%/html/base_module.htm
+%%WWWROOT%%/html/base_type.htm
+%%WWWROOT%%/html/config.htm
+%%WWWROOT%%/html/config_files.htm
+%%WWWROOT%%/html/config_pages.htm
+%%WWWROOT%%/html/images/lam_baseModule.png
+%%WWWROOT%%/html/images/lam_baseType.png
+%%WWWROOT%%/html/images/lam_config.png
+%%WWWROOT%%/html/images/lam_lists.png
+%%WWWROOT%%/html/images/lam_overview.png
+%%WWWROOT%%/html/images/lam_pdfEditor.png
+%%WWWROOT%%/html/images/lam_profedit.png
+%%WWWROOT%%/html/images/lam_upload.png
+%%WWWROOT%%/html/index.htm
+%%WWWROOT%%/html/ldap.htm
+%%WWWROOT%%/html/lists.htm
+%%WWWROOT%%/html/login.htm
+%%WWWROOT%%/html/mod_accountPages.htm
+%%WWWROOT%%/html/mod_basics.htm
+%%WWWROOT%%/html/mod_config.htm
+%%WWWROOT%%/html/mod_ext.htm
+%%WWWROOT%%/html/mod_general.htm
+%%WWWROOT%%/html/mod_help.htm
+%%WWWROOT%%/html/mod_index.htm
+%%WWWROOT%%/html/mod_pdf.htm
+%%WWWROOT%%/html/mod_profiles.htm
+%%WWWROOT%%/html/mod_rdn.htm
+%%WWWROOT%%/html/mod_upload.htm
+%%WWWROOT%%/html/mod_upload2.htm
+%%WWWROOT%%/html/modules-specification.htm
+%%WWWROOT%%/html/other_libs.htm
+%%WWWROOT%%/html/ou-edit.htm
+%%WWWROOT%%/html/pdf_editor.htm
+%%WWWROOT%%/html/pdf_libs.htm
+%%WWWROOT%%/html/pdf_profiles.htm
+%%WWWROOT%%/html/profile_editor.htm
+%%WWWROOT%%/html/profile_files.htm
+%%WWWROOT%%/html/profiles.htm
+%%WWWROOT%%/html/samba_domains.htm
+%%WWWROOT%%/html/style/layout.css
+%%WWWROOT%%/html/tree_schema.htm
+%%WWWROOT%%/html/type_basics.htm
+%%WWWROOT%%/html/type_css.htm
+%%WWWROOT%%/html/type_general.htm
+%%WWWROOT%%/html/type_icon.htm
+%%WWWROOT%%/html/type_index.htm
+%%WWWROOT%%/html/type_list.htm
+%%WWWROOT%%/html/type_profile.htm
+%%WWWROOT%%/html/types-specification.htm
+%%WWWROOT%%/html/upload.htm
%%WWWROOT%%/index.html
%%WWWROOT%%/lib/.htaccess
%%WWWROOT%%/lib/account.inc
@@ -125,6 +199,7 @@
%%WWWROOT%%/lib/profiles.inc
%%WWWROOT%%/lib/schema.inc
%%WWWROOT%%/lib/security.inc
+%%WWWROOT%%/lib/selfService.inc
%%WWWROOT%%/lib/status.inc
%%WWWROOT%%/lib/tree.inc
%%WWWROOT%%/lib/types.inc
@@ -135,24 +210,26 @@
%%WWWROOT%%/lib/types/user.inc
%%WWWROOT%%/lib/ufpdf.php
%%WWWROOT%%/lib/xml_parser.inc
-%%WWWROOT%%/locale/ca_ES/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/ca_ES/LC_MESSAGES/messages.po
-%%WWWROOT%%/locale/de_DE/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/de_DE/LC_MESSAGES/messages.po
-%%WWWROOT%%/locale/es_ES/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/es_ES/LC_MESSAGES/messages.po
-%%WWWROOT%%/locale/fr_FR/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/fr_FR/LC_MESSAGES/messages.po
-%%WWWROOT%%/locale/hu_HU/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/hu_HU/LC_MESSAGES/messages.po
-%%WWWROOT%%/locale/it_IT/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/it_IT/LC_MESSAGES/messages.po
-%%WWWROOT%%/locale/ja_JP/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/ja_JP/LC_MESSAGES/messages.po
-%%WWWROOT%%/locale/nl_NL/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/nl_NL/LC_MESSAGES/messages.po
-%%WWWROOT%%/locale/zh_TW/LC_MESSAGES/messages.mo
-%%WWWROOT%%/locale/zh_TW/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/ca_ES/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/ca_ES/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/de_DE/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/de_DE/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/es_ES/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/es_ES/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/fr_FR/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/fr_FR/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/hu_HU/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/hu_HU/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/it_IT/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/it_IT/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/ja_JP/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/ja_JP/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/nl_NL/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/nl_NL/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/ru_RU/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/ru_RU/LC_MESSAGES/messages.po
+%%NLS%%%%WWWROOT%%/locale/zh_TW/LC_MESSAGES/messages.mo
+%%NLS%%%%WWWROOT%%/locale/zh_TW/LC_MESSAGES/messages.po
%%WWWROOT%%/sess/.cvsignore
%%WWWROOT%%/sess/.htaccess
%%WWWROOT%%/style/layout.css
@@ -166,8 +243,9 @@
%%WWWROOT%%/templates/config/confmain.php
%%WWWROOT%%/templates/config/confmodules.php
%%WWWROOT%%/templates/config/conftypes.php
-%%WWWROOT%%/templates/config/mainmanage.php
+%%WWWROOT%%/templates/config/index.php
%%WWWROOT%%/templates/config/mainlogin.php
+%%WWWROOT%%/templates/config/mainmanage.php
%%WWWROOT%%/templates/config/profmanage.php
%%WWWROOT%%/templates/delete.php
%%WWWROOT%%/templates/help.php
@@ -232,33 +310,41 @@
@dirrm %%WWWROOT%%/templates
@dirrm %%WWWROOT%%/style
@dirrm %%WWWROOT%%/sess
-@dirrm %%WWWROOT%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/zh_TW
-@dirrm %%WWWROOT%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/nl_NL
-@dirrm %%WWWROOT%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/ja_JP
-@dirrm %%WWWROOT%%/locale/it_IT/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/it_IT
-@dirrm %%WWWROOT%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/hu_HU
-@dirrm %%WWWROOT%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/fr_FR
-@dirrm %%WWWROOT%%/locale/es_ES/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/es_ES
-@dirrm %%WWWROOT%%/locale/de_DE/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/de_DE
-@dirrm %%WWWROOT%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%WWWROOT%%/locale/ca_ES
-@dirrm %%WWWROOT%%/locale
+%%NLS%%@dirrm %%WWWROOT%%/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/zh_TW
+%%NLS%%@dirrm %%WWWROOT%%/locale/ru_RU/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/ru_RU
+%%NLS%%@dirrm %%WWWROOT%%/locale/nl_NL/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/nl_NL
+%%NLS%%@dirrm %%WWWROOT%%/locale/ja_JP/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/ja_JP
+%%NLS%%@dirrm %%WWWROOT%%/locale/it_IT/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/it_IT
+%%NLS%%@dirrm %%WWWROOT%%/locale/hu_HU/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/hu_HU
+%%NLS%%@dirrm %%WWWROOT%%/locale/fr_FR/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/fr_FR
+%%NLS%%@dirrm %%WWWROOT%%/locale/es_ES/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/es_ES
+%%NLS%%@dirrm %%WWWROOT%%/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/de_DE
+%%NLS%%@dirrm %%WWWROOT%%/locale/ca_ES/LC_MESSAGES
+%%NLS%%@dirrm %%WWWROOT%%/locale/ca_ES
+%%NLS%%@dirrm %%WWWROOT%%/locale
@dirrm %%WWWROOT%%/lib/types
@dirrm %%WWWROOT%%/lib/modules
@dirrm %%WWWROOT%%/lib/font
@dirrm %%WWWROOT%%/lib
+@dirrm %%WWWROOT%%/html/style
+@dirrm %%WWWROOT%%/html/images
+@dirrm %%WWWROOT%%/html
@dirrm %%WWWROOT%%/help
@dirrm %%WWWROOT%%/graphics
+@dirrm %%WWWROOT%%/config/selfService
@dirrm %%WWWROOT%%/config/profiles
@dirrm %%WWWROOT%%/config/pdf/logos
@dirrm %%WWWROOT%%/config/pdf
@dirrm %%WWWROOT%%/config
@dirrm %%WWWROOT%%
+@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608241651.k7OGpT3A094848>