Date: Thu, 16 Mar 2000 18:21:18 -0500 (EST) From: Mikhail Teterin <mi@video-collage.com> To: FreeBSD-gnats-submit@freebsd.org Cc: gljohns@bellsouth.net, nic@postilion.org Subject: ports/17414: upgrade and fix for the postilion port Message-ID: <200003162321.SAA34300@dufus.video-collage.com>
next in thread | raw e-mail | index | archive | help
>Number: 17414
>Category: ports
>Synopsis: upgrade and fix for the postilion port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 16 15:30:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Mikhail Teterin
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Virtual Estates, Inc.
>Environment:
>Description:
The port had a long standing problem of using the imap
library bundled with the software instead of the one
installed by the imap-uw port like, for example, tkrat2
port is doing.
This version also uses the latest postilion-0.9.3c.
>How-To-Repeat:
>Fix:
Note, that all of the imap-related patches are simply removed:
diff -U1 -N -P -r /m2/mail/postilion/Makefile postilion/Makefile
--- /m2/mail/postilion/Makefile Sat Dec 11 02:19:13 1999
+++ postilion/Makefile Thu Mar 16 18:08:54 2000
@@ -8,3 +8,3 @@
-DISTNAME= postilion-0.9.2
+DISTNAME= postilion-0.9.3c
CATEGORIES= mail tk82
@@ -15,2 +15,3 @@
LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
+ c-client4:${PORTSDIR}/mail/imap-uw \
img.1:${PORTSDIR}/graphics/libimg
@@ -20,2 +21,4 @@
GNU_CONFIGURE= yes
+# Do not even extract the imap library that comes bundled:
+EXTRACT_AFTER_ARGS+= | ${TAR} -xf - --exclude ${DISTNAME}/imap/*
diff -U1 -N -P -r /m2/mail/postilion/files/md5 postilion/files/md5
--- /m2/mail/postilion/files/md5 Fri Apr 23 02:18:26 1999
+++ postilion/files/md5 Thu Mar 16 18:00:34 2000
@@ -1 +1 @@
-MD5 (postilion-0.9.2.tar.gz) = f37dc1c995130450182adbee9225f3da
+MD5 (postilion-0.9.3c.tar.gz) = e87addacfd83e30cd678eb6d549ef655
diff -U1 -N -P -r /m2/mail/postilion/patches/patch-ab postilion/patches/patch-ab
--- /m2/mail/postilion/patches/patch-ab Fri Apr 23 02:18:29 1999
+++ postilion/patches/patch-ab Wed Dec 31 19:00:00 1969
@@ -1,21 +0,0 @@
---- imap-4.6.BETA/src/osdep/unix/os_bsi.h.orig Sat Oct 19 12:30:04 1996
-+++ imap-4.6.BETA/src/osdep/unix/os_bsi.h Sun Feb 21 10:25:47 1999
-@@ -37,7 +37,18 @@
- #include <unistd.h>
- #include <string.h>
- #include <sys/types.h>
-+
-+/*
-+ * FreeBSD v3.x and onward whines about <sys/dir.h> being obsolete, so switch
-+ * to POSIX semantics.
-+ */
-+#if __FreeBSD__ >= 3
-+#include <dirent.h>
-+#define direct dirent
-+#else
- #include <sys/dir.h>
-+#endif
-+
- #include <fcntl.h>
- #include <syslog.h>
- #include <sys/file.h>
diff -U1 -N -P -r /m2/mail/postilion/patches/patch-ac postilion/patches/patch-ac
--- /m2/mail/postilion/patches/patch-ac Fri Apr 23 02:18:29 1999
+++ postilion/patches/patch-ac Wed Dec 31 19:00:00 1969
@@ -1,20 +0,0 @@
---- imap-4.6.BETA/src/osdep/unix/Makefile.orig Sun Feb 21 10:27:22 1999
-+++ imap-4.6.BETA/src/osdep/unix/Makefile Sun Feb 21 10:29:24 1999
-@@ -100,7 +100,7 @@
- dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
- rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
- unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
--CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
-+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
- MAKE=make
- MV=mv
- RM=rm -rf
-@@ -190,7 +190,7 @@
- SPOOLDIR=/var \
- ACTIVEFILE=/usr/local/news/lib/active \
- RSHPATH=/usr/bin/rsh \
-- BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
-+ BASECFLAGS="-DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS" \
- BASELDFLAGS="-lcrypt"
-
- bsi: # BSD/i386
diff -U1 -N -P -r /m2/mail/postilion/patches/patch-ad postilion/patches/patch-ad
--- /m2/mail/postilion/patches/patch-ad Sat Apr 17 00:52:04 1999
+++ postilion/patches/patch-ad Thu Mar 16 16:44:08 2000
@@ -2,2 +2,13 @@
+++ lib/Makefile.in Sun Feb 21 10:58:09 1999
+@@ -38 +38 @@
+-override EXTRA_CFLAGS += @CFLAGS@
++EXTRA_CFLAGS += @CFLAGS@
+@@ -81,2 +81,2 @@
+-CFLAGS = ${EXTRA_CFLAGS} -I${C_CLIENT} ${INCLUDES} ${TK_XINCLUDES} ${FIX_INCLUDE} -I${C_CLIENT}
+-C_CLIENT_LIB = ${C_CLIENT}/c-client.a
++CFLAGS = ${EXTRA_CFLAGS} -I${prefix}/include ${INCLUDES} ${TK_XINCLUDES} ${FIX_INCLUDE}
++C_CLIENT_LIB = -L${prefix}/lib -lc-client4 -lpam
+@@ -97 +97 @@
+-postilion.exec: ${OBJ} ${C_CLIENT}
++postilion.exec: ${OBJ}
@@ -101,7 +101,7 @@
diff -U1 -N -P -r /m2/mail/postilion/patches/patch-ae postilion/patches/patch-ae
--- /m2/mail/postilion/patches/patch-ae Fri Apr 23 02:18:29 1999
+++ postilion/patches/patch-ae Wed Dec 31 19:00:00 1969
@@ -1,36 +0,0 @@
-*** imap-4.6.BETA/Makefile.orig Thu Feb 18 13:09:30 1999
---- imap-4.6.BETA/Makefile Wed Apr 21 10:54:50 1999
-***************
-*** 200,206 ****
-
- # Make the IMAP Toolkit
-
-! all: c-client rebuild bundled
-
-
- # The following ports are defined. These refer to the *standard* compiler
---- 200,206 ----
-
- # Make the IMAP Toolkit
-
-! all: c-client rebuild
-
-
- # The following ports are defined. These refer to the *standard* compiler
-***************
-*** 386,392 ****
- $(TOOLS)/$@ "$(LN)" src/imapd imapd
- $(LN) $(TOOLS)/$@ .
-
-! build: OSTYPE rebuild rebuildclean bundled
-
- OSTYPE:
- @echo Building c-client for $(OS)...
---- 386,392 ----
- $(TOOLS)/$@ "$(LN)" src/imapd imapd
- $(LN) $(TOOLS)/$@ .
-
-! build: OSTYPE rebuild rebuildclean
-
- OSTYPE:
- @echo Building c-client for $(OS)...
diff -U1 -N -P -r /m2/mail/postilion/patches/patch-af postilion/patches/patch-af
--- /m2/mail/postilion/patches/patch-af Fri Apr 23 02:18:29 1999
+++ postilion/patches/patch-af Thu Mar 16 17:21:41 2000
@@ -1,5 +1,5 @@
-*** postilion/options.tcl.orig Sun Apr 18 06:20:34 1999
---- postilion/options.tcl Wed Apr 21 11:16:43 1999
+*** postilion/options.tcl Wed Feb 23 17:27:28 2000
+--- postilion/options.tcl Thu Mar 16 17:19:37 2000
***************
-*** 214,220 ****
+*** 214,221 ****
set option(icon_name) "Postilion v$postilion_version"
@@ -7,7 +7,8 @@
# Command to get default folder
-! set option(default_folder) "INBOX file {} /var/spool/mail/$env(USER)"
-
- # Format of list of messages
- set option(list_format) "%4S %6d %-24n %4B %s"
---- 214,220 ----
+! if [info exists $env(MAIL)] {
+! set option(default_folder) "INBOX file {} /var/spool/mail/$env(USER)"
+ } else {
+ set option(default_folder) "INBOX file {} $env(MAIL)"
+ }
+--- 214,221 ----
set option(icon_name) "Postilion v$postilion_version"
@@ -15,8 +16,9 @@
# Command to get default folder
-! set option(default_folder) "INBOX file {} /var/mail/$env(USER)"
-
- # Format of list of messages
- set option(list_format) "%4S %6d %-24n %4B %s"
+! if {![info exists env(MAIL)] || ![file exists $env(MAIL)]} {
+! set option(default_folder) "INBOX file {} /var/mail/$env(USER)"
+ } else {
+ set option(default_folder) "INBOX file {} $env(MAIL)"
+ }
***************
-*** 259,265 ****
+*** 263,269 ****
set option(sendprot) smtp
@@ -28,3 +30,3 @@
set option(sendprog_8bit) false
---- 259,265 ----
+--- 263,269 ----
set option(sendprot) smtp
diff -U1 -N -P -r /m2/mail/postilion/patches/patch-inc postilion/patches/patch-inc
--- /m2/mail/postilion/patches/patch-inc Wed Dec 31 19:00:00 1969
+++ postilion/patches/patch-inc Thu Mar 16 17:01:23 2000
@@ -0,0 +1,11 @@
+--- lib/rat.h Sun Aug 23 17:49:20 1998
++++ lib/rat.h Thu Mar 16 16:36:01 2000
+@@ -43,7 +43,4 @@
+ #include <mail.h>
+-#include <nl.h>
+ #include <rfc822.h>
+-#include <env.h>
+-#include <smtp.h>
+-#include <misc.h>
++char *cpystr (const char *string);
+ #include <string.h>
diff -U1 -N -P -r /m2/mail/postilion/patches/patch-sysimap postilion/patches/patch-sysimap
--- /m2/mail/postilion/patches/patch-sysimap Wed Dec 31 19:00:00 1969
+++ postilion/patches/patch-sysimap Thu Mar 16 16:45:06 2000
@@ -0,0 +1,11 @@
+--- Makefile.in Thu Feb 24 17:30:10 2000
++++ Makefile.in Thu Mar 16 16:37:14 2000
+@@ -35,8 +35,2 @@
+ build:
+- -cd imap; \
+- if test "`cat OSTYPE 2>/dev/null`" = "${OSTYPE}" ; then \
+- ${MAKE}; \
+- else \
+- ${MAKE} ${OSTYPE}; \
+- fi
+ @echo Building the C language components
diff -U1 -N -P -r /m2/mail/postilion/pkg/PLIST postilion/pkg/PLIST
--- /m2/mail/postilion/pkg/PLIST Fri Apr 23 02:18:29 1999
+++ postilion/pkg/PLIST Thu Mar 16 17:15:14 2000
@@ -49,2 +49,11 @@
lib/postilionlib/text_t_sv.tcl
+lib/postilionlib/newuser.tcl
+lib/postilionlib/text_balText_de.tcl
+lib/postilionlib/text_balText_nl.tcl
+lib/postilionlib/text_changes_de.tcl
+lib/postilionlib/text_changes_nl.tcl
+lib/postilionlib/text_help_de.tcl
+lib/postilionlib/text_help_nl.tcl
+lib/postilionlib/text_t_de.tcl
+lib/postilionlib/text_t_nl.tcl
lib/postilionlib/vfolder.tcl
@@ -132,2 +141,8 @@
lib/postilionlib/images/wed.gif
+lib/postilionlib/images/de.gif
+lib/postilionlib/images/en.gif
+lib/postilionlib/images/fr.gif
+lib/postilionlib/images/it.gif
+lib/postilionlib/images/nl.gif
+lib/postilionlib/images/sv.gif
@dirrm lib/postilionlib/images
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003162321.SAA34300>