From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 8 15:20:55 2006 Return-Path: X-Original-To: freebsd-ports-bugs@FreeBSD.org Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D67FD16A420 for ; Wed, 8 Feb 2006 15:20:55 +0000 (GMT) (envelope-from jmelo@freebsdbrasil.com.br) Received: from capeta.freebsdbrasil.com.br (vrrp.freebsdbrasil.com.br [200.210.70.30]) by mx1.FreeBSD.org (Postfix) with SMTP id 8808C43D48 for ; Wed, 8 Feb 2006 15:20:54 +0000 (GMT) (envelope-from jmelo@freebsdbrasil.com.br) Received: (qmail 64053 invoked by uid 0); 8 Feb 2006 13:20:53 -0200 Received: from jmelo@freebsdbrasil.com.br by capeta.freebsdbrasil.com.br by uid 82 with qmail-scanner-1.22 (uvscan: v4.3.20/v4691. Clear:RC:1(201.17.153.114):. Processed in 0.76966 secs); 08 Feb 2006 15:20:53 -0000 Received: from unknown (HELO ?10.69.69.2?) (201.17.153.114) by capeta.freebsdbrasil.com.br with SMTP; 8 Feb 2006 13:20:52 -0200 Message-ID: <43EA0D12.6070305@freebsdbrasil.com.br> Date: Wed, 08 Feb 2006 13:24:02 -0200 From: Jean Milanez Melo User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050614) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Pav Lucistnik References: <200602072059.k17KxDlo016205@freefall.freebsd.org> In-Reply-To: <200602072059.k17KxDlo016205@freefall.freebsd.org> Content-Type: multipart/mixed; boundary="------------020103030206040405010001" Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/92974: Update port: mail/prayer unbreak and update to 1.0.16 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2006 15:20:56 -0000 This is a multi-part message in MIME format. --------------020103030206040405010001 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Pav Lucistnik wrote: > Synopsis: Update port: mail/prayer unbreak and update to 1.0.16 > > State-Changed-From-To: open->feedback > State-Changed-By: pav > State-Changed-When: Tue Feb 7 20:58:51 UTC 2006 > State-Changed-Why: > Does not compile: > > cc -Wall -g -O -pipe -I/usr/kerberos/include -I/usr/local/include/c-client -DLDAP_ENABLE -c lookup.c > lookup.c:12:18: ldap.h: No such file or directory > > > Responsible-Changed-From-To: freebsd-ports-bugs->pav > Responsible-Changed-By: pav > Responsible-Changed-When: Tue Feb 7 20:58:51 UTC 2006 > Responsible-Changed-Why: > Track > > http://www.freebsd.org/cgi/query-pr.cgi?pr=92974 Pav, Seems that patch i sent was missing few lines. I'm sending the patch again. Look at line 159, "LDAP_INCLUDE = -I${LOCALBASE}/include" It fix this problem. Thanks. -- Atenciosamente Jean Milanez Melo FreeBSD Brasil LTDA. Fone: (31) 3281-9633 http://www.freebsdbrasil.com.br --------------020103030206040405010001 Content-Type: text/x-patch; name="prayer.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="prayer.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/prayer/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 17 Feb 2005 23:21:17 -0000 1.5 +++ Makefile 7 Feb 2006 15:01:12 -0000 @@ -6,10 +6,9 @@ # PORTNAME= prayer -PORTVERSION= 1.0.12 +PORTVERSION= 1.0.16 CATEGORIES= mail www MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/ -# ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/prayer-1.0.8.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= Prayer Webmail System @@ -19,9 +18,9 @@ LIB_DEPENDS+= ${BERKELEYDB_LIB}:${PORTSDIR}/${BERKELEYDB_PORT} .endif +USE_OPENLDAP= yes USE_GMAKE= yes USE_OPENSSL= yes -USE_REINPLACE= yes USE_PERL5_BUILD= yes MAKE_ENV+= PORTCFLAGS="${CFLAGS}" BERKELEYDB_PORT?= databases/db42 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/prayer/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 25 Nov 2005 15:30:54 -0000 1.5 +++ distinfo 7 Feb 2006 15:01:12 -0000 @@ -1,3 +1,3 @@ -MD5 (prayer-1.0.12.tar.gz) = e2bb8fb3ccc54ab1719896bb4cc226db -SHA256 (prayer-1.0.12.tar.gz) = d8152bdbac2469eef6e01f40bf9ee6701e130018a817ea13fb0437437deb14b4 -SIZE (prayer-1.0.12.tar.gz) = 544239 +MD5 (prayer-1.0.16.tar.gz) = bede9f6cb3502d6180581bc4ff1f1961 +SHA256 (prayer-1.0.16.tar.gz) = 227fc7130b1ca2cc07cfe32aabc1b47ea5edfe9c8960dd46502f748a92cfd69b +SIZE (prayer-1.0.16.tar.gz) = 575980 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/prayer/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 17 Feb 2005 23:21:17 -0000 1.3 +++ pkg-plist 7 Feb 2006 15:01:12 -0000 @@ -4,7 +4,6 @@ prayer/help/CVS/Root prayer/help/CVS/Repository prayer/help/CVS/Entries -prayer/help/CVS/Entries.Log prayer/help/compose/CVS/Root prayer/help/compose/CVS/Repository prayer/help/compose/CVS/Entries @@ -14,7 +13,10 @@ prayer/help/compose/role_list.html prayer/help/abook_add.html prayer/help/abook_list.html +prayer/help/abook_lookup.html prayer/help/abook_search.html +prayer/help/abook_take.html +prayer/help/abook_update.html prayer/help/abook_xfer.html prayer/help/attachments.html prayer/help/block.html @@ -50,9 +52,12 @@ prayer/help/prefs/CVS/Entries prayer/help/prefs/compose1.html prayer/help/prefs/compose2.html +prayer/help/prefs/compose2.html.~1.2.~ prayer/help/prefs/display1.html +prayer/help/prefs/display1.html.~1.2.~ prayer/help/prefs/folder.html prayer/help/prefs/general.html +prayer/help/prefs/general.html.~1.2.~ prayer/icons/CVS/Root prayer/icons/CVS/Repository prayer/icons/CVS/Entries @@ -96,6 +101,7 @@ prayer/etc/motd.html prayer/etc/welcome.html prayer/sbin/prayer +prayer/sbin/prayer-db-prune prayer/sbin/prayer-session prayer/sbin/prayer-ssl-prune prayer/sbin/prayer-sem-prune @@ -130,4 +136,4 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%% @exec mkdir -p /var/spool/prayer @exec chown -R prayer:prayer /var/spool/prayer -@unexec rmdir /var/spool/prayer +@dirrmtry /var/spool/prayer Index: files/patch-Config =================================================================== RCS file: /home/ncvs/ports/mail/prayer/files/patch-Config,v retrieving revision 1.2 diff -u -r1.2 patch-Config --- files/patch-Config 17 Feb 2005 23:21:17 -0000 1.2 +++ files/patch-Config 7 Feb 2006 15:01:12 -0000 @@ -1,6 +1,6 @@ ---- Config.orig Thu Feb 17 12:18:46 2005 -+++ Config Thu Feb 17 12:23:25 2005 -@@ -27,7 +27,7 @@ +--- Config.orig Tue Feb 7 12:38:13 2006 ++++ Config Tue Feb 7 12:38:46 2006 +@@ -28,7 +28,7 @@ ############################################################################ # Location of compiler @@ -9,7 +9,7 @@ # Location of make program (GNU make required) MAKE = gmake # Location of install program (GNU install or compatible required) -@@ -36,7 +36,8 @@ +@@ -37,7 +37,8 @@ # Base Compiler options for GCC. #BASECFLAGS = -Wall -g #BASELDFLAGS = -g @@ -19,7 +19,7 @@ BASELDFLAGS = -g -O2 BASE_LIBS = -lcrypt -@@ -57,9 +58,9 @@ +@@ -58,9 +59,9 @@ # which points to ../../imap/c-client. This just reduces the amount of # noise output on each line when building the package. # @@ -32,7 +32,7 @@ CCLIENT_SSL_ENABLE = true # -@@ -79,12 +80,14 @@ +@@ -80,12 +81,14 @@ # Following works with the mail/cclient port from FreeBSD # #CCLIENT_INCLUDE = -I/usr/local/include/c-client @@ -48,7 +48,16 @@ #CCLIENT_KERB_ENABLE = true ############################################################################ -@@ -123,12 +126,12 @@ +@@ -99,7 +102,7 @@ + Z_LIB = -lz + + # LDAP (required if LDAP_ENABLE set) +-LDAP_INCLUDE = ++LDAP_INCLUDE = -I${LOCALBASE}/include + LDAP_LIB = -lldap + + # Pam (required if CCLIENT_PAM_ENABLE set) +@@ -128,12 +131,12 @@ # DB definitions (required if SESSION_CACHE_ENABLE set) # # Following suitable for Redhat Linux which has DB 3 preinstalled --------------020103030206040405010001--