diff options
| -rw-r--r-- | comms/efax/Makefile | 4 | ||||
| -rw-r--r-- | misc/kdeutils3/Makefile | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/comms/efax/Makefile b/comms/efax/Makefile index fdd3ed55401..336bc2234fc 100644 --- a/comms/efax/Makefile +++ b/comms/efax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/06/02 01:21:23 jschauma Exp $ +# $NetBSD: Makefile,v 1.7 2003/06/16 13:31:45 markd Exp $ DISTNAME= efax-0.9 CATEGORIES= comms @@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://www.cce.com/efax/ COMMENT= collection of small programs for sending and receiving faxes -CONFLICTS= kdeutils-[0-9]* +CONFLICTS= kdeutils<3.1 USE_BUILDLINK2= # defined diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 8680755cb67..89fb65f645c 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2003/05/22 02:57:13 markd Exp $ +# $NetBSD: Makefile,v 1.21 2003/06/16 13:31:44 markd Exp $ DISTNAME= kdeutils-3.1.2 COMMENT= Utilities for the KDE integrated X11 desktop -CONFLICTS= efax-[0-9]* - .include "../../x11/kde3/Makefile.kde3" USE_BUILDLINK2= YES @@ -17,9 +15,6 @@ MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" .include "../../mk/bsd.prefs.mk" -_KDE_SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4755 -SPECIAL_PERMS+= ${PREFIX}/bin/efax ${_KDE_SETUID_ROOT} - .if ${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h) CPPFLAGS+= -D__NetBSD_APM__ .endif |