Attachment 74164 Details for Bug 107343 – lmtpd-0.10.2.patch

[patch] lmtpd-0.10.2.patch

lmtpd-0.10.2.patch (text/plain), 4.28 KB, created by Xavier Beaudouin on 2006-12-29 22:50:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Beaudouin

Created: 2006-12-29 22:50:10 UTC

Size: 4.28 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/mail/lmtpd.old/Makefile /usr/ports/mail/lmtpd/Makefile
>--- /usr/ports/mail/lmtpd.old/Makefile	Fri Dec 29 23:40:11 2006
>+++ /usr/ports/mail/lmtpd/Makefile	Fri Dec 29 23:44:05 2006
>@@ -24,16 +24,16 @@
> OPTIONS+=	TRE "Support for TRE regexp (Approx regexp)" on
> OPTIONS+=	SIEVE "Support for SIEVE regexp (Approx regexp)" on
> 
>+.include <bsd.port.pre.mk>
>+
> .if defined(LMTPD_WITH_BDB_VER)
> WITH_BDB_VER=	${LMTPD_WITH_BDB_VER}
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
> .for num in 3 4
> .if defined(WITH_DB${num})
> WITH_BDB=	yes
>-IGNORE=	Use 'make config' to select Berkeley DB.
>+IGNORE=	use 'make config' to select Berkeley DB
> OBSOLETE_BDB_VAR+=	WITH_DB${num}
> .endif
> .endfor
>@@ -111,11 +111,11 @@
> 	@${MKDIR} ${DOCSDIR}
> 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
> .endif
>-	${FIND} ${PREFIX}/share/nls -type d -name 'fr_*8859*' ! -name fr_FR.ISO_8859-1 -exec basename {} \; | ${XARGS} -n1 -I % echo share/nls/%/filtercheck.cat >> ${TMPPLIST}
>-	${FIND} ${PREFIX}/share/nls -type d -name 'fr_*.UTF-8' ! -name fr_FR.UTF-8 -exec basename {} \; | ${XARGS} -n1 -I % echo share/nls/%/filtercheck.cat >> ${TMPPLIST}
>-	${FIND} ${PREFIX}/share/nls -type d -name 'en_*' -exec basename {} \; | ${XARGS} -n1 -I % echo share/nls/%/filtercheck.cat >> ${TMPPLIST}
>-	${FIND} ${PREFIX}/share/nls -type d -name 'fr_*8859*' -exec basename {} \; | ${XARGS} -n1 -I _ -R 2 echo "@unexec if ! grep -q _ ${MTREE_FILE} ; then rmdir %D/share/nls/_ >/dev/null || true ; fi" >> ${TMPPLIST}
>-	${FIND} ${PREFIX}/share/nls -type d -name 'fr_*.UTF-8' -exec basename {} \; | ${XARGS} -n1 -I _ -R 2 echo "@unexec if ! grep -q _ ${MTREE_FILE} ; then rmdir %D/share/nls/_ >/dev/null || true ; fi" >> ${TMPPLIST}
>+	${FIND} ${PREFIX}/share/nls -type d -name 'fr_*8859*' ! -name fr_FR.ISO_8859-1 -exec basename {} \; | ${XARGS} -n1 -I % ${ECHO_MSG} share/nls/%/filtercheck.cat >> ${TMPPLIST}
>+	${FIND} ${PREFIX}/share/nls -type d -name 'fr_*.UTF-8' ! -name fr_FR.UTF-8 -exec basename {} \; | ${XARGS} -n1 -I % ${ECHO_MSG} share/nls/%/filtercheck.cat >> ${TMPPLIST}
>+	${FIND} ${PREFIX}/share/nls -type d -name 'en_*' -exec basename {} \; | ${XARGS} -n1 -I % ${ECHO_MSG} share/nls/%/filtercheck.cat >> ${TMPPLIST}
>+	${FIND} ${PREFIX}/share/nls -type d -name 'fr_*8859*' -exec basename {} \; | ${XARGS} -n1 -I _ -R 2 ${ECHO_MSG} "@unexec if ! grep -q _ ${MTREE_FILE} ; then rmdir %D/share/nls/_ >/dev/null || true ; fi" >> ${TMPPLIST}
>+	${FIND} ${PREFIX}/share/nls -type d -name 'fr_*.UTF-8' -exec basename {} \; | ${XARGS} -n1 -I _ -R 2 ${ECHO_MSG} "@unexec if ! grep -q _ ${MTREE_FILE} ; then rmdir %D/share/nls/_ >/dev/null || true ; fi" >> ${TMPPLIST}
> 	${FIND} ${PREFIX}/share/nls -type d -name 'en*' -exec basename {} \; | ${XARGS} -n1 -I _ -R 2 echo "@unexec if ! grep -q _ ${MTREE_FILE} ; then rmdir %D/share/nls/_ >/dev/null || true ; fi" >> ${TMPPLIST}
> 
> .include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/mail/lmtpd.old/files/patch-lmtpconf.c /usr/ports/mail/lmtpd/files/patch-lmtpconf.c
>--- /usr/ports/mail/lmtpd.old/files/patch-lmtpconf.c	Thu Jan  1 01:00:00 1970
>+++ /usr/ports/mail/lmtpd/files/patch-lmtpconf.c	Fri Dec 29 23:35:30 2006
>@@ -0,0 +1,19 @@
>+--- lmtpconf.c.org	2004-10-26 17:59:50.000000000 +0200
>++++ lmtpconf.c	2006-12-24 11:23:03.000000000 +0100
>+@@ -197,6 +197,7 @@
>+   return rl;
>+ }
>+ 
>++static int readconf1(char *file, struct fstate *state, struct conf *spec);
>+ 
>+ static int setval(void *val, int type, char *args) {
>+   switch(type) {
>+@@ -392,8 +393,6 @@
>+     return 0;
>+   case FLAGS_INCLUDE: 
>+     if (args) {
>+-      static int readconf1(char *file, struct fstate *state,
>+-			   struct conf *spec);
>+       struct conf_state *cstate = val;
>+       char *filename = args;
>+       int ret = -1;
>diff -ruN --exclude=CVS /usr/ports/mail/lmtpd.old/files/patch-re-re.c /usr/ports/mail/lmtpd/files/patch-re-re.c
>--- /usr/ports/mail/lmtpd.old/files/patch-re-re.c	Thu Jan  1 01:00:00 1970
>+++ /usr/ports/mail/lmtpd/files/patch-re-re.c	Fri Dec 29 23:36:09 2006
>@@ -0,0 +1,13 @@
>+--- re/re.c.orig	2004-10-26 17:59:51.000000000 +0200
>++++ re/re.c	2006-12-24 11:29:14.000000000 +0100
>+@@ -44,8 +44,8 @@
>+ extern RE re_rfc822;
>+ extern RE re_true;
>+ extern RE re_false;
>+-extern RE re_error;
>+-extern RE re_error_memory;
>++static RE re_error;
>++static RE re_error_memory;
>+ #if WITH_TRE
>+ extern RE re_tre_extended;
>+ char *re_tre_init(void);

Actions: View | Diff

Attachments on bug 107343: 74164