Date: 7 Feb 2006 13:11:53 -0200 From: Jean Milanez Melo <jmelo@freebsdbrasil.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92974: Update port: mail/prayer unbreak and update to 1.0.16 Message-ID: <20060207151153.78089.qmail@capeta.freebsdbrasil.com.br> Resent-Message-ID: <200602071520.k17FK5En095094@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92974
>Category: ports
>Synopsis: Update port: mail/prayer unbreak and update to 1.0.16
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 07 15:20:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jean Milanez Melo
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD capeta.freebsdbrasil.com.br 5.3-STABLE FreeBSD 5.3-STABLE #5: Wed Mar 2 15:03:19 BRT 2005 eksffa@capeta.freebsdbrasil.com.br:/usr/obj/usr/src/sys/CAPETA i386
>Description:
- Update port to 1.0.16.
- This port was broken. When i tried to compile show this error:
/usr/bin/ld: cannot find -lldap
gmake[1]: *** [prayer] Error 1
So i added "USE_OPENLDAP=yes" for this port uses the OpenLDAP libraries.
- In files/patch-Config i added "LDAP_INCLUDE = -I${LOCALBASE}/include" to find the correct include place.
- Removed "USE_REINPLACE=yes".
- Update pkg-plist with new entries.
- PS: tested on my tinderbox.
>How-To-Repeat:
>Fix:
--- prayer.diff begins here ---
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 @@
+@@
--- prayer.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060207151153.78089.qmail>