Hi.
People asked me several times to resolve the mgetty/hylafax conflict so
that they could easily install both (since hylafax can make use of
mgetty).
This workaround should fix that.
Let me know...
--
Antoine
Index: comms/hylafax/Makefile
===================================================================
RCS file: /cvs/ports/comms/hylafax/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- comms/hylafax/Makefile 14 Jan 2006 12:05:34 -0000 1.47
+++ comms/hylafax/Makefile 15 Oct 2006 14:35:05 -0000
@@ -2,7 +2,7 @@
COMMENT= "send/receive faxes and share modems"
DISTNAME= hylafax-4.1.5
-PKGNAME= ${DISTNAME}p4
+PKGNAME= ${DISTNAME}p5
CATEGORIES= comms
FLAVORS= a4
Index: comms/hylafax/pkg/PLIST
===================================================================
RCS file: /cvs/ports/comms/hylafax/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- comms/hylafax/pkg/PLIST 14 Jan 2006 12:05:34 -0000 1.11
+++ comms/hylafax/pkg/PLIST 15 Oct 2006 14:35:05 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2006/01/14 12:05:34 steven Exp $
[EMAIL PROTECTED] mgetty+sendfax-*
@conflict p5-SendPage-*
bin/faxalter
bin/faxcover
Index: comms/mgetty+sendfax/Makefile
===================================================================
RCS file: /cvs/ports/comms/mgetty+sendfax/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- comms/mgetty+sendfax/Makefile 4 Mar 2006 10:38:58 -0000 1.30
+++ comms/mgetty+sendfax/Makefile 15 Oct 2006 14:35:05 -0000
@@ -5,12 +5,12 @@
VERSION= 1.1.35
RELEASE= Feb22
DISTNAME= mgetty${VERSION}-${RELEASE}
-PKGNAME= mgetty+sendfax-${VERSION}
+PKGNAME= mgetty+sendfax-${VERSION}p0
CATEGORIES= comms
HOMEPAGE= http://mgetty.greenie.net/
-MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
+MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
# GPL
PERMIT_PACKAGE_CDROM= yes
@@ -38,9 +38,14 @@
@cp ${WRKSRC}/policy.h-dist ${WRKSRC}/policy.h
pre-install:
+.for i in faxq.1 faxrm.1 faxqueue.5 fax.1 mgetty.texi
+ perl -pi -e "s,faxrm,mgetty-faxrm,g" ${WRKSRC}/doc/${i}
+.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mgetty+sendfax
post-install:
+ mv ${PREFIX}/bin/faxrm ${PREFIX}/bin/mgetty-faxrm
+ mv ${PREFIX}/man/man1/faxrm.1 ${PREFIX}/man/man1/mgetty-faxrm.1
${INSTALL_SCRIPT} ${WRKDIR}/setup ${PREFIX}/lib/mgetty+sendfax
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgetty+sendfax
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgetty+sendfax/faq
Index: comms/mgetty+sendfax/pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/comms/mgetty+sendfax/pkg/MESSAGE,v
retrieving revision 1.1
diff -u -r1.1 MESSAGE
--- comms/mgetty+sendfax/pkg/MESSAGE 25 Sep 2005 18:18:24 -0000 1.1
+++ comms/mgetty+sendfax/pkg/MESSAGE 15 Oct 2006 14:35:05 -0000
@@ -5,3 +5,8 @@
It will help you to create the following configuration files in
${SYSCONFDIR}/mgetty+sendfax:
faxheader mgetty.config sendfax.config
+
+The faxrm utility and man page have been rename to avoid conflict with
+comms/hylafax:
+ faxrm -> mgetty-faxrm
+ faxrm(1) -> mgetty-faxrm(1)
Index: comms/mgetty+sendfax/pkg/PLIST
===================================================================
RCS file: /cvs/ports/comms/mgetty+sendfax/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- comms/mgetty+sendfax/pkg/PLIST 4 Mar 2006 10:38:58 -0000 1.11
+++ comms/mgetty+sendfax/pkg/PLIST 15 Oct 2006 14:35:05 -0000
@@ -1,14 +1,13 @@
@comment $OpenBSD: PLIST,v 1.11 2006/03/04 10:38:58 mbalmer Exp $
[EMAIL PROTECTED] hylafax-*
bin/autopvf
bin/basictopvf
bin/faxq
-bin/faxrm
bin/faxrunq
bin/faxspool
bin/g32pbm
bin/g3cat
bin/lintopvf
+bin/mgetty-faxrm
bin/newslock
bin/pbm2g3
bin/pvfamp
@@ -42,11 +41,11 @@
lib/mgetty+sendfax/setup
@man man/man1/coverpg.1
@man man/man1/faxq.1
[EMAIL PROTECTED] man/man1/faxrm.1
@man man/man1/faxrunq.1
@man man/man1/faxspool.1
@man man/man1/g32pbm.1
@man man/man1/g3cat.1
[EMAIL PROTECTED] man/man1/mgetty-faxrm.1
@man man/man1/pbm2g3.1
@man man/man1/pvf.1
@man man/man1/sff2g3.1
