Workaround to remove mgetty/hylafax conflict.

Update my email address while there.
ok mbalmer@ kili@
This commit is contained in:
ajacoutot 2006-10-15 16:07:07 +00:00
parent 681b205576
commit 077f9204e1
5 changed files with 20 additions and 11 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.47 2006/01/14 12:05:34 steven Exp $
# $OpenBSD: Makefile,v 1.48 2006/10/15 16:07:07 ajacoutot Exp $
COMMENT= "send/receive faxes and share modems"
DISTNAME= hylafax-4.1.5
PKGNAME= ${DISTNAME}p4
PKGNAME= ${DISTNAME}p5
CATEGORIES= comms
FLAVORS= a4

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2006/01/14 12:05:34 steven Exp $
@conflict mgetty+sendfax-*
@comment $OpenBSD: PLIST,v 1.12 2006/10/15 16:07:07 ajacoutot Exp $
@conflict p5-SendPage-*
bin/faxalter
bin/faxcover

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.30 2006/03/04 10:38:58 mbalmer Exp $
# $OpenBSD: Makefile,v 1.31 2006/10/15 16:07:07 ajacoutot Exp $
COMMENT= "handle external logins, send and receive faxes"
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 <ajacoutot@lphp.org>
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= yes
@ -38,9 +38,15 @@ pre-configure:
@cp ${WRKSRC}/policy.h-dist ${WRKSRC}/policy.h
pre-install:
.for i in faxq.1 faxrm.1 faxqueue.5 fax.1 faxq-helper.8 mgetty.texi
perl -pi -e "s,faxrm,mgetty-faxrm,g" ${WRKSRC}/doc/${i}
perl -pi -e "s,usage\: faxrm,usage\: mgetty-faxrm,g" ${WRKSRC}/fax/faxrm.in
.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

View File

@ -5,3 +5,8 @@ ${PREFIX}/lib/mgetty+sendfax/setup
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)

View File

@ -1,14 +1,13 @@
@comment $OpenBSD: PLIST,v 1.11 2006/03/04 10:38:58 mbalmer Exp $
@conflict hylafax-*
@comment $OpenBSD: PLIST,v 1.12 2006/10/15 16:07:07 ajacoutot Exp $
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/faxq-helper
lib/mgetty+sendfax/setup
@man man/man1/coverpg.1
@man man/man1/faxq.1
@man man/man1/faxrm.1
@man man/man1/faxrunq.1
@man man/man1/faxspool.1
@man man/man1/g32pbm.1
@man man/man1/g3cat.1
@man man/man1/mgetty-faxrm.1
@man man/man1/pbm2g3.1
@man man/man1/pvf.1
@man man/man1/sff2g3.1