diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-08-11 15:58:32 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-08-11 15:58:32 +0000 |
commit | 4080742b151243f0fc7c8354402c1e9dd7e53b4a (patch) | |
tree | a601b30ec4a97159413f5e5cdaf67c03607a33f8 /news | |
parent | Update to 0.2.31. (diff) |
- change varargs.h to stdargs.h to be compatible with gcc33
Notes
Notes:
svn path=/head/; revision=86771
Diffstat (limited to 'news')
-rw-r--r-- | news/ifmail/Makefile | 15 | ||||
-rw-r--r-- | news/ifmail/files/patch-lutil.c | 97 | ||||
-rw-r--r-- | news/ifmail/files/patch-respfreq.c | 52 |
3 files changed, 152 insertions, 12 deletions
diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile index 8c7cf56a0b5d..0a16197b3610 100644 --- a/news/ifmail/Makefile +++ b/news/ifmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= ifmail PORTVERSION= 2.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= news MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= system/fido @@ -24,7 +24,7 @@ pre-configure: @${MV} ${WRKSRC}/CONFIG ${WRKSRC}/CONFIG.sed ${SED} -e "s/OWNER = ifmail/OWNER = ${IFMAIL_RUNAS}/" \ -e "s#CC = gcc#CC = ${CC}#" \ - -e "s#-O2 -Wall#${CFLAGS} -Wall#" \ + -e "s#-O2 -Wall#${CFLAGS} -DHAS_STDARG_H -Wall#" \ ${WRKSRC}/CONFIG.sed > ${WRKSRC}/CONFIG pre-install: @@ -54,13 +54,4 @@ post-install: @${TAR} -C ${WRKSRC}/misc -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf - .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 501101 -CC= gcc32 -CXX= g++32 -BUILD_DEPENDS+= gcc32:${PORTSDIR}/${GCC32_PORT} -GCC32_PORT?= lang/gcc32 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/news/ifmail/files/patch-lutil.c b/news/ifmail/files/patch-lutil.c new file mode 100644 index 000000000000..6e1653ca49a1 --- /dev/null +++ b/news/ifmail/files/patch-lutil.c @@ -0,0 +1,97 @@ +--- iflib/lutil.c.orig Sun Feb 1 23:11:53 1998 ++++ iflib/lutil.c Mon Aug 11 17:29:35 2003 +@@ -4,7 +4,11 @@ + #include <stdio.h> + #include <sys/stat.h> + #include <string.h> ++#ifdef HAS_STDARG_H ++#include <stdarg.h> ++#else + #include <varargs.h> ++#endif + #include <errno.h> + #include <time.h> + #ifdef HAS_SYSLOG +@@ -126,17 +130,27 @@ + syslog(level,"\terrno=%d : %s",\ + errno,strerror(errno)); + ++#ifdef HAS_STDARG_H ++void loginf(char *fmt, ...) ++{ ++ va_list args; ++#else + void loginf(va_alist) + va_dcl + { + va_list args; + char *fmt; ++#endif + #ifndef HAS_SYSLOG + int oldmask; + #endif + ++#ifdef HAS_STDARG_H ++ va_start(args, fmt); ++#else + va_start(args); + fmt=va_arg(args, char*); ++#endif + if (verbose) + { + PRINT_DEBUG(fmt,args); +@@ -166,17 +180,27 @@ + return; + } + ++#ifdef HAS_STDARG_H ++void logerr(char *fmt, ...) ++{ ++ va_list args; ++#else + void logerr(va_alist) + va_dcl + { + va_list args; + char *fmt; ++#endif + #ifndef HAS_SYSLOG + int oldmask; + #endif + ++#ifdef HAS_STDARG_H ++ va_start(args, fmt); ++#else + va_start(args); + fmt=va_arg(args, char*); ++#endif + if (verbose) + { + PRINT_DEBUG(fmt,args); +@@ -206,16 +230,26 @@ + return; + } + ++#ifdef HAS_STDARG_H ++void debug(unsigned long level, char *fmt, ...) ++{ ++ va_list args; ++#else + void debug(va_alist) + va_dcl + { + va_list args; + unsigned long level; + char *fmt; ++#endif + ++#ifdef HAS_STDARG_H ++ va_start(args, fmt); ++#else + va_start(args); + level=va_arg(args, unsigned long); + fmt=va_arg(args, char*); ++#endif + + if ((verbose && (level == 0)) || (verbose & (1 << (level-1)))) + { diff --git a/news/ifmail/files/patch-respfreq.c b/news/ifmail/files/patch-respfreq.c new file mode 100644 index 000000000000..fe38a39397c6 --- /dev/null +++ b/news/ifmail/files/patch-respfreq.c @@ -0,0 +1,52 @@ +--- ifcico/respfreq.c.orig Sun Jul 13 01:38:51 1997 ++++ ifcico/respfreq.c Mon Aug 11 17:34:09 2003 +@@ -17,7 +17,11 @@ + #include "lutil.h" + #include "config.h" + #ifndef NOFREQREPORT ++#ifdef HAS_STDARG_H ++#include <stdarg.h> ++#else + #include <varargs.h> ++#endif + #include "ftnmsg.h" + #endif + #include "version.h" +@@ -43,7 +47,7 @@ + + #ifndef NOFREQREPORT + static void attach_report(file_list**); +-static void add_report(); ++static void add_report(char *fmt,...); + static char *report_text=NULL; + static unsigned long report_total=0L; + #endif +@@ -519,15 +523,25 @@ + report_text=NULL; + } + ++#ifdef HAS_STDARG_H ++static void add_report(char *fmt, ...) ++{ ++ va_list args; ++#else + static void add_report(va_alist) + va_dcl + { +- va_list args; +- char *fmt; ++ va_list args; ++ char *fmt; ++#endif + char buf[1024]; + ++#ifdef HAS_STDARG_H ++ va_start(args, fmt); ++#else + va_start(args); +- fmt=va_arg(args,char*); ++ fmt=va_arg(args, char*); ++#endif + + if (report_text == NULL) + { |