From owner-svn-ports-all@FreeBSD.ORG  Sat Mar  8 11:59:18 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 96A91911;
 Sat,  8 Mar 2014 11:59:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 83B41A38;
 Sat,  8 Mar 2014 11:59:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s28BxIFv014010;
 Sat, 8 Mar 2014 11:59:18 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s28BxIlT014009;
 Sat, 8 Mar 2014 11:59:18 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201403081159.s28BxIlT014009@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 8 Mar 2014 11:59:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347482 - head/mail/prayer
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Mar 2014 11:59:18 -0000

Author: antoine
Date: Sat Mar  8 11:59:18 2014
New Revision: 347482
URL: http://svnweb.freebsd.org/changeset/ports/347482
QAT: https://qat.redports.org/buildarchive/r347482/

Log:
  - Fix build on 8 and 9
  - Pass maintainership to submitter
  
  PR:		ports/186965
  Submitted by:	Nikola Kolev

Modified:
  head/mail/prayer/Makefile

Modified: head/mail/prayer/Makefile
==============================================================================
--- head/mail/prayer/Makefile	Sat Mar  8 11:55:16 2014	(r347481)
+++ head/mail/prayer/Makefile	Sat Mar  8 11:59:18 2014	(r347482)
@@ -5,7 +5,7 @@ PORTVERSION=	1.3.5
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	koue@chaosophia.net
 COMMENT=	Prayer Webmail System
 
 LICENSE=	GPLv2
@@ -42,7 +42,8 @@ MAKE_ARGS+=	RW_USER="${UID}" RW_GROUP="$
 		CCLIENT_INCLUDE="-I${LOCALBASE}/include/c-client" \
 		CCLIENT_LIBS="-L${LOCALBASE}/lib -lc-client4" \
 		CC="${CC}" \
-		CPPFLAGS="${CFLAGS}" \
+		CPPFLAGS="${CFLAGS} -I${ICONV_PREFIX}/include" \
+		LDFLAGS="-L${ICONV_PREFIX}/lib" \
 		PREFIX="${PREFIX}/prayer" \
 		BIN_DIR="${PREFIX}/sbin" \
 		PRAYER_CONFIG_FILE="${ETCDIR}/prayer.cf" \
@@ -91,7 +92,7 @@ post-patch:
 # change the user in the default config and cylog util
 	@${REINPLACE_CMD} "s#prayer_user           = \"prayer\"#prayer_user           = \"_prayer\"#" ${WRKSRC}/files/etc/prayer.cf.SRC
 	@${REINPLACE_CMD} "s#\"prayer\" \"prayer\"#\"_prayer\" \"prayer\"#" ${WRKSRC}/utils/prayer-cyclog.SRC
-	@${REINPLACE_CMD} "s,-liconv,${ICONV_LIB}," ${WRKSRC}/Config
+	@${REINPLACE_CMD} "s,-lutil,-lutil ${ICONV_LIB}," ${WRKSRC}/Config
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/prayer \