From markand@malikania.fr  Thu Jan 30 13:07:09 2014
Return-Path: <markand@malikania.fr>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 7F92092C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Jan 2014 13:07:09 +0000 (UTC)
Received: from postfix.malikania.fr (ks3292218.kimsufi.com [5.135.187.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A2D91972
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Jan 2014 13:07:09 +0000 (UTC)
Received: from postfix.malikania.fr (unknown [10.0.0.5])
	by postfix.malikania.fr (Postfix) with ESMTPS id A7BC26D5E
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Jan 2014 14:07:05 +0100 (CET)
Received: by postfix.malikania.fr (sSMTP sendmail emulation); Thu, 30 Jan 2014 14:07:05 +0100
Message-Id: <20140130130705.A7BC26D5E@postfix.malikania.fr>
Date: Thu, 30 Jan 2014 14:07:05 +0100
From: "David Demelier" <markand@malikania.fr>
Reply-To: David Demelier <markand@malikania.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] net-im/ejabberd: does not compile in poudriere
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         186274
>Category:       ports
>Synopsis:       [patch] net-im/ejabberd: does not compile in poudriere
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    ashish
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 30 13:10:00 UTC 2014
>Closed-Date:    Wed Feb 05 08:27:55 UTC 2014
>Last-Modified:  Wed Feb  5 08:30:00 UTC 2014
>Originator:     David Demelier
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD Pomme.malikania.fr 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r261002: Wed Jan 22 10:16:44 CET 2014 root@Pomme.malikania.fr:/usr/obj/usr/src/sys/Pomme amd64

>Description:
Does not compile in poudriere because it cannot find expat.h. I also wonder how it can compile outside poudriere.

The patch adds --with-expat and it seems to work, however I don't know which one from LOCALBASE
or PREFIX is the best.

checking for XML_ParserCreate in -lexpat... no
configure: error: Could not find development files of Expat library
===>  Script "configure" failed unexpectedly.
Please report the problem to ashish@FreeBSD.org [maintainer] and attach the
"/wrkdirs/usr/ports/net-im/ejabberd/work/ejabberd-2.1.13/src/config.log"
including the output of the failure of your make command. Also, it might be
a good idea to provide an overview of all packages installed on your system
(e.g. a /usr/local/sbin/pkg-static info -g -Ea).
*** Error code 1

Stop.
make: stopped in /usr/ports/net-im/ejabberd
===>  Cleaning for ejabberd-2.1.13
build of /usr/ports/net-im/ejabberd ended at Thu Jan 30 13:18:00 CET 2014
build time: 00:00:33

>How-To-Repeat:
>Fix:

--- ejabberd.diff begins here ---
--- Makefile.orig	2014-01-30 13:55:42.076324542 +0100
+++ Makefile	2014-01-30 13:59:01.682311214 +0100
@@ -28,7 +28,7 @@
 OPTIONS_DEFINE=	ODBC PAM
 
 MAKE_ENV=	PORTVERSION=${PORTVERSION}
-CONFIGURE_ARGS+=--localstatedir=/var --with-openssl=${OPENSSLBASE}
+CONFIGURE_ARGS+=--localstatedir=/var --with-openssl=${OPENSSLBASE} --with-expat=${LOCALBASE}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
--- ejabberd.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ashish 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jan 30 13:10:07 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186274 

From: ashish@FreeBSD.org (Ashish SHUKLA)
To: markand@malikania.fr
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186274: [patch] net-im/ejabberd: does not compile in poudriere
Date: Thu, 30 Jan 2014 22:28:49 +0530

 --==-=-=
 Content-Type: multipart/mixed; boundary="=-=-="
 
 --=-=-=
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 
 Hi David,
 
 Could you please try the attached diff ?
 
 It adds STAGEing support as well. It's pending from quite sometime, I was
 hoping to update port to latest version, but chances are not that good atm,=
  so
 I'll commit this, if it passes the build for you.
 
 Thanks!
 =2D-=20
 Ashish SHUKLA      | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
 Sent from my Emacs
 
 --=-=-=
 Content-Type: text/x-diff
 Content-Disposition: attachment; filename=ejabberd.diff
 Content-Transfer-Encoding: quoted-printable
 Content-Description: net-im/ejabberd
 
 diff -urN /usr/ports/net-im/ejabberd/Makefile ejabberd/Makefile
 =2D-- /usr/ports/net-im/ejabberd/Makefile	2013-09-21 03:43:34.000000000 +05=
 30
 +++ ejabberd/Makefile	2014-01-02 07:23:30.490752420 +0530
 @@ -15,7 +15,7 @@
 =20
  BUILD_DEPENDS=3D	erlc:${PORTSDIR}/lang/erlang
  RUN_DEPENDS=3D	erl:${PORTSDIR}/lang/erlang
 =2DLIB_DEPENDS=3D	expat.6:${PORTSDIR}/textproc/expat2
 +LIB_DEPENDS=3D	expat:${PORTSDIR}/textproc/expat2
 =20
  USERS=3D		ejabberd
  GROUPS=3D		${USERS}
 @@ -25,57 +25,43 @@
  USE_RC_SUBR=3D	${PORTNAME}
  NOPRECIOUSMAKEVARS=3D	yes
 =20
 =2DOPTIONS_DEFINE=3D	ODBC PAM
 +OPTIONS_DEFINE=3D	ODBC PAM DOCS
 =20
  MAKE_ENV=3D	PORTVERSION=3D${PORTVERSION}
 =2DCONFIGURE_ARGS+=3D--localstatedir=3D/var --with-openssl=3D${OPENSSLBASE}
 +CONFIGURE_ARGS+=3D--localstatedir=3D/var --with-openssl=3D${OPENSSLBASE} -=
 -with-expat=3D${LOCALBASE}
  PKGMESSAGE=3D	${WRKDIR}/pkg-message
  PKGINSTALL=3D	${WRKDIR}/pkg-install
  PLIST_SUB=3D	PORTNAME=3D${PORTNAME} PORTVERSION=3D${PORTVERSION}
  SUB_FILES=3D	pkg-message pkg-install
  SUB_LIST=3D	PORTNAME=3D${PORTNAME} PORTVERSION=3D${PORTVERSION} \
 =2D		USERS=3D${USERS} GROUPS=3D${GROUPS}
 +		USERS=3D${USERS} GROUPS=3D${GROUPS} SHAREMODE=3D${SHAREMODE} \
 +		SHAREOWN=3D${SHAREOWN} SHAREGRP=3D${SHAREGRP}
  WRKSRC=3D		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 =20
 =2DNO_STAGE=3D	yes
 +OPTIONS_SUB=3D		PAM ODBC
 +PAM_CONFIGURE_ENABLE=3D	pam
 +ODBC_CONFIGURE_ENABLE=3D	odbc
 +DOCS_MAKE_ARGS=3D		NOPORTDOCS=3D${NOPORTDOCS}
 +
  .include <bsd.port.pre.mk>
 =20
  USE_OPENSSL=3D	yes
 =20
  .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 =20
 =2D.if ${PORT_OPTIONS:MODBC}
 =2DCONFIGURE_ARGS+=3D--enable-odbc
 =2DPLIST_SUB+=3D	ODBC=3D""
 =2D.else
 =2DPLIST_SUB+=3D	ODBC=3D"@comment "
 =2D.endif
 =2D
  .if ${PORT_OPTIONS:MPAM}
 =2DCONFIGURE_ARGS+=3D--enable-pam
 =2DPLIST_SUB+=3D	PAM=3D""
 +SUB_LIST+=3D		PAM=3D"1"
  .else
 =2DPLIST_SUB+=3D	PAM=3D"@comment "
 =2D.endif
 =2D
 =2D.if ! ${PORT_OPTIONS:MDOCS}
 =2DMAKE_ARGS+=3D	NOPORTDOCS=3D${NOPORTDOCS}
 +SUB_LIST+=3D		PAM=3D"0"
  .endif
 =20
  post-patch:
  	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure
 =20
  post-install:
 =2D	@PKG_PREFIX=3D${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 =2D	@${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS=
 } -0 ${CHMOD} ${SHAREMODE}
 =2D	@${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS=
 } -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 =2D
  .if ${PORT_OPTIONS:MPAM}
 =2D	${CHMOD} 4750 ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/epam
 =2D	${CHOWN} root:ejabberd ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/ep=
 am
 =2D	${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${PREFIX}/etc/pam.d/ejabberd
 +	${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${STAGEDIR}${PREFIX}/etc/pam.d=
 /ejabberd
  .endif
 =2D
  	@${CAT} ${PKGMESSAGE}
 =20
  .include <bsd.port.post.mk>
 diff -urN /usr/ports/net-im/ejabberd/files/patch-src-Makefile.in ejabberd/f=
 iles/patch-src-Makefile.in
 =2D-- /usr/ports/net-im/ejabberd/files/patch-src-Makefile.in	2012-07-14 19:=
 59:18.000000000 +0530
 +++ ejabberd/files/patch-src-Makefile.in	2014-01-02 07:23:31.215108611 +0530
 @@ -1,15 +1,18 @@
 +
 +$FreeBSD$
 +
  --- Makefile.in.orig
  +++ Makefile.in
 =2D@@ -89,7 +89,7 @@
 +@@ -95,7 +95,7 @@
   SBINDIR =3D $(DESTDIR)@sbindir@
 =20=20
   # /lib/ejabberd/
  -EJABBERDDIR =3D $(DESTDIR)@libdir@/ejabberd
 =2D+EJABBERDDIR =3D @libdir@/erlang/lib/ejabberd-$(PORTVERSION)
 ++EJABBERDDIR =3D $(DESTDIR)@libdir@/erlang/lib/ejabberd-$(PORTVERSION)
 =20=20
   # /share/doc/ejabberd
   PACKAGE_TARNAME =3D @PACKAGE_TARNAME@
 =2D@@ -115,7 +115,7 @@
 +@@ -121,7 +121,7 @@
   MSGSDIR =3D $(PRIVDIR)/msgs
 =20=20
   # /var/lib/ejabberd/
 @@ -18,7 +21,7 @@
 =20=20
   # /var/lock/ejabberdctl
   CTLLOCKDIR =3D $(DESTDIR)@localstatedir@/lock/ejabberdctl
 =2D@@ -178,25 +178,22 @@
 +@@ -184,25 +184,22 @@
   	#
   	# Configuration files
   	install -d -m 750 $(G_USER) $(ETCDIR)
 @@ -51,7 +54,7 @@
   	#
   	# Init script
   	sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
 =2D@@ -253,6 +250,7 @@
 +@@ -260,6 +257,7 @@
   	chmod -R 750 $(LOGDIR)
   	#
   	# Documentation
 @@ -59,7 +62,7 @@
   	install -d $(DOCDIR)
   	install -m 644 ../doc/dev.html $(DOCDIR)
   	install -m 644 ../doc/guide.html $(DOCDIR)
 =2D@@ -262,6 +260,7 @@
 +@@ -269,6 +267,7 @@
   		&& install -m 644 ../doc/guide.pdf $(DOCDIR) \
   		|| echo "No ../doc/guide.pdf was built"
   	install -m 644 ../COPYING $(DOCDIR)
 diff -urN /usr/ports/net-im/ejabberd/files/pkg-install.in ejabberd/files/pk=
 g-install.in
 =2D-- /usr/ports/net-im/ejabberd/files/pkg-install.in	2012-07-14 19:59:18.0=
 00000000 +0530
 +++ ejabberd/files/pkg-install.in	2014-01-02 07:23:31.280751797 +0530
 @@ -10,5 +10,13 @@
 =20
  chown -R %%USERS%%:%%GROUPS%%  %%PREFIX%%/etc/%%PORTNAME%%
  chown -R %%USERS%%:%%GROUPS%%  %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PO=
 RTVERSION%%
 +=09
 +find %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% -type f -print=
 0 | xargs -0 chmod %%SHAREMODE%%
 +find %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% -type f -print=
 0 | xargs -0 chown %%SHAREOWN%%:%%SHAREGRP%%
 +
 +if [ "%%PAM%%" =3D 1 ]; then
 +	chmod 4750 %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bi=
 n/epam
 +	chown root:%%GROUPS%% %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSIO=
 N%%/priv/bin/epam
 +fi
 =20
  exit 0
 diff -urN /usr/ports/net-im/ejabberd/pkg-plist ejabberd/pkg-plist
 =2D-- /usr/ports/net-im/ejabberd/pkg-plist	2013-09-09 20:18:31.000000000 +0=
 530
 +++ ejabberd/pkg-plist	2014-01-02 07:23:31.331752906 +0530
 @@ -2,8 +2,8 @@
  %%ETCDIR%%/%%PORTNAME%%ctl.cfg.example
  %%ETCDIR%%/inetrc.example
  @unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.defaults.example %D/%%ETCDIR%=
 %/%%PORTNAME%%.defaults; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.defaults; fi
 =2D@unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%=
 %/%%PORTNAME%%.inetrc; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; fi
 =2D@exec [ ! -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc ] && cp %D/%%ETCDIR%%/%%P=
 ORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc
 +@unexec if cmp -s %D/%%ETCDIR%%/inetrc.example %D/%%ETCDIR%%/inetrc; then =
 rm -f %D/%%ETCDIR%%/inetrc; fi
 +@exec [ ! -f %D/%%ETCDIR%%/inetrc ] && cp %D/%%ETCDIR%%/inetrc.example %D/=
 %%ETCDIR%%/inetrc
  %%PAM%%etc/pam.d/%%PORTNAME%%
  lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
  lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
 
 --=-=-=--
 
 --==-=-=
 Content-Type: application/pgp-signature; name="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (FreeBSD)
 
 iQIcBAEBCgAGBQJS6oTJAAoJEMdGz6nnT6Sw38MP/3HBgOVuKGdAKKHoF9BnVS4T
 mrGkR+qcCeHpq2eSwiOH+sJlTW+JOaOKc3oWe963hMa/HM7t9cnTS2RMjtDzPeKq
 8dLdlBMJQaLIy19oM08XdRPuKjqk+4fJfmbh/wNstiwBknQUGlxigCZth8326ckY
 PInaJngBJxnNMhDH6jk7R1P9iWaWh+bBWmQxSsHgGfK6UthrrE9VXljE8C5nbOHB
 oawSIk0EoWnmoSlkrSSmpYAypgnkGRW+dYZ+SBjXRq92cPHYW0Q3D339MQ2YSnyI
 qp6I/FzFec6sAwt1nGoaDZo+Nhz4TDf2TFKuxB+zIdc2g+SkC6khi2KoD4yme1r4
 HqoK6+0E351Q3eW0rkJQEbMuWZMf1/9jR8pPyxRLGuADKzyaMIG9j2VvPWIT0VnZ
 9DPzXey2RD17rFxv4XUQLtB/Tng78HkBZtCibuN8sZ9WHQS3uNnZSSxZOQCCf4UY
 ca2U9uCTQuHWDjeQL+0SSUp7oV7T9xa3ZyXhLvQ6eVCyc+ALAut2kRkCay3abtv+
 M3PeaysDy+Tf4mHfYI48rXxMekpMkJpGF9xfSeKbRa9FYB81FbGe0uTlcPN494sI
 bhsSa3Y6ogXvztPupmFE+9v7mWQvbLxCqxdU0tGMgHD+PeawRvuHAm4cfKO60Mkn
 +eK8dcz1BGm/8w/gZViy
 =RNvB
 -----END PGP SIGNATURE-----
 --==-=-=--

From: David Demelier <markand@malikania.fr>
To: Ashish SHUKLA <ashish@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186274: [patch] net-im/ejabberd: does not compile in poudriere
Date: Fri, 31 Jan 2014 11:59:30 +0100

 On 30/01/2014 17:58, Ashish SHUKLA wrote:
 > Hi David,
 >
 > Could you please try the attached diff ?
 >
 > It adds STAGEing support as well. It's pending from quite sometime, I was
 > hoping to update port to latest version, but chances are not that good atm, so
 > I'll commit this, if it passes the build for you.
 >
 > Thanks!
 
 It seems to work ;-).
 
 Regards,
State-Changed-From-To: open->closed 
State-Changed-By: ashish 
State-Changed-When: Wed Feb 5 08:27:54 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186274 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186274: commit references a PR
Date: Wed,  5 Feb 2014 08:24:53 +0000 (UTC)

 Author: ashish
 Date: Wed Feb  5 08:24:45 2014
 New Revision: 342652
 URL: http://svnweb.freebsd.org/changeset/ports/342652
 QAT: https://qat.redports.org/buildarchive/r342652/
 
 Log:
   - Fix brokenness on 10-RELEASE due to expat library
   - Remove ABI version from LIB_DEPENDS
   - Add STAGE support
   - Add option for documentation
   - Use OptionsNG helpers
   
   PR:		ports/186274 ports/185594
 
 Modified:
   head/net-im/ejabberd/Makefile
   head/net-im/ejabberd/files/patch-src-Makefile.in
   head/net-im/ejabberd/files/pkg-install.in
   head/net-im/ejabberd/pkg-plist
 
 Modified: head/net-im/ejabberd/Makefile
 ==============================================================================
 --- head/net-im/ejabberd/Makefile	Wed Feb  5 08:22:02 2014	(r342651)
 +++ head/net-im/ejabberd/Makefile	Wed Feb  5 08:24:45 2014	(r342652)
 @@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PO
  
  BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
  RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 -LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 +LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
  
  USERS=		ejabberd
  GROUPS=		${USERS}
 @@ -25,57 +25,41 @@ USES=		iconv gmake pkgconfig
  USE_RC_SUBR=	${PORTNAME}
  NOPRECIOUSMAKEVARS=	yes
  
 -OPTIONS_DEFINE=	ODBC PAM
 +OPTIONS_DEFINE=	ODBC PAM DOCS
  
  MAKE_ENV=	PORTVERSION=${PORTVERSION}
 -CONFIGURE_ARGS+=--localstatedir=/var --with-openssl=${OPENSSLBASE}
 +CONFIGURE_ARGS+=--localstatedir=/var --with-openssl=${OPENSSLBASE} --with-expat=${LOCALBASE}
  PKGMESSAGE=	${WRKDIR}/pkg-message
  PKGINSTALL=	${WRKDIR}/pkg-install
  PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
  SUB_FILES=	pkg-message pkg-install
  SUB_LIST=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
 -		USERS=${USERS} GROUPS=${GROUPS}
 +		USERS=${USERS} GROUPS=${GROUPS} SHAREMODE=${SHAREMODE} \
 +		SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP}
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
  
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 +OPTIONS_SUB=		PAM ODBC
 +PAM_CONFIGURE_ENABLE=	pam
 +ODBC_CONFIGURE_ENABLE=	odbc
 +DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=yes
  
  USE_OPENSSL=	yes
  
 -.include "${PORTSDIR}/Mk/bsd.openssl.mk"
 -
 -.if ${PORT_OPTIONS:MODBC}
 -CONFIGURE_ARGS+=--enable-odbc
 -PLIST_SUB+=	ODBC=""
 -.else
 -PLIST_SUB+=	ODBC="@comment "
 -.endif
 +.include <bsd.port.pre.mk>
  
  .if ${PORT_OPTIONS:MPAM}
 -CONFIGURE_ARGS+=--enable-pam
 -PLIST_SUB+=	PAM=""
 +SUB_LIST+=		PAM="1"
  .else
 -PLIST_SUB+=	PAM="@comment "
 -.endif
 -
 -.if ! ${PORT_OPTIONS:MDOCS}
 -MAKE_ARGS+=	NOPORTDOCS=${NOPORTDOCS}
 +SUB_LIST+=		PAM="0"
  .endif
  
  post-patch:
  	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure
  
  post-install:
 -	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 -	@${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
 -	@${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 -
  .if ${PORT_OPTIONS:MPAM}
 -	${CHMOD} 4750 ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/epam
 -	${CHOWN} root:ejabberd ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/epam
 -	${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${PREFIX}/etc/pam.d/ejabberd
 +	${INSTALL} -m 444 ${FILESDIR}/pam_ejabberd ${STAGEDIR}${PREFIX}/etc/pam.d/ejabberd
  .endif
 -
  	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.mk>
 
 Modified: head/net-im/ejabberd/files/patch-src-Makefile.in
 ==============================================================================
 --- head/net-im/ejabberd/files/patch-src-Makefile.in	Wed Feb  5 08:22:02 2014	(r342651)
 +++ head/net-im/ejabberd/files/patch-src-Makefile.in	Wed Feb  5 08:24:45 2014	(r342652)
 @@ -1,15 +1,18 @@
 +
 +$FreeBSD$
 +
  --- Makefile.in.orig
  +++ Makefile.in
 -@@ -89,7 +89,7 @@
 +@@ -95,7 +95,7 @@
   SBINDIR = $(DESTDIR)@sbindir@
   
   # /lib/ejabberd/
  -EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
 -+EJABBERDDIR = @libdir@/erlang/lib/ejabberd-$(PORTVERSION)
 ++EJABBERDDIR = $(DESTDIR)@libdir@/erlang/lib/ejabberd-$(PORTVERSION)
   
   # /share/doc/ejabberd
   PACKAGE_TARNAME = @PACKAGE_TARNAME@
 -@@ -115,7 +115,7 @@
 +@@ -121,7 +121,7 @@
   MSGSDIR = $(PRIVDIR)/msgs
   
   # /var/lib/ejabberd/
 @@ -18,7 +21,7 @@
   
   # /var/lock/ejabberdctl
   CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
 -@@ -178,25 +178,22 @@
 +@@ -184,25 +184,22 @@
   	#
   	# Configuration files
   	install -d -m 750 $(G_USER) $(ETCDIR)
 @@ -51,7 +54,7 @@
   	#
   	# Init script
   	sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
 -@@ -253,6 +250,7 @@
 +@@ -260,6 +257,7 @@
   	chmod -R 750 $(LOGDIR)
   	#
   	# Documentation
 @@ -59,7 +62,7 @@
   	install -d $(DOCDIR)
   	install -m 644 ../doc/dev.html $(DOCDIR)
   	install -m 644 ../doc/guide.html $(DOCDIR)
 -@@ -262,6 +260,7 @@
 +@@ -269,6 +267,7 @@
   		&& install -m 644 ../doc/guide.pdf $(DOCDIR) \
   		|| echo "No ../doc/guide.pdf was built"
   	install -m 644 ../COPYING $(DOCDIR)
 
 Modified: head/net-im/ejabberd/files/pkg-install.in
 ==============================================================================
 --- head/net-im/ejabberd/files/pkg-install.in	Wed Feb  5 08:22:02 2014	(r342651)
 +++ head/net-im/ejabberd/files/pkg-install.in	Wed Feb  5 08:24:45 2014	(r342652)
 @@ -10,5 +10,13 @@ install -d -m 750 -o %%USERS%% -g %%GROU
  
  chown -R %%USERS%%:%%GROUPS%%  %%PREFIX%%/etc/%%PORTNAME%%
  chown -R %%USERS%%:%%GROUPS%%  %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
 +	
 +find %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 | xargs -0 chmod %%SHAREMODE%%
 +find %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%% -type f -print0 | xargs -0 chown %%SHAREOWN%%:%%SHAREGRP%%
 +
 +if [ "%%PAM%%" = 1 ]; then
 +	chmod 4750 %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
 +	chown root:%%GROUPS%% %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
 +fi
  
  exit 0
 
 Modified: head/net-im/ejabberd/pkg-plist
 ==============================================================================
 --- head/net-im/ejabberd/pkg-plist	Wed Feb  5 08:22:02 2014	(r342651)
 +++ head/net-im/ejabberd/pkg-plist	Wed Feb  5 08:24:45 2014	(r342652)
 @@ -2,8 +2,8 @@
  %%ETCDIR%%/%%PORTNAME%%ctl.cfg.example
  %%ETCDIR%%/inetrc.example
  @unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.defaults.example %D/%%ETCDIR%%/%%PORTNAME%%.defaults; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.defaults; fi
 -@unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; fi
 -@exec [ ! -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc ] && cp %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc
 +@unexec if cmp -s %D/%%ETCDIR%%/inetrc.example %D/%%ETCDIR%%/inetrc; then rm -f %D/%%ETCDIR%%/inetrc; fi
 +@exec [ ! -f %D/%%ETCDIR%%/inetrc ] && cp %D/%%ETCDIR%%/inetrc.example %D/%%ETCDIR%%/inetrc
  %%PAM%%etc/pam.d/%%PORTNAME%%
  lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam
  lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
