pkg/28638: mail/imapproxy needs a few changes

[georg.schwarz%freenet.de@localhost]

>Number:         28638
>Category:       pkg
>Synopsis:       mail/imapproxy needs a few changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Dec 12 18:21:00 +0000 2004
>Originator:     Georg Schwarz
>Release:        current pkgsrc
>Organization:
>Environment:
IRIX lorenz 5.3 08031225 IP20 mips
>Description:
- mail/imapproxy has non-existing MASTER_SITES and HOMEPAGE.
- network.c, database.c, configfile.c must include sys/types.h before 
sys/socket.h for uid_t to be known.
- log facilities on IRIX 5 (and 6 as well?) are the same ones as on Solaris.
>How-To-Repeat:

>Fix:
-Homepage now seems to be at http://www.imapproxy.org, and the version has 
advanced quite a bit.
- Patch network.c, database.c, configfile.c
- Apply the following patch to configfile.c

--- configfile.c.orig   2004-12-12 18:49:49.000000000 +0100
+++ configfile.c        2004-12-12 19:07:50.000000000 +0100
@@ -96,7 +96,7 @@
 
 int check_and_set_log_facility(char *var,char *val)
 {
-#ifdef SOLARIS /* Solaris */
+#if defined(SOLARIS) || defined(IRIX5) /* Solaris or IRIX 5 */
     char *values[] = {         "LOG_AUTH", "LOG_CRON", "LOG_DAEMON", 
"LOG_KERN", 
                        "LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", 
"LOG_LOCAL4", 
                        "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", "LOG_LPR", 
"LOG_MAIL", "LOG_NEWS", 
@@ -114,7 +114,7 @@
                        LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, 
LOG_LOCAL4, 
                        LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, 
LOG_NEWS, 
                        LOG_SYSLOG, LOG_USER, LOG_UUCP };
-#endif /* Solaris */
+#endif /* Solaris or IRIX 5 */
 
     int i = 0;
     
@@ -483,7 +483,7 @@
 
 char *log_facility_to_str(int x)
 {
-#ifdef SOLARIS /* Solaris */
+#if defined(SOLARIS) || defined(IRIX5) /* Solaris or IRIX 5 */
     char *values[] = {         "LOG_AUTH", "LOG_CRON", "LOG_DAEMON", 
"LOG_KERN", 
                        "LOG_LOCAL0", "LOG_LOCAL1", "LOG_LOCAL2", "LOG_LOCAL3", 
"LOG_LOCAL4", 
                        "LOG_LOCAL5", "LOG_LOCAL6", "LOG_LOCAL7", "LOG_LPR", 
"LOG_MAIL", "LOG_NEWS", 
@@ -501,7 +501,7 @@
                        LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3, 
LOG_LOCAL4, 
                        LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, LOG_LPR, LOG_MAIL, 
LOG_NEWS, 
                        LOG_SYSLOG, LOG_USER, LOG_UUCP };
-#endif /* Solaris */
+#endif /* Solaris or IRIX 5 */
 
     int i = 0;
     


and patch Makefile appropriately, e.g.

--- Makefile.orig       2004-12-12 18:58:28.000000000 +0100
+++ Makefile    2004-12-12 19:01:05.000000000 +0100
@@ -12,6 +12,11 @@
 USE_BUILDLINK3=        YES
 GNU_CONFIGURE= YES
 
+.include "../../mk/bsd.prefs.mk"
+.if !empty(LOWER_OPSYS:Mirix5*)
+CFLAGS+=       -DIRIX5
+.endif
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/imapproxy ${PREFIX}/bin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imapproxy