Bug 194004 - [PATCH] sysutils/ldap-account-manager upgrade to 4.7 (maintainer update)
Summary: [PATCH] sysutils/ldap-account-manager upgrade to 4.7 (maintainer update)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Kurt Jaeger
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-09-28 20:10 UTC by basil
Modified: 2014-09-29 19:00 UTC (History)
1 user (show)

See Also:

Attachments
ldap-account-manager 4.6 -> 4.7 (1.94 KB, text/plain)
2014-09-28 20:10 UTC, basil 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description basil 2014-09-28 20:10:53 UTC 
Created attachment 147767 [details]
ldap-account-manager 4.6 -> 4.7

diff -ruN /usr/ports/sysutils/ldap-account-manager/Makefile /root/ldap-account-manager/Makefile
--- /usr/ports/sysutils/ldap-account-manager/Makefile	2014-09-18 22:26:56.000000000 +0300
+++ /root/ldap-account-manager/Makefile	2014-09-28 22:55:45.570313572 +0300
@@ -1,7 +1,7 @@
 # $FreeBSD: head/sysutils/ldap-account-manager/Makefile 368508 2014-09-18 19:26:56Z antoine $
 
 PORTNAME=	ldap-account-manager
-PORTVERSION=	4.6
+PORTVERSION=	4.7
 CATEGORIES=	sysutils www
 MASTER_SITES=	SF/${SHORTNAME}/LAM/${PORTVERSION}
 
@@ -31,14 +31,11 @@
 
 .include <bsd.port.options.mk>
 
-post-extract:
-.for CONFIG in ${CONFIGS}
-	@${MV} ${WRKSRC}/config/${CONFIG}_sample ${WRKSRC}/config/${CONFIG}.sample
-.endfor
 do-install:
-	@${ECHO_CMD} '@unexec if [ -f %D/${WWWDIR_REL}/config/shells ]; then ${RM} -f %D/${WWWDIR_REL}/config/shells; fi' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec if [ -f %D/${WWWDIR_REL}/config/shells ]; then ${RM} -f %D/${WWWDIR_REL}/config/shells; fi' >> ${TMPPLIST}
 .for CONFIG in ${CONFIGS}
 	@${ECHO_CMD} '@sample ${WWWDIR_REL}/config/${CONFIG}.sample' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec if [ -f %D/${WWWDIR_REL}/config/${CONFIG}_sample ]; then ${RM} -f %D/${WWWDIR_REL}/config/${CONFIG}_sample; fi' >> ${TMPPLIST}
 .endfor
 .for I in ${LAMDATA}
 	@${FIND} -s ${WRKSRC}/${I} -type f -not -name '*.sample' | ${SED} -e 's,^${WRKSRC},${WWWDIR_REL},' >> ${TMPPLIST}
diff -ruN /usr/ports/sysutils/ldap-account-manager/distinfo /root/ldap-account-manager/distinfo
--- /usr/ports/sysutils/ldap-account-manager/distinfo	2014-06-22 17:39:49.000000000 +0300
+++ /root/ldap-account-manager/distinfo	2014-09-28 22:45:16.341283154 +0300
@@ -1,2 +1,2 @@
-SHA256 (ldap-account-manager-4.6.tar.bz2) = df9f267c33ddce52e598ac540fecce0f3dc2546a0cc339f8200f39a1baa411f1
-SIZE (ldap-account-manager-4.6.tar.bz2) = 12358788
+SHA256 (ldap-account-manager-4.7.tar.bz2) = 207b424ca27743095509bc093983978481e9372a285ca6fd8bd3dd2f4dcf924f
+SIZE (ldap-account-manager-4.7.tar.bz2) = 12491347
Comment 1 basil 2014-09-28 20:11:40 UTC 
4.7
Nginx webserver support
DHCP: support pooling of IP ranges (RFE 107)
Personal: support pager attribute (hidden by default)
Renamed config/lam.conf_sample to lam.conf.sample and config.cfg_sample to config.cfg.sample
LAM Pro:
Password dialog: preset alternate email address with backup email address (RFE 111)
Comment 2 commit-hook freebsd_committer freebsd_triage 2014-09-29 19:00:04 UTC 
A commit references this bug:

Author: pi
Date: Mon Sep 29 18:59:32 UTC 2014
New revision: 369546
URL: https://svnweb.freebsd.org/changeset/ports/369546

Log:
  sysutils/ldap-account-manager: 4.6 -> 4.7

  Changes:
  - Nginx webserver support
  - DHCP: support pooling of IP ranges (RFE 107)
  - Personal: support pager attribute (hidden by default)
  - Renamed config/lam.conf_sample to lam.conf.sample and
    config.cfg_sample to config.cfg.sample
  - LAM Pro:
    Password dialog: preset alternate email address with backup email
    address (RFE 111)

  PR:		194004
  Submitted by:	basil@vpm.net.ua (maintainer)

Changes:
  head/sysutils/ldap-account-manager/Makefile
  head/sysutils/ldap-account-manager/distinfo
Comment 3 Kurt Jaeger freebsd_committer freebsd_triage 2014-09-29 19:00:48 UTC 
Tested with poudriere, fixed @dirrmtry -> @dir, looks fine.

Committed, thanks!