From 49740f2c5082d48eb4fa7c8ea40d10114d7de1ee Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Wed, 6 Jun 2012 19:30:28 +0000 Subject: [PATCH] Register CONFLICTS Reported by: "Sulev-Madis 'ketas' Silber" --- comms/efax-gtk/Makefile | 2 ++ comms/efax/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index ecb24294815f..543d80d800e1 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -29,6 +29,8 @@ GNU_CONFIGURE= yes USE_GCC= 4.4+ MAKE_JOBS_SAFE= yes +CONFLICTS= efax-[0-9]* + MAN1= efax.1 efix.1 efax-gtk.1 CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} diff --git a/comms/efax/Makefile b/comms/efax/Makefile index f259d8404741..ad0ce1aa243c 100644 --- a/comms/efax/Makefile +++ b/comms/efax/Makefile @@ -25,6 +25,8 @@ MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" +CONFLICTS= efax-gtk-* + post-build: ${MV} ${WRKSRC}/fax ${WRKSRC}/fax.orig ${CAT} ${WRKSRC}/fax.orig | ${SED} -e s!%%PREFIX%%!${PREFIX}!g > \