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

hylafax: fix the build with ports-gcc-8.

Browse Source 
Allow building with C++14 (even for clang archs).
Also add various portcheck(1) fixes and move HOMEPAGE to https.

OK sthen@
This commit is contained in:
cwen 2019-04-21 15:44:04 +00:00
parent e9e5cced4f
commit 18dbbfd7f9
5 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
comms/hylafax/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.84 2018/10/24 14:27:59 sthen Exp $
# $OpenBSD: Makefile,v 1.85 2019/04/21 15:44:04 cwen Exp $
COMMENT= send/receive faxes and share modems
DISTNAME= hylafax-6.0.6
REVISION = 13
REVISION= 14
CATEGORIES= comms
HOMEPAGE= http://www.HylaFAX.org/
HOMEPAGE= https://www.HylaFAX.org/
MASTER_SITES= http://ftp.hylafax.org/source/ \
ftp://ftp.hylafax.org/source/ \
@ -21,7 +21,7 @@ FLAVOR?=
WANTLIB= c iconv intl jbig m ${COMPILER_LIBCXX} tiff util z
COMPILER = base-clang ports-gcc base-gcc
COMPILER= base-clang ports-gcc base-gcc
BUILD_DEPENDS= print/ghostscript/gnu
RUN_DEPENDS= print/ghostscript/gnu \
@ -51,11 +51,6 @@ CONFIGURE_ENV+= CCOMPILER="${CC}" CXXCOMPILER="${CXX}" \
CONFIGURE_ARGS+= --with-PAGESIZE=A4
.endif
.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mclang}
CXXFLAGS += -std=c++03
.endif
FAKE_FLAGS= ROOT=${WRKINST} SPOOL=${PREFIX}/libdata/hylafax
NO_TEST= Yes
@ -64,6 +59,7 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/configure
post-install:
echo "FontMap: ${LOCALBASE}/share/fonts/ghostscript" >${PREFIX}/libdata/hylafax/etc/hyla.conf
echo "FontMap: ${LOCALBASE}/share/fonts/ghostscript" \
>${PREFIX}/libdata/hylafax/etc/hyla.conf
.include <bsd.port.mk>

13
comms/hylafax/patches/patch-faxd_ModemConfig_c++ Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-faxd_ModemConfig_c++,v 1.1 2019/04/21 15:44:05 cwen Exp $
Allow building with C++14
Index: faxd/ModemConfig.c++
--- faxd/ModemConfig.c++.orig
+++ faxd/ModemConfig.c++
@@ -817,4 +817,4 @@ ModemConfig::setConfigItem(const char* tag, const char
}
#undef N
-fxIMPLEMENT_ObjArray(IDConfArray, id_config);
+fxIMPLEMENT_ObjArray(IDConfArray, id_config)

2
comms/hylafax/patches/patch-faxd_UUCPLock_c++
View File

@ -1,3 +1,5 @@
$OpenBSD: patch-faxd_UUCPLock_c++,v 1.3 2019/04/21 15:44:05 cwen Exp $
--- faxd/UUCPLock.c++.orig Thu Sep 21 05:24:54 2000
+++ faxd/UUCPLock.c++ Wed Jul 31 12:40:10 2002
@@ -37,6 +37,7 @@ extern "C" {

16
comms/hylafax/patches/patch-libhylafax_FaxRecvInfo_c++ Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-libhylafax_FaxRecvInfo_c++,v 1.1 2019/04/21 15:44:05 cwen Exp $
Allow building with C++14
Index: libhylafax/FaxRecvInfo.c++
--- libhylafax/FaxRecvInfo.c++.orig
+++ libhylafax/FaxRecvInfo.c++
@@ -112,7 +112,7 @@ FaxRecvInfo::decode(const char* cp)
if (cp == NULL || cp[1] != ',' || cp[2] != '"')
return (false);
u_int i = 0;
- while (cp+2 != '\0') {
+ while (*(cp+2) != '\0') {
callid[i] = cp+3; // +1 for "/+1 for ,/+1 for "
if (*cp == '\"') break;
callid[i].resize(callid[i].next(0,'"'));

10
comms/hylafax/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.7 2018/09/04 12:46:09 espie Exp $
$OpenBSD: README,v 1.8 2019/04/21 15:44:05 cwen Exp $
+-----------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD
@ -9,9 +9,9 @@ Post-installation steps
Hylafax needs some manual configuration before it is usable.
Make sure that you have configured HylaFAX before running faxq:
server: ${TRUEPREFIX}/sbin/faxsetup
modems:${TRUEPREFIX}/sbin/faxaddmodem
incoming calls: /etc/ttys
server: ${TRUEPREFIX}/sbin/faxsetup
modems:${TRUEPREFIX}/sbin/faxaddmodem
incoming calls: /etc/ttys
When you are asked to specify the name of tty device, use a tty device
existing on your architecture instead of "ttyd1".
@ -25,4 +25,4 @@ and send a SIGHUP to init(8).
References
==========
Additional documentation at http://www.hylafax.org/.
Additional documentation at https://www.hylafax.org/.