Please test and comment.
Marc
diff -urNx CVS /usr/ports/comms/hylafax/Makefile comms/hylafax/Makefile
--- /usr/ports/comms/hylafax/Makefile Sat Jan 14 21:33:40 2006
+++ comms/hylafax/Makefile Fri Feb 17 14:20:55 2006
@@ -1,14 +1,16 @@
# $OpenBSD: Makefile,v 1.47 2006/01/14 12:05:34 steven Exp $
COMMENT= "send/receive faxes and share modems"
-DISTNAME= hylafax-4.1.5
-PKGNAME= ${DISTNAME}p4
+DISTNAME= hylafax-4.2.5
+PKGNAME= ${DISTNAME}
CATEGORIES= comms
FLAVORS= a4
FLAVOR?=
HOMEPAGE= http://www.HylaFAX.org/
+MAINTAINER= Marc Winiger <[EMAIL PROTECTED]>
+
MASTER_SITES= ftp://ftp.hylafax.org/source/
# License: BSD
@@ -19,7 +21,8 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m stdc++ util z
-RUN_DEPENDS= :ghostscript-*:print/ghostscript/gnu
+RUN_DEPENDS= :ghostscript-*:print/ghostscript/gnu \
+ :metamail-*:mail/metamail
LIB_DEPENDS= tiff::graphics/tiff \
jpeg::graphics/jpeg
@@ -52,7 +55,6 @@
@chown uucp:dialer ${SUID_EXES}
@chmod a=rx,u+s ${SUID_EXES}
${INSTALL_DATA} ${FILESDIR}/hylafax.sh.sample ${PREFIX}/lib/fax
- @ln -sf ${TRUEPREFIX}/libdata/hylafax ${WRKINST}/var/spool/hylafax
@chown -R uucp:dialer ${PREFIX}/libdata/hylafax
.include <bsd.port.mk>
diff -urNx CVS /usr/ports/comms/hylafax/distinfo comms/hylafax/distinfo
--- /usr/ports/comms/hylafax/distinfo Wed Jan 5 16:58:29 2005
+++ comms/hylafax/distinfo Fri Feb 17 13:07:08 2006
@@ -1,4 +1,4 @@
-MD5 (hylafax-4.1.5.tar.gz) = 67135ae721f7a927e0f9a96644694617
-RMD160 (hylafax-4.1.5.tar.gz) = caae931300e2025b7672ee2a516c4101d870f930
-SHA1 (hylafax-4.1.5.tar.gz) = fa60a8a51921d42aa36732b5c9ee62d5b0f18dab
-SIZE (hylafax-4.1.5.tar.gz) = 1276511
+MD5 (hylafax-4.2.5.tar.gz) = 5989c2638f79b178cbe935882cd58f3e
+RMD160 (hylafax-4.2.5.tar.gz) = aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a
+SHA1 (hylafax-4.2.5.tar.gz) = b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc
+SIZE (hylafax-4.2.5.tar.gz) = 1450958
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-config_site
comms/hylafax/patches/patch-config_site
--- /usr/ports/comms/hylafax/patches/patch-config_site Thu Jan 1 01:00:00 1970
+++ comms/hylafax/patches/patch-config_site Fri Feb 17 13:21:21 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- config.site.orig Fri Feb 17 13:11:38 2006
++++ config.site Fri Feb 17 13:11:14 2006
+@@ -141,7 +141,7 @@
+ #LIBSUN="auto" # yes|no|auto configure -lsun
use
+ #LLDOPTS="" # extra link line options
+ #MACHDEPLIBS="" # extra libraries for linking
+-#OPTIMIZER="-O" # optimizer flags
++OPTIMIZER="" # optimizer flags
+ #PORTFUNCS="" # non-standard functions to emulate
+ #PROTOTYPES="-prototypes" # C compiler options for checking
function prototypes
+ #RANLIB=":" # pathname of suitable ranlib program
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-configure
comms/hylafax/patches/patch-configure
--- /usr/ports/comms/hylafax/patches/patch-configure Sat Jun 18 20:48:12 2005
+++ comms/hylafax/patches/patch-configure Fri Feb 17 13:21:21 2006
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.4 2005/06/18 18:48:12 naddy Exp $
---- configure.orig Tue Oct 1 16:05:55 2002
-+++ configure Sat Jun 18 19:23:37 2005
+--- configure.orig Fri Dec 16 23:40:30 2005
++++ configure Fri Feb 17 13:14:24 2006
@@ -37,10 +37,10 @@
#
# Setup general configuration parameters.
@@ -16,10 +16,10 @@
DIR_LIBEXEC=$DIR_SBIN
DIR_SPOOL=/var/spool/hylafax
DIR_HTML=/var/httpd/htdocs/hylafax
-@@ -72,8 +72,8 @@ DPS=no
- GS=no
+@@ -73,8 +73,8 @@ GS=no
IMP=no
UTMP=auto
+ OPTIMIZER="-O"
-LIBTIFF="-L/usr/local/lib -ltiff"
-TIFFINC=/usr/local/include
+LIBTIFF="-L${LOCALBASE}/lib -ltiff -ljpeg -lz"
@@ -27,7 +27,7 @@
TIFFBIN=
LIBZ=
ZLIBINC=
-@@ -81,8 +81,8 @@ REGEX=yes
+@@ -82,8 +82,8 @@ REGEX=yes
LIBREGEX='-L${DEPTH}/regex -lregex'
REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
DBLIB=no
@@ -38,33 +38,3 @@
FAXD=
LIBFAXSERVER='libfaxserver.${DSO}'
LIBUTIL='${UTIL}/libfaxutil.${DSO}'
-@@ -2312,11 +2312,10 @@ EOF
- Note " Found tiffio.h version ${header_ver}"
- Note " Found libtiff version ${lib_ver}"
- if [ ${header_ver} -ge 19960307 ]; then
-- if [ "${lib_ver}" = "3.4" ]; then
-- tiff_runlen_t="uint16"
-- elif [ "${lib_ver}" = "3.5" ]; then
-- tiff_runlen_t="uint32"
-- fi
-+ case ${lib_ver} in
-+ 3.4) tiff_runlen_t="uint16" ;;
-+ 3.[567]) tiff_runlen_t="uint32" ;;
-+ esac
- fi
- else
- cat 1>&2 <<EOF
-@@ -2351,9 +2350,10 @@ EOF
-
- Incompatible TIFF Library.
-
--HylaFAX ${VERSION} requires TIFF software distribution ver 3.4 or 3.5.
--If you do not have up to date TIFF software on your system then you can
--retrieve it from the location where you obtained this software.
-+HylaFAX ${VERSION} requires TIFF software distribution ver 3.4, 3.5, or
-+3.6. If you do not have up to date TIFF software on your system then
-+you can retrieve it from the location where you obtained this software.
-+The Home Page for version 3.5 and later is http://www.libtiff.org
- EOF
- boom
- return 1
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-defs_in
comms/hylafax/patches/patch-defs_in
--- /usr/ports/comms/hylafax/patches/patch-defs_in Fri Jan 31 16:53:50 2003
+++ comms/hylafax/patches/patch-defs_in Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-defs_in,v 1.1 2003/01/31 15:53:50 brad Exp $
---- defs.in.orig Fri Jan 31 10:34:45 2003
-+++ defs.in Fri Jan 31 10:35:31 2003
-@@ -128,7 +128,7 @@ LLDOPTS = @LLDOPTS@
- #
- # Default optimizer and prototype options
- #
--OPTIMIZER = -O
-+OPTIMIZER =
- CVERSION = @ENVOPTS@
- C++FILE = @CXXFILE@
-
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-faxd_Getty_c++
comms/hylafax/patches/patch-faxd_Getty_c++
--- /usr/ports/comms/hylafax/patches/patch-faxd_Getty_c++ Mon Jan 27
14:42:48 2003
+++ comms/hylafax/patches/patch-faxd_Getty_c++ Fri Feb 17 13:21:21 2006
@@ -1,8 +1,8 @@
---- faxd/Getty.c++.orig Sat Sep 16 07:13:48 2000
-+++ faxd/Getty.c++ Wed Jul 31 12:40:10 2002
-@@ -219,7 +219,7 @@ Getty::hangup()
+--- faxd/Getty.c++.orig Sat Jan 1 22:27:15 2005
++++ faxd/Getty.c++ Fri Feb 17 13:08:24 2006
+@@ -234,7 +234,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);
Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());
- Sys::chmod(device, 0600); // reset protection
+ Sys::chmod(device, 0660); // reset protection
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-hfaxd_FileTransfer_c++
comms/hylafax/patches/patch-hfaxd_FileTransfer_c++
--- /usr/ports/comms/hylafax/patches/patch-hfaxd_FileTransfer_c++ Tue Nov
11 23:30:34 2003
+++ comms/hylafax/patches/patch-hfaxd_FileTransfer_c++ Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-hfaxd_FileTransfer_c++,v 1.2 2003/11/11 22:30:34 todd Exp $
---- hfaxd/FileTransfer.c++.orig 1999-11-18 06:18:57.000000000 -0600
-+++ hfaxd/FileTransfer.c++ 2003-11-11 16:26:23.000000000 -0600
-@@ -556,7 +556,7 @@ HylaFAXServer::storeUniqueCmd(bool isTem
- } else
- perror_reply(553, filename, errno);
- } else
-- reply(553, emsg);
-+ reply(553, "%s", (const char*)emsg);
- }
-
- /*
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-hfaxd_OldProtocol_c++
comms/hylafax/patches/patch-hfaxd_OldProtocol_c++
--- /usr/ports/comms/hylafax/patches/patch-hfaxd_OldProtocol_c++ Tue Feb
10 18:24:59 2004
+++ comms/hylafax/patches/patch-hfaxd_OldProtocol_c++ Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-$OpenBSD: patch-hfaxd_OldProtocol_c++,v 1.1 2004/02/10 17:24:59 espie Exp $
---- hfaxd/OldProtocol.c++.orig 2004-02-09 02:20:33.000000000 +0100
-+++ hfaxd/OldProtocol.c++ 2004-02-09 02:20:46.000000000 +0100
-@@ -752,9 +752,9 @@ OldProtocolServer::reallyRemoveJob(const
- }
-
- #define DEFINE_Op(op) \
--void OldProtocolServer::##op##Job(const char* tag) \
-+void OldProtocolServer::op##Job(const char* tag) \
- { applyToJob(tag, fxQUOTE(op), &OldProtocolServer::do##op); }\
--void OldProtocolServer::##op##JobGroup(const char* tag) \
-+void OldProtocolServer::op##JobGroup(const char* tag) \
- { applyToJobGroup(tag, fxQUOTE(op), &OldProtocolServer::do##op); }
- void
- OldProtocolServer::doremove(Job& job, const char*)
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-hfaxd_Parser_c++
comms/hylafax/patches/patch-hfaxd_Parser_c++
--- /usr/ports/comms/hylafax/patches/patch-hfaxd_Parser_c++ Tue Nov 11
23:30:34 2003
+++ comms/hylafax/patches/patch-hfaxd_Parser_c++ Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-hfaxd_Parser_c++,v 1.2 2003/11/11 22:30:34 todd Exp $
---- hfaxd/Parser.c++.orig 2002-09-13 11:20:34.000000000 -0500
-+++ hfaxd/Parser.c++ 2003-11-11 16:26:23.000000000 -0600
-@@ -963,7 +963,7 @@ HylaFAXServer::site_cmd(Token t)
- break;
- case T_TRIGGER:
- if (string_param(s, "trigger-spec")) {
-- logcmd(t, s);
-+ logcmd(t, "%s", (const char*)s);
- triggerCmd("%s", (const char*) s);
- return (true);
- }
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-hfaxd_SNPPServer_c++
comms/hylafax/patches/patch-hfaxd_SNPPServer_c++
--- /usr/ports/comms/hylafax/patches/patch-hfaxd_SNPPServer_c++ Tue Nov 11
23:30:34 2003
+++ comms/hylafax/patches/patch-hfaxd_SNPPServer_c++ Thu Jan 1 01:00:00 1970
@@ -1,21 +0,0 @@
-$OpenBSD: patch-hfaxd_SNPPServer_c++,v 1.1 2003/11/11 22:30:34 todd Exp $
---- hfaxd/SNPPServer.c++.orig 2002-02-14 22:20:50.000000000 -0600
-+++ hfaxd/SNPPServer.c++ 2003-11-11 16:26:23.000000000 -0600
-@@ -849,7 +849,7 @@ SNPPServer::dataCmd(void)
- fxStr emsg;
- u_int seqnum = getDocumentNumbers(1, emsg);
- if (seqnum == (u_int) -1) {
-- reply(554, emsg);
-+ reply(554, "%s", (const char*)emsg);
- return;
- }
- msgFile = fxStr::format("/%s/doc%u.page", FAX_TMPDIR, seqnum);
-@@ -1053,7 +1053,7 @@ SNPPServer::messageCmd(const char* msg)
- fxStr emsg;
- u_int seqnum = getDocumentNumbers(1, emsg);
- if (seqnum == (u_int) -1) {
-- reply(554, emsg);
-+ reply(554, "%s", (const char*)emsg);
- return;
- }
- msgFile = fxStr::format("/%s/doc%u.page", FAX_TMPDIR, seqnum);
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-port_install_sh_in
comms/hylafax/patches/patch-port_install_sh_in
--- /usr/ports/comms/hylafax/patches/patch-port_install_sh_in Mon Jan 27
14:42:48 2003
+++ comms/hylafax/patches/patch-port_install_sh_in Fri Feb 17 13:21:21 2006
@@ -1,11 +1,11 @@
---- port/install.sh.in.orig Mon Oct 12 16:47:50 1998
-+++ port/install.sh.in Wed Jul 31 12:31:40 2002
+--- port/install.sh.in.orig Tue Apr 29 06:03:43 2003
++++ port/install.sh.in Fri Feb 17 13:15:26 2006
@@ -129,7 +129,7 @@ do
test -p $1 >/dev/null 2>&1
}
;;
-- -ln) shift; [EMAIL PROTECTED]@; SRC="$1"
-+ -ln) shift; [EMAIL PROTECTED]@; SRC="$ROOT/$1"
+- -ln) shift; [EMAIL PROTECTED]@; SRC="${ROOT}$1"
++ -ln) shift; [EMAIL PROTECTED]@; SRC="${ROOT}/$1"
STRIP=":"
;;
-lns) shift; [EMAIL PROTECTED]@; preopts="@LN_S@"; SRC="$1"
diff -urNx CVS /usr/ports/comms/hylafax/patches/patch-util_Types_h
comms/hylafax/patches/patch-util_Types_h
--- /usr/ports/comms/hylafax/patches/patch-util_Types_h Tue Feb 10 18:24:59 2004
+++ comms/hylafax/patches/patch-util_Types_h Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-util_Types_h,v 1.1 2004/02/10 17:24:59 espie Exp $
---- util/Types.h.orig 2004-02-09 02:11:40.000000000 +0100
-+++ util/Types.h 2004-02-09 02:11:47.000000000 +0100
-@@ -29,7 +29,7 @@
- #include "string.h"
- #include "assert.h"
- #include "stdio.h"
--#include "new.h"
-+#include "new"
- #include "sys/types.h"
- #include "port.h"
-
diff -urNx CVS /usr/ports/comms/hylafax/pkg/PLIST comms/hylafax/pkg/PLIST
--- /usr/ports/comms/hylafax/pkg/PLIST Sat Jan 14 21:33:40 2006
+++ comms/hylafax/pkg/PLIST Fri Feb 17 13:50:29 2006
@@ -18,12 +18,14 @@
lib/fax/typerules
libdata/hylafax/
libdata/hylafax/COPYRIGHT
[EMAIL PROTECTED] libdata/hylafax/FIFO
libdata/hylafax/archive/
libdata/hylafax/bin/
libdata/hylafax/bin/archive
libdata/hylafax/bin/faxrcvd
libdata/hylafax/bin/mkcover
libdata/hylafax/bin/notify
+libdata/hylafax/bin/notify-4.1
libdata/hylafax/bin/notify.awk
libdata/hylafax/bin/pcl2fax
libdata/hylafax/bin/pdf2fax.gs
@@ -32,9 +34,12 @@
libdata/hylafax/bin/ps2fax.gs
libdata/hylafax/bin/ps2fax.imp
libdata/hylafax/bin/tiff2fax
+libdata/hylafax/bin/tiff2pdf
libdata/hylafax/bin/wedged
libdata/hylafax/client/
libdata/hylafax/config/
+libdata/hylafax/config/agere-mp-2
+libdata/hylafax/config/agere-mp-21
libdata/hylafax/config/att-dataport
libdata/hylafax/config/att-dataport-2
libdata/hylafax/config/att-dataport-2.0
@@ -45,6 +50,7 @@
libdata/hylafax/config/class2
libdata/hylafax/config/class2.0
libdata/hylafax/config/class2.1
+libdata/hylafax/config/conexant-1.0
libdata/hylafax/config/davicom-2
libdata/hylafax/config/digi
libdata/hylafax/config/digi-2
@@ -62,6 +68,7 @@
libdata/hylafax/config/intel-400e
libdata/hylafax/config/lucent
libdata/hylafax/config/lucent-isa
+libdata/hylafax/config/lucent-mt-10
libdata/hylafax/config/lucent-mt-2
libdata/hylafax/config/lucent-mt-20
libdata/hylafax/config/lucent-mt-21
@@ -81,6 +88,7 @@
libdata/hylafax/config/rockwell-rc
libdata/hylafax/config/sierra
libdata/hylafax/config/skel
+libdata/hylafax/config/t38modem
libdata/hylafax/config/telebit-qblazer
libdata/hylafax/config/telebit-t3000
libdata/hylafax/config/telebit-wb
@@ -115,6 +123,7 @@
libdata/hylafax/sendq/
libdata/hylafax/status/
libdata/hylafax/tmp/
[EMAIL PROTECTED] man/man1/edit-faxcover.1
@man man/man1/faxalter.1
@man man/man1/faxcover.1
@man man/man1/faxmail.1
@@ -125,7 +134,7 @@
@man man/man1/sendpage.1
@man man/man1/sgi2fax.1
@man man/man1/textfmt.1
[EMAIL PROTECTED] man/man5/cid.5f
[EMAIL PROTECTED] man/man5/callid.5f
@man man/man5/destctrls.5f
@man man/man5/dialrules.5f
@man man/man5/doneq.5f
@@ -182,6 +191,7 @@
sbin/choptest
sbin/cqtest
sbin/dialtest
+sbin/edit-faxcover
sbin/faxabort
sbin/faxaddmodem
sbin/faxadduser
@@ -217,8 +227,8 @@
sbin/tsitest
sbin/typetest
sbin/xferfaxstats
[EMAIL PROTECTED] install -d -o uucp -g dialer -m 755 /var/spool/hylafax
[EMAIL PROTECTED] ln -s /var/spool/hylafax %D/hylafax
[EMAIL PROTECTED] ln -sf %D/libdata/hylafax /var/spool/hylafax
[EMAIL PROTECTED] ln -sf %D/libdata/hylafax %D/hylafax
@exec install -d -o uucp -g dialer -m 700 %D/hylafax/archive
@exec install -d -o uucp -g dialer -m 755 %D/hylafax/bin
@exec install -d -o uucp -g dialer -m 755 %D/hylafax/client
