diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2011-04-01 20:27:29 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2011-04-01 20:27:29 +0000 |
| commit | 37e5e69e190daf057d8dd9eddeab8229a73e61c3 (patch) | |
| tree | 70b393c651cd7721256ab6c95fd2a51a2da1638e /comms | |
| parent | 4d1b69274a32eb50283fd37b7fba8a89a92ac8cb (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=272103
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/mgetty+sendfax/Makefile | 4 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/files/patch-g3_Makefile | 16 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/pkg-plist | 1 |
3 files changed, 17 insertions, 4 deletions
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 |