From 37e5e69e190daf057d8dd9eddeab8229a73e61c3 Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Fri, 1 Apr 2011 20:27:29 +0000
Subject: Remove CONFLICTS with graphics/netpbm: do not install link from
 g32pbm to g3topbm, which already exists in netpbm.

The g3topbm alias is intended for 3rd party fax viewers, however
no ports depend on comms/mgetty+sendfax. g3topbm is also not
referenced anywhere in lib/mgetty+sendfax.
---
 comms/mgetty+sendfax/Makefile                |  4 +---
 comms/mgetty+sendfax/files/patch-g3_Makefile | 16 ++++++++++++++++
 comms/mgetty+sendfax/pkg-plist               |  1 -
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 comms/mgetty+sendfax/files/patch-g3_Makefile

(limited to 'comms')

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 877261c8a45f..e381a2587086 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mgetty
 PORTVERSION=	1.1.35
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms
 MASTER_SITES=	ftp://mgetty.greenie.net/pub/mgetty/source/1.1/
 DISTNAME=	${PORTNAME}${PORTVERSION}-Feb22
@@ -17,8 +17,6 @@ COMMENT=	Handle external logins, send and receive faxes
 
 USE_PERL5=	yes
 
-CONFLICTS=	netpbm-[0-9]*
-
 SUB_FILES=	pkg-message mgettycfg
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_FLAGS=	CFLAGS="${CFLAGS}" prefix=${PREFIX} -f
diff --git a/comms/mgetty+sendfax/files/patch-g3_Makefile b/comms/mgetty+sendfax/files/patch-g3_Makefile
new file mode 100644
index 000000000000..662cc8c284f2
--- /dev/null
+++ b/comms/mgetty+sendfax/files/patch-g3_Makefile
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- g3/Makefile.orig
++++ g3/Makefile
+@@ -45,8 +45,8 @@
+ #
+ # make symlink for "g3topbm" (so third-party fax viewers won't fail)
+ #
+-	-cd $(BINDIR) ; \
+-	test -x g3topbm || ln -s g32pbm g3topbm
++#	-cd $(BINDIR) ; \
++#	test -x g3topbm || ln -s g32pbm g3topbm
+ 
+ 
+ # test suite
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index 19b26c18729b..985039997803 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -6,7 +6,6 @@ bin/faxrunq
 bin/faxspool
 bin/g32pbm
 bin/g3cat
-bin/g3topbm
 bin/lintopvf
 bin/mg.echo
 bin/mgettycfg
-- 
cgit v1.2.3