cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix most problems with hylafax and OpenBSD current

Browse Source
This commit is contained in:
espie 1999-06-17 16:57:01 +00:00
parent d8cb9f764c
commit f7d8610d24
4 changed files with 184 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
comms/hylafax/Makefile
View File

@ -1,7 +1,12 @@
# $OpenBSD: Makefile,v 1.8 1999/04/01 02:57:55 brad Exp $
# $OpenBSD: Makefile,v 1.9 1999/06/17 16:57:01 espie Exp $
DISTNAME= hylafax-v4.0pl2
PKGNAME= hylafax-4.0.2
.if defined(A4)
PKGNAME= hylafax-4.0.2-A4
.else
PKGNAME= hylafax-4.0.2-letter
.endif
CATEGORIES= comms
MAINTAINER= d@openbsd.org
@ -13,6 +18,8 @@ BUILD_DEPENDS+= ${PREFIX}/lib/afm/Courier:${PORTSDIR}/print/afm
RUN_DEPENDS= ghostscript-5.10:${PORTSDIR}/print/ghostscript5
LIB_DEPENDS= tiff\\.3\\.4:${PORTSDIR}/graphics/tiff34
USE_EGXX=yes
.if !defined(A4)
PAGESIZE= North American Letter
.else
@ -37,6 +44,7 @@ CONFIGURE_ARGS= --with-INSTALL="" \
SUID_EXES= ${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \
${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
CONFIGURE_ENV=CONFIG_SOCKARGLENTYPE=::socklen_t
pre-fetch:
.if !defined(NO_WARNINGS)
.if !defined(A4)

13
comms/hylafax/patches/patch-ag
View File

@ -1,5 +1,5 @@
--- configure.orig Wed Sep 2 12:58:28 1998
+++ configure Wed Sep 2 13:11:44 1998
--- configure.orig Sat Feb 14 11:46:28 1998
+++ configure Thu Jun 17 03:55:04 1999
@@ -248,7 +248,7 @@
test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and others
test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin # BSDi
@ -9,6 +9,15 @@
PATH=$PATH:$OPATH
POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
@@ -911,7 +911,7 @@
compiler=$1
if isGNU $compiler; then
ISGXX=yes
- checkGCCVersion $compiler 2 6 1 || return 1
+# checkGCCVersion $compiler 2 6 1 || return 1
else
ISGXX=no
fi
@@ -3399,6 +3399,7 @@
*-solaris*) LOCKS="+ascii";;
*-freebsd*) LOCKS=ascii;;

100
comms/hylafax/patches/patch-ah
View File

@ -1,10 +1,90 @@
--- util/Types.h.orig Wed Sep 2 16:36:00 1998
+++ util/Types.h Wed Sep 2 16:36:20 1998
@@ -26,6 +26,7 @@
#ifndef _Types_
#define _Types_
+#include <std.h>
#include "string.h"
#include "assert.h"
#include "stdio.h"
142,143c142,143
< HylaFAXServer::listStatus, HylaFAXServer::listStatusFile,
< HylaFAXServer::nlstStatus, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listStatus, &HylaFAXServer::listStatusFile,
> &HylaFAXServer::nlstStatus, &HylaFAXServer::nlstUnixFile, },
146,147c146,147
< HylaFAXServer::listSendQ, HylaFAXServer::listSendQFile,
< HylaFAXServer::nlstSendQ, HylaFAXServer::nlstSendQFile, },
---
> &HylaFAXServer::listSendQ, &HylaFAXServer::listSendQFile,
> &HylaFAXServer::nlstSendQ, &HylaFAXServer::nlstSendQFile, },
150,151c150,151
< HylaFAXServer::listSendQ, HylaFAXServer::listSendQFile,
< HylaFAXServer::nlstSendQ, HylaFAXServer::nlstSendQFile, },
---
> &HylaFAXServer::listSendQ, &HylaFAXServer::listSendQFile,
> &HylaFAXServer::nlstSendQ, &HylaFAXServer::nlstSendQFile, },
154,155c154,155
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
158,159c158,159
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
162,163c162,163
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
166,167c166,167
< HylaFAXServer::listRecvQ, HylaFAXServer::listRecvQFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listRecvQ, &HylaFAXServer::listRecvQFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
170,171c170,171
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
174,175c174,175
< HylaFAXServer::listRecvQ, HylaFAXServer::listRecvQFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listRecvQ, &HylaFAXServer::listRecvQFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
178,179c178,179
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
182,183c182,183
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
186,187c186,187
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
190,191c190,191
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
194,195c194,195
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },
198,199c198,199
< HylaFAXServer::listDirectory, HylaFAXServer::listUnixFile,
< HylaFAXServer::nlstDirectory, HylaFAXServer::nlstUnixFile, },
---
> &HylaFAXServer::listDirectory, &HylaFAXServer::listUnixFile,
> &HylaFAXServer::nlstDirectory, &HylaFAXServer::nlstUnixFile, },

75
comms/hylafax/patches/patch-al
View File

@ -1,5 +1,76 @@
--- hfaxd/OldProtocol.c++.orig Wed Sep 2 17:30:28 1998
+++ hfaxd/OldProtocol.c++ Wed Sep 2 17:32:36 1998
--- hfaxd/OldProtocol.c++.orig Sat Feb 14 11:50:07 1998
+++ hfaxd/OldProtocol.c++ Thu Jun 17 10:22:03 1999
@@ -220,38 +220,38 @@
// NB: there is no support for the old style data transfer
const OldProtocolServer::protoCmd OldProtocolServer::cmds[] = {
-{ "begin", TRUE, OldProtocolServer::submitJob },
-{ "checkPerm", TRUE, OldProtocolServer::ackPermission },
-{ "tiff", TRUE, OldProtocolServer::getTIFFData },
-{ "postscript", TRUE, OldProtocolServer::getPostScriptData },
-{ "zpostscript", TRUE, OldProtocolServer::getZPostScriptData },
-{ "opaque", TRUE, OldProtocolServer::getOpaqueData },
-{ "zopaque", TRUE, OldProtocolServer::getZOpaqueData },
-{ "poll", TRUE, OldProtocolServer::newPollID },
-{ "userID", FALSE, OldProtocolServer::setUserID },
-{ "version", FALSE, OldProtocolServer::setProtoVersion },
-{ "serverStatus", FALSE, OldProtocolServer::sendServerStatus },
-{ "serverInfo", FALSE, OldProtocolServer::sendServerInfo },
-{ "allStatus", FALSE, OldProtocolServer::sendAllStatus },
-{ "userStatus", FALSE, OldProtocolServer::sendUserStatus },
-{ "jobStatus", FALSE, OldProtocolServer::sendJobStatus },
-{ "recvStatus", FALSE, OldProtocolServer::sendRecvStatus },
-{ "remove", TRUE, OldProtocolServer::removeJob },
-{ "removeGroup", TRUE, OldProtocolServer::removeJobGroup },
-{ "kill", TRUE, OldProtocolServer::killJob },
-{ "killGroup", TRUE, OldProtocolServer::killJobGroup },
-{ "alterTTS", TRUE, OldProtocolServer::alterJobTTS },
-{ "alterGroupTTS", TRUE, OldProtocolServer::alterJobGroupTTS },
-{ "alterKillTime", TRUE, OldProtocolServer::alterJobKillTime },
-{ "alterGroupKillTime", TRUE, OldProtocolServer::alterJobGroupKillTime },
-{ "alterMaxDials", TRUE, OldProtocolServer::alterJobMaxDials },
-{ "alterGroupMaxDials", TRUE, OldProtocolServer::alterJobGroupMaxDials },
-{ "alterNotify", TRUE, OldProtocolServer::alterJobNotification },
-{ "alterGroupNotify", TRUE, OldProtocolServer::alterJobGroupNotification },
-{ "alterModem", TRUE, OldProtocolServer::alterJobModem },
-{ "alterGroupModem", TRUE, OldProtocolServer::alterJobGroupModem },
-{ "alterPriority", TRUE, OldProtocolServer::alterJobPriority },
-{ "alterGroupPriority", TRUE, OldProtocolServer::alterJobGroupPriority },
+{ "begin", TRUE, &OldProtocolServer::submitJob },
+{ "checkPerm", TRUE, &OldProtocolServer::ackPermission },
+{ "tiff", TRUE, &OldProtocolServer::getTIFFData },
+{ "postscript", TRUE, &OldProtocolServer::getPostScriptData },
+{ "zpostscript", TRUE, &OldProtocolServer::getZPostScriptData },
+{ "opaque", TRUE, &OldProtocolServer::getOpaqueData },
+{ "zopaque", TRUE, &OldProtocolServer::getZOpaqueData },
+{ "poll", TRUE, &OldProtocolServer::newPollID },
+{ "userID", FALSE, &OldProtocolServer::setUserID },
+{ "version", FALSE, &OldProtocolServer::setProtoVersion },
+{ "serverStatus", FALSE, &OldProtocolServer::sendServerStatus },
+{ "serverInfo", FALSE, &OldProtocolServer::sendServerInfo },
+{ "allStatus", FALSE, &OldProtocolServer::sendAllStatus },
+{ "userStatus", FALSE, &OldProtocolServer::sendUserStatus },
+{ "jobStatus", FALSE, &OldProtocolServer::sendJobStatus },
+{ "recvStatus", FALSE, &OldProtocolServer::sendRecvStatus },
+{ "remove", TRUE, &OldProtocolServer::removeJob },
+{ "removeGroup", TRUE, &OldProtocolServer::removeJobGroup },
+{ "kill", TRUE, &OldProtocolServer::killJob },
+{ "killGroup", TRUE, &OldProtocolServer::killJobGroup },
+{ "alterTTS", TRUE, &OldProtocolServer::alterJobTTS },
+{ "alterGroupTTS", TRUE, &OldProtocolServer::alterJobGroupTTS },
+{ "alterKillTime", TRUE, &OldProtocolServer::alterJobKillTime },
+{ "alterGroupKillTime", TRUE, &OldProtocolServer::alterJobGroupKillTime },
+{ "alterMaxDials", TRUE, &OldProtocolServer::alterJobMaxDials },
+{ "alterGroupMaxDials", TRUE, &OldProtocolServer::alterJobGroupMaxDials },
+{ "alterNotify", TRUE, &OldProtocolServer::alterJobNotification },
+{ "alterGroupNotify", TRUE, &OldProtocolServer::alterJobGroupNotification },
+{ "alterModem", TRUE, &OldProtocolServer::alterJobModem },
+{ "alterGroupModem", TRUE, &OldProtocolServer::alterJobGroupModem },
+{ "alterPriority", TRUE, &OldProtocolServer::alterJobPriority },
+{ "alterGroupPriority", TRUE, &OldProtocolServer::alterJobGroupPriority },
};
#define NCMDS (sizeof (cmds) / sizeof (cmds[0]))
@@ -604,9 +604,9 @@
#define DEFINE_Alter(param) \