Hylafax updated to 6.0.1, all new patches has been committed upstream. This version has a lot of bugfixes, full changelog available at http://git.hylafax.org/HylaFAX?a=blob;f=doc/RELEASENOTES-6.0.txt;hb=HYLAFAX-6_0-branch Cheers Giovanni
Index: Makefile =================================================================== RCS file: /cvs/ports/comms/hylafax/Makefile,v retrieving revision 1.55 diff -u -p -r1.55 Makefile --- Makefile 8 May 2008 17:09:49 -0000 1.55 +++ Makefile 23 May 2009 09:00:45 -0000 @@ -1,15 +1,18 @@ # $OpenBSD: Makefile,v 1.55 2008/05/08 17:09:49 okan Exp $ COMMENT= send/receive faxes and share modems -DISTNAME= hylafax-4.4.4 -PKGNAME= ${DISTNAME}p1 +DISTNAME= hylafax-6.0.1 CATEGORIES= comms HOMEPAGE= http://www.HylaFAX.org/ -MAINTAINER= Giovanni Bechis <g.bec...@snb.it> +MAINTAINER= Giovanni Bechis <giova...@openbsd.org> + +MASTER_SITES= ftp://ftp.hylafax.org/source/ \ + ftp://ftp.ntua.gr/pub/net/hylafax/source/ \ + ftp://mirror.aarnet.edu.au/pub/hylafax/source/ \ + ftp://gd.tuwien.ac.at/infosys/fax/hylafax/source/ -MASTER_SITES= ftp://ftp.hylafax.org/source/ # License: BSD # http://www.hylafax.org/HylaFAQ/copyright.html @@ -33,14 +36,17 @@ USE_GMAKE= Yes CONFIGURE_ARGS= --nointeractive \ --disable-pam \ + --disable-nls \ --with-CC="${CC}" \ --with-CXX="${CXX}" \ - --with-INSTALL="" + --with-INSTALL="" \ + --with-OPTIMIZER="" CONFIGURE_ENV+= CCOMPILER="${CC}" CXXCOMPILER="${CXX}" \ GCOPTS="${CFLAGS}" GCXXOPTS="${CXXFLAGS}" \ PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}" \ - SCRIPT_SH=/bin/ksh + MKFIFO=/sbin/mkfifo SCRIPT_SH=/bin/ksh \ + INETDCONF=/etc/inetd.conf .if ${FLAVOR:L} == "a4" CONFIGURE_ARGS+= --with-PAGESIZE=A4 @@ -51,7 +57,7 @@ FAKE_FLAGS= ROOT=${WRKINST} SPOOL=${PREF NO_REGRESS= Yes pre-configure: - @perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/configure + ${SUBST_CMD} ${WRKSRC}/configure post-install: @sed -e s,%%PREFIX%%,${TRUEPREFIX},g ${FILESDIR}/README.OpenBSD > \ Index: distinfo =================================================================== RCS file: /cvs/ports/comms/hylafax/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 8 Feb 2008 23:10:45 -0000 1.5 +++ distinfo 23 May 2009 09:00:45 -0000 @@ -1,5 +1,5 @@ -MD5 (hylafax-4.4.4.tar.gz) = S+s9Q4ymxPAPHZT5ZD5maA== -RMD160 (hylafax-4.4.4.tar.gz) = WYJYrWy8pTRO+58/oNzCmkOufEs= -SHA1 (hylafax-4.4.4.tar.gz) = aoZnZeSMTIUbT9xFxxRdC/GLIUM= -SHA256 (hylafax-4.4.4.tar.gz) = bAWaOe/qm12NJABNxHda4RQCaBPqO2yk43fU8pyOtWk= -SIZE (hylafax-4.4.4.tar.gz) = 1188551 +MD5 (hylafax-6.0.1.tar.gz) = /YBLMbadC5zEl0Jo2BgPkA== +RMD160 (hylafax-6.0.1.tar.gz) = 3de1ySTgJWS72xBqN7QxwPw1nPg= +SHA1 (hylafax-6.0.1.tar.gz) = pHr9bWAe8dLe6V4PWeB+cgUfOZw= +SHA256 (hylafax-6.0.1.tar.gz) = NxEmfEzTrpVuqqmmjtOSJpZJ9cdhJRjsg2QBqKCSp8I= +SIZE (hylafax-6.0.1.tar.gz) = 1328906 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/comms/hylafax/patches/patch-configure,v retrieving revision 1.8 diff -u -p -r1.8 patch-configure --- patches/patch-configure 26 Feb 2008 18:37:38 -0000 1.8 +++ patches/patch-configure 23 May 2009 09:00:45 -0000 @@ -1,21 +1,47 @@ $OpenBSD: patch-configure,v 1.8 2008/02/26 18:37:38 merdely Exp $ ---- configure.orig Wed Nov 21 07:45:23 2007 -+++ configure Tue Feb 26 09:46:17 2008 -@@ -69,7 +69,7 @@ DPS=no - GS=no - IMP=no - UTMP=auto --OPTIMIZER="-O" -+#OPTIMIZER="-O" - LIBTIFF="-L/usr/local/lib -ltiff" - TIFFINC=/usr/local/include +--- configure.orig Fri May 15 19:50:52 2009 ++++ configure Sat May 23 10:49:33 2009 +@@ -73,8 +73,8 @@ NLS=auto + OPTIMIZER="-O" + LIBCRYPT= + LIBPAM= +-LIBTIFF="-ltiff" +-TIFFINC= ++LIBTIFF="-L/usr/local/lib -ltiff" ++TIFFINC="-I/usr/local/include" TIFFBIN= -@@ -1521,7 +1521,7 @@ int t() { $f(); return 0; } + LIBUTIL= + LIBZ=-lz +@@ -1559,7 +1559,7 @@ int t() { $f(); return 0; } int main(){ t(); return 0; } EOF capture cat t.c - runMake t "t:; \${CCF} t.c $libs" -+ runMake t "t:; \${CCF} t.c -L%%LOCALBASE%%/lib $libs" ++ runMake t "t:; \${CCF} t.c -I/usr/local/include -L/usr/local/lib $libs" } # +@@ -1587,7 +1587,7 @@ CheckForIncludeFile() + echo "#include \"$i\"" + done)>t.c++ + capture cat t.c++ +- runMake t "t:; \${C++F} \${C++FILE} -E t.c++${MAKECXXOVERRIDE}" ++ runMake t "t:; \${C++F} \${C++FILE} -E t.c++${MAKECXXOVERRIDE} -I/usr/local/include" + } + + if [ "$SGI2FAX" = auto ]; then +@@ -4659,10 +4659,10 @@ case $MANSCHEME in + *-0|*-0.gz|*-0.Z|*-gz|*-Z|*-z) + suf=`echo $MANSCHEME | $SED 's/.*-/./'` + A='`echo $$i | sed' B='`' # workaround shell bugs +- MANCAPPNAME="$A s/\\\\.1\$\$/$suf/$B" +- MANCFILENAME="$A s/\\\\.4f\$\$/$suf/$B" +- MANSAPPNAME="$A s/\\\\.1m\$\$/$suf/$B" +- MANSFILENAME="$A s/\\\\.4f\$\$/$suf/$B" ++ MANCAPPNAME="$A s/\\\\.1\$$/$suf/$B" ++ MANCFILENAME="$A s/\\\\.4f\$$/$suf/$B" ++ MANSAPPNAME="$A s/\\\\.1m\$$/$suf/$B" ++ MANSFILENAME="$A s/\\\\.4f\$$/$suf/$B" + ;; + bsd-*-strip) + MANCAPPNAME='$$i' Index: patches/patch-etc_faxaddmodem_sh_in =================================================================== RCS file: patches/patch-etc_faxaddmodem_sh_in diff -N patches/patch-etc_faxaddmodem_sh_in --- patches/patch-etc_faxaddmodem_sh_in 8 Feb 2008 23:10:45 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-etc_faxaddmodem_sh_in,v 1.1 2008/02/08 23:10:45 okan Exp $ ---- etc/faxaddmodem.sh.in.orig Sat Nov 24 23:49:32 2007 -+++ etc/faxaddmodem.sh.in Sat Nov 24 23:49:53 2007 -@@ -1745,7 +1745,7 @@ fi - FIFO=$SPOOL/FIFO.$DEVID - test -p $FIFO || { - prompt "Creating fifo $FIFO for faxgetty..." -- if (mkfifo $FIFO) >/dev/null 2>&1; then -+ if (/sbin/mkfifo $FIFO) >/dev/null 2>&1; then - echo "done." - elif (mknod $FIFO p) >/dev/null 2>&1; then - echo "done." Index: patches/patch-etc_faxsetup_sh_in =================================================================== RCS file: /cvs/ports/comms/hylafax/patches/patch-etc_faxsetup_sh_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-etc_faxsetup_sh_in --- patches/patch-etc_faxsetup_sh_in 8 Feb 2008 23:10:45 -0000 1.1 +++ patches/patch-etc_faxsetup_sh_in 23 May 2009 09:00:45 -0000 @@ -1,7 +1,26 @@ $OpenBSD: patch-etc_faxsetup_sh_in,v 1.1 2008/02/08 23:10:45 okan Exp $ ---- etc/faxsetup.sh.in.orig Tue Nov 13 15:33:30 2007 -+++ etc/faxsetup.sh.in Sat Nov 24 23:27:24 2007 -@@ -2265,12 +2265,7 @@ if onServer; then +--- etc/faxsetup.sh.in.orig Mon Sep 22 21:49:41 2008 ++++ etc/faxsetup.sh.in Fri May 1 23:08:41 2009 +@@ -46,6 +46,7 @@ test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and ot + test -d /usr/bsd && PATH=$PATH:/usr/bsd # Silicon Graphics + test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others + test -d /usr/sbin && PATH=/usr/sbin:$PATH # 4.4BSD-derived ++test -d /sbin && PATH=/sbin:$PATH # 4.4BSD-derived + test -d /usr/local/bin && PATH=$PATH:/usr/local/bin # for GNU tools + + a...@awk@ # awk for use below +@@ -76,8 +77,8 @@ UUENCODE="@UUENCODE@" # uuencode command to dump in s + + f...@faxuid@ # identity of the fax user + SERVICES=/etc/services # location of services database +-INETDCONF=/usr/etc/inetd.conf # default location of inetd configuration file +-ALIASES=/usr/lib/aliases # default location of mail aliases database file ++INETDCONF=/etc/inetd.conf # default location of inetd configuration file ++ALIASES=/etc/mail/aliases # default location of mail aliases database file + PASSWD=/etc/passwd # where to go for password entries + protou...@faxuid@ # user who's uid we use for FAX user + defPROTOUID=3 # use this uid if PROTOUID doesn't exist +@@ -2265,12 +2266,7 @@ if onServer; then findproc() { Index: patches/patch-faxd_Getty_c++ =================================================================== RCS file: /cvs/ports/comms/hylafax/patches/patch-faxd_Getty_c++,v retrieving revision 1.3 diff -u -p -r1.3 patch-faxd_Getty_c++ --- patches/patch-faxd_Getty_c++ 8 Feb 2008 23:10:45 -0000 1.3 +++ patches/patch-faxd_Getty_c++ 23 May 2009 09:00:45 -0000 @@ -1,12 +1,9 @@ $OpenBSD: patch-faxd_Getty_c++,v 1.3 2008/02/08 23:10:45 okan Exp $ --- faxd/Getty.c++.orig Tue May 15 17:52:03 2007 -+++ faxd/Getty.c++ Wed Nov 7 17:29:51 2007 -@@ -228,9 +228,9 @@ void - Getty::hangup() - { ++++ faxd/Getty.c++ Tue Dec 2 16:31:26 2008 +@@ -230,7 +230,7 @@ Getty::hangup() // NB: this is executed in the parent -- fxStr device = fxStr::format("%s" | line, _PATH_DEV); -+ fxStr device = fxStr::format("%s/" | line, _PATH_DEV); + fxStr device = fxStr::format("%s" | line, _PATH_DEV); Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid()); - Sys::chmod(device, 0600); // reset protection + Sys::chmod(device, 0660); // reset protection Index: patches/patch-hfaxd_InetFaxServer_c++ =================================================================== RCS file: patches/patch-hfaxd_InetFaxServer_c++ diff -N patches/patch-hfaxd_InetFaxServer_c++ --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-hfaxd_InetFaxServer_c++ 23 May 2009 09:00:45 -0000 @@ -0,0 +1,73 @@ +$OpenBSD$ +--- hfaxd/InetFaxServer.c++.orig Fri Feb 27 22:56:31 2009 ++++ hfaxd/InetFaxServer.c++ Sat May 23 10:47:36 2009 +@@ -87,11 +87,11 @@ InetSuperServer::startServer(void) + * Somethings broken here, let's pick some conservative defaults + */ + memset(&addr, 0, sizeof(addr)); +- addr.family = AF_INET; ++ Socket::family(addr) = AF_INET; + addr.in.sin_port = htons(FAX_DEFPORT); + } + +- int s = socket(addr.family, SOCK_STREAM, 0); ++ int s = socket(Socket::family(addr), SOCK_STREAM, 0); + if (s >= 0) { + int on = 1; + if (Socket::setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) >= 0) { +@@ -119,7 +119,7 @@ InetFaxServer::InetFaxServer() + swaitint = 5; // interval between retries + + memset(&data_dest, 0, sizeof (data_dest)); +- data_dest.family = AF_INET6; // We'll allow AF_INET6 by default. ++ Socket::family(data_dest) = AF_INET6; // We'll allow AF_INET6 by default. + + hostent* hp = Socket::gethostbyname(hostname); + +@@ -211,7 +211,7 @@ logDebug("checkHostIdentity(\"%s\")", name); + if (getaddrinfo(name, NULL, &hints, &ai) == 0) { + for (struct addrinfo *aip = ai; aip != NULL; aip = aip->ai_next) { + Socket::Address *addr = (Socket::Address*)aip->ai_addr; +- if (aip->ai_family != peer_addr.family) ++ if (aip->ai_family != Socket::family(peer_addr)) + continue; + if ( (aip->ai_family == AF_INET6 && + memcmp(&addr->in6.sin6_addr, &peer_addr.in6.sin6_addr, sizeof(struct in6_addr)) ==0) +@@ -287,7 +287,7 @@ InetFaxServer::setupNetwork(int fd) + + char hostbuf[128]; + +- remoteaddr = inet_ntop(peer_addr.family, Socket::addr(peer_addr), hostbuf, sizeof(hostbuf)); ++ remoteaddr = inet_ntop(Socket::family(peer_addr), Socket::addr(peer_addr), hostbuf, sizeof(hostbuf)); + + getnameinfo((struct sockaddr*)&peer_addr, Socket::socklen(peer_addr), + hostbuf, sizeof(hostbuf), NULL, 0, 0); +@@ -378,8 +378,8 @@ InetFaxServer::passiveCmd(void) + { + if (tokenBody[0] == 'E') { + pasv_addr = ctrl_addr; +- logDebug("Extended passive requested for family %d", pasv_addr.family); +- pdata = socket(pasv_addr.family, SOCK_STREAM, 0); ++ logDebug("Extended passive requested for family %d", Socket::family(pasv_addr)); ++ pdata = socket(Socket::family(pasv_addr), SOCK_STREAM, 0); + if (pdata >= 0) { + Socket::port(pasv_addr) = 0; + if (!setupPassiveDataSocket(pdata, pasv_addr)) +@@ -392,7 +392,7 @@ InetFaxServer::passiveCmd(void) + perror_reply(425, "Cannot setup extended passive connection", errno); + return; + } +- if (ctrl_addr.family != AF_INET) { ++ if (Socket::family(ctrl_addr) != AF_INET) { + reply(500, "Cannot use PASV with IPv6 connections"); + return; + } +@@ -444,7 +444,7 @@ InetFaxServer::getDataSocket(const char* mode) + { + if (data >= 0) + return (fdopen(data, mode)); +- int s = socket(data_dest.family, SOCK_STREAM, 0); ++ int s = socket(Socket::family(data_dest), SOCK_STREAM, 0); + if (s < 0) + goto bad; + { int on = 1; Index: patches/patch-hfaxd_SuperServer_c++ =================================================================== RCS file: patches/patch-hfaxd_SuperServer_c++ diff -N patches/patch-hfaxd_SuperServer_c++ --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-hfaxd_SuperServer_c++ 23 May 2009 09:00:45 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- hfaxd/SuperServer.c++.orig Fri Feb 27 18:38:05 2009 ++++ hfaxd/SuperServer.c++ Sat May 23 10:47:45 2009 +@@ -68,7 +68,7 @@ SuperServer::inputReady(int fd) + _exit(-1); + } + #ifdef IPV6_ADDRFORM +- if (addr.family == AF_INET6) { ++ if (Socket::family(addr) == AF_INET6) { + struct in6_addr& a = addr.in6.sin6_addr; + if ( (a.s6_addr32[0] == 0 && a.s6_addr32[1] == 0 && a.s6_addr32[2] == htonl(0xFFFF)) || + (a.s6_addr32[0] == 0 && a.s6_addr32[1] == 0 && a.s6_addr32[2] == 0 && ntohl(a.s6_addr32[3]) > 1) ) { Index: patches/patch-libhylafax_FaxClient_c++ =================================================================== RCS file: patches/patch-libhylafax_FaxClient_c++ diff -N patches/patch-libhylafax_FaxClient_c++ --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libhylafax_FaxClient_c++ 23 May 2009 09:00:45 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- libhylafax/FaxClient.c++.orig Fri Jan 16 21:35:22 2009 ++++ libhylafax/FaxClient.c++ Sat May 23 10:47:56 2009 +@@ -155,7 +155,7 @@ FaxClient::setupHostModem(const fxStr& s) + } else + host = s; + +- if (host[0] == '[') ++ if (host.length() && host[0] == '[') + { + host.remove(0,1); + pos = host.next(0,']'); Index: patches/patch-libhylafax_InetTransport_c++ =================================================================== RCS file: patches/patch-libhylafax_InetTransport_c++ diff -N patches/patch-libhylafax_InetTransport_c++ --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libhylafax_InetTransport_c++ 23 May 2009 09:00:45 -0000 @@ -0,0 +1,61 @@ +$OpenBSD$ +--- libhylafax/InetTransport.c++.orig Tue Jan 20 19:41:30 2009 ++++ libhylafax/InetTransport.c++ Sat May 23 10:48:05 2009 +@@ -120,11 +120,11 @@ InetTransport::callServer(fxStr& emsg) + { + Socket::Address *addr = (Socket::Address*)aip->ai_addr; + char buf[256]; // For inet_ntop use +- fxAssert(aip->ai_family == addr->family, "addrinfo ai_family doesn't match in_addr->ai_info"); ++ fxAssert(aip->ai_family == Socket::family(*addr), "addrinfo ai_family doesn't match in_addr->ai_info"); + if (client.getVerbose()) + client.traceServer(NLS::TEXT("Trying %s [%d] (%s) at port %u..."), +- (const char*)client.getHost(), addr->family, +- inet_ntop(addr->family, Socket::addr(*addr), buf, sizeof(buf)), ++ (const char*)client.getHost(), Socket::family(*addr), ++ inet_ntop(Socket::family(*addr), Socket::addr(*addr), buf, sizeof(buf)), + ntohs(Socket::port(*addr))); + int fd = socket (aip->ai_family, aip->ai_socktype, aip->ai_protocol); + if (fd != -1 && ( connect(fd, aip->ai_addr, aip->ai_addrlen) == 0)) +@@ -282,7 +282,7 @@ InetTransport::initDataConnV6(fxStr& emsg) + client.printWarning(NLS::TEXT("Couldn't parse last response \"%s\""), (const char*)client.getLastResponse()); + return(false); + } +- } else if (err == FaxClient::ERROR && data_addr.family == AF_INET) { ++ } else if (err == FaxClient::ERROR && Socket::family(data_addr) == AF_INET) { + + client.printWarning(NLS::TEXT("EPSV not supported, trying PASV since we're AF_INET\n")); + if (client.command("PASV") != FaxClient::COMPLETE) +@@ -311,7 +311,7 @@ InetTransport::initDataConnV6(fxStr& emsg) + Socket::port(data_addr) = 0; // let system allocate port + } + +- int fd = socket(data_addr.family, SOCK_STREAM, IPPROTO_TCP); ++ int fd = socket(Socket::family(data_addr), SOCK_STREAM, IPPROTO_TCP); + if (fd < 0) { + emsg = fxStr::format("socket: %s", strerror(errno)); + return (false); +@@ -320,10 +320,10 @@ InetTransport::initDataConnV6(fxStr& emsg) + if (Socket::connect(fd, &data_addr.in, Socket::socklen(data_addr)) >= 0) { + if (client.getVerbose()) + client.traceServer("Connected to %s at port %u.", +- inet_ntop(data_addr.family, Socket::addr(data_addr), buf, sizeof(buf)), ntohs(Socket::port(data_addr))); ++ inet_ntop(Socket::family(data_addr), Socket::addr(data_addr), buf, sizeof(buf)), ntohs(Socket::port(data_addr))); + } else { + emsg = fxStr::format("Can not reach server at %s at port %u (%s).", +- inet_ntop(data_addr.family, Socket::addr(data_addr), buf, sizeof(buf)), ntohs(Socket::port(data_addr)), strerror(errno)); ++ inet_ntop(Socket::family(data_addr), Socket::addr(data_addr), buf, sizeof(buf)), ntohs(Socket::port(data_addr)), strerror(errno)); + goto bad; + } + } else { +@@ -348,9 +348,9 @@ InetTransport::initDataConnV6(fxStr& emsg) + hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf), + NI_NUMERICHOST | NI_NUMERICSERV); + int err = client.command("EPRT |%d|%s|%s|", +- (data_addr.family == AF_INET6 ? 2 : 1), ++ (Socket::family(data_addr) == AF_INET6 ? 2 : 1), + hostbuf, portbuf); +- if (err == FaxClient::ERROR && data_addr.family == AF_INET) ++ if (err == FaxClient::ERROR && Socket::family(data_addr) == AF_INET) + { + if (client.getVerbose()) + client.printWarning(NLS::TEXT("EPRT not supported, trying PORT")); Index: patches/patch-libhylafax_Socket_h =================================================================== RCS file: patches/patch-libhylafax_Socket_h diff -N patches/patch-libhylafax_Socket_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libhylafax_Socket_h 23 May 2009 09:00:46 -0000 @@ -0,0 +1,72 @@ +$OpenBSD$ +--- libhylafax/Socket.h.orig Fri Feb 27 21:38:29 2009 ++++ libhylafax/Socket.h Sat May 23 10:53:39 2009 +@@ -35,6 +35,7 @@ extern "C" { + #include <net/errno.h> + #endif + #include <netdb.h> ++#include <netinet/in.h> + } + + /* +@@ -67,7 +68,7 @@ class Socket { (public) + + union Address + { +- sa_family_t family; ++ struct sockaddr s; + struct sockaddr_in in; + struct sockaddr_in6 in6; + struct sockaddr_un un; +@@ -78,6 +79,8 @@ class Socket { (public) + + static socklen_t socklen(const Address& a); + static size_t addrlen(const Address& a); ++ ++ static sa_family_t& family(Address& a); + static in_port_t& port(Address& a); + static void* addr (Address& a); + }; +@@ -131,7 +134,7 @@ inline struct hostent* Socket::gethostbyname(const cha + + inline socklen_t Socket::socklen (const Address& a) + { +- switch (a.family) ++ switch (a.s.sa_family) + { + case AF_INET: + return sizeof(a.in); +@@ -145,7 +148,7 @@ inline socklen_t Socket::socklen (const Address& a) + + inline size_t Socket::addrlen (const Address& a) + { +- switch (a.family) ++ switch (a.s.sa_family) + { + case AF_INET: + return sizeof(a.in.sin_addr); +@@ -155,9 +158,14 @@ inline size_t Socket::addrlen (const Address& a) + fxAssert(true, "Socket::addrlen on invalid Address"); + return 0; // DEAD CODE + } ++inline sa_family_t& Socket::family (Address& a) ++{ ++ return a.s.sa_family; ++} ++ + inline in_port_t& Socket::port (Address& a) + { +- switch (a.family) ++ switch (a.s.sa_family) + { + case AF_INET: + return a.in.sin_port; +@@ -170,7 +178,7 @@ inline in_port_t& Socket::port (Address& a) + + inline void* Socket::addr (Address& a) + { +- switch (a.family) ++ switch (a.s.sa_family) + { + case AF_INET: + return (void*) &a.in.sin_addr; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/comms/hylafax/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 8 May 2008 17:09:50 -0000 1.15 +++ pkg/PLIST 23 May 2009 09:00:46 -0000 @@ -3,22 +3,22 @@ @mode 4555 @owner uucp @group dialer -bin/faxalter +...@bin bin/faxalter @mode @owner @group -bin/faxcover -bin/faxmail +...@bin bin/faxcover +...@bin bin/faxmail @mode 4555 @owner uucp @group dialer -bin/faxrm +...@bin bin/faxrm @mode @owner @group -bin/faxstat -bin/sendfax -bin/sendpage +...@bin bin/faxstat +...@bin bin/sendfax +...@bin bin/sendpage lib/fax/ lib/fax/faxcover.ps lib/fax/faxcover_example_sgi.ps @@ -90,7 +90,9 @@ libdata/hylafax/config/lucent-mt-10 libdata/hylafax/config/lucent-mt-2 libdata/hylafax/config/lucent-mt-20 libdata/hylafax/config/lucent-mt-21 +libdata/hylafax/config/mainpine-10 libdata/hylafax/config/mainpine-2 +libdata/hylafax/config/mainpine-20 libdata/hylafax/config/mainpine-21 libdata/hylafax/config/moto-288 libdata/hylafax/config/mt-1432 @@ -148,6 +150,7 @@ libdata/hylafax/etc/templates/de/notify- libdata/hylafax/etc/templates/de/notify-done.txt libdata/hylafax/etc/templates/de/notify-failed-page.txt libdata/hylafax/etc/templates/de/notify-failed.txt +libdata/hylafax/etc/templates/de/notify-faxmaster.txt libdata/hylafax/etc/templates/de/notify-format_failed.txt libdata/hylafax/etc/templates/de/notify-killed.txt libdata/hylafax/etc/templates/de/notify-no_formatter.txt @@ -169,6 +172,7 @@ libdata/hylafax/etc/templates/en/notify- libdata/hylafax/etc/templates/en/notify-done.txt libdata/hylafax/etc/templates/en/notify-failed-page.txt libdata/hylafax/etc/templates/en/notify-failed.txt +libdata/hylafax/etc/templates/en/notify-faxmaster.txt libdata/hylafax/etc/templates/en/notify-format_failed.txt libdata/hylafax/etc/templates/en/notify-killed.txt libdata/hylafax/etc/templates/en/notify-no_formatter.txt @@ -190,6 +194,7 @@ libdata/hylafax/etc/templates/es/notify- libdata/hylafax/etc/templates/es/notify-done.txt libdata/hylafax/etc/templates/es/notify-failed-page.txt libdata/hylafax/etc/templates/es/notify-failed.txt +libdata/hylafax/etc/templates/es/notify-faxmaster.txt libdata/hylafax/etc/templates/es/notify-format_failed.txt libdata/hylafax/etc/templates/es/notify-killed.txt libdata/hylafax/etc/templates/es/notify-no_formatter.txt @@ -211,6 +216,7 @@ libdata/hylafax/etc/templates/fr/notify- libdata/hylafax/etc/templates/fr/notify-done.txt libdata/hylafax/etc/templates/fr/notify-failed-page.txt libdata/hylafax/etc/templates/fr/notify-failed.txt +libdata/hylafax/etc/templates/fr/notify-faxmaster.txt libdata/hylafax/etc/templates/fr/notify-format_failed.txt libdata/hylafax/etc/templates/fr/notify-killed.txt libdata/hylafax/etc/templates/fr/notify-no_formatter.txt @@ -239,6 +245,7 @@ libdata/hylafax/etc/templates/html-sampl libdata/hylafax/etc/templates/html-sample1/notify-blocked.txt libdata/hylafax/etc/templates/html-sample1/notify-done.txt libdata/hylafax/etc/templates/html-sample1/notify-failed.txt +libdata/hylafax/etc/templates/html-sample1/notify-faxmaster.txt libdata/hylafax/etc/templates/html-sample1/notify-format_failed.txt libdata/hylafax/etc/templates/html-sample1/notify-killed.txt libdata/hylafax/etc/templates/html-sample1/notify-no_formatter.txt @@ -258,6 +265,7 @@ libdata/hylafax/etc/templates/it/notify- libdata/hylafax/etc/templates/it/notify-done.txt libdata/hylafax/etc/templates/it/notify-failed-page.txt libdata/hylafax/etc/templates/it/notify-failed.txt +libdata/hylafax/etc/templates/it/notify-faxmaster.txt libdata/hylafax/etc/templates/it/notify-format_failed.txt libdata/hylafax/etc/templates/it/notify-killed.txt libdata/hylafax/etc/templates/it/notify-no_formatter.txt @@ -279,6 +287,7 @@ libdata/hylafax/etc/templates/pl/notify- libdata/hylafax/etc/templates/pl/notify-done.txt libdata/hylafax/etc/templates/pl/notify-failed-page.txt libdata/hylafax/etc/templates/pl/notify-failed.txt +libdata/hylafax/etc/templates/pl/notify-faxmaster.txt libdata/hylafax/etc/templates/pl/notify-format_failed.txt libdata/hylafax/etc/templates/pl/notify-killed.txt libdata/hylafax/etc/templates/pl/notify-no_formatter.txt @@ -300,6 +309,7 @@ libdata/hylafax/etc/templates/pt/notify- libdata/hylafax/etc/templates/pt/notify-done.txt libdata/hylafax/etc/templates/pt/notify-failed-page.txt libdata/hylafax/etc/templates/pt/notify-failed.txt +libdata/hylafax/etc/templates/pt/notify-faxmaster.txt libdata/hylafax/etc/templates/pt/notify-format_failed.txt libdata/hylafax/etc/templates/pt/notify-killed.txt libdata/hylafax/etc/templates/pt/notify-no_formatter.txt @@ -321,6 +331,7 @@ libdata/hylafax/etc/templates/pt_BR/noti libdata/hylafax/etc/templates/pt_BR/notify-done.txt libdata/hylafax/etc/templates/pt_BR/notify-failed-page.txt libdata/hylafax/etc/templates/pt_BR/notify-failed.txt +libdata/hylafax/etc/templates/pt_BR/notify-faxmaster.txt libdata/hylafax/etc/templates/pt_BR/notify-format_failed.txt libdata/hylafax/etc/templates/pt_BR/notify-killed.txt libdata/hylafax/etc/templates/pt_BR/notify-no_formatter.txt @@ -342,6 +353,7 @@ libdata/hylafax/etc/templates/ro/notify- libdata/hylafax/etc/templates/ro/notify-done.txt libdata/hylafax/etc/templates/ro/notify-failed-page.txt libdata/hylafax/etc/templates/ro/notify-failed.txt +libdata/hylafax/etc/templates/ro/notify-faxmaster.txt libdata/hylafax/etc/templates/ro/notify-format_failed.txt libdata/hylafax/etc/templates/ro/notify-killed.txt libdata/hylafax/etc/templates/ro/notify-no_formatter.txt @@ -426,56 +438,56 @@ libdata/hylafax/tmp/ @man man/man8/tsitest.8c @man man/man8/wedged.8c @man man/man8/xferfaxstats.8c -sbin/choptest -sbin/cqtest -sbin/dialtest +...@bin sbin/choptest +...@bin sbin/cqtest +...@bin sbin/dialtest sbin/edit-faxcover -sbin/faxabort +...@bin sbin/faxabort sbin/faxaddmodem -sbin/faxadduser -sbin/faxanswer -sbin/faxconfig +...@bin sbin/faxadduser +...@bin sbin/faxanswer +...@bin sbin/faxconfig sbin/faxcron -sbin/faxdeluser +...@bin sbin/faxdeluser @mode 4555 @owner uucp @group dialer -sbin/faxgetty +...@bin sbin/faxgetty @mode @owner @group -sbin/faxinfo -sbin/faxlock -sbin/faxmodem -sbin/faxmsg +...@bin sbin/faxinfo +...@bin sbin/faxlock +...@bin sbin/faxmodem +...@bin sbin/faxmsg @mode 4555 @owner uucp @group dialer -sbin/faxq +...@bin sbin/faxq @mode @owner @group -sbin/faxqclean -sbin/faxquit -sbin/faxsend +...@bin sbin/faxqclean +...@bin sbin/faxquit +...@bin sbin/faxsend sbin/faxsetup sbin/faxsetup.bsdi sbin/faxsetup.irix sbin/faxsetup.linux -sbin/faxstate -sbin/faxwatch -sbin/hfaxd +...@bin sbin/faxstate +...@bin sbin/faxwatch +...@bin sbin/hfaxd sbin/hylafax -sbin/lockname -sbin/ondelay -sbin/pagesend +...@bin sbin/lockname +...@bin sbin/ondelay +...@bin sbin/pagesend sbin/probemodem sbin/recvstats -sbin/tagtest -sbin/textfmt -sbin/tiffcheck -sbin/tsitest -sbin/typetest +...@bin sbin/tagtest +...@bin sbin/textfmt +...@bin sbin/tiffcheck +...@bin sbin/tsitest +...@bin sbin/typetest sbin/xferfaxstats share/doc/hylafax/ share/doc/hylafax/README.OpenBSD